[Libreoffice-bugs] [Bug 106179] [META] Writer comment bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=106179 Dieter changed: What|Removed |Added Depends on||137459 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=137459 [Bug 137459] Delete key behaves like Backspace in Calc and Writer when editing a comment -- 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/qa
sc/qa/uitest/calc_dialogs/openDialogs.py |4 ++-- sc/qa/uitest/calc_tests8/tdf137726.py| 28 2 files changed, 30 insertions(+), 2 deletions(-) New commits: commit 585f8dacba798afde6b4cc439c969a37a37e6162 Author: Xisco Fauli AuthorDate: Tue Oct 27 17:44:30 2020 +0100 Commit: Xisco Fauli CommitDate: Wed Oct 28 09:22:09 2020 +0100 tdf#tdf#137726: sc: Add UItest Change-Id: I67bcafb3155b991dc8b1515f224675906e0a5955 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104897 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/qa/uitest/calc_dialogs/openDialogs.py b/sc/qa/uitest/calc_dialogs/openDialogs.py index abf6857c02e1..79759b953328 100644 --- a/sc/qa/uitest/calc_dialogs/openDialogs.py +++ b/sc/qa/uitest/calc_dialogs/openDialogs.py @@ -26,8 +26,8 @@ dialogs = [ # tested in sc/qa/uitest/search_replace/* # {"command": ".uno:InsertObjectChart", "closeButton": "cancel"}, # tested in uitest/calc_tests/create_chart.py -{"command": ".uno:DataDataPilotRun", "closeButton": "cancel", "skipTestOK": True}, -# OK button triggers a new dialog +# {"command": ".uno:DataDataPilotRun", "closeButton": "cancel", "skipTestOK": True}, +# tested in sc/qa/uitest/calc_tests8/tdf137726.py # {"command": ".uno:FunctionDialog", "closeButton": "cancel"}, # Cancel button tested in uitest/calc_tests/function_wizard.py # OK button tested in sc/qa/uitest/calc_tests7/tdf123479.py diff --git a/sc/qa/uitest/calc_tests8/tdf137726.py b/sc/qa/uitest/calc_tests8/tdf137726.py new file mode 100644 index ..8256a778ba26 --- /dev/null +++ b/sc/qa/uitest/calc_tests8/tdf137726.py @@ -0,0 +1,28 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# 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/. +# +from uitest.framework import UITestCase + +class tdf137726(UITestCase): + +def test_tdf137726(self): +calc_doc = self.ui_test.create_doc_in_start_center("calc") +xCalcDoc = self.xUITest.getTopFocusWindow() +gridwin = xCalcDoc.getChild("grid_window") + +self.ui_test.execute_dialog_through_command(".uno:DataDataPilotRun") + +# three dialogs are displayed one after the other, click OK in all of them +for i in range(3): +xDialog = self.xUITest.getTopFocusWindow() +xOKBtn = xDialog.getChild('ok') +self.ui_test.close_dialog_through_button(xOKBtn) + +# Without the fix in place, this test would have hung here + +self.ui_test.close_doc() + +# 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 137813] Status bar shows 'SVG selected' while the actual image based on PDF (so PDF selected)
https://bugs.documentfoundation.org/show_bug.cgi?id=137813 Telesto changed: What|Removed |Added CC||libreoffice-ux-advise@lists ||.freedesktop.org Keywords||needsUXEval -- 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 137813] New: Status bar shows 'SVG selected' while the actual image based on PDF (so PDF selected)
https://bugs.documentfoundation.org/show_bug.cgi?id=137813 Bug ID: 137813 Summary: Status bar shows 'SVG selected' while the actual image based on PDF (so PDF selected) Product: LibreOffice Version: 7.1.0.0.alpha0+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tele...@surfxs.nl Description: Status bar shows 'SVG selected' while the actual image based on PDF (so PDF selected) Steps to Reproduce: 1. open attachment 134456 2. Click the PDF image (left) with white border 3. Status bar shows SVG while file being PDF Actual Results: Status bar shows SVG Expected Results: PDF Reproducible: Always User Profile Reset: No Additional Info: Version: 7.1.0.0.alpha0+ (x64) Build ID: 94e6e140491de31c0788c91af855a75a3bb12709 CPU threads: 4; OS: Windows 6.3 Build 9600; UI render: Skia/Raster; VCL: win Locale: nl-NL (nl_NL); UI: en-US Calc: CL -- 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 137813] Status bar shows 'SVG selected' while the actual image based on PDF (so PDF selected)
https://bugs.documentfoundation.org/show_bug.cgi?id=137813 Telesto changed: What|Removed |Added CC||libreoffice-ux-advise@lists ||.freedesktop.org Keywords||needsUXEval -- 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 82363] create test files for regression testing of libvisio
https://bugs.documentfoundation.org/show_bug.cgi?id=82363 Bartosz changed: What|Removed |Added Status|ASSIGNED|NEW Assignee|gan...@poczta.onet.pl |libreoffice-b...@lists.free ||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-bugs] [Bug 135668] [LOCALHELP] Writer: add info about submenu items for "Headings" context menu in Navigator
https://bugs.documentfoundation.org/show_bug.cgi?id=135668 --- Comment #30 from sdc.bla...@youmail.dk --- (In reply to Jim Raykowski from comment #29) > I see you already have the concept of what makes a paragraph an outline > heading or possibly an outline content paragraph :) (-: But your detailed discussion has made it apparent that it would be good to present the page in a way that also takes account of the fact that some who read the page will know know about outline levels. I will add some links in the "Related Topics" section at the bottom. Meanwhile -- the intention in my question 2.5 about "Headings" was much more banal. Let me try again. As you know, the "To access" currently says: In Navigator (F5) (for Headings) And as you also know, there are different "parts" of Navigator (I do not know what they are called -- so I make up some terms here: the navigation panel across the top, and the "Content Window" with the different icons (Heading, Images, Bookmarks, etc.). So -- I considered an alternative like: In Navigator (F5) (for Headings in Content View) (but I was uncertain if "Content View" was a "technical" term, or if that Window should be called something else) -- which motivated question 2.5. Actually, the alternative looks better to me -- but maybe it creates confusion if "Content View" could not be understood or guessed. "Content Window"? (nothing critical here -- but while the paint is still wet, now is the time for small adjustments.) -- 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 86630] MENU: Easily insert page number into header/footer with extended menu Insert
https://bugs.documentfoundation.org/show_bug.cgi?id=86630 --- Comment #20 from Albert Acer --- Created attachment 166790 --> https://bugs.documentfoundation.org/attachment.cgi?id=166790=edit Insert Page Number in OnlyOffice 6.0 - Spanish Version on Windows 10 Pro. -- 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 95096] ibus keyboarding solution - kmfl characters are not "swallowed" for cell in row with "table in table"
https://bugs.documentfoundation.org/show_bug.cgi?id=95096 --- Comment #17 from Justin L --- Created attachment 166789 --> https://bugs.documentfoundation.org/attachment.cgi?id=166789=edit writerTableDebug.txt: output of debugging lines showing different coordinates (In reply to Justin L from comment #16) The use of the fullstop is the key here. The fullstop restarts the coordinate numbering position - but the delete context doesn't restart. -- 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 86630] MENU: Easily insert page number into header/footer with extended menu Insert
https://bugs.documentfoundation.org/show_bug.cgi?id=86630 --- Comment #19 from Albert Acer --- In the image that I attach today (28-October-2020) shows, for example, how this problem was solved in a relatively new Open Source Office Suite, known as OnlyOffice Desktop Editors, which comes with the distribution of GNU / Linux known as LinuxFx 10.X. Taking advantage of the fact that OnlyOffice is open source, I think that LibreOffice developers could review, analyze or study the OnlyOffice code to understand how they managed to solve this problem less than a year ago. -- 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 113163] FILEOPEN PPTX: EMF+ A color change to transparent on the image is missing on import (PPT OK)
https://bugs.documentfoundation.org/show_bug.cgi?id=113163 --- Comment #10 from Timur --- Created attachment 166788 --> https://bugs.documentfoundation.org/attachment.cgi?id=166788=edit PPTX sample saved as PPT in MSO Repro 7.1+ with original PPTX. MSO saved PPT is OK. -- 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 113163] FILEOPEN PPTX: EMF+ A color change to transparent on the image is missing on import (PPT OK)
https://bugs.documentfoundation.org/show_bug.cgi?id=113163 Timur changed: What|Removed |Added Keywords||filter:pptx -- 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 113163] FILEOPEN PPTX: EMF+ A color change to transparent on the image is missing on import (PPT OK)
https://bugs.documentfoundation.org/show_bug.cgi?id=113163 Timur changed: What|Removed |Added Summary|FILEOPEN: EMF+ A color |FILEOPEN PPTX: EMF+ A color |change to transparent on|change to transparent on |the image is missing on |the image is missing on |import |import (PPT OK) -- 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 137236] Chapter, Filename and Template should be be shown in "Select" frame not "Format" frame in Fields dialog - Document tab
https://bugs.documentfoundation.org/show_bug.cgi?id=137236 --- Comment #18 from sdc.bla...@youmail.dk --- (In reply to Mike Kaganski from comment #16) > that don't take overall architectural picture into account; e.g. here, I > don't see an analysis like "This will change this from consistent into > inconsistent; yet, we estimate that about 60% users who currently use this > feature have problems, and the suggestion is expected to lower that number > to 35%". [avoiding politely the question of whether the possible change in consistency is "logical" or "subjective" (-: and completely oblivious of the overall architectural picture - but without disputing the general validity and importance of doing so ] How about an analysis like this (seriously meant): This change will guarantee with 100% that it will be possible to write a simpler, more comprehensible help page: https://help.libreoffice.org/7.1/en-US/text/swriter/01/04090001.html where (on this help page) all Types and Select items can be placed in a single table (so their relationship can be clearly indicated), rather than the current hybrid with a separate "Select" section, and where the instruction to the user is -- as the page currently says -- to insert a field, choose an item in the select list and press insert. (At present, the current help page is wrong, when some items to insert are in the Format frame. This change will also avoid having to find a way to explain these alternatives.) With all that in place, then it is easy to indicate that "Format" applies only Types "Date", "Page" "Statistics" and "Time", where format can be used to choose how dates, times, and numbers are displayed. Based on these potential improvements in the help page, we estimate that 3% of the users might read it, with 85% of them being able to successfully achieve (and/or) expand their possibility to use Document Field Types, with satisfaction. (ok, maybe this paragraph is only half-serious) Furthermore, it is predicted that with a consistent relation between Type and Select, and useful explanations of Field Types and Select in the Document Fields help, then users will gain advantage in understanding the DocInformation tab and the Variables tab, where all fields are inserted from the "Select" frame, and where Format is used (in DocInformation) like in Document to control dates and times (no numbers there) and roughly the same in Variables (now with numbers, and with greater numerical display variations (plus text) because of "Additional formats"). I suspect there already exist usability studies that show the advantage of a consistency across the tabs of the UI -- even if there are not studies of this particular Insert Fields dialog (with its different tabs). ---Please -- no reply to this analysis is needed -- but I wanted to lay out the main issue that motivated the OP and comment 14 -- 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 137236] Chapter, Filename and Template should be be shown in "Select" frame not "Format" frame in Fields dialog - Document tab
https://bugs.documentfoundation.org/show_bug.cgi?id=137236 --- Comment #18 from sdc.bla...@youmail.dk --- (In reply to Mike Kaganski from comment #16) > that don't take overall architectural picture into account; e.g. here, I > don't see an analysis like "This will change this from consistent into > inconsistent; yet, we estimate that about 60% users who currently use this > feature have problems, and the suggestion is expected to lower that number > to 35%". [avoiding politely the question of whether the possible change in consistency is "logical" or "subjective" (-: and completely oblivious of the overall architectural picture - but without disputing the general validity and importance of doing so ] How about an analysis like this (seriously meant): This change will guarantee with 100% that it will be possible to write a simpler, more comprehensible help page: https://help.libreoffice.org/7.1/en-US/text/swriter/01/04090001.html where (on this help page) all Types and Select items can be placed in a single table (so their relationship can be clearly indicated), rather than the current hybrid with a separate "Select" section, and where the instruction to the user is -- as the page currently says -- to insert a field, choose an item in the select list and press insert. (At present, the current help page is wrong, when some items to insert are in the Format frame. This change will also avoid having to find a way to explain these alternatives.) With all that in place, then it is easy to indicate that "Format" applies only Types "Date", "Page" "Statistics" and "Time", where format can be used to choose how dates, times, and numbers are displayed. Based on these potential improvements in the help page, we estimate that 3% of the users might read it, with 85% of them being able to successfully achieve (and/or) expand their possibility to use Document Field Types, with satisfaction. (ok, maybe this paragraph is only half-serious) Furthermore, it is predicted that with a consistent relation between Type and Select, and useful explanations of Field Types and Select in the Document Fields help, then users will gain advantage in understanding the DocInformation tab and the Variables tab, where all fields are inserted from the "Select" frame, and where Format is used (in DocInformation) like in Document to control dates and times (no numbers there) and roughly the same in Variables (now with numbers, and with greater numerical display variations (plus text) because of "Additional formats"). I suspect there already exist usability studies that show the advantage of a consistency across the tabs of the UI -- even if there are not studies of this particular Insert Fields dialog (with its different tabs). ---Please -- no reply to this analysis is needed -- but I wanted to lay out the main issue that motivated the OP and comment 14 -- 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 108726] inserted PDF images lose transparency in 5.4
https://bugs.documentfoundation.org/show_bug.cgi?id=108726 --- Comment #14 from Timur --- If I understand this bug, claim is that attached PDF has transparent background. But I see it solid in PDF viewer. Please explain how it can be seen? -- 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/inc sc/source
sc/inc/editutil.hxx |4 sc/inc/scmod.hxx|2 sc/inc/spellcheckcontext.hxx| 71 +++--- sc/source/ui/app/scmod.cxx | 37 --- sc/source/ui/inc/gridwin.hxx|4 sc/source/ui/inc/output.hxx |2 sc/source/ui/inc/tabview.hxx|2 sc/source/ui/view/dbfunc.cxx|2 sc/source/ui/view/gridwin.cxx | 200 - sc/source/ui/view/gridwin2.cxx |6 sc/source/ui/view/spellcheckcontext.cxx | 360 sc/source/ui/view/tabview.cxx | 18 - sc/source/ui/view/viewfun2.cxx | 32 ++ sc/source/ui/view/viewfun3.cxx | 15 - sc/source/ui/view/viewfunc.cxx |7 15 files changed, 426 insertions(+), 336 deletions(-) New commits: commit bdd149b1ff3d43b94cadc0d43365100c287c7639 Author: Dennis Francis AuthorDate: Sun Oct 4 12:47:46 2020 +0530 Commit: Noel Grandin CommitDate: Wed Oct 28 08:39:25 2020 +0100 Improve spell checking performance and impl. in several ways: * do synchronous spell checking, avoiding an idle handler * avoid continuous invalidations caused per-cell by spell-checking * cache spell-checking information for a given SharedString to avoid repeated checking of frequently recurring strings. Change-Id: Ie251f263a8932465297dd8bd66dfc4aa10984947 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104705 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index f28249145c06..d760faf5c53e 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -117,10 +117,8 @@ protected: class SC_DLLPUBLIC ScEditEngineDefaulter : public ScEnginePoolHelper, public EditEngine { -private: -using EditEngine::SetText; - public: +using EditEngine::SetText; /// bDeleteEnginePool: Engine becomes the owner of the pool /// and deletes it on destruction ScEditEngineDefaulter( SfxItemPool* pEnginePool, diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index c8af1d424d9b..20dc94e9e9e8 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -81,7 +81,6 @@ class SfxDialogController; class SAL_DLLPUBLIC_RTTI ScModule final : public SfxModule, public SfxListener, public utl::ConfigurationListener { Timer m_aIdleTimer; -Idlem_aSpellIdle; std::unique_ptr m_pDragData; ScSelectionTransferObj* m_pSelTransfer; ScMessagePool* m_pMessagePool; @@ -131,7 +130,6 @@ public: // moved by the application DECL_LINK( IdleHandler, Timer*, void ); // Timer instead of idle -DECL_LINK( SpellTimerHdl, Timer*, void ); DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); voidExecute( SfxRequest& rReq ); diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx index 42ec80389af2..684b2ceb9edc 100644 --- a/sc/inc/spellcheckcontext.hxx +++ b/sc/inc/spellcheckcontext.hxx @@ -10,50 +10,53 @@ #ifndef INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX #define INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX +#include #include #include "types.hxx" -#include +#include #include -namespace sc { +class ScDocument; +class ScTabEditEngine; -struct SpellCheckContext +namespace sc { -struct CellPos -{ -struct Hash -{ -size_t operator() (const CellPos& rPos) const; -}; - -SCCOL mnCol; -SCROW mnRow; - -CellPos(); -CellPos(SCCOL nCol, SCROW nRow); - -void setInvalid(); -bool isValid() const; -void reset(); - -bool operator== (const CellPos& r) const; -}; - -typedef std::unordered_map, CellPos::Hash> CellMapType; - -CellPos maPos; -CellMapType maMisspellCells; - -SpellCheckContext(); - -bool isMisspelled( SCCOL nCol, SCROW nRow ) const; -const std::vector* getMisspellRanges( SCCOL nCol, SCROW nRow ) const; -void setMisspellRanges( SCCOL nCol, SCROW nRow, const std::vector* pRanges ); +/** + * Class shared between grid windows to cache + * spelling results. + */ +class SpellCheckContext +{ +class SpellCheckCache; +struct SpellCheckStatus; +struct SpellCheckResult; + +std::unique_ptr mpCache; +std::unique_ptr mpResult; +ScDocument* pDoc; +std::unique_ptr mpEngine; +std::unique_ptr mpStatus; +SCTAB mnTab; +LanguageType meLanguage; + +public: +SpellCheckContext(ScDocument* pDocument, SCTAB nTab); +~SpellCheckContext(); + +bool isMisspelled(SCCOL nCol, SCROW nRow) const; +const std::vector* getMisspellRanges(SCCOL nCol, SCROW nRow) const; +void setMisspellRanges(SCCOL nCol, SCROW nRow, + const std::vector* pRanges); void reset(); -}; +void resetForContentChange(); +private: +void
[Libreoffice-bugs] [Bug 86630] MENU: Easily insert page number into header/footer with extended menu Insert
https://bugs.documentfoundation.org/show_bug.cgi?id=86630 --- Comment #18 from Albert Acer --- This Bug was created 6 years ago (since November 2014) and it has been abandoned since April 2017. Apparently there is no solution in sight or reports about possible advances for its solution. I understand that Mr. Yousuf Philips is retired, so from today I assume as spokesman, on behalf of the users, requesting a solution to this problem. In other free-use office suites such as WPS Office Free, SoftMaker FreeOffice and OnlyOffice Free Desktop Editors have already solved this same problem, some of them using reverse engineering techniques to understand how this works in Microsoft Office Word. -- 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/filter/PDFiumLibrary.hxx |1 + vcl/source/filter/ipdf/pdfread.cxx |4 ++-- vcl/source/pdf/PDFiumLibrary.cxx |5 + 3 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 2beecc277959051026d7d1303e3c3ad7922c326c Author: Miklos Vajna AuthorDate: Tue Oct 27 21:04:04 2020 +0100 Commit: Miklos Vajna CommitDate: Wed Oct 28 08:36:45 2020 +0100 pdfium: add an FPDFBitmap_FillRect() wrapper Change-Id: I4201a9ead756cf814c8452ef504acd054c4fe38b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104908 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/include/vcl/filter/PDFiumLibrary.hxx b/include/vcl/filter/PDFiumLibrary.hxx index 556ca44ac4fd..43cbdb2f9a12 100644 --- a/include/vcl/filter/PDFiumLibrary.hxx +++ b/include/vcl/filter/PDFiumLibrary.hxx @@ -74,6 +74,7 @@ public: PDFiumBitmap(FPDF_BITMAP pBitmap); ~PDFiumBitmap(); FPDF_BITMAP getPointer() { return mpBitmap; } +void fillRect(int left, int top, int width, int height, sal_uInt32 nColor); }; class VCL_DLLPUBLIC PDFiumAnnotation final diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index f9d367002f2e..3e0207e86bd5 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -178,8 +178,8 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector& r // the PDF is not transparent. bTransparent = true; } -const FPDF_DWORD nColor = bTransparent ? 0x : 0x; -FPDFBitmap_FillRect(pPdfBitmap->getPointer(), 0, 0, nPageWidth, nPageHeight, nColor); +const sal_uInt32 nColor = bTransparent ? 0x : 0x; +pPdfBitmap->fillRect(0, 0, nPageWidth, nPageHeight, nColor); FPDF_RenderPageBitmap(pPdfBitmap->getPointer(), pPdfPage->getPointer(), /*start_x=*/0, /*start_y=*/0, nPageWidth, nPageHeight, /*rotate=*/0, /*flags=*/0); diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx index fa5baeebb0c3..607ad7ab9d2c 100644 --- a/vcl/source/pdf/PDFiumLibrary.cxx +++ b/vcl/source/pdf/PDFiumLibrary.cxx @@ -498,6 +498,11 @@ PDFiumBitmap::~PDFiumBitmap() } } +void PDFiumBitmap::fillRect(int left, int top, int width, int height, sal_uInt32 nColor) +{ +FPDFBitmap_FillRect(mpBitmap, left, top, width, height, nColor); +} + PDFiumAnnotation::PDFiumAnnotation(FPDF_ANNOTATION pAnnotation) : mpAnnotation(pAnnotation) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 137612] Table Rows aren't vertically centered
https://bugs.documentfoundation.org/show_bug.cgi?id=137612 --- Comment #6 from Timur --- Created attachment 166787 --> https://bugs.documentfoundation.org/attachment.cgi?id=166787=edit .odt in MSO 2016 and LO 7.1+ We don't see the same, here is comparison of MSO and LO. Let's wait next opinion. -- 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 136979] FILEOPEN PPTX: EMF pictures not transparent.
https://bugs.documentfoundation.org/show_bug.cgi?id=136979 Timur changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Timur --- *** This bug has been marked as a duplicate of bug 137413 *** -- 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 136978] FILEOPEN PPTX: not displayed correctly EMF pictures (that can't be open in image viewer, but look fine in MSO)
https://bugs.documentfoundation.org/show_bug.cgi?id=136978 Timur changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #2 from Timur --- *** This bug has been marked as a duplicate of bug 137413 *** -- 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 'distro/lhm/libreoffice-6-1+backports' - external/nss
external/nss/UnpackedTarball_nss.mk |1 external/nss/nss-restore-manual-pre-dependencies.patch.1 | 83 +++ 2 files changed, 84 insertions(+) New commits: commit e13d8f6a5d481cab3fb450cf1244aec0f4e10e06 Author: Jan-Marek Glogowski AuthorDate: Thu Oct 1 12:57:53 2020 +0200 Commit: Michael Stahl CommitDate: Wed Oct 28 08:20:32 2020 +0100 nss: restore manual pre-dependency build We had some seldom build failures on Windows, with errors like: PermissionError: [WinError 32] The process cannot access the file because it is being used by another process: '/nssckmdt.h'. This happens, because of the "." / parent shell hack. Thinking about it again, it doesn't prevent the parent make to run in parallel to the "." directory make. So I tried to use a terminal match-all rule like ifneq (,$(filter .,$(DIRS))) %:: # empty terminal rule triggered $(error can't happen) endif to stop the original parent make, but that doesn't work and the $(error ...) is triggered. So AFAIK I'm out of options here and have to restore the old manual pre-dependency build variant - still much better then no parallel build. An alternative idea was to put the rest of the rules.mk in the "else" of the terminal rule, to skip all normal rules, but this still leaves out all rules from the rest of the make-files, which might result in some hard to debug errors. This reverts my upstream patch 15608:744881490c78. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103777 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-by: Jan-Marek Glogowski (cherry picked from commit d2f9c55e065d559de903d540da28502646714a24) Change-Id: I9e2e9e1ec9f35697c7853c92f60434f514cba5ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104882 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 2e6e7f80e3ee..100b32b31efe 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/clang-cl.patch.0 \ external/nss/nss.vs2015.patch \ external/nss/nss.vs2015.pdb.patch \ +external/nss/nss-restore-manual-pre-dependencies.patch.1 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ $(if $(filter ANDROID,$(OS)), \ diff --git a/external/nss/nss-restore-manual-pre-dependencies.patch.1 b/external/nss/nss-restore-manual-pre-dependencies.patch.1 new file mode 100644 index ..ebcc5b48c540 --- /dev/null +++ b/external/nss/nss-restore-manual-pre-dependencies.patch.1 @@ -0,0 +1,83 @@ +Revert of upstream: + +changeset: 15608:744881490c78 +user:Jan-Marek Glogowski +date:Wed May 13 19:00:40 2020 + +summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea + +--- b/nss/coreconf/rules.mkWed May 13 19:00:40 2020 + a/nss/coreconf/rules.mkTue May 12 21:33:43 2020 + +@@ -31,21 +31,10 @@ + USE_NT_C_SYNTAX=1 + endif + +-# For whatever reason, "." can't be handled using make conditionals. +-# Based on automake's SUBDIRS "." handling. + ifdef DIRS + ifndef IGNORE_DIRS +-ifneq (,$(filter .,$(DIRS))) +-TARGETS = $(NULL) +-ALL_TRASH = $(NULL) +-endif +- + $(DIRS): ++ $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS) +- $(IGNORE_ERROR)@if [ "$@" != "." ]; then \ +- $(MAKE) -C $@ $(MAKECMDGOALS) ; \ +- else \ +- IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \ +- fi + @$(CLICK_STOPWATCH) + endif + endif +@@ -84,9 +73,7 @@ + check: $(DIRS) + + clean clobber: $(DIRS) +-ifneq (,$(ALL_TRASH)) + rm -rf $(ALL_TRASH) +-endif + + realclean clobber_all: $(DIRS) + rm -rf $(wildcard *.OBJ) dist $(ALL_TRASH) +--- b/nss/lib/ckfw/builtins/manifest.mnWed May 13 19:00:40 2020 + a/nss/lib/ckfw/builtins/manifest.mnTue May 12 21:33:43 2020 + +@@ -5,9 +5,7 @@ + + CORE_DEPTH = ../../.. + ++DIRS = testlib +-DIRS = . testlib +- +-testlib: . + + MODULE = nss + +--- b/nss/lib/ckfw/manifest.mn Wed May 13 19:00:40 2020 + a/nss/lib/ckfw/manifest.mn Tue May 12 21:33:43 2020 + +@@ -5,9 +5,7 @@ + + CORE_DEPTH = ../.. + ++DIRS = builtins +-DIRS = . builtins +- +-builtins: . + + PRIVATE_EXPORTS = \ + ck.h \ +--- b/nss/manifest.mn Wed May 13 19:00:40 2020 + a/nss/manifest.mn Tue May 12 21:33:43 2020 + +@@ -23,6 +23,12 @@ + # no real way to encode these in any sensible way + $(MAKE) -C coreconf/nsinstall program + $(MAKE) export ++ # pre-build child dir -> parent dir dependencies ++ # ckfw/builtins -> ckfw ++ IGNORE_DIRS=1 $(MAKE) -C lib/ckfw libs ++ # ckfw/builtins/testlib -> ckfw/builtins + base ++
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa
sw/qa/extras/uiwriter/uiwriter.cxx | 32 1 file changed, 32 insertions(+) New commits: commit a780fd334a3a6d9a5a300f1b0ba0e067b500dcad Author: Xisco Fauli AuthorDate: Tue Sep 29 13:20:21 2020 +0200 Commit: Michael Stahl CommitDate: Wed Oct 28 08:18:50 2020 +0100 tdf#133358: sw_uiwriter: Add unittest Change-Id: I148052d7038824b43ec0c473d4bcbcb64e2f92b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103608 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 416cb76758719b88a4cdefe8c9d16131c35cfdf5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104747 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 43abc73da811..d287894f94db 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -7557,6 +7557,38 @@ void SwUiWriterTest::testTdf59666() CPPUNIT_ASSERT_EQUAL(sReplaced, static_cast(pDoc->GetNodes()[nIndex])->GetText()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf133358) +{ +mxComponent = loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument"); + +SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); +CPPUNIT_ASSERT(pTextDoc); + +SwWrtShell* pWrtSh = pTextDoc->GetDocShell()->GetWrtShell(); +CPPUNIT_ASSERT(pWrtSh); + +pWrtSh->Insert("Test"); + +CPPUNIT_ASSERT_EQUAL(OUString("Test"), getParagraph(1)->getString()); + +uno::Reference xParagraph(getParagraph(1), uno::UNO_QUERY); + +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xParagraph, "ParaLeftMargin")); + +lcl_dispatchCommand(mxComponent, ".uno:IncrementIndent", {}); + +CPPUNIT_ASSERT_EQUAL(sal_Int32(1251), getProperty(xParagraph, "ParaLeftMargin")); + +lcl_dispatchCommand(mxComponent, ".uno:Undo", {}); + +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xParagraph, "ParaLeftMargin")); + +// Without the fix in place, this test would have crashed here +lcl_dispatchCommand(mxComponent, ".uno:Redo", {}); + +CPPUNIT_ASSERT_EQUAL(sal_Int32(1251), getProperty(xParagraph, "ParaLeftMargin")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); CPPUNIT_PLUGIN_IMPLEMENT(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa
sw/qa/extras/uiwriter/data/tdf132911.odt |binary sw/qa/extras/uiwriter/uiwriter.cxx | 74 +++ 2 files changed, 74 insertions(+) New commits: commit b2faa46071ff4a00672b0699e524e7ae66915fc0 Author: Xisco Fauli AuthorDate: Tue Jul 28 18:34:48 2020 +0200 Commit: Michael Stahl CommitDate: Wed Oct 28 08:19:07 2020 +0100 tdf#132911: sw_uiwriter: Add unittest Change-Id: I0ad6697d8dce814f20ea5f98e9c8f4b9c68f278d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99641 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit a206054ac048702d48077eea6f3d464c3d241ab3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104824 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/sw/qa/extras/uiwriter/data/tdf132911.odt b/sw/qa/extras/uiwriter/data/tdf132911.odt new file mode 100644 index ..3c311f3ed36b Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf132911.odt differ diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index d287894f94db..0bd769d2b121 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -5784,6 +5784,80 @@ void SwUiWriterTest::testRedlineViewAuthor() pDocShell->SetView(pView); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf132911) +{ +load(DATA_DIRECTORY, "tdf132911.odt"); + +SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); +CPPUNIT_ASSERT(pTextDoc); + +auto getShapes = [&]() -> int +{ +uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); +uno::Reference xDraws = xDrawPageSupplier->getDrawPage(); +return xDraws->getCount(); +}; + +uno::Reference xTextTablesSupplier(mxComponent, uno::UNO_QUERY); +uno::Reference xIndexAccess(xTextTablesSupplier->getTextTables(), + uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(4, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:SelectAll", {}); +lcl_dispatchCommand(mxComponent, ".uno:Cut", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(0, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:Paste", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(4, getShapes()); + +// Without the fix in place, it would have crashed here +lcl_dispatchCommand(mxComponent, ".uno:Paste", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(8, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:Undo", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(4, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:Undo", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(0, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:Paste", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(4, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:Paste", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(8, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:Undo", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(4, getShapes()); + +lcl_dispatchCommand(mxComponent, ".uno:Undo", {}); +Scheduler::ProcessEventsToIdle(); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); +CPPUNIT_ASSERT_EQUAL(0, getShapes()); + +//FIXME: tdf#135247 +//lcl_dispatchCommand(mxComponent, ".uno:Undo", {}); +//Scheduler::ProcessEventsToIdle(); +//CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); +//CPPUNIT_ASSERT_EQUAL(4, getShapes()); +} + void SwUiWriterTest::testTdf91292() { createDoc("tdf91292_paraBackground.docx"); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - 2 commits - sw/qa sw/source
sw/qa/extras/uiwriter/data/tdf135056.odt |binary sw/qa/extras/uiwriter/uiwriter.cxx | 25 +++ sw/source/core/layout/fly.cxx| 49 +-- 3 files changed, 72 insertions(+), 2 deletions(-) New commits: commit fc67a79cd9268795f8049aea79c8f94d7165de8a Author: Michael Stahl AuthorDate: Thu Oct 22 19:17:24 2020 +0200 Commit: Michael Stahl CommitDate: Wed Oct 28 08:19:36 2020 +0100 tdf#131679 sw: fix crash when copying fly via context menu sw::DocumentContentOperationsManager::CopyImplImpl() is called with a rPam that's on an SwOLENode. The problem (which i can't reproduce in --enable-dbgutil build, presumably for timing reasons) is that after the context menu pops up, some idle layout runs and reformats the document and deletes a SwFlyFrame and that calls SdrMarkView::UnmarkAllObj(). Then when SwFEShell::Copy() is called, it finds IsFrameSelected() returns false, and it tries to copy normal text when the cursor is on an SwOLENode. Fix this in SwFlyFrame::FinitDrawObj() by first moving the cursor out of any selected flys. (regression from 81ec0039b2085faab49380c7a56af0c562d4c9e4 - previously CopyImplImpl() would return early) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104697 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 40bff2567fa4a3fa8ec4445182cbbe3547c17410) tdf#131679 sw: follow-up: Unmark before SetSelection() Backporting this to 6.4, it crashes in CppunitTest_desktop_lib because some sidebar is loaded from SwView::AttrChangedNotify()/SelectShell() and that ends up calling SwView::StateTabWin() about 40 stack frames later and this calls SwFEShell::GetAnyCurRect() which gets the still selected fly but its page frame is null. So make sure shells don't see the deleted fly. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104815 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit f63afb95b5c2d80d33a35820ef1d9abd9e70d3ca) Change-Id: Id135fcc002c03c07c34fbdc0355f2895d8b6565b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104683 Tested-by: Michael Stahl Reviewed-by: Michael Stahl diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index b5f364511f6e..190e799dbc56 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -377,6 +377,32 @@ void SwFlyFrame::InitDrawObj() : nHellId ); } +static SwPosition ResolveFlyAnchor(SwFrameFormat const& rFlyFrame) +{ +SwFormatAnchor const& rAnch(rFlyFrame.GetAnchor()); +if (rAnch.GetAnchorId() == RndStdIds::FLY_AT_PAGE) +{ // arbitrarily pick last node +return SwPosition(SwNodeIndex(rFlyFrame.GetDoc()->GetNodes().GetEndOfContent(), -1)); +} +else +{ +SwPosition const*const pPos(rAnch.GetContentAnchor()); +assert(pPos); +if (SwFrameFormat const*const pParent = pPos->nNode.GetNode().GetFlyFormat()) +{ +return ResolveFlyAnchor(*pParent); +} +else if (pPos->nContent.GetIdxReg()) +{ +return *pPos; +} +else +{ +return SwPosition(*pPos->nNode.GetNode().GetContentNode(), 0); +} +} +} + void SwFlyFrame::FinitDrawObj() { if(!GetVirtDrawObj() ) @@ -391,8 +417,27 @@ void SwFlyFrame::FinitDrawObj() for(SwViewShell& rCurrentShell : p1St->GetRingContainer()) { // At the moment the Drawing can do just do an Unmark on everything, // as the Object was already removed -if(rCurrentShell.HasDrawView() ) -rCurrentShell.Imp()->GetDrawView()->UnmarkAll(); +if (rCurrentShell.HasDrawView() && + rCurrentShell.Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()) +{ +if (SwFEShell *const pFEShell = dynamic_cast()) +{ // tdf#131679 move any cursor out of fly +SwFlyFrame const*const pOldSelFly = ::GetFlyFromMarked(nullptr, pFEShell); +rCurrentShell.Imp()->GetDrawView()->UnmarkAll(); +if (pOldSelFly) +{ +SwPosition const pos(ResolveFlyAnchor(*pOldSelFly->GetFormat())); +SwPaM const temp(pos); +pFEShell->SetSelection(temp); +// could also call SetCursor() like SwFEShell::SelectObj() +// does, but that would access layout a bit much... +} +} +else +{ +rCurrentShell.Imp()->GetDrawView()->UnmarkAll(); +
[Libreoffice-bugs] [Bug 108747] [META] File properties/settings (meta data) bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108747 Bug 108747 depends on bug 116214, which changed state. Bug 116214 Summary: Custom properties: value type is changed from Number to Text https://bugs.documentfoundation.org/show_bug.cgi?id=116214 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 108747] [META] File properties/settings (meta data) bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108747 Bartosz changed: What|Removed |Added Depends on||103987 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103987 [Bug 103987] FILESAVE: DOCX Duplicated custom properties after roundtrip -- 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 comphelper/qa compilerplugins/clang cui/source desktop/qa drawinglayer/source sal/qa sc/qa sd/qa sd/source sfx2/source sw/qa sw/source
chart2/qa/extras/chart2geometry.cxx| 32 ++--- comphelper/qa/string/test_string.cxx | 12 -- compilerplugins/clang/elidestringvar.cxx | 47 --- compilerplugins/clang/test/elidestringvar.cxx | 12 +- cui/source/dialogs/AdditionsDialog.cxx |4 desktop/qa/desktop_lib/test_desktop_lib.cxx|3 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 25 +--- sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 59 +++-- sal/qa/rtl/digest/rtl_digest.cxx | 18 --- sal/qa/rtl/oustring/rtl_OUString2.cxx | 78 - sal/qa/rtl/uri/rtl_Uri.cxx |3 sc/qa/unit/copy_paste_test.cxx |3 sc/qa/unit/screenshots/screenshots.cxx |3 sc/qa/unit/subsequent_export-test.cxx |8 - sd/qa/unit/dialogs-test.cxx|4 sd/qa/unit/export-tests-ooxml1.cxx |6 - sd/qa/unit/export-tests-ooxml2.cxx |4 sd/qa/unit/tiledrendering/tiledrendering.cxx | 10 + sd/source/ui/remotecontrol/Communicator.cxx|5 sfx2/source/bastyp/frmhtmlw.cxx|5 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |8 - sw/qa/extras/uiwriter/uiwriter.cxx | 10 - sw/source/filter/html/wrthtml.cxx |4 23 files changed, 145 insertions(+), 218 deletions(-) New commits: commit 40fa3a61ac7dbe2ba73b5ee71bb85cc3bb4a27af Author: Stephan Bergmann AuthorDate: Tue Oct 27 23:18:23 2020 +0100 Commit: Stephan Bergmann CommitDate: Wed Oct 28 08:03:52 2020 +0100 Extend loplugin:elidestringvar to OString (In VisitVarDecl, filtering out AbstractConditionalOperator avoids an unhelpful > ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:63:32: error: replace single use of literal 'rtl::OString' variable with a literal [loplugin:elidestringvar] > aXmlWriter.content(sPdfConformance); >^~~ > ~/lo/core/vcl/source/pdf/XmpMetadata.cxx:52:21: note: literal 'rtl::OString' variable defined here [loplugin:elidestringvar] > OString sPdfConformance = (mnPDF_A == 1) ? "A" : "B"; > ^~~~ ) Change-Id: I7d0410f04827d79b4b526752917c37d33cad2671 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104911 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx index be6d842d7780..08e909162766 100644 --- a/chart2/qa/extras/chart2geometry.cxx +++ b/chart2/qa/extras/chart2geometry.cxx @@ -296,9 +296,9 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() // Find transparency gradient name xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8"); CPPUNIT_ASSERT(pXmlDoc); -const OString sChartPath( +const OUString sOUChartStyleName = getXPathContent( +pXmlDoc, "//office:document-content/office:body/office:chart/chart:chart/@chart:style-name"); -const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath); const OString sStylePath( "//office:document-content/office:automatic-styles/style:style[@style:name='" + OU2O(sOUChartStyleName) + "']"); @@ -310,9 +310,8 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() // Verify the content of the opacity definition xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8"); CPPUNIT_ASSERT(pXmlDoc2); -const OString sOpacityPath("//office:document-styles/office:styles/draw:opacity"); const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'"); -const OString sStart(sOpacityPath + "[" + sAttribute); +const OString sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute); assertXPath(pXmlDoc2, sStart + "]", 1); assertXPath(pXmlDoc2, sStart + " and @draw:style='linear']"); assertXPath(pXmlDoc2, sStart + " and @draw:start='30%']"); @@ -348,9 +347,9 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import() // Find transparency gradient name xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8"); CPPUNIT_ASSERT(pXmlDoc); -const OString sChartPath("//office:document-content/office:body/office:chart/chart:chart/" - "chart:plot-area/chart:wall/@chart:style-name"); -const OUString sOUChartStyleName = getXPathContent(pXmlDoc, sChartPath); +const OUString sOUChartStyleName += getXPathContent(pXmlDoc,
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/data/tdf136453.fodt | 66 ++ sw/qa/extras/uiwriter/uiwriter.cxx| 51 +++ sw/source/core/undo/undel.cxx |3 - 3 files changed, 119 insertions(+), 1 deletion(-) New commits: commit c4967928475f2be20ac2d79e3fa84ac435a7e560 Author: Michael Stahl AuthorDate: Tue Oct 27 16:33:30 2020 +0100 Commit: Michael Stahl CommitDate: Wed Oct 28 08:01:53 2020 +0100 tdf#136453 sw_redlinehide: SwUndoDelete: only create extra frames... ... at the start if the section nodes were at the start. m_bBackSp and m_bJoinNext can't both be true. (regression from 740f1796504f66408b692225a9676c9ee3d63722) Change-Id: I999ed3809ca8f527bc3e754b229df02da4576825 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104891 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/qa/extras/uiwriter/data/tdf136453.fodt b/sw/qa/extras/uiwriter/data/tdf136453.fodt new file mode 100644 index ..2234957e1db8 --- /dev/null +++ b/sw/qa/extras/uiwriter/data/tdf136453.fodt @@ -0,0 +1,66 @@ + +http://www.w3.org/TR/css3-text/; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/; xmlns:rpt="http://openoffice.org/2005/report; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:d r3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:xforms="http://www.w3.org/2002/xforms; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:grddl="http://www.w3.org/2003/g/data-view#; office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + foo + bar + +baz + + + + diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index b1f93e1b8422..26a2f8a21056 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -1220,6 +1220,57 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf134252) CPPUNIT_ASSERT_EQUAL(OUString(""), xCursor->getString()); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf136453) +{ +load(DATA_DIRECTORY, "tdf136453.fodt"); + +SwXTextDocument *const pTextDoc(dynamic_cast(mxComponent.get())); +CPPUNIT_ASSERT(pTextDoc); +SwDoc* const pDoc(pTextDoc->GetDocShell()->GetDoc()); +SwWrtShell *const pWrtShell(pDoc->GetDocShell()->GetWrtShell()); + +sal_uLong const nNodes(pDoc->GetNodes().Count()); + +pWrtShell->SttEndDoc(false); +pWrtShell->SetMark(); +pWrtShell->Up(true, 1); +pWrtShell->SttPara(true); +pWrtShell->Delete(); + +// one paragraph deleted, section is gone +CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count()); + +pWrtShell->Undo(); + +CPPUNIT_ASSERT_EQUAL(nNodes, pDoc->GetNodes().Count()); + +// check that every node has 1 frame +xmlDocUniquePtr pXmlDoc = parseLayoutDump(); +assertXPath(pXmlDoc, "/root/page[1]/body/txt", 3); +assertXPath(pXmlDoc, "/root/page[1]/body/section", 1); +assertXPath(pXmlDoc, "/root/page[1]/body/section/txt", 1); + +pWrtShell->Redo(); + +// one paragraph deleted, section is gone +CPPUNIT_ASSERT_EQUAL(nNodes - 3, pDoc->GetNodes().Count()); + +discardDumpedLayout(); +pXmlDoc = parseLayoutDump(); +assertXPath(pXmlDoc, "/root/page[1]/body/txt", 3); +assertXPath(pXmlDoc, "/root/page[1]/body/section", 0); + +pWrtShell->Undo(); + +CPPUNIT_ASSERT_EQUAL(nNodes, pDoc->GetNodes().Count()); + +
[Libreoffice-bugs] [Bug 137410] Hang on reading tabledata from mariadb
https://bugs.documentfoundation.org/show_bug.cgi?id=137410 --- Comment #4 from bugzi...@htbes.nl --- Connection is made via MySQL / Direct -- 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 137410] Hang on reading tabledata from mariadb
https://bugs.documentfoundation.org/show_bug.cgi?id=137410 --- Comment #3 from bugzi...@htbes.nl --- A couple of days after deleting the library the problem is back. MariaDB is hosted on Synology DS218. I had the same problem on one of my Win7 machines and never solved it. On Linux it worked for nearly a year. -- 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/tools sw/inc sw/source tools/source
include/tools/multisel.hxx | 15 --- sw/inc/printdata.hxx |8 sw/source/core/doc/doc.cxx |8 tools/source/memtools/multisel.cxx | 10 +- 4 files changed, 21 insertions(+), 20 deletions(-) New commits: commit 371b84dcb653f241d40265fba9f0d00f7c7e8150 Author: Noel Grandin AuthorDate: Tue Oct 27 20:57:04 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 28 07:57:50 2020 +0100 std::set->o3tl::sorted_vector in MultiSelection Change-Id: I88a77f4b07e5aaccc42e6fb6e5bd0366f57381a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104899 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/tools/multisel.hxx b/include/tools/multisel.hxx index 3e06a3dce239..176bd9984b53 100644 --- a/include/tools/multisel.hxx +++ b/include/tools/multisel.hxx @@ -25,6 +25,7 @@ #include #include +#include #define SFX_ENDOFSELECTION (-1) @@ -92,18 +93,18 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC StringRangeEnumerator bool setRange( const OUString& i_rNewRange ); bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence ); void insertJoinedRanges( const std::vector< sal_Int32 >& rNumbers ); -bool checkValue( sal_Int32, const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; +bool checkValue( sal_Int32, const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; public: class TOOLS_DLLPUBLIC Iterator { const StringRangeEnumerator* pEnumerator; -const std::set< sal_Int32 >* pPossibleValues; +const o3tl::sorted_vector< sal_Int32 >* pPossibleValues; sal_Int32 nRangeIndex; sal_Int32 nCurrent; friend class StringRangeEnumerator; Iterator( const StringRangeEnumerator* i_pEnum, - const std::set< sal_Int32 >* i_pPossibleValues, + const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues, sal_Int32 i_nRange, sal_Int32 i_nCurrent ) : pEnumerator( i_pEnum ), pPossibleValues( i_pPossibleValues ) @@ -126,10 +127,10 @@ public: ); sal_Int32 size() const { return mnCount; } -Iterator begin( const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; -Iterator end( const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; +Iterator begin( const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; +Iterator end( const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; -bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = nullptr ) const; +bool hasValue( sal_Int32 nValue, const o3tl::sorted_vector< sal_Int32 >* i_pPossibleValues = nullptr ) const; /** i_rPageRange: the string to be changed into a sequence of numbers @@ -160,7 +161,7 @@ public: sal_Int32 i_nMinNumber, sal_Int32 i_nMaxNumber, sal_Int32 i_nLogicalOffset = -1, - std::set< sal_Int32 > const * i_pPossibleValues = nullptr + o3tl::sorted_vector< sal_Int32 > const * i_pPossibleValues = nullptr ); }; diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 60778a13eb2c..35f0aa72505c 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -204,7 +204,7 @@ class SwRenderData { /** pages valid for printing (according to the current settings) This set of pages does NOT depend on the 'PageRange' that is used as a printing option! */ -std::set< sal_Int32 > m_aValidPages; ///< the set of possible pages (see StringRangeEnumerator::getRangesFromString ) +o3tl::sorted_vector< sal_Int32 >m_aValidPages; ///< the set of possible pages (see StringRangeEnumerator::getRangesFromString ) /// printer paper tray to use for each of the m_aValidPages above std::map< sal_Int32, sal_Int32 >m_aPrinterPaperTrays; @@ -262,8 +262,8 @@ public: typedef std::vector< std::pair< sal_Int32, sal_Int32 > >PagePairsVec_t; -std::set< sal_Int32 > & GetValidPagesSet() { return m_aValidPages; } -const std::set< sal_Int32 > & GetValidPagesSet() const{ return m_aValidPages; } +o3tl::sorted_vector< sal_Int32 > & GetValidPagesSet() { return m_aValidPages; } +const o3tl::sorted_vector< sal_Int32 > & GetValidPagesSet() const{ return m_aValidPages; } /** a map for printer paper tray numbers to use for each document page a value of -1 for
[Libreoffice-bugs] [Bug 137812] New: Crash in: rptui::::lcl_getQuotedFunctionName
https://bugs.documentfoundation.org/show_bug.cgi?id=137812 Bug ID: 137812 Summary: Crash in: rptuilcl_getQuotedFunctionName Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Base Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: michaelgmann...@gmail.com This bug was filed from the crash reporting server and is br-d63385d2-be18-4405-ba20-85d13a548c39. = -- 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-7-0' - vcl/unx
vcl/unx/gtk3/gtk3gtkdata.cxx | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit 99e924f3faab58076221c7be326c697cb2dcf047 Author: Caolán McNamara AuthorDate: Tue Oct 27 15:17:01 2020 + Commit: Noel Grandin CommitDate: Wed Oct 28 07:27:50 2020 +0100 tdf#133950 scale hotspot to sync with scaled cursors keep aspect ratio as well Change-Id: Ia3c7f84e377ebb952be0a56e9e532fb260f83459 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104840 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index 912bc52d116b..3182d1551f36 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -131,10 +131,18 @@ GdkCursor* GtkSalDisplay::getFromSvg(OUString const & name, int nXHot, int nYHot assert(pPixBuf && "missing image?"); if (!pPixBuf) return nullptr; + guint nDefaultCursorSize = gdk_display_get_default_cursor_size( m_pGdkDisplay ); -GdkPixbuf* pScaledPixBuf = gdk_pixbuf_scale_simple(pPixBuf, nDefaultCursorSize, nDefaultCursorSize, GDK_INTERP_HYPER); +int nPixWidth = gdk_pixbuf_get_width(pPixBuf); +int nPixHeight = gdk_pixbuf_get_height(pPixBuf); +double fScalefactor = static_cast(nDefaultCursorSize) / std::max(nPixWidth, nPixHeight); +GdkPixbuf* pScaledPixBuf = gdk_pixbuf_scale_simple(pPixBuf, + nPixWidth * fScalefactor, + nPixHeight * fScalefactor, + GDK_INTERP_HYPER); g_object_unref(pPixBuf); -GdkCursor* pCursor = gdk_cursor_new_from_pixbuf( m_pGdkDisplay, pScaledPixBuf, nXHot, nYHot); +GdkCursor* pCursor = gdk_cursor_new_from_pixbuf(m_pGdkDisplay, pScaledPixBuf, +nXHot * fScalefactor, nYHot * fScalefactor); return pCursor; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 137711] Fix "Roumania" in the dictionary
https://bugs.documentfoundation.org/show_bug.cgi?id=137711 --- Comment #3 from Dan Dascalescu --- Created attachment 166786 --> https://bugs.documentfoundation.org/attachment.cgi?id=166786=edit English dictionary doesn't include "Romania" -- 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: toolkit/inc toolkit/source
toolkit/inc/helper/unopropertyarrayhelper.hxx |4 ++-- toolkit/source/controls/unocontrolmodel.cxx |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 1977138acba04a7b91d73a3041606b2387e72e70 Author: Noel Grandin AuthorDate: Tue Oct 27 21:12:49 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 28 07:25:01 2020 +0100 std::set->o3tl::sorted_vector in toolkit Change-Id: I1ef897d38c26d2875432d279fdd50d2e073ad2a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104903 Tested-by: Jenkins Tested-by: Noel Grandin Reviewed-by: Noel Grandin diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx index 6036901ac842..29c87099a83b 100644 --- a/toolkit/inc/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx @@ -24,13 +24,13 @@ #include #include -#include +#include class UnoPropertyArrayHelper final : public ::cppu::IPropertyArrayHelper { -std::set maIDs; +o3tl::sorted_vector maIDs; boolImplHasProperty( sal_uInt16 nPropId ) const; diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 5725cd16501a..80ebb041299c 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -46,7 +46,7 @@ #include #include -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -546,7 +546,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt OutStream->writeShort( UNOCONTROL_STREAMVERSION ); -std::set aProps; +o3tl::sorted_vector aProps; for (const auto& rData : maData) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/o3tl include/svx svx/source
include/o3tl/sorted_vector.hxx |1 + include/svx/fmtools.hxx|4 ++-- svx/source/form/fmshimp.cxx|2 +- 3 files changed, 4 insertions(+), 3 deletions(-) New commits: commit ce0f8cff3e2e42bf6ff0968c3a6a9efb71ec00d1 Author: Noel Grandin AuthorDate: Tue Oct 27 21:10:39 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 28 07:23:39 2020 +0100 std::set->o3tl::sorted_vector in InterfaceBag Change-Id: I28ecffdcf6c97f9153e62974bf76b972452747eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104901 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/o3tl/sorted_vector.hxx b/include/o3tl/sorted_vector.hxx index 803a044535e8..508fe61cc03e 100644 --- a/include/o3tl/sorted_vector.hxx +++ b/include/o3tl/sorted_vector.hxx @@ -45,6 +45,7 @@ public: typedef typename std::vector::const_reverse_iterator const_reverse_iterator; typedef typename std::vector::difference_type difference_type; typedef typename std::vector::size_type size_type; +typedef Value value_type; constexpr sorted_vector( std::initializer_list init ) : m_vector(init) diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index f0fba4e0f32a..90eb6d74c49c 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -30,7 +30,7 @@ #include #include - +#include #include namespace com::sun::star::beans { class XPropertySet; } @@ -168,7 +168,7 @@ bool isRowSetAlive(const css::uno::Reference< css::uno::XInterface>& _rxRowSet); // checks if the css::sdbcx::XColumnsSupplier provided by _rxRowSet supplies any columns -typedef ::std::set< css::uno::Reference< css::uno::XInterface > > InterfaceBag; +typedef ::o3tl::sorted_vector< css::uno::Reference< css::uno::XInterface > > InterfaceBag; #endif // INCLUDED_SVX_FMTOOLS_HXX diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index d7f25ec073bc..df80dae12a11 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2603,7 +2603,7 @@ void FmXFormShell::impl_RemoveElement_nothrow_Lock(const Reference& } } -InterfaceBag::iterator wasSelectedPos = m_aCurrentSelection.find( Element ); +auto wasSelectedPos = m_aCurrentSelection.find( Element ); if ( wasSelectedPos != m_aCurrentSelection.end() ) m_aCurrentSelection.erase( wasSelectedPos ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - comphelper/source include/basegfx
comphelper/source/property/propagg.cxx |5 ++--- include/basegfx/polygon/b2dpolypolygontools.hxx |4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit 458ee884c5a57ee1e6dd775b0fbe86a4e3dad5a5 Author: Noel Grandin AuthorDate: Tue Oct 27 21:02:46 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 28 07:24:16 2020 +0100 std::set->o3tl::sorted_vector in PointIndexSet Change-Id: I223a00b66f6de75eb06969a6d4582200e8229e2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104900 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx index 9a83ab4549d7..aed3766d75df 100644 --- a/include/basegfx/polygon/b2dpolypolygontools.hxx +++ b/include/basegfx/polygon/b2dpolypolygontools.hxx @@ -25,7 +25,7 @@ #include #include #include - +#include namespace com::sun::star::drawing { struct PolyPolygonBezierCoords; } @@ -118,7 +118,7 @@ namespace basegfx::utils points in a tools::PolyPolygon by giving the polygon and point index. Adding points double makes no sense, hence the std::set */ -typedef std::set< PointIndex > PointIndexSet; +typedef o3tl::sorted_vector< PointIndex > PointIndexSet; /** Read poly-polygon from SVG. commit 765a1ac1ff67b3fb2ddd109c9589e4b8e1090695 Author: Noel Grandin AuthorDate: Tue Oct 27 21:11:44 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 28 07:23:55 2020 +0100 std::set->o3tl::sorted_vector in OPropertyArrayAggregationHelper Change-Id: Iec4935af8946e453b39221dcb982059c806f62a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104902 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index af1092c9748b..576621246207 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -24,10 +24,9 @@ #include #include #include - +#include #include #include -#include #include #include @@ -250,7 +249,7 @@ namespace internal { private: OPropertySetAggregationHelper& m_rAggregationHelper; -std::set< sal_Int32 > m_aProperties; +o3tl::sorted_vector< sal_Int32 > m_aProperties; sal_Int32 m_nCurrentlyForwarding; public: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLExport.cxx |9 ++--- xmloff/source/draw/sdxmlexp_impl.hxx |4 ++-- xmloff/source/forms/elementexport.cxx |4 ++-- xmloff/source/forms/elementexport.hxx |4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) New commits: commit 917401207eed9e3c70a01260f1ea770779620e9d Author: Noel Grandin AuthorDate: Tue Oct 27 21:23:53 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 28 07:22:35 2020 +0100 std::set->o3tl::sorted_vector in xmloff Change-Id: Iba07a9905f37c2fb00d59ac00703744e5f81b1c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104906 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 723c07fe15c4..4c526f9b8236 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -3363,9 +3364,11 @@ void SchXMLExportHelper_Impl::exportDataPoints( // collect elements if( bVaryColorsByPoint && xColorScheme.is() ) { -::std::set< sal_Int32 > aAttrPointSet; -aAttrPointSet.insert( pPoints, pPoints + aDataPointSeq.getLength() ); -const ::std::set< sal_Int32 >::const_iterator aEndIt( aAttrPointSet.end()); +o3tl::sorted_vector< sal_Int32 > aAttrPointSet; +aAttrPointSet.reserve(aDataPointSeq.getLength()); +for (auto p = pPoints; p < pPoints + aDataPointSeq.getLength(); ++p) +aAttrPointSet.insert( *p ); +const auto aEndIt = aAttrPointSet.end(); for( nElement = 0; nElement < nSeriesLength; ++nElement ) { aPropertyStates.clear(); diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index aacacba93b07..c2c3f7a16c14 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include namespace tools { class Rectangle; } @@ -54,7 +54,7 @@ enum XmlPlaceholder XmlPlaceholderVerticalOutline }; -typedef std::set SdXMLFormatMap; +typedef o3tl::sorted_vector SdXMLFormatMap; struct HeaderFooterPageSettingsImpl { diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 1006fc19a152..4fdad0a36ee2 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -1293,7 +1293,7 @@ namespace xmloff ++pValues; } -Int16Set::iterator aSelectedPos = aSelection.find(i); +Int16Set::const_iterator aSelectedPos = aSelection.find(i); if (aSelection.end() != aSelectedPos) { // the item at this position is selected AddAttribute( @@ -1304,7 +1304,7 @@ namespace xmloff aSelection.erase(aSelectedPos); } -Int16Set::iterator aDefaultSelectedPos = aDefaultSelection.find(i); +Int16Set::const_iterator aDefaultSelectedPos = aDefaultSelection.find(i); if (aDefaultSelection.end() != aDefaultSelectedPos) { // the item at this position is selected as default AddAttribute( diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 13e1b52d2260..92c5a70f61e5 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include @@ -88,7 +88,7 @@ namespace xmloff ,public OElementExport { protected: -typedef std::set Int16Set; +typedef o3tl::sorted_vector Int16Set; // used below OUStringm_sControlId; // the control id to use when exporting ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/unx
vcl/inc/PhysicalFontFamily.hxx |4 ++-- vcl/source/edit/texteng.cxx|8 vcl/source/font/PhysicalFontCollection.cxx |4 ++-- vcl/source/font/PhysicalFontFamily.cxx |2 +- vcl/source/font/fontcharmap.cxx|5 +++-- vcl/source/gdi/pdfwriter_impl.cxx |3 ++- vcl/unx/gtk3/a11y/gtk3atkutil.cxx |2 +- 7 files changed, 15 insertions(+), 13 deletions(-) New commits: commit 35f16614ee7ddf518d4c01de6b1d800f5ff1ba7e Author: Noel Grandin AuthorDate: Tue Oct 27 21:17:29 2020 +0200 Commit: Noel Grandin CommitDate: Wed Oct 28 07:21:42 2020 +0100 std::set->o3tl::sorted_vector in vcl Change-Id: Ie486b629b4074da5121b55c76965aeb8ea057f31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104904 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/vcl/inc/PhysicalFontFamily.hxx b/vcl/inc/PhysicalFontFamily.hxx index b8468a6e4580..cd9f3f08e8d1 100644 --- a/vcl/inc/PhysicalFontFamily.hxx +++ b/vcl/inc/PhysicalFontFamily.hxx @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -60,7 +60,7 @@ public: const OUString& GetAliasNames() const{ return maMapNames; } int GetMinQuality() const{ return mnMinQuality; } FontTypeFaces GetTypeFaces() const { return mnTypeFaces; } -voidGetFontHeights( std::set& rHeights ) const; +voidGetFontHeights( o3tl::sorted_vector& rHeights ) const; const OUString& GetMatchFamilyName() const { return maMatchFamilyName; } ImplFontAttrs GetMatchType() const { return mnMatchType ; } diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index d05aeb892df3..e03a203ddb60 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include @@ -1700,8 +1700,8 @@ void TextEngine::CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos ) TextNode* pNode = pTEParaPortion->GetNode(); SAL_WARN_IF( pNode->GetText().isEmpty(), "vcl", "CreateTextPortions: should not be used for empty paragraphs!" ); -std::set aPositions; -std::set::iterator aPositionsIt; +o3tl::sorted_vector aPositions; +o3tl::sorted_vector::const_iterator aPositionsIt; aPositions.insert(0); const sal_uInt16 nAttribs = pNode->GetCharAttribs().Count(); @@ -1777,7 +1777,7 @@ void TextEngine::CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos ) if ( aPositionsIt != aPositions.end() ) { -std::set::iterator nextIt = aPositionsIt; +o3tl::sorted_vector::const_iterator nextIt = aPositionsIt; for ( ++nextIt; nextIt != aPositions.end(); ++aPositionsIt, ++nextIt ) { std::unique_ptr pNew( new TETextPortion( *nextIt - *aPositionsIt ) ); diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 8ea23f0b8659..6741f79faae2 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -23,7 +23,7 @@ #include #include #include - +#include #include #include @@ -905,7 +905,7 @@ std::unique_ptr PhysicalFontCollection::GetDeviceFontSiz PhysicalFontFamily* pFontFamily = FindFontFamily( rFontName ); if( pFontFamily != nullptr ) { -std::set rHeights; +o3tl::sorted_vector rHeights; pFontFamily->GetFontHeights( rHeights ); for( const auto& rHeight : rHeights ) diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index b8c630b6a7b3..d5ab2415b338 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -242,7 +242,7 @@ void PhysicalFontFamily::UpdateDevFontList( ImplDeviceFontList& rDevFontList ) c } } -void PhysicalFontFamily::GetFontHeights( std::set& rHeights ) const +void PhysicalFontFamily::GetFontHeights( o3tl::sorted_vector& rHeights ) const { // add all available font heights for (auto const& font : maFontFaces) diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 545707cc0906..e68939d3885e 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -23,7 +23,7 @@ #include #include -#include +#include CmapResult::CmapResult( bool bSymbolic, const sal_UCS4* pRangeCodes, int nRangeCount ) @@ -330,7 +330,8 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, CmapResult& rResult ) if( aConverter && aCvtContext ) { // determine the set of supported code points from encoded ranges -std::set aSupportedCodePoints; +o3tl::sorted_vector aSupportedCodePoints; +aSupportedCodePoints.reserve(256); static const int NINSIZE = 64; static const int NOUTSIZE = 64; diff --git
[Libreoffice-commits] core.git: 2 commits - basctl/source basic/source dbaccess/source desktop/qa drawinglayer/source editeng/inc editeng/source filter/source include/editeng include/svx include/vcl o
basctl/source/basicide/baside2.cxx |2 basic/source/sbx/sbxdec.cxx |2 dbaccess/source/ui/app/AppIconControl.cxx|2 desktop/qa/desktop_lib/test_desktop_lib.cxx |4 - drawinglayer/source/primitive2d/textlayoutdevice.cxx |6 +- drawinglayer/source/processor2d/vclprocessor2d.cxx |2 editeng/inc/editdoc.hxx |2 editeng/source/editeng/impedit3.cxx |2 editeng/source/misc/txtrange.cxx | 24 +-- filter/source/graphicfilter/ieps/ieps.cxx|4 - filter/source/svg/svgwriter.cxx |2 include/editeng/txtrange.hxx |4 - include/svx/xtable.hxx |2 include/vcl/layout.hxx |4 - include/vcl/toolkit/treelistbox.hxx |2 oox/source/core/xmlfilterbase.cxx|4 + oox/source/drawingml/fillproperties.cxx |2 oox/source/export/chartexport.cxx| 19 + oox/source/export/drawingml.cxx |2 reportdesign/source/ui/report/ReportWindow.cxx |2 sc/inc/dpgroup.hxx |2 sc/inc/dptabdat.hxx | 10 ++-- sc/inc/dptabres.hxx |2 sc/inc/dptabsrc.hxx |8 +-- sc/source/core/data/dpgroup.cxx | 10 ++-- sc/source/core/data/dpobject.cxx |2 sc/source/core/data/dptabdat.cxx |2 sc/source/core/data/dptabsrc.cxx | 14 +++--- sc/source/core/data/table2.cxx |2 sc/source/core/data/table4.cxx |2 sc/source/core/inc/interpre.hxx |4 - sc/source/core/tool/interpr3.cxx |6 +- sc/source/core/tool/interpr5.cxx |2 sc/source/filter/excel/xepivotxml.cxx|6 +- sc/source/ui/docshell/docsh8.cxx |4 - sc/source/ui/inc/pfuncache.hxx |4 - sc/source/ui/inc/preview.hxx |6 +- sc/source/ui/view/output.cxx |2 sc/source/ui/view/output2.cxx|2 sc/source/ui/view/preview.cxx|2 sc/source/ui/view/tabview.cxx|6 +- sd/source/ui/view/drtxtob1.cxx | 10 ++-- sd/source/ui/view/drviewse.cxx |4 - sd/source/ui/view/outlnvs2.cxx |4 - sd/source/ui/view/viewshel.cxx |4 - sfx2/source/sidebar/PanelLayout.cxx |2 starmath/source/dialog.cxx |4 - starmath/source/edit.cxx |2 starmath/source/node.cxx |4 - svtools/source/brwbox/brwbox1.cxx|6 +- svtools/source/control/ctrlbox.cxx |6 +- svx/source/dialog/fntctrl.cxx|2 svx/source/dialog/framelinkarray.cxx | 10 ++-- svx/source/dialog/rulritem.cxx |4 - svx/source/inc/fmshimp.hxx |2 svx/source/svdraw/svdotext.cxx |4 - sw/inc/redline.hxx |2 sw/qa/extras/layout/layout.cxx | 20 + sw/qa/extras/ww8export/ww8export2.cxx|4 - sw/source/core/doc/DocumentStatisticsManager.cxx |2 sw/source/core/layout/dbg_lay.cxx|2 sw/source/core/layout/newfrm.cxx |2 sw/source/core/layout/tabfrm.cxx |2 sw/source/core/layout/wsfrm.cxx |2 sw/source/core/table/swnewtable.cxx |2 sw/source/core/table/swtable.cxx | 12 ++--- sw/source/core/text/inftxt.hxx |6 +- sw/source/core/text/itrform2.cxx |6 +- sw/source/core/text/porlay.cxx |2 sw/source/core/text/porlay.hxx |4 - sw/source/core/text/pormulti.cxx |4 - sw/source/core/text/txtfly.cxx |2 sw/source/filter/html/htmlcss1.cxx |4 - sw/source/filter/writer/wrtswtbl.cxx |2 sw/source/filter/ww8/WW8TableInfo.hxx|2 sw/source/filter/ww8/ww8par.cxx |2 sw/source/ui/index/cnttab.cxx| 10 ++-- sw/source/uibase/shells/tabsh.cxx|4 - tools/qa/cppunit/test_bigint.cxx | 12
[Libreoffice-bugs] [Bug 137811] Netgear router orange light | +1-844-935-3936 |Netgear orange light
https://bugs.documentfoundation.org/show_bug.cgi?id=137811 Smith Bill changed: What|Removed |Added Keywords||accessibility URL||https://routerfixiya.com/ne ||tgear-router-orange-light/ -- 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 137811] New: Netgear router orange light | +1-844-935-3936 |Netgear orange light
https://bugs.documentfoundation.org/show_bug.cgi?id=137811 Bug ID: 137811 Summary: Netgear router orange light | +1-844-935-3936 |Netgear orange light Product: LibreOffice Version: 3.3.0 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: BASIC Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: smithbill9...@gmail.com Description: We are always ready to help you solve any problem with https://routerfixiya.com/netgear-router-orange-light/>Netgear Orange Light. Join us anytime and get full help from our team of experts. Simple steps taken by a technician will go a long way toward solving all the problems related to Orange lights on Netgear routers, they guarantee you to give your best. So don't worry that the technical expert group is always there. Read more: https://routerfixiya.com/netgear-router-orange-light/ Actual Results: Pass Expected Results: Clear Reproducible: Always User Profile Reset: No Additional Info: For more information visit the website. -- 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-7-0' - vcl/qt5
vcl/qt5/Qt5Graphics_Text.cxx |4 1 file changed, 4 insertions(+) New commits: commit dc44470620857fae533246f4cb1038b3e9d2b2bd Author: Jan-Marek Glogowski AuthorDate: Tue Oct 27 16:41:30 2020 +0100 Commit: Michael Weghorn CommitDate: Wed Oct 28 07:01:59 2020 +0100 tdf#137804 Qt5 don't paint empty strings For a test I added a SAL_WARN, but that created many more debug messages then expected, just when opening the print dialog. So this just handles the crash like the CairoTextRender variant of DrawTextLayout does, by returning early. Change-Id: Ie5b58ebbba02dace0e777b60fcbc3b9f46ea9d66 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104893 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski (cherry picked from commit feb5985b463974476985dee83376067941d77da0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104845 Reviewed-by: Michael Weghorn diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx index 4ba009106d26..ded886efd648 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/Qt5Graphics_Text.cxx @@ -197,6 +197,10 @@ void Qt5Graphics::DrawTextLayout(const GenericSalLayout& rLayout) positions.push_back(QPointF(aPos.X(), aPos.Y())); } +// seems to be common to try to layout an empty string... +if (positions.empty()) +return; + if (nOrientation) pQt5Layout->SetOrientation(nOrientation); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 137804] Qt5 printing (from Writer) crashes LibreOffice
https://bugs.documentfoundation.org/show_bug.cgi?id=137804 --- Comment #2 from Commit Notification --- Jan-Marek Glogowski committed a patch related to this issue. It has been pushed to "libreoffice-7-0": https://git.libreoffice.org/core/commit/dc44470620857fae533246f4cb1038b3e9d2b2bd tdf#137804 Qt5 don't paint empty strings It will be available in 7.0.4. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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 137804] Qt5 printing (from Writer) crashes LibreOffice
https://bugs.documentfoundation.org/show_bug.cgi?id=137804 Commit Notification changed: What|Removed |Added Whiteboard|target:7.1.0|target:7.1.0 target:7.0.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 137720] UI: Slide -> Properties opens dialog named "Slide setup"
https://bugs.documentfoundation.org/show_bug.cgi?id=137720 Ayhan Yalçınsoy changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |ayhanyalcin...@pisilinux.or |desktop.org |g -- 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