[Libreoffice-bugs] [Bug 156027] New: Improper translation to Italian
https://bugs.documentfoundation.org/show_bug.cgi?id=156027 Bug ID: 156027 Summary: Improper translation to Italian Product: LibreOffice Version: 7.5.4.2 release Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: trivial Priority: medium Component: Localization Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: vincenzo.dand...@gmail.com Description: The Italian translation of the "tip of the day" #187 (VLOOKUP) seems wrong to me. The 4th parameter has to do with the (possible) order in the searched range. The tip is stating that it would order (or not) the result column. The problem is the use of the verb "va" instead of "è". Steps to Reproduce: 1. I don't know how to show a specific tip. Nevertheless, being text it's easy to check it. Actual Results: Il quarto parametro opzionale della funzione di Calc 'CERCA.VERT' indica se la prima colonna di dati va ordinata o no. Se non va ordinata, digita FALSO oppure zero. Expected Results: Il quarto parametro opzionale della funzione di Calc 'CERCA.VERT' indica se la prima colonna di dati è ordinata o no. Se non è ordinata, digita FALSO oppure zero. Reproducible: Always User Profile Reset: No Additional Info: [Information automatically included from LibreOffice] Locale: it Module: SpreadsheetDocument [Information guessed from browser] OS: Linux (All) OS is 64bit: yes -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 133560] FILEOPEN DOCX Direct font name/formatting not read from docx file for empty paragraph (last paragraph only) (fine for DOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=133560 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=15 ||4192 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 154192] FILEOPEN DOCX: import fails special case for anchor-after-break in last paragraph of the document
https://bugs.documentfoundation.org/show_bug.cgi?id=154192 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=13 ||3560, ||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=49 ||785 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 133560] FILEOPEN DOCX Direct font name/formatting not read from docx file for empty paragraph (last paragraph only) (fine for DOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=133560 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=49 ||785 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 113719] Pasting text from Microsoft Word into Calc results in OLE object being inserted
https://bugs.documentfoundation.org/show_bug.cgi?id=113719 Diana Vides changed: What|Removed |Added CC||dianavide...@gmail.com --- Comment #26 from Diana Vides --- I was able to reproduce it. It did not have an issue when pasting text from Writer to Calc, but it does when pasting text from Word to Calc. Version: 7.5.3.2 (X86_64) / LibreOffice Community Build ID: 9f56dff12ba03b9acd7730a5a481eea045e468f3 CPU threads: 6; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: es-ES (en_US); UI: en-US Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155739] Writer crashed while writing
https://bugs.documentfoundation.org/show_bug.cgi?id=155739 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155740] Support distinction rather than override of conflicting subdocument styles
https://bugs.documentfoundation.org/show_bug.cgi?id=155740 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155744] Footnotes numbering is wrong with numbering per page and within tables.
https://bugs.documentfoundation.org/show_bug.cgi?id=155744 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155741] Allow insertion of items into master without a selected item
https://bugs.documentfoundation.org/show_bug.cgi?id=155741 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155727] Add context menu to Recent Documents window
https://bugs.documentfoundation.org/show_bug.cgi?id=155727 QA Administrators changed: What|Removed |Added Whiteboard|| QA:needsComment -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 152190] Libre Impress - Text in tables once created cannot be deleted
https://bugs.documentfoundation.org/show_bug.cgi?id=152190 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 152190] Libre Impress - Text in tables once created cannot be deleted
https://bugs.documentfoundation.org/show_bug.cgi?id=152190 --- Comment #3 from QA Administrators --- Dear beruce61, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 146133] No access to file "Il Regno dei Funghi.doc" after an update
https://bugs.documentfoundation.org/show_bug.cgi?id=146133 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 146133] No access to file "Il Regno dei Funghi.doc" after an update
https://bugs.documentfoundation.org/show_bug.cgi?id=146133 --- Comment #11 from QA Administrators --- Dear Missio Paolo, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145771] Slide number not displayed in normal slide view after inserting header & footer
https://bugs.documentfoundation.org/show_bug.cgi?id=145771 --- Comment #3 from QA Administrators --- Dear hartmut.brummack, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145850] formatting of monospace ubuntu font keeps changing
https://bugs.documentfoundation.org/show_bug.cgi?id=145850 QA Administrators changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145850] formatting of monospace ubuntu font keeps changing
https://bugs.documentfoundation.org/show_bug.cgi?id=145850 --- Comment #4 from QA Administrators --- Dear Darko Veberic, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145771] Slide number not displayed in normal slide view after inserting header & footer
https://bugs.documentfoundation.org/show_bug.cgi?id=145771 QA Administrators changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145690] One view for "Properties", Formatvorlagen, Galery, Navigator, Page, Vorlagenkontrolle
https://bugs.documentfoundation.org/show_bug.cgi?id=145690 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144941] validity - dropdown window too large not showing shorter text
https://bugs.documentfoundation.org/show_bug.cgi?id=144941 QA Administrators changed: What|Removed |Added Resolution|--- |INSUFFICIENTDATA Status|NEEDINFO|RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145724] Automatic icon detection make the icons invisible
https://bugs.documentfoundation.org/show_bug.cgi?id=145724 --- Comment #3 from QA Administrators --- Dear a.geno, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145724] Automatic icon detection make the icons invisible
https://bugs.documentfoundation.org/show_bug.cgi?id=145724 QA Administrators changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145690] One view for "Properties", Formatvorlagen, Galery, Navigator, Page, Vorlagenkontrolle
https://bugs.documentfoundation.org/show_bug.cgi?id=145690 --- Comment #3 from QA Administrators --- Dear Guenter Alzinger, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144941] validity - dropdown window too large not showing shorter text
https://bugs.documentfoundation.org/show_bug.cgi?id=144941 --- Comment #5 from QA Administrators --- Dear a, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 141088] Freeze rows and colums act like hide columns and rows with the frozen part
https://bugs.documentfoundation.org/show_bug.cgi?id=141088 --- Comment #4 from QA Administrators --- Dear assamite4ever, Please read this message in its entirety before proceeding. Your bug report is being closed as INSUFFICIENTDATA due to inactivity and a lack of information which is needed in order to accurately reproduce and confirm the problem. We encourage you to retest your bug against the latest release. If the issue is still present in the latest stable release, we need the following information (please ignore any that you've already provided): a) Provide details of your system including your operating system and the latest version of LibreOffice that you have confirmed the bug to be present b) Provide easy to reproduce steps – the simpler the better c) Provide any test case(s) which will help us confirm the problem d) Provide screenshots of the problem if you think it might help e) Read all comments and provide any requested information Once all of this is done, please set the bug back to UNCONFIRMED and we will attempt to reproduce the issue. Please do not: a) respond via email b) update the version field in the bug or any of the other details on the top section of our bug tracker Warm Regards, QA Team MassPing-NeedInfo-FollowUp -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 141088] Freeze rows and colums act like hide columns and rows with the frozen part
https://bugs.documentfoundation.org/show_bug.cgi?id=141088 QA Administrators changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 152659] Lock up then crash
https://bugs.documentfoundation.org/show_bug.cgi?id=152659 --- Comment #3 from QA Administrators --- Dear winnd, This bug has been in NEEDINFO status with no change for at least 6 months. Please provide the requested information as soon as possible and mark the bug as UNCONFIRMED. Due to regular bug tracker maintenance, if the bug is still in NEEDINFO status with no change in 30 days the QA team will close the bug as INSUFFICIENTDATA due to lack of needed information. For more information about our NEEDINFO policy please read the wiki located here: https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Status/NEEDINFO If you have already provided the requested information, please mark the bug as UNCONFIRMED so that the QA team knows that the bug is ready to be confirmed. Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-NeedInfo-Ping -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 149587] Using the CMD shortcuts for styles causes app to crash.
https://bugs.documentfoundation.org/show_bug.cgi?id=149587 --- Comment #4 from QA Administrators --- Dear Robert George, This bug has been in NEEDINFO status with no change for at least 6 months. Please provide the requested information as soon as possible and mark the bug as UNCONFIRMED. Due to regular bug tracker maintenance, if the bug is still in NEEDINFO status with no change in 30 days the QA team will close the bug as INSUFFICIENTDATA due to lack of needed information. For more information about our NEEDINFO policy please read the wiki located here: https://wiki.documentfoundation.org/QA/Bugzilla/Fields/Status/NEEDINFO If you have already provided the requested information, please mark the bug as UNCONFIRMED so that the QA team knows that the bug is ready to be confirmed. Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-NeedInfo-Ping -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 117616] lighten and darken of e.g. shape Square Bevel is lost, if a style with gradient is applied
https://bugs.documentfoundation.org/show_bug.cgi?id=117616 --- Comment #6 from QA Administrators --- Dear Regina Henschel, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://web.libera.chat/?settings=#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 142987] Icon Customise in menus
https://bugs.documentfoundation.org/show_bug.cgi?id=142987 --- Comment #2 from QA Administrators --- Dear lol, To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from https://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://web.libera.chat/?settings=#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 152062] Noto Serif Ahom font does not implement correctly in Libre Office
https://bugs.documentfoundation.org/show_bug.cgi?id=152062 --- Comment #20 from Stephen Morey --- Created attachment 188060 --> https://bugs.documentfoundation.org/attachment.cgi?id=188060=edit Screen shot of Libre Office 20230623 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 152062] Noto Serif Ahom font does not implement correctly in Libre Office
https://bugs.documentfoundation.org/show_bug.cgi?id=152062 --- Comment #19 from Stephen Morey --- Thanks, I tried logging in to Libre Office in Safe Mode and it didn't make any difference. Can I just double check that 2.0006 is the latest version of the font? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: 2 commits - editeng/source include/i18nutil sw/qa sw/source
editeng/source/editeng/impedit2.cxx |8 +++- include/i18nutil/unicode.hxx| 13 - sw/qa/extras/uiwriter/uiwriter6.cxx | 18 +++--- sw/source/uibase/wrtsh/delete.cxx | 31 +-- 4 files changed, 23 insertions(+), 47 deletions(-) New commits: commit 97aff867f519d7bcb530486208faec68671190a9 Author: Khaled Hosny AuthorDate: Thu Jun 22 11:39:00 2023 +0300 Commit: خالد حسني CommitDate: Fri Jun 23 04:58:22 2023 +0200 Remove recently unused unicode::isCJKIVSCharacter() Change-Id: I7d41657e2611aa66303f9315ff6e36a8e08d8688 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153453 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index 3b8091db0c24..69e3e9d6e267 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.hxx @@ -61,19 +61,6 @@ public: return u_getIntPropertyValue(nCode, UCHAR_VARIATION_SELECTOR) != 0; } -/** Check for base characters of a CJK ideographic variation sequence (IVS) - -@param nCode A Unicode code point. - -@return True if code is a Unicode base character part of CJK IVS - */ -static bool isCJKIVSCharacter(sal_uInt32 nCode) -{ -return (nCode >= 0x4E00 && nCode <= 0x9FFF) // CJK Unified Ideographs - || (nCode >= 0x3400 && nCode <= 0x4DBF) // CJK Unified Ideographs Extension A - || (nCode >= 0x2 && nCode <= 0x2A6DF); // CJK Unified Ideographs Extension B -} - //Map an ISO 15924 script code to Latin/Asian/Complex/Weak static sal_Int16 getScriptClassFromUScriptCode(UScriptCode eScript); commit 96964547dc40b9d6396aad40c29709bb83070fee Author: Khaled Hosny AuthorDate: Thu Jun 22 11:34:50 2023 +0300 Commit: خالد حسني CommitDate: Fri Jun 23 04:58:13 2023 +0200 Make backscpace always delete whole variation sequences We don’t want to limit this to CJK chars, since variation selectors can be used with Emoji, mathematical symbol, and possibly more in the future, and in all these cases the character + variation selector is considered one unit. Change-Id: Ifc41183ec27a9e3715058cc0b5865a5bd4fcaa69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153452 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 1ce5f87e0593..664c8f5d18f0 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2361,17 +2361,15 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n if ( nDelMode == DeleteMode::Simple ) { sal_uInt16 nCharMode = i18n::CharacterIteratorMode::SKIPCHARACTER; -// Check if we are deleting a CJK ideograph variance sequence (IVS). +// If we are deleting a variation selector, we want to delete the +// whole sequence (cell). sal_Int32 nIndex = aCurPos.GetIndex(); if (nIndex > 0) { const OUString& rString = aCurPos.GetNode()->GetString(); sal_Int32 nCode = rString.iterateCodePoints(, -1); -if (unicode::isVariationSelector(nCode) && nIndex > 0 && - unicode::isCJKIVSCharacter(rString.iterateCodePoints(, -1))) -{ +if (unicode::isVariationSelector(nCode)) nCharMode = i18n::CharacterIteratorMode::SKIPCELL; -} } aDelStart = CursorLeft(aCurPos, nCharMode); } diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx b/sw/qa/extras/uiwriter/uiwriter6.cxx index 3c7f616a5be3..78b5e9ac5ec1 100644 --- a/sw/qa/extras/uiwriter/uiwriter6.cxx +++ b/sw/qa/extras/uiwriter/uiwriter6.cxx @@ -695,26 +695,22 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, testTdf113481) const uno::Reference xPara1 = getParagraph(1); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xPara1->getString().getLength()); -// In case that weak script is treated as CJK script, remove one character. +// Also variation sequence of weak characters that are treated as CJK script pWrtShell->Down(false); pWrtShell->EndPara(); // Before: U+4E2D U+2205 U+FE00. After: U+4E2D U+2205 -if (pWrtShell->GetScriptType() == SvtScriptType::ASIAN) -{ -pWrtShell->DelLeft(); -const uno::Reference xPara2 = getParagraph(2); -CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xPara2->getString().getLength()); -CPPUNIT_ASSERT_EQUAL(u'\x2205', xPara2->getString()[1]); -} +pWrtShell->DelLeft(); +const uno::Reference xPara2 = getParagraph(2); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xPara2->getString().getLength()); +CPPUNIT_ASSERT_EQUAL(u'\x4E2D', xPara2->getString()[0]); -// Characters of other scripts, remove one character. +// Also
[Libreoffice-commits] core.git: 2 commits - editeng/source include/i18nutil sc/source sw/source
editeng/source/editeng/impedit2.cxx |2 +- include/i18nutil/unicode.hxx|6 +++--- sc/source/ui/docshell/impex.cxx | 11 --- sw/source/uibase/wrtsh/delete.cxx |2 +- 4 files changed, 13 insertions(+), 8 deletions(-) New commits: commit 1adae2e08949c5d73b3bc68b9cda81f8614289c0 Author: Khaled Hosny AuthorDate: Thu Jun 22 16:43:09 2023 +0300 Commit: خالد حسني CommitDate: Fri Jun 23 04:58:03 2023 +0200 Improve and rename unicode::isIVSSelector() Check Variation_Selector Unicode property instead of hard-coding variation selector classes. This now handles also Mongolian Variation Selector. Change-Id: I2dd5c4770d7bb9bf4c1e9edc43926fe0863b0da7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153460 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index a2f88c7a5c5d..1ce5f87e0593 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2367,7 +2367,7 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n { const OUString& rString = aCurPos.GetNode()->GetString(); sal_Int32 nCode = rString.iterateCodePoints(, -1); -if (unicode::isIVSSelector(nCode) && nIndex > 0 && +if (unicode::isVariationSelector(nCode) && nIndex > 0 && unicode::isCJKIVSCharacter(rString.iterateCodePoints(, -1))) { nCharMode = i18n::CharacterIteratorMode::SKIPCELL; diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx index 4d8a84b19c40..3b8091db0c24 100644 --- a/include/i18nutil/unicode.hxx +++ b/include/i18nutil/unicode.hxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -55,10 +56,9 @@ public: @return True if code is a Unicode variation sequence selector. */ -static bool isIVSSelector(sal_uInt32 nCode) +static bool isVariationSelector(sal_uInt32 nCode) { -return (nCode >= 0xFE00 && nCode <= 0xFE0F) // Variation Selectors block - || (nCode >= 0xE0100 && nCode <= 0xE01EF); // Variation Selectors Supplement block +return u_getIntPropertyValue(nCode, UCHAR_VARIATION_SELECTOR) != 0; } /** Check for base characters of a CJK ideographic variation sequence (IVS) diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index c4c89df82a67..8c21b35bc12d 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -266,7 +266,7 @@ bool SwWrtShell::DelLeft() nCode = sStr.iterateCodePoints( ::temporary(sal_Int32(0)) ); } -if ( unicode::isIVSSelector( nCode ) ) +if ( unicode::isVariationSelector( nCode ) ) { SwCursorShell::Push(); SwCursorShell::Left(1, SwCursorSkipMode::Chars); commit aed0344f9053bddca905d154f2e3b92f35313a7b Author: Khaled Hosny AuthorDate: Thu Jun 22 11:15:04 2023 +0300 Commit: خالد حسني CommitDate: Fri Jun 23 04:57:53 2023 +0200 Improve ScImportExport::CountVisualWidth() - Use East_Asian_Width Unicode property to check for double width chars instead of hard-coding CJK characters. - Use Default_Ignorable_Code_Point Unicode property to check for characters that shouldn’t be counted, instead of checking only of IVS characters. Change-Id: I4349ea0ee6a32736865f37cd0a6e1a8e7e9a6e71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153451 Tested-by: Jenkins Reviewed-by: خالد حسني diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 970e75aadd9e..1c552967f1ae 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -70,6 +70,8 @@ #include #include +#include + #include // We don't want to end up with 2GB read in one line just because of malformed @@ -552,6 +554,8 @@ void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm ) endl( rStrm ); } +// tdf#104927 +// http://www.unicode.org/reports/tr11/ sal_Int32 ScImportExport::CountVisualWidth(const OUString& rStr, sal_Int32& nIdx, sal_Int32 nMaxWidth) { sal_Int32 nWidth = 0; @@ -559,9 +563,10 @@ sal_Int32 ScImportExport::CountVisualWidth(const OUString& rStr, sal_Int32& nIdx { sal_uInt32 nCode = rStr.iterateCodePoints(); -if (unicode::isCJKIVSCharacter(nCode) || (nCode >= 0x3000 && nCode <= 0x303F)) +auto nEaWidth = u_getIntPropertyValue(nCode, UCHAR_EAST_ASIAN_WIDTH); +if (nEaWidth == U_EA_FULLWIDTH || nEaWidth == U_EA_WIDE) nWidth += 2; -else if (!unicode::isIVSSelector(nCode)) +else if (!u_getIntPropertyValue(nCode, UCHAR_DEFAULT_IGNORABLE_CODE_POINT)) nWidth += 1; } @@
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/PaletteManager.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit bbf6fa94a92abc1085addaba20519ee0166bae5e Author: Tomaž Vajngerl AuthorDate: Fri Jun 23 00:01:19 2023 +0900 Commit: Tomaž Vajngerl CommitDate: Fri Jun 23 03:53:23 2023 +0200 fix crash in PaletteManager triggered by the color picker The code expects the SfxObjectShell::GetThemeColors() always returns a current set of theme colors, but then for some modules we return nullptr. Change-Id: I4096b75942d818965cedf43f35444faeb870cb74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153424 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 141938d145d7..7735e09d44e8 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -209,6 +209,9 @@ void PaletteManager::ReloadColorSet(SvxColorValueSet ) rColorSet.Clear(); sal_uInt16 nItemId = 0; +if (!pColorSet) +return; + svx::ThemeColorPaletteManager aThemeColorManager(pColorSet); moThemePaletteCollection = aThemeColorManager.generate();
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/xls/cell-multi-line.xls |binary sc/qa/unit/data/xlsx/cell-multi-line.xlsx |binary sc/qa/unit/subsequent_filters_test2.cxx | 33 ++ 3 files changed, 33 insertions(+) New commits: commit 0533b51dbe13838d2bffdf59fdf6fcfe36c4a451 Author: Henry Castro AuthorDate: Tue Feb 28 09:57:07 2023 -0400 Commit: Henry Castro CommitDate: Fri Jun 23 03:22:23 2023 +0200 sc: qa: filter: add import excel unit test single line. Change-Id: I2d76f54e0ccf943794bd817b2e80583b8dd69558 Signed-off-by: Henry Castro Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148005 Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153473 Tested-by: Jenkins diff --git a/sc/qa/unit/data/xls/cell-multi-line.xls b/sc/qa/unit/data/xls/cell-multi-line.xls new file mode 100644 index ..8ed0aded3243 Binary files /dev/null and b/sc/qa/unit/data/xls/cell-multi-line.xls differ diff --git a/sc/qa/unit/data/xlsx/cell-multi-line.xlsx b/sc/qa/unit/data/xlsx/cell-multi-line.xlsx new file mode 100644 index ..ecaf8124c86b Binary files /dev/null and b/sc/qa/unit/data/xlsx/cell-multi-line.xlsx differ diff --git a/sc/qa/unit/subsequent_filters_test2.cxx b/sc/qa/unit/subsequent_filters_test2.cxx index a00558730d0b..a0a4a92d299b 100644 --- a/sc/qa/unit/subsequent_filters_test2.cxx +++ b/sc/qa/unit/subsequent_filters_test2.cxx @@ -1580,6 +1580,39 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testNamedTableRef) } } +namespace +{ +void testCells(ScDocument* pDoc) +{ +{ +const EditTextObject* pObj = pDoc->GetEditText(ScAddress(0, 0, 0)); +CPPUNIT_ASSERT(pObj); +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pObj->GetParagraphCount()); +CPPUNIT_ASSERT_EQUAL(size_t(1), pObj->GetSharedStrings().size()); +} + +{ +const EditTextObject* pObj = pDoc->GetEditText(ScAddress(0, 1, 0)); +CPPUNIT_ASSERT(pObj); +CPPUNIT_ASSERT_EQUAL(sal_Int32(3), pObj->GetParagraphCount()); +CPPUNIT_ASSERT_EQUAL(size_t(3), pObj->GetSharedStrings().size()); +} +} +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest2, testSingleLine) +{ +createScDoc("xls/cell-multi-line.xls"); +ScDocument* pDoc = getScDoc(); +CPPUNIT_ASSERT(pDoc); +testCells(pDoc); + +createScDoc("xlsx/cell-multi-line.xlsx"); +pDoc = getScDoc(); +CPPUNIT_ASSERT(pDoc); +testCells(pDoc); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/tabctrl.cxx | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 7626e37b7c77980ba41bdc7e9131b9c373dea038 Author: Justin Luth AuthorDate: Thu Jun 22 12:23:21 2023 -0400 Commit: Justin Luth CommitDate: Fri Jun 23 02:54:38 2023 +0200 tdf#141136 NBB SetContext: don't SetCurPageId twice for the same page I noticed that SetCurPageId was running multiple times for the HomeLabel page. Plus, let's flatten this a bit more. It has always been like since, since commit d7da58ae362b661c03fc754e4e8f4a89798b0127 Author: Szymon Kłos on Fri Jul 22 11:50:57 2016 +0200 GSoC notebookbar: better default page handling Change-Id: Ied13ea5019df7cce2afe38d5d5d3615168338f0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153475 Tested-by: Jenkins Reviewed-by: Justin Luth diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index fd6f53d63a1e..c384cb036db6 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -2290,22 +2290,22 @@ void NotebookbarTabControlBase::SetContext( vcl::EnumContext::Context eContext ) sal_uInt16 nPageId = TabControl::GetPageId(nChild); TabPage* pPage = GetTabPage(nPageId); -if (pPage) -{ -SetPageVisible(nPageId, pPage->HasContext(eContext) || pPage->HasContext(vcl::EnumContext::Context::Any)); +if (!pPage) +continue; -if (!bHandled && bLastContextWasSupported -&& pPage->HasContext(vcl::EnumContext::Context::Default)) -{ -SetCurPageId(nPageId); -} +SetPageVisible(nPageId, pPage->HasContext(eContext) || pPage->HasContext(vcl::EnumContext::Context::Any)); -if (pPage->HasContext(eContext) && eContext != vcl::EnumContext::Context::Any) -{ -SetCurPageId(nPageId); -bHandled = true; -bLastContextWasSupported = true; -} +if (pPage->HasContext(eContext) && eContext != vcl::EnumContext::Context::Any) +{ +SetCurPageId(nPageId); +bHandled = true; +bLastContextWasSupported = true; +} + +if (!bHandled && bLastContextWasSupported +&& pPage->HasContext(vcl::EnumContext::Context::Default)) +{ +SetCurPageId(nPageId); } }
[Libreoffice-bugs] [Bug 156025] FILEOPEN PPTX: horizontal lines disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=156025 m.a.riosv changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 CC||miguelangelrv@libreoffice.o ||rg --- Comment #2 from m.a.riosv --- Reproducible Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 098e8d6f111ca9d7680ed1eec00522fed6487e95 CPU threads: 16; OS: Windows 10.0 Build 22621; UI render: Skia/Raster; VCL: win Locale: es-ES (es_ES); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 115122] In specific XLS file in drop-down autofilter's list there aren't any items (workaround: turn off-on autofilter)
https://bugs.documentfoundation.org/show_bug.cgi?id=115122 --- Comment #10 from ady --- (In reply to ady from comment #9) > Using Calc, I can eliminate the original autofilter, rebuild it, save as > (with different name), close and load the new file > the autofilter seems to > work correctly (tested with LO 7.5.3.2 and with a recent Dev version). I had the intention to quote the current title subject of this report, but I didn't, so here it is: that is the "(workaround: turn off-on autofilter)" mentioned. Additionally, the title subject of this report currently says "In specific XLS file...". Let me add that other programs (other than Excel) can open attachment 139234 (the original xls file from comment 1) and show/use the autofilter correctly, without having to rebuild it. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 115122] In specific XLS file in drop-down autofilter's list there aren't any items (workaround: turn off-on autofilter)
https://bugs.documentfoundation.org/show_bug.cgi?id=115122 --- Comment #9 from ady --- (In reply to Roman Kuznetsov from comment #8) > now there are items in Autofilter's list, but they are all > grey and you can't select/deselect it. Using Calc, I can eliminate the original autofilter, rebuild it, save as (with different name), close and load the new file > the autofilter seems to work correctly (tested with LO 7.5.3.2 and with a recent Dev version). While this is not the perfect solution for _opening_ (older) files that might have some autofilter problem in LO (e.g. read-only files, or for inexperienced users), maybe current versions of Calc are WFM regarding _saving_ as xls with (new) autofilter ON. It remains to be seen whether xls files created/saved (by some other program such as Excel) with autofilter set ON can be opened correctly without having to rebuild the autofilter in Calc. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155708] UI: Validity dialog closes when moving focus to another Calc window
https://bugs.documentfoundation.org/show_bug.cgi?id=155708 ady changed: What|Removed |Added Keywords||bibisectRequest, regression --- Comment #2 from ady --- For now, I am leaving aside the procedure I described in STR_B from comment 1 for future evaluation. Following _exactly_ STR_A from comment 1: * In LO 6.2.6.2 and older, it seems OK, but the focus is not within the Validity dialog when going back to it; I can click within the "Source" field to obtain focus. * In LO 6.3.3.2, the Validity dialog has the focus when going back to it, but then the dialog cannot be closed, neither the file "Untitled 2" itself. The file "Untitled 1" can still be closed. I have to use Task Manager to kill LO. This would seem closely related to STR_B from comment 1. * In LO 7.0.0.3, the frame of the Validity dialog is seen, but not its content, and it cannot be closed in any way, neither the file "Untitled 2" itself. The file "Untitled 1" can still be closed. I have to use Task Manager to kill LO. * In LO 7.0.4.2, repro _exactly_ as in STR_A from comment 1; both files can be successfully closed. Considering those results, I'm not sure which version would be adequate for the "Version" field for this bug 155708. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 142705] [DOCUMENTATION] Shortcut Keys shifted
https://bugs.documentfoundation.org/show_bug.cgi?id=142705 --- Comment #5 from LeroyG --- Writer Help problem still present. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156026] New: BUG version writer libreoffice 7.54.2
https://bugs.documentfoundation.org/show_bug.cgi?id=156026 Bug ID: 156026 Summary: BUG version writer libreoffice 7.54.2 Product: LibreOffice Version: unspecified Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: jon.nico...@wanadoo.fr Bonjour Je viens de constater un bug avec la version LibreOffice 7.5.4.2, le document tremble, bouge : 1/ Copier la sélection d'un mot ou phrase. 2/ Cliquer sur Insertion. 3/ Cliquer sur Repère texte. 4/ L'image, le document tremble, bouge. 5/ Après environ 10s le paramètre Repère texte apparaît, le bug s'arrête. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155947] Korean word default font size is 10pt.
https://bugs.documentfoundation.org/show_bug.cgi?id=155947 --- Comment #17 from Shinji Enoki --- (In reply to Cheng-Chia Tseng from comment #13) > It seems to be the official regulation from Korean government, so it should > be changed to 10pt for Korean users to respect the local usage and the > culture. > > I think it is practical to make 10pt default for Korean UI only, and leave > others (Chinese and Japanese) using 10.5pt as before. I agree with that. As for Korean, I think it's better to match the local culture with 10pt. In Japanese, 10.5pt is often used by default for Japanese typewriters, Japanese word processor hardware, and even word processor software, probably due to the influence of old printing standards. https://www.jagat.or.jp/past_archives/story/2381.html https://www.nik-prt.co.jp/surusuru/proud/complicated-the-size-of-letter-gou-1/ According to Cheng-Chia Tseng's LibreOffice conference 2017 slides, it seems to be the same in Chinese -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 155561] Notification/warning when the overwrite mode is enabled for the first time
https://bugs.documentfoundation.org/show_bug.cgi?id=155561 Eyal Rozenberg changed: What|Removed |Added Summary|Warning when the overwrite |Notification/warning when |mode is enabled for the |the overwrite mode is |first time |enabled for the first time --- Comment #5 from Eyal Rozenberg --- A few nitpicks: 1. The dialog should not be a warning - as we don't want to deter the user from pressing insert. 2. We had considered a tooltip, but concluded that would like be insufficient for properly informing the user who is not aware of what the INSERT key is supposed to do. 3. "not every casual user is aware of the classic workflow" 3.1 The issue is not casual vs regular users; it's novice vs veteran users of text editing software. 3.2 Unfortunately, a large number, and perhaps most, novice users today are not aware of "classical" workflows utilizing keyboard keys such as INSERT. 4. "LibreOffice users are typically more tech-affine" I'm not sure that is correct; remember we have 200 Million users or so... but even if it is, we should assume that it isn't, and design as though Writer is the document authoring app used by everyone. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svgio/inc svgio/qa svgio/source
svgio/inc/svgtoken.hxx |1 + svgio/qa/cppunit/SvgImportTest.cxx | 17 + svgio/qa/cppunit/data/tdf156018.svg | 11 +++ svgio/source/svgreader/svgnode.cxx | 15 +++ svgio/source/svgreader/svgtoken.cxx | 13 + 5 files changed, 57 insertions(+) New commits: commit e29f25d3e3894b8febe6a18a1ba896ffb3590dc6 Author: Xisco Fauli AuthorDate: Thu Jun 22 18:00:01 2023 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 22 22:26:52 2023 +0200 tdf#156018: check if there is a css style with element inside element Change-Id: I54fa5bea42560eec5ae51dd7ba07de11f418c75c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153466 Tested-by: Jenkins Reviewed-by: Xisco Fauli Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153472 diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx index a28be73df50a..9c28674b1cfb 100644 --- a/svgio/inc/svgtoken.hxx +++ b/svgio/inc/svgtoken.hxx @@ -187,6 +187,7 @@ namespace svgio::svgreader }; SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent); +OUString SVGTokenToStr(const SVGToken& rToken); OUString getStrTitle(); OUString getStrDesc(); diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index df1337090ff3..d29cc30bf41c 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -320,6 +320,23 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf145896) assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[3]", "color", "#ff"); } +CPPUNIT_TEST_FIXTURE(Test, testTdf156018) +{ +Primitive2DSequence aSequence = parseSvg(u"/svgio/qa/cppunit/data/tdf156018.svg"); +CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); + +drawinglayer::Primitive2dXmlDump dumper; +xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence); + +CPPUNIT_ASSERT (pDocument); + +// Without the fix in place, this test would have failed with +// - Expected: #008000 +// - Actual : #ff +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]", "color", "#008000"); +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]", "color", "#ff"); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf155932) { Primitive2DSequence aSequence = parseSvg(u"/svgio/qa/cppunit/data/tdf155932.svg"); diff --git a/svgio/qa/cppunit/data/tdf156018.svg b/svgio/qa/cppunit/data/tdf156018.svg new file mode 100644 index ..cff3f924a589 --- /dev/null +++ b/svgio/qa/cppunit/data/tdf156018.svg @@ -0,0 +1,11 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="-0 0 300 300"> + + +g rect {fill:green;} + + + + + + + diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index d45624d3edc6..2137209d5599 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -160,6 +160,21 @@ namespace svgio::svgreader // add CssStyle if found maCssStyleVector.push_back(pNew); } + +// check if there is a css style with element inside element +if(pParent) +{ +OUString sParentType(SVGTokenToStr(pParent->getType())); + +aNewConcatenated = sParentType + rClassStr; +pNew = rDocument.findGlobalCssStyleAttributes(aNewConcatenated); + +if(pNew) +{ +// add CssStyle if found +maCssStyleVector.push_back(pNew); +} +} } void SvgNode::fillCssStyleVector(const OUString& rClassStr, const SvgStyleAttributes& rOriginal) diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index 45af658b1ebd..ed50612323e5 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -243,6 +243,19 @@ SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent) } } +OUString SVGTokenToStr(const SVGToken& rToken) +{ +for (auto it = aSVGTokenMapperList.begin(); it != aSVGTokenMapperList.end(); ++it) +{ +if (it->second == rToken) +{ +OUString aFirst(it->first); +return aFirst; +} +} +return OUString(); +} + OUString getStrTitle() { return OUString(constToken_Title);
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - svgio/Library_svgio.mk svgio/source
svgio/Library_svgio.mk |5 svgio/source/svgreader/svgtoken.cxx | 538 ++-- 2 files changed, 214 insertions(+), 329 deletions(-) New commits: commit e09c3c43ce372cbd22fcc064d2a8eeb11d3b2a1d Author: Tomaž Vajngerl AuthorDate: Mon Jul 25 15:38:24 2022 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 22 22:26:32 2023 +0200 svgio: use "frozen" for mapping between token strings and enums Change-Id: I2061606146cfcb34169dccf69b6f720727839d04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153174 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153471 diff --git a/svgio/Library_svgio.mk b/svgio/Library_svgio.mk index 6221cb141316..76c0e87123bb 100644 --- a/svgio/Library_svgio.mk +++ b/svgio/Library_svgio.mk @@ -25,7 +25,10 @@ $(eval $(call gb_Library_set_include,svgio,\ -I$(SRCDIR)/svgio/inc \ )) -$(eval $(call gb_Library_use_external,svgio,boost_headers)) +$(eval $(call gb_Library_use_externals,svgio,\ +boost_headers \ +frozen \ +)) $(eval $(call gb_Library_set_precompiled_header,svgio,svgio/inc/pch/precompiled_svgio)) diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index 09ed13459b2e..45af658b1ebd 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -18,359 +18,241 @@ */ #include -#include +#include +#include +#include namespace svgio::svgreader { -const char aSVGStrWidth[] = "width"; -const char aSVGStrHeight[] = "height"; -const char aSVGStrViewBox[] = "viewBox"; -const char aSVGStrTransform[] = "transform"; -const char aSVGStrStyle[] = "style"; -const char aSVGStrDisplay[] = "display"; // #i121656# -const char aSVGStrD[] = "d"; -const char aSVGStrX[] = "x"; -const char aSVGStrY[] = "y"; -const char aSVGStrXmlns[] = "xmlns"; -const char aSVGStrVersion[] = "version"; -const char aSVGStrId[] = "id"; -const char aSVGStrIn[] = "in"; -const char aSVGStrRx[] = "rx"; -const char aSVGStrRy[] = "ry"; -const char aSVGStrPoints[] = "points"; -const char aSVGStrDx[] = "dx"; -const char aSVGStrDy[] = "dy"; -const char aSVGStrRotate[] = "rotate"; -const char aSVGStrTextLength[] = "textLength"; -const char aSVGStrLengthAdjust[] = "lengthAdjust"; -const char aSVGStrFont[] = "font"; -const char aSVGStrFontFamily[] = "font-family"; -const char aSVGStrFontSize[] = "font-size"; -const char aSVGStrFontSizeAdjust[] = "font-size-adjust"; -const char aSVGStrFontStretch[] = "font-stretch"; -const char aSVGStrFontStyle[] = "font-style"; -const char aSVGStrFontVariant[] = "font-variant"; -const char aSVGStrFontWeight[] = "font-weight"; -const char aSVGStrDirection[] = "direction"; -const char aSVGStrLetterSpacing[] = "letter-spacing"; -const char aSVGStrTextDecoration[] = "text-decoration"; -const char aSVGStrUnicodeBidi[] = "unicode-bidi"; -const char aSVGStrWordSpacing[] = "word-spacing"; -const char aSVGStrTspan[] = "tspan"; -const char aSVGStrTref[] = "tref"; -const char aSVGStrTextPath[] = "textPath"; -const char aSVGStrStartOffset[] = "startOffset"; -const char aSVGStrMethod[] = "method"; -const char aSVGStrSpacing[] = "spacing"; -const char aSVGStrStdDeviation[] = "stdDeviation"; -const char aSVGStrTextAlign[] = "text-align"; -const char aSVGStrPathLength[] = "pathLength"; -const char aSVGStrType[] = "type"; -const char aSVGStrClass[] = "class"; -const char aSVGStrTextAnchor[] = "text-anchor"; -const char aSVGStrXmlSpace[] = "xml:space"; -const char aSVGStrColor[] = "color"; -const char aSVGStrClipPathNode[] = "clipPath"; -const char aSVGStrClipPathProperty[] = "clip-path"; -const char aSVGStrFeGaussianBlur[] = "feGaussianBlur"; -const char aSVGStrFeColorMatrix[] = "feColorMatrix"; -const char aSVGStrFilter[] = "filter"; -const char aSVGStrMask[] = "mask"; -const char aSVGStrClipPathUnits[] = "clipPathUnits"; -const char aSVGStrMaskUnits[] = "maskUnits"; -const char aSVGStrMaskContentUnits[] = "maskContentUnits"; -const char aSVGStrClipRule[] = "clip-rule"; -const char aSVGStrMarker[] = "marker"; -const char aSVGStrMarkerStart[] = "marker-start"; -const char aSVGStrMarkerMid[] = "marker-mid"; -const char aSVGStrMarkerEnd[] = "marker-end"; -const char aSVGStrRefX[] = "refX"; -const char aSVGStrRefY[] = "refY"; -const char aSVGStrMarkerUnits[] = "markerUnits"; -const char aSVGStrMarkerWidth[] = "markerWidth"; -
[Libreoffice-commits] core.git: include/basegfx
include/basegfx/color/bcolormodifier.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 758c8539024769188c4aca647a0b5b42362fcf0b Author: Andrea Gelmini AuthorDate: Thu Jun 22 17:54:09 2023 +0200 Commit: Julien Nabet CommitDate: Thu Jun 22 22:17:18 2023 +0200 Remove duplicated include Change-Id: I77bfc427afa62cf1667b0dc5cd60c82032aed856 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153465 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 586e203ae66b..6eb40b67e9d7 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include
[Libreoffice-commits] core.git: 2 commits - config_host/config_vclplug.h.in config_host.mk.in configure.ac RepositoryExternal.mk Repository.mk vcl/CustomTarget_kf6_moc.mk vcl/Library_vclplug_kf6.mk vc
Repository.mk |1 RepositoryExternal.mk | 24 + config_host.mk.in |3 + config_host/config_vclplug.h.in |1 configure.ac| 101 +++- vcl/CustomTarget_kf6_moc.mk | 29 +++ vcl/Library_vclplug_kf6.mk | 86 ++ vcl/Module_vcl.mk |8 +++ vcl/source/app/salplug.cxx | 28 ++- vcl/unx/kf6/KFFilePicker.cxx| 12 vcl/unx/kf6/KFFilePicker.hxx| 12 vcl/unx/kf6/KFSalInstance.cxx | 12 vcl/unx/kf6/KFSalInstance.hxx | 12 13 files changed, 326 insertions(+), 3 deletions(-) New commits: commit 06dbdb0f5b618ce01a79f07dc78e8049c419cc5f Author: Michael Weghorn AuthorDate: Thu Jun 22 08:56:36 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Jun 22 22:16:23 2023 +0200 Use kf6 VCL plugin by default on Plasma 6 If running in a Plasma 6 session, use the kf6 VCL plugin if available. Otherwise use the same fallbacks as on Plasma 5 or LXQt. Change-Id: I223002d116c896d628f6ab4e3c1246a774b5ebe9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153439 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index 7f0ba2e96bb9..026867e99bf2 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -217,6 +217,26 @@ const char* const* autodetect_plugin_list() nullptr }; +static const char* const pPlasma6FallbackList[] = +{ +#if ENABLE_KF6 +"kf6", +#endif +#if ENABLE_KF5 +"kf5", +#endif +#if ENABLE_GTK3_KDE5 +"gtk3_kde5", +#endif +#if ENABLE_GTK3 +"gtk3", +#endif +#if ENABLE_GEN +"gen", +#endif +nullptr +}; + static const char* const pStandardFallbackList[] = { #if ENABLE_GTK3 @@ -250,8 +270,10 @@ const char* const* autodetect_plugin_list() desktop == DESKTOP_XFCE || desktop == DESKTOP_MATE ) pList = pStandardFallbackList; -else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_PLASMA6 || desktop == DESKTOP_LXQT) +else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT) pList = pKDEFallbackList; +else if (desktop == DESKTOP_PLASMA6) +pList = pPlasma6FallbackList; return pList; } commit 720bf6ac8612c32942bb059f9086ee86c2963bb5 Author: Michael Weghorn AuthorDate: Thu Jun 22 08:48:05 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Jun 22 22:16:11 2023 +0200 kf6: Add a kf6 VCL plugin Add a "kf6" VCL plugin that uses the KF6 (KDE Frameworks 6) libraries to provide a native KDE/Plasma file chooser, just like the kf5 VCL plugin does for KF5. Building the plugin is disabled by default and can be enabled by autogen option '--enable-kf6'. Selecting the VCL plugin can be done by starting LO with environment variable 'SAL_USE_VCLPLUGIN=kf6' set. The kf6 VCL plugin reuses the kf5 VCL plugin code. (The kf6 headers and sources for now just `#include` the kf5 ones.) This was quickly tested on KDE Neon unstable, which provides a daily snapshot of Plasma 6 and the KF6 libraries. (Regarding a potential release date, [1] mentions: "Plasma 6 is built on top of Qt 6 and is tentatively planned to be released in late 2023 or early 2024.") [1] https://community.kde.org/Plasma/Plasma_6 Change-Id: I4c2b7e3be8e60f1d8cf60119f6f3f642b71349f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153438 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/Repository.mk b/Repository.mk index 76e91e62c94b..22e1da82d263 100644 --- a/Repository.mk +++ b/Repository.mk @@ -318,6 +318,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,$(gb_haiku_or_kde), \ $(if $(ENABLE_KF5),vclplug_kf5) \ +$(if $(ENABLE_KF6),vclplug_kf6) \ $(if $(ENABLE_QT5),vclplug_qt5) \ $(if $(ENABLE_QT6),vclplug_qt6) \ $(if $(ENABLE_GTK3_KDE5),vclplug_gtk3_kde5) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b105e1d755d0..0d70c7e966fb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3117,7 +3117,31 @@ endef endif # ENABLE_KF5 +ifneq (,$(filter TRUE,$(ENABLE_KF6))) +define gb_LinkTarget__use_kf6 +$(call gb_LinkTarget_set_include,$(1),\ + $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KF6_CFLAGS \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_cxxflags,$(1),\ + $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF6_CFLAGS))) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(KF6_LIBS) \ +) + +endef + +else # !ENABLE_KF6 + +define gb_LinkTarget__use_kf6 + +endef + +endif # ENABLE_KF6
[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/unx
vcl/inc/unx/desktops.hxx |1 + vcl/source/app/IconThemeSelector.cxx |1 + vcl/source/app/salplug.cxx|4 ++-- vcl/unx/generic/desktopdetect/desktopdetector.cxx | 11 +++ vcl/unx/kf5/KFSalInstance.cxx |8 +--- 5 files changed, 20 insertions(+), 5 deletions(-) New commits: commit 8b0e1f2a914d672182d585d8cb2d4a815e88977e Author: Michael Weghorn AuthorDate: Thu Jun 22 08:40:56 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Jun 22 22:15:50 2023 +0200 Detect Plasma 6 desktop Add detection for Plasma 6, which is currently in development stage. With the following plasma-workspace commit [1] in place, KDE_SESSION_VERSION is set to 6, so use that to detect it: commit 4c2242d7dfafac161baec3ec316af24d7b48ef8b Author: Michael Weghorn Date: Thu Jun 22 07:47:31 2023 +0200 Set KDE_SESSION_VERSION to 6 Since the master branch is based on Qt6/KF6 and will become Plasma 6, set KDE_SESSION_VERSION to "6". This will allow other applications to detect they're running in a (preview of a) Plasma 6 session and react accordingly. (E.g. LibreOffice can use this to choose to use its upcoming kf6 integration by default instead of the kf5 one.) [1] https://invent.kde.org/plasma/plasma-workspace/-/commit/4c2242d7dfafac161baec3ec316af24d7b48ef8b Change-Id: I5a15ad1fb177721fbfa016139c56a08b228f2e1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153437 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/vcl/inc/unx/desktops.hxx b/vcl/inc/unx/desktops.hxx index 0abb6aa71339..2056c2c37928 100644 --- a/vcl/inc/unx/desktops.hxx +++ b/vcl/inc/unx/desktops.hxx @@ -33,6 +33,7 @@ enum SAL_DLLPUBLIC_RTTI DesktopType DESKTOP_XFCE, DESKTOP_MATE, DESKTOP_PLASMA5, +DESKTOP_PLASMA6, DESKTOP_LXQT }; // keep in sync with desktop_strings[] in salplug.cxx diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index 6b8dfc0f42c7..15eb4b7768fc 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -70,6 +70,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi #else OUString r; if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") || + desktopEnvironment.equalsIgnoreAsciiCase("plasma6") || desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) { if (!bPreferDarkIconTheme) r = "breeze"; diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx index e51375b94ae5..fee5b7e33e6d 100644 --- a/vcl/source/app/salplug.cxx +++ b/vcl/source/app/salplug.cxx @@ -249,7 +249,7 @@ const char* const* autodetect_plugin_list() desktop == DESKTOP_XFCE || desktop == DESKTOP_MATE ) pList = pStandardFallbackList; -else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT) +else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_PLASMA6 || desktop == DESKTOP_LXQT) pList = pKDEFallbackList; return pList; @@ -426,7 +426,7 @@ const OUString& SalGetDesktopEnvironment() // Order to match desktops.hxx' DesktopType static const char * const desktop_strings[] = { "none", "unknown", "GNOME", "UNITY", -"XFCE", "MATE", "PLASMA5", "LXQT" }; +"XFCE", "MATE", "PLASMA5", "PLASMA6", "LXQT" }; static OUString aDesktopEnvironment; if( aDesktopEnvironment.isEmpty()) { diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx index bad134fbdafd..8baeb303feed 100644 --- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx +++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx @@ -117,6 +117,13 @@ static bool is_plasma5_desktop() return pFullVersion && pSessionVersion && (0 == strcmp(pSessionVersion, "5")); } +static bool is_plasma6_desktop() +{ +static const char* pFullVersion = getenv("KDE_FULL_SESSION"); +static const char* pSessionVersion = getenv("KDE_SESSION_VERSION"); +return pFullVersion && pSessionVersion && (0 == strcmp(pSessionVersion, "6")); +} + extern "C" { @@ -132,6 +139,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() return DESKTOP_LXQT; if (aOver.equalsIgnoreAsciiCase("plasma5") || aOver.equalsIgnoreAsciiCase("plasma")) return DESKTOP_PLASMA5; +if (aOver.equalsIgnoreAsciiCase("plasma6")) +return DESKTOP_PLASMA6; if ( aOver.equalsIgnoreAsciiCase( "gnome" ) ) return DESKTOP_GNOME; if ( aOver.equalsIgnoreAsciiCase( "gnome-wayland" ) ) @@ -190,6 +199,8 @@ DESKTOP_DETECTOR_PUBLIC DesktopType get_desktop_environment() if
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/Library_vclplug_kf5.mk vcl/unx
vcl/Library_vclplug_kf5.mk|2 +- vcl/inc/vclpluginapi.h|6 +++--- vcl/unx/kf5/KFSalInstance.cxx |5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) New commits: commit 4239a29760ff9748965b4c670d1d4e272f81205d Author: Michael Weghorn AuthorDate: Tue Jun 20 15:27:46 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Jun 22 22:15:33 2023 +0200 kf5/kf6: Don't hardcode reported KF version to 5 Use the Qt major version number instead of a hardcoded "5" when constructing the toolkit ID, so the upcoming "kf6" VCL plugin will be reported as such (e.g. in the "About LibreOffice" dialog), not as "kf5". Change-Id: I8ff0721b8b22fd4b1ca035def37a84bcc5ffede6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153436 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/vcl/unx/kf5/KFSalInstance.cxx b/vcl/unx/kf5/KFSalInstance.cxx index 741f01006356..21463e05439a 100644 --- a/vcl/unx/kf5/KFSalInstance.cxx +++ b/vcl/unx/kf5/KFSalInstance.cxx @@ -36,7 +36,8 @@ KFSalInstance::KFSalInstance(std::unique_ptr& pQApp, bool bUseCair : QtInstance(pQApp, bUseCairo) { ImplSVData* pSVData = ImplGetSVData(); -pSVData->maAppData.mxToolkitName = constructToolkitID(u"kf5"); +const OUString sToolkit = u"kf" + OUString::number(QT_VERSION_MAJOR); +pSVData->maAppData.mxToolkitName = constructToolkitID(sToolkit); } bool KFSalInstance::hasNativeFileSelection() const commit f5a2f4739b26428d87a2538988ed114c834f9c72 Author: Michael Weghorn AuthorDate: Tue Jun 20 14:32:36 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Jun 22 22:15:19 2023 +0200 kf5: Drop "5" from VCLPLUG_KF5_{IMPLEMENTATION,PUBLIC} defines Rename those to no more include the Qt/KF version number, since they will be used for the upcoming kf6 VCL plugin as well. This is basically the same as commit 51d148c748d8e23b69ba91d3c1b5a9057bd22548 Author: Michael Weghorn Date: Wed Sep 29 10:26:03 2021 +0200 qt5: Drop "5" from VCLPLUG_QT5_{IMPLEMENTATION,PUBLIC} defines , just for the kf5 instead of the qt5 VCL plugin. Change-Id: I9ec6d40a05ee55ff0df4869966831d6bff94f575 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153435 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/vcl/Library_vclplug_kf5.mk b/vcl/Library_vclplug_kf5.mk index 3bc4c17d1811..4e28be29a3a6 100644 --- a/vcl/Library_vclplug_kf5.mk +++ b/vcl/Library_vclplug_kf5.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_include,vclplug_kf5,\ )) $(eval $(call gb_Library_add_defs,vclplug_kf5,\ --DVCLPLUG_KF5_IMPLEMENTATION \ +-DVCLPLUG_KF_IMPLEMENTATION \ )) $(eval $(call gb_Library_use_sdk_api,vclplug_kf5)) diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h index 930f080a9a9d..4211a581c979 100644 --- a/vcl/inc/vclpluginapi.h +++ b/vcl/inc/vclpluginapi.h @@ -35,10 +35,10 @@ #define VCLPLUG_GTK_PUBLIC SAL_DLLPUBLIC_IMPORT #endif -#if defined VCLPLUG_KF5_IMPLEMENTATION -#define VCLPLUG_KF5_PUBLIC SAL_DLLPUBLIC_EXPORT +#if defined VCLPLUG_KF_IMPLEMENTATION +#define VCLPLUG_KF_PUBLIC SAL_DLLPUBLIC_EXPORT #else -#define VCLPLUG_KF5_PUBLIC SAL_DLLPUBLIC_IMPORT +#define VCLPLUG_KF_PUBLIC SAL_DLLPUBLIC_IMPORT #endif #if defined VCLPLUG_OSX_IMPLEMENTATION diff --git a/vcl/unx/kf5/KFSalInstance.cxx b/vcl/unx/kf5/KFSalInstance.cxx index 7dd7d4a89678..741f01006356 100644 --- a/vcl/unx/kf5/KFSalInstance.cxx +++ b/vcl/unx/kf5/KFSalInstance.cxx @@ -68,7 +68,7 @@ KFSalInstance::createPicker(css::uno::Reference con } extern "C" { -VCLPLUG_KF5_PUBLIC SalInstance* create_SalInstance() +VCLPLUG_KF_PUBLIC SalInstance* create_SalInstance() { static const bool bUseCairo = (nullptr == getenv("SAL_VCL_KF5_USE_QFONT"));
[Libreoffice-commits] core.git: 2 commits - vcl/CustomTarget_kf5_moc.mk vcl/Library_vclplug_kf5.mk vcl/unx
vcl/CustomTarget_kf5_moc.mk |2 +- vcl/Library_vclplug_kf5.mk|4 ++-- vcl/unx/kf5/KFFilePicker.cxx | 40 vcl/unx/kf5/KFFilePicker.hxx |8 vcl/unx/kf5/KFSalInstance.cxx | 18 +- vcl/unx/kf5/KFSalInstance.hxx |4 ++-- 6 files changed, 38 insertions(+), 38 deletions(-) New commits: commit 6922c2fcfec92292d763c0346b7afdc44c63d1e9 Author: Michael Weghorn AuthorDate: Tue Jun 20 14:27:02 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Jun 22 22:15:06 2023 +0200 kf5: Rename sources + headers according to new class names As commit b9cd02937b358ae035ed554a28037237a6c8434c Author: Michael Weghorn Date: Tue Sep 28 15:55:43 2021 +0200 qt5: Rename sources + headers according to new class names did for the qt5 VCL plugin, this renames the source and header files according to the new class names without a "5" in them, as mentioned in Change-Id If785792f8669688de2156b1a990d7956dbe7a401 ("kf5: Remove "5" from class names in kf5 VCL plugin"): > Renaming the headers and source files will be done > in a separate commit to make tracking git history easier. Change-Id: Ieb49cda25b170ac777029f7288a885a0b953e02d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153434 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/vcl/CustomTarget_kf5_moc.mk b/vcl/CustomTarget_kf5_moc.mk index 96f84a937560..27e783fad1f8 100644 --- a/vcl/CustomTarget_kf5_moc.mk +++ b/vcl/CustomTarget_kf5_moc.mk @@ -10,7 +10,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kf5)) $(call gb_CustomTarget_get_target,vcl/unx/kf5) : \ - $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/KF5FilePicker.moc + $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/KFFilePicker.moc $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/%.moc : \ $(SRCDIR)/vcl/unx/kf5/%.hxx \ diff --git a/vcl/Library_vclplug_kf5.mk b/vcl/Library_vclplug_kf5.mk index fe89ec00ec05..3bc4c17d1811 100644 --- a/vcl/Library_vclplug_kf5.mk +++ b/vcl/Library_vclplug_kf5.mk @@ -63,8 +63,8 @@ $(eval $(call gb_Library_use_externals,vclplug_kf5,\ )) $(eval $(call gb_Library_add_exception_objects,vclplug_kf5,\ -vcl/unx/kf5/KF5FilePicker \ -vcl/unx/kf5/KF5SalInstance \ +vcl/unx/kf5/KFFilePicker \ +vcl/unx/kf5/KFSalInstance \ )) ifeq ($(OS),LINUX) diff --git a/vcl/unx/kf5/KF5FilePicker.cxx b/vcl/unx/kf5/KFFilePicker.cxx similarity index 99% rename from vcl/unx/kf5/KF5FilePicker.cxx rename to vcl/unx/kf5/KFFilePicker.cxx index d7e6128bd35e..b1c6fc91b45b 100644 --- a/vcl/unx/kf5/KF5FilePicker.cxx +++ b/vcl/unx/kf5/KFFilePicker.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "KF5FilePicker.hxx" -#include +#include "KFFilePicker.hxx" +#include #include #include diff --git a/vcl/unx/kf5/KF5FilePicker.hxx b/vcl/unx/kf5/KFFilePicker.hxx similarity index 100% rename from vcl/unx/kf5/KF5FilePicker.hxx rename to vcl/unx/kf5/KFFilePicker.hxx diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KFSalInstance.cxx similarity index 98% rename from vcl/unx/kf5/KF5SalInstance.cxx rename to vcl/unx/kf5/KFSalInstance.cxx index 88600b01ed5e..7dd7d4a89678 100644 --- a/vcl/unx/kf5/KF5SalInstance.cxx +++ b/vcl/unx/kf5/KFSalInstance.cxx @@ -27,8 +27,8 @@ #include -#include "KF5FilePicker.hxx" -#include "KF5SalInstance.hxx" +#include "KFFilePicker.hxx" +#include "KFSalInstance.hxx" using namespace com::sun::star; diff --git a/vcl/unx/kf5/KF5SalInstance.hxx b/vcl/unx/kf5/KFSalInstance.hxx similarity index 100% rename from vcl/unx/kf5/KF5SalInstance.hxx rename to vcl/unx/kf5/KFSalInstance.hxx commit 0914025d93af5797b662fda82cd954081b2fda39 Author: Michael Weghorn AuthorDate: Tue Jun 20 14:20:42 2023 +0200 Commit: Michael Weghorn CommitDate: Thu Jun 22 22:14:58 2023 +0200 kf5: Remove "5" from class names in kf5 VCL plugin This is the kf5 equivalent of what commit dfd3fdfe664e214ca1bba72b96d19b89ff25e7bc Author: Michael Weghorn Date: Tue Sep 28 15:02:47 2021 +0200 qt5: Remove "5" from class names in qt5 VCL plugin did for the qt5 VCL plugin. This is in preparation of an upcomng kf6 VCL plugin. Renaming the headers and source files will be done in a separate commit to make tracking git history easier. Change-Id: If785792f8669688de2156b1a990d7956dbe7a401 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153433 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/vcl/unx/kf5/KF5FilePicker.cxx b/vcl/unx/kf5/KF5FilePicker.cxx index 491ce7e31eb4..d7e6128bd35e 100644 --- a/vcl/unx/kf5/KF5FilePicker.cxx +++ b/vcl/unx/kf5/KF5FilePicker.cxx @@ -39,15 +39,15 @@ namespace uno::Sequence FilePicker_getSupportedServiceNames() {
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5141834c378fa731cabe0f325c5a95d56034e3f0 Author: Olivier Hallot AuthorDate: Thu Jun 22 16:28:51 2023 -0300 Commit: Gerrit Code Review CommitDate: Thu Jun 22 21:28:51 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 6b96b109055418994353b2d36c8735b0fff14637 - tdf#1552354 Update page number wizard help page + synch with latest 7.6 features. Change-Id: Ia84f044cbb0e9f46da30219ac0c950dc1dda6396 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153474 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 47a2e63384c7..6b96b1090554 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 47a2e63384c754cf2c8766bc1d03b9a1d009c498 +Subproject commit 6b96b109055418994353b2d36c8735b0fff14637
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/pagenumbering.xhp | 30 ++ 1 file changed, 22 insertions(+), 8 deletions(-) New commits: commit 6b96b109055418994353b2d36c8735b0fff14637 Author: Olivier Hallot AuthorDate: Thu Jun 22 16:26:45 2023 -0300 Commit: Olivier Hallot CommitDate: Thu Jun 22 21:28:50 2023 +0200 tdf#1552354 Update page number wizard help page + synch with latest 7.6 features. Change-Id: Ia84f044cbb0e9f46da30219ac0c950dc1dda6396 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153474 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/swriter/01/pagenumbering.xhp b/source/text/swriter/01/pagenumbering.xhp index 674d37b7fb..44053b9a93 100644 --- a/source/text/swriter/01/pagenumbering.xhp +++ b/source/text/swriter/01/pagenumbering.xhp @@ -10,30 +10,44 @@ --> -Page Number Wizard +Page Number Wizard /text/swriter/01/pagenumbering.xhp - - - + + + page number;insert quickly Page Number Wizard -Use this command to quickly insert a page number in the header or footer of the current page style. +Use this command to quickly insert a page number in the header or footer of the current page style. + Choose Insert - Page Number. + +In the Insert menu of the Insert tab, choose Page Numbers. - + Position -Select the position of the page number: options are header or footer. +Select the position of the page number, Options are Top of page (Header) or Bottom of page (Footer). The Page Number command enables the header or footer of the current page style. - + + Alignment Select the alignment of the page number in the header or footer. Options are Left, Center and Right. + +Mirror on even pages +Creates separate left/right pages with mirrored page number placement. + +Include page total +Also insert the total number of pages. + +Page Numbers +Select a numbering scheme for the page numbers. +
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/03130500.xhp | 64 ++--- 1 file changed, 36 insertions(+), 28 deletions(-) New commits: commit 47a2e63384c754cf2c8766bc1d03b9a1d009c498 Author: Olivier Hallot AuthorDate: Thu Jun 22 06:43:13 2023 -0300 Commit: Olivier Hallot CommitDate: Thu Jun 22 21:27:47 2023 +0200 tdf#156015 Mark unimplemented args of BASIC Shell + refactor Change-Id: Ide7bc5a4abd4685b2bbe2727740358ac4c811030 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153455 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/shared/03130500.xhp b/source/text/sbasic/shared/03130500.xhp index 2ae8648136..2282d64834 100644 --- a/source/text/sbasic/shared/03130500.xhp +++ b/source/text/sbasic/shared/03130500.xhp @@ -20,7 +20,7 @@ -Shell Function +Shell Function /text/sbasic/shared/03130500.xhp @@ -28,99 +28,107 @@ - + Shell function Shell Function -Starts another application and defines the respective window style, if necessary. +Starts another application and defines the respective window style, if necessary. -Shell (Pathname As String[, Windowstyle As Integer[, Param As String[, bSync]]]) +Shell (Pathname As String[, Windowstyle As Integer[, Param As String[, bSync]]]) Pathname -Name of the program that you want to start, optionally with complete path and/or arguments. +Name of the program that you want to start, optionally with complete path and/or arguments. Windowstyle -Optional integer expression that specifies the style of the window that the program is executed in. The following values are possible: +Optional integer expression that specifies the style of the window that the program is executed in. + +Parameter Windowstyle is only effective on Windows systems. On other systems the parameter is ignored. + +The following values are possible: -Windowstyle +Windowstyle -Meaning +Meaning - 0 + 0 - The focus is on the hidden program window. + The focus is on the hidden program window. + Not implemented in %PRODUCTNAME. - 1 + 1 - The focus is on the program window in standard size. + The focus is on the program window in standard size. + - 2 + 2 - The focus is on the minimized program window. + The focus is on the minimized program window. - 3 + 3 - focus is on the maximized program window. + focus is on the maximized program window. - 4 + 4 - Standard size program window, without focus. + Standard size program window, without focus. + - 6 + 6 - Minimized program window, focus remains on the active window. + Minimized program window, focus remains on the active window. + - 10 + 10 - Full-screen display. + Full-screen display. - +Windowstyle 3 and 10 are equivalent in Windows systems. Param -String that specifies additional arguments passed to the program. +String that specifies additional arguments passed to the program. bSync -If this value is set to true, the Shell command and all $[officename] tasks wait until the shell process completes. If the value is set to false, the shell returns directly. The default value is false. +If this value is set to true, the Shell command and all $[officename] tasks wait until the shell process completes. If the value is set to false, the shell returns directly. The default value is false. @@ -128,9 +136,9 @@ -Sub ExampleShellForWin -Shell("c:\windows\calc.exe",2) -End Sub +Sub ExampleShellForWin + Shell("c:\windows\calc.exe",2) +End Sub
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aaace6fbdf302e32417da86681a366efb388a030 Author: Olivier Hallot AuthorDate: Thu Jun 22 16:27:47 2023 -0300 Commit: Gerrit Code Review CommitDate: Thu Jun 22 21:27:47 2023 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 47a2e63384c754cf2c8766bc1d03b9a1d009c498 - tdf#156015 Mark unimplemented args of BASIC Shell + refactor Change-Id: Ide7bc5a4abd4685b2bbe2727740358ac4c811030 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/153455 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ff091dd8df2a..47a2e63384c7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ff091dd8df2ad426820ecccbbdb7eb7fb746dceb +Subproject commit 47a2e63384c754cf2c8766bc1d03b9a1d009c498
[Libreoffice-bugs] [Bug 155234] [LOCALHELP] Update page number wizard for Writer w/latest improvements
https://bugs.documentfoundation.org/show_bug.cgi?id=155234 Olivier Hallot changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |olivier.hallot@libreoffice. |desktop.org |org -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 141136] Tabbed toolbar mode keeps switching you away from the current tab to the "Home" tab each time you enter (focus) or leave a comment
https://bugs.documentfoundation.org/show_bug.cgi?id=141136 Justin L changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |jl...@mail.com |desktop.org | --- Comment #9 from Justin L --- NotebookbarTabControlBase::SetContext knows eLastContext, and is passed vcl::EnumContext::Context::Default when it is deactivated (but LOKit doesn't deactive). Then it activates with a real context, which always seems to match HOME if it doesn't have a specific tab (so even skipping deactivation won't help). If the current tab is vcl::EnumContext::Context::Any, then we don't want to switch to another ANY control. ANY pages are always visible. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xihelper.cxx |6 ++ sc/source/filter/inc/worksheethelper.hxx |4 +++- sc/source/filter/oox/sheetdatabuffer.cxx |4 +++- sc/source/filter/oox/worksheethelper.cxx |6 +- 4 files changed, 17 insertions(+), 3 deletions(-) New commits: commit b224e450d09a0405043a011d48f4f57e88cdc344 Author: Henry Castro AuthorDate: Tue Feb 28 09:50:28 2023 -0400 Commit: Henry Castro CommitDate: Thu Jun 22 21:04:15 2023 +0200 sc: filter: excel: import cell multi-line text The excel document, if the cell has multi-line text and the property wrap text is off, the paragraphs are rendered all in a single line. Signed-off-by: Henry Castro Change-Id: I3b5c82dde2616887e51ad6e3dfe91d100482f747 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148004 Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153470 Tested-by: Jenkins diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 3552e8d65f1b..e095d22018ac 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -238,10 +238,16 @@ void XclImpStringHelper::SetToDocument( const OUString& aStr = rString.GetText(); if (aStr.indexOf('\n') != -1 || aStr.indexOf('\r') != -1) { +const XclImpXFBuffer& rXFBuffer = rRoot.GetXFBuffer(); +const XclImpXF* pXF = rXFBuffer.GetXF( nXFIndex ); +bool bSingleLine = pXF ? !pXF->GetLineBreak() : false; + // Multiline content. ScFieldEditEngine& rEngine = rDoc.getDoc().GetEditEngine(); +rEngine.SetSingleLine(bSingleLine); rEngine.SetTextCurrentDefaults(aStr); rDoc.setEditCell(rPos, rEngine.CreateTextObject()); +rEngine.SetSingleLine(false); } else { diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 3a44dc2e105e..4081d248e32b 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -262,7 +262,9 @@ public: /** Inserts a rich-string cell directly into the Calc sheet. */ void putRichString( const ScAddress& rAddress, -RichString& rString, const oox::xls::Font* pFirstPortionFont ); +RichString& rString, +const oox::xls::Font* pFirstPortionFont, +bool bSingleLine = false); /** Inserts a formula cell directly into the Calc sheet. */ void putFormulaTokens( diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 0769897e2620..76721ded0d17 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -121,6 +121,8 @@ void SheetDataBuffer::setStringCell( const CellModel& rModel, const RichStringRe { OSL_ENSURE( rxString, "SheetDataBuffer::setStringCell - missing rich string object" ); const oox::xls::Font* pFirstPortionFont = getStyles().getFontFromCellXf( rModel.mnXfId ).get(); +const Xf* pXf = getStyles().getCellXf( rModel.mnXfId ).get(); +bool bSingleLine = pXf ? !rxString->isPreserveSpace() && !pXf->getAlignment().getModel().mbWrapText : false; OUString aText; if( rxString->extractPlainString( aText, pFirstPortionFont ) ) { @@ -128,7 +130,7 @@ void SheetDataBuffer::setStringCell( const CellModel& rModel, const RichStringRe } else { -putRichString( rModel.maCellAddr, *rxString, pFirstPortionFont ); +putRichString( rModel.maCellAddr, *rxString, pFirstPortionFont, bSingleLine ); setCellFormat( rModel ); } } diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 6ea756f884ce..e34f5a47d190 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1596,12 +1596,16 @@ void WorksheetHelper::setCellFormulaValue( getFormulaBuffer().setCellFormulaValue(rAddress, rValueStr, nCellType); } -void WorksheetHelper::putRichString( const ScAddress& rAddress, RichString& rString, const oox::xls::Font* pFirstPortionFont ) +void WorksheetHelper::putRichString( const ScAddress& rAddress, RichString& rString, const oox::xls::Font* pFirstPortionFont, bool bSingleLine ) { ScEditEngineDefaulter& rEE = getEditEngine(); +rEE.SetSingleLine(bSingleLine); + // The cell will own the text object instance returned from convert(). getDocImport().setEditCell(rAddress, rString.convert(rEE, pFirstPortionFont)); + +rEE.SetSingleLine(false); } void WorksheetHelper::putFormulaTokens( const ScAddress& rAddress, const ApiTokenSequence& rTokens )
[Libreoffice-bugs] [Bug 88380] Character formats (e.g. bold) lost when pasting multiple times
https://bugs.documentfoundation.org/show_bug.cgi?id=88380 Diana Vides changed: What|Removed |Added CC||dianavide...@gmail.com --- Comment #16 from Diana Vides --- This problem is still present in Version: 7.5.3.2 (X86_64) / LibreOffice Community Build ID: 9f56dff12ba03b9acd7730a5a481eea045e468f3 CPU threads: 6; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: es-ES (en_US); UI: en-US Calc: threaded Also, it is present in Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 098e8d6f111ca9d7680ed1eec00522fed6487e95 CPU threads: 6; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - include/editeng oox/source sw/qa sw/source writerfilter/source
include/editeng/unoprnms.hxx |4 + include/editeng/unotext.hxx |5 - oox/source/drawingml/textcharacterproperties.cxx |6 + oox/source/token/properties.txt |2 sw/qa/extras/ooxmlexport/data/tdf155945.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport19.cxx | 11 +++ sw/source/core/unocore/unoobj.cxx| 48 --- sw/source/filter/ww8/docxattributeoutput.cxx | 28 ++--- writerfilter/source/dmapper/CellColorHandler.cxx | 70 ++- writerfilter/source/dmapper/CellColorHandler.hxx | 15 writerfilter/source/dmapper/PropertyIds.cxx |7 +- writerfilter/source/dmapper/PropertyIds.hxx |3 12 files changed, 163 insertions(+), 36 deletions(-) New commits: commit 79b17173296c00f2292240c2304cdbd6c4a97b06 Author: Tomaž Vajngerl AuthorDate: Sun Jun 11 00:57:36 2023 +0900 Commit: Xisco Fauli CommitDate: Thu Jun 22 21:03:15 2023 +0200 ooxml: import and export background and fill theme colors props. This adds support to import and export background and fill theme color properties. Change-Id: I0f40615fe2d06cdcb4f2f9752602fe2ec699c7b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152835 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl (cherry picked from commit 9e121f3a6b95dab7525aa1583f810b2b504ce1b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153421 Reviewed-by: Xisco Fauli diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 8859dfe5a4a5..214b8fd53dea 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -350,6 +350,10 @@ inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_SHADOWED = u"CharShadowed"; inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_UNDERLINE = u"CharUnderline"; inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_OVERLINE = u"CharOverline"; +inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_COLOR = u"CharBackColor"; +inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_COMPLEX_COLOR = u"CharBackgroundComplexColor"; +inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT = u"CharBackTransparent"; + inline constexpr OUStringLiteral UNO_NAME_BITMAP = u"Bitmap"; inline constexpr OUStringLiteral UNO_NAME_LINKDISPLAYNAME = u"LinkDisplayName"; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 84dc7d9fdb6f..a027e331ae00 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -93,8 +93,9 @@ struct SfxItemPropertyMapEntry; { UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD, EE_CHAR_COLOR, ::cppu::UnoType::get(), 0, MID_COLOR_LUM_MOD }, \ { UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF, EE_CHAR_COLOR, ::cppu::UnoType::get(), 0, MID_COLOR_LUM_OFF }, \ { UNO_NAME_EDIT_CHAR_COMPLEX_COLOR, EE_CHAR_COLOR, ::cppu::UnoType::get(), 0, MID_COMPLEX_COLOR }, \ -{ u"CharBackColor",EE_CHAR_BKGCOLOR, ::cppu::UnoType::get(),0, 0 }, \ -{ u"CharBackTransparent", EE_CHAR_BKGCOLOR, ::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \ +{ UNO_NAME_EDIT_CHAR_BACKGROUND_COLOR, EE_CHAR_BKGCOLOR, ::cppu::UnoType::get(),0, MID_COLOR_RGB }, \ +{ UNO_NAME_EDIT_CHAR_BACKGROUND_COMPLEX_COLOR, EE_CHAR_BKGCOLOR, ::cppu::UnoType::get(), 0, MID_COMPLEX_COLOR }, \ +{ UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT, EE_CHAR_BKGCOLOR, ::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \ { UNO_NAME_EDIT_CHAR_ESCAPEMENT, EE_CHAR_ESCAPEMENT, ::cppu::UnoType::get(),0, MID_ESC }, \ { UNO_NAME_EDIT_CHAR_UNDERLINE, EE_CHAR_UNDERLINE, ::cppu::UnoType::get(),0, MID_TL_STYLE }, \ { u"CharUnderlineColor", EE_CHAR_UNDERLINE, ::cppu::UnoType::get(),0, MID_TL_COLOR }, \ diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx index 1217c19441ae..c3dde4889a64 100644 --- a/oox/source/drawingml/textcharacterproperties.cxx +++ b/oox/source/drawingml/textcharacterproperties.cxx @@ -216,7 +216,11 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil } if (maHighlightColor.isUsed() && maHighlightColor.getTransparency() != 100) -rPropMap.setProperty( PROP_CharBackColor, maHighlightColor.getColor( rFilter.getGraphicHelper() )); +{ +rPropMap.setProperty(PROP_CharBackColor, maHighlightColor.getColor( rFilter.getGraphicHelper() )); +model::ComplexColor aComplexColor = maHighlightColor.getComplexColor(); +rPropMap.setProperty(PROP_CharBackgroundComplexColor, model::color::createXComplexColor(aComplexColor)); +} else rPropMap.setProperty( PROP_CharBackColor, sal_Int32(-1)); } diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - sc/CppunitTest_sc_theme_import_export_test.mk sc/Module_sc.mk sc/qa sc/source
sc/CppunitTest_sc_theme_import_export_test.mk | 67 sc/Module_sc.mk |1 sc/qa/unit/ThemeImportExportTest.cxx | 71 ++ sc/qa/unit/data/xlsx/CalcThemeTest.xlsx |binary sc/source/filter/excel/xestyle.cxx| 62 +++--- sc/source/filter/inc/xestyle.hxx |5 + 6 files changed, 186 insertions(+), 20 deletions(-) New commits: commit 2e027a9d5ae1ed65c25755c77d14584fff126866 Author: Tomaž Vajngerl AuthorDate: Wed May 17 14:54:20 2023 +0900 Commit: Xisco Fauli CommitDate: Thu Jun 22 21:00:40 2023 +0200 sc: theme color export for cell fill color + test Change-Id: Ibaad410f094f86d9f7197090db702ae45340c239 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151859 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153448 diff --git a/sc/CppunitTest_sc_theme_import_export_test.mk b/sc/CppunitTest_sc_theme_import_export_test.mk new file mode 100644 index ..52f9736e36b9 --- /dev/null +++ b/sc/CppunitTest_sc_theme_import_export_test.mk @@ -0,0 +1,67 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#* + +$(eval $(call gb_CppunitTest_CppunitTest,sc_theme_import_export_test)) + +$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_theme_import_export_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_theme_import_export_test, \ +sc/qa/unit/ThemeImportExportTest \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sc_theme_import_export_test, \ +boost_headers \ +mdds_headers \ +libxml2 \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_theme_import_export_test, \ +basegfx \ +comphelper \ +cppu \ +cppuhelper \ +sal \ +salhelper \ +sax \ +sc \ +scqahelper \ +sfx \ +subsequenttest \ +test \ +tl \ +unotest \ +utl \ +vcl \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_theme_import_export_test,\ +-I$(SRCDIR)/sc/source/ui/inc \ +-I$(SRCDIR)/sc/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sc_theme_import_export_test,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sc_theme_import_export_test)) +$(eval $(call gb_CppunitTest_use_ure,sc_theme_import_export_test)) +$(eval $(call gb_CppunitTest_use_vcl,sc_theme_import_export_test)) +$(eval $(call gb_CppunitTest_use_rdb,sc_theme_import_export_test,services)) +$(eval $(call gb_CppunitTest_use_components,sc_theme_import_export_test)) +$(eval $(call gb_CppunitTest_use_configuration,sc_theme_import_export_test)) + +$(eval $(call gb_CppunitTest_add_arguments,sc_theme_import_export_test, \ + -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"{$(gb_Helper_LIBRARY_PATH_VAR)+=$(gb_Helper_LIBRARY_PATH_VAR)}" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index ce76695b4e4b..0c2178b7fea1 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -236,6 +236,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ CppunitTest_sc_tablesheetsobj \ CppunitTest_sc_tablevalidationobj \ CppunitTest_sc_tabviewobj \ + CppunitTest_sc_theme_import_export_test \ CppunitTest_sc_uniquecellformatsenumeration \ CppunitTest_sc_uniquecellformatsobj \ CppunitTest_sc_viewpaneobj \ diff --git a/sc/qa/unit/ThemeImportExportTest.cxx b/sc/qa/unit/ThemeImportExportTest.cxx new file mode 100644 index ..ae1653837f36 --- /dev/null +++ b/sc/qa/unit/ThemeImportExportTest.cxx @@ -0,0 +1,71 @@ +/* -*- 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/. + */ + +#include + +#include +#include +#include + +using namespace css; + +class ThemeImportExportTest : public UnoApiXmlTest +{ +public: +ThemeImportExportTest() +: UnoApiXmlTest("sc/qa/unit/data") +{ +} + +void test(); + +CPPUNIT_TEST_SUITE(ThemeImportExportTest); +CPPUNIT_TEST(test); +CPPUNIT_TEST_SUITE_END(); +}; + +void ThemeImportExportTest::test() +{ +loadFromURL(u"xlsx/CalcThemeTest.xlsx"); + +save("Calc Office Open XML"); + +xmlDocUniquePtr pXmlDoc =
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 3 commits - include/oox oox/source sc/inc sc/qa sc/source test/Library_subsequenttest.mk test/source
include/oox/drawingml/color.hxx| 10 ++- oox/source/drawingml/color.cxx | 84 +- sc/inc/patattr.hxx | 50 +--- sc/inc/unonames.hxx|2 sc/qa/extras/scstyleobj.cxx| 35 --- sc/qa/unit/helper/qahelper.cxx | 26 sc/qa/unit/subsequent_export_test4.cxx |4 - sc/qa/unit/ucalc.cxx |2 sc/qa/unit/uicalc/uicalc.cxx | 10 +-- sc/qa/unit/uicalc/uicalc2.cxx | 10 +-- sc/source/core/data/column2.cxx|6 - sc/source/core/data/global.cxx |2 sc/source/core/data/patattr.cxx| 103 +++-- sc/source/core/tool/editutil.cxx |2 sc/source/core/tool/interpr1.cxx |4 - sc/source/filter/excel/xecontent.cxx |8 +- sc/source/filter/excel/xehelper.cxx| 23 --- sc/source/filter/excel/xestyle.cxx | 16 ++--- sc/source/filter/excel/xlstyle.cxx | 18 ++--- sc/source/filter/inc/stylesbuffer.hxx |3 sc/source/filter/inc/xestyle.hxx | 18 ++--- sc/source/filter/inc/xlstyle.hxx |8 +- sc/source/filter/oox/stylesbuffer.cxx | 17 +++-- sc/source/ui/cctrl/dpcontrol.cxx |5 - sc/source/ui/docshell/docsh3.cxx |4 - sc/source/ui/unoobj/cellsuno.cxx | 13 sc/source/ui/unoobj/styleuno.cxx |2 sc/source/ui/vba/vbarange.cxx |4 - sc/source/ui/view/cellsh1.cxx |8 +- sc/source/ui/view/gridwin4.cxx |6 - sc/source/ui/view/output2.cxx | 12 +-- sc/source/ui/view/printfun.cxx |8 +- test/Library_subsequenttest.mk |1 test/source/beans/xpropertyset.cxx |9 ++ 34 files changed, 368 insertions(+), 165 deletions(-) New commits: commit 076ab906e6007b1a2e58e27af30700051a970004 Author: Tomaž Vajngerl AuthorDate: Tue May 16 22:10:10 2023 +0900 Commit: Xisco Fauli CommitDate: Thu Jun 22 21:00:34 2023 +0200 sc: factor out color from setting vcl::Font from a ItemSet vcl::Font color parameter is deprecated so we need to handle the color separately from font data. This refactors GetFont into 2 separate functions - fillFontOnly and fillColor, where fillFont now does the same as previously GetFont function did. All GetFont calls have been changed depending on if we need only the font data or also color - where the color is now treated in a different call. There are a couple of calls where fillFont was used, because to change that needs a more complex refactoring. Change-Id: I0a2ce50a0cb28d196fcff87e1e80099a2bb60a9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151858 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153447 diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index 49cae62994b4..ba15cfb1dd27 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -92,23 +92,55 @@ public: SvxCellOrientation GetCellOrientation( const SfxItemSet* pCondSet = nullptr ) const; /** Static helper function to fill a font object from the passed item set. */ -static void GetFont( vcl::Font& rFont, const SfxItemSet& rItemSet, +static void fillFontOnly(vcl::Font& rFont, const SfxItemSet& rItemSet, +const OutputDevice* pOutDev = nullptr, +const Fraction* pScale = nullptr, +const SfxItemSet* pCondSet = nullptr, +SvtScriptType nScript = SvtScriptType::NONE); + +static void fillFont( vcl::Font& rFont, const SfxItemSet& rItemSet, ScAutoFontColorMode eAutoMode, const OutputDevice* pOutDev = nullptr, const Fraction* pScale = nullptr, const SfxItemSet* pCondSet = nullptr, SvtScriptType nScript = SvtScriptType::NONE, const Color* pBackConfigColor = nullptr, -const Color* pTextConfigColor = nullptr ); +const Color* pTextConfigColor = nullptr); + +static void fillColor(Color& rColor, const SfxItemSet& rItemSet, ScAutoFontColorMode eAutoMode, const SfxItemSet* pCondSet = nullptr, +const Color* pBackConfigColor = nullptr, const Color* pTextConfigColor = nullptr); + static ScDxfFontGetDxfFont(const SfxItemSet& rSet, SvtScriptType nScript); + +void fillColor(Color& rColor, +ScAutoFontColorMode eAutoMode, +const SfxItemSet* pCondSet = nullptr, +const Color* pBackConfigColor = nullptr, +
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 2 commits - config_host.mk.in configure.ac external/Module_external.mk filter/Library_msfilter.mk filter/source include/oox oox/Library_oox.m
RepositoryExternal.mk | 10 config_host.mk.in |2 configure.ac | 26 + external/Module_external.mk|2 filter/Library_msfilter.mk |5 filter/source/msfilter/msvbahelper.cxx | 95 ++--- include/oox/drawingml/clrscheme.hxx| 17 oox/Library_oox.mk |1 oox/source/drawingml/clrscheme.cxx | 34 + oox/source/drawingml/color.cxx | 310 - oox/source/drawingml/colorchoicecontext.cxx|7 oox/source/drawingml/fontworkhelpers.cxx | 44 +- oox/source/drawingml/misccontexts.cxx |5 oox/source/drawingml/table/predefined-table-styles.cxx | 44 +- oox/source/export/ThemeExport.cxx | 164 oox/source/ppt/presentationfragmenthandler.cxx | 29 + oox/source/token/relationship.cxx | 25 - oox/source/token/relationship.inc | 96 ++--- sc/Library_scfilt.mk |1 sd/Library_sd.mk |1 sd/source/filter/eppt/pptx-epptooxml.cxx |2 writerfilter/Library_writerfilter.mk |1 writerfilter/source/dmapper/PropertyIds.cxx| 19 - writerfilter/source/dmapper/PropertyIds.hxx|2 xmloff/Library_xo.mk |5 xmloff/source/style/XMLRtlGutterPropertyHandler.cxx| 18 26 files changed, 547 insertions(+), 418 deletions(-) New commits: commit 5a61e6cb899ebce32228d5ee70332c3fcf303212 Author: Tomaž Vajngerl AuthorDate: Wed Jun 14 11:48:51 2023 +0900 Commit: Xisco Fauli CommitDate: Thu Jun 22 21:00:12 2023 +0200 oox, writerfilter, xmloff: use frozen data structures for static data Change-Id: I4a53fa57f52900104d249c84cde36c9d3b9e1300 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153175 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153444 diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 0429a6e31874..fcc343520602 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -21,7 +21,10 @@ $(eval $(call gb_Library_Library,msfilter)) $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter,services)) -$(eval $(call gb_Library_use_external,msfilter,boost_headers)) +$(eval $(call gb_Library_use_externals,msfilter,\ +boost_headers \ +frozen \ +)) $(eval $(call gb_Library_use_sdk_api,msfilter)) diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 923aecb9c3dd..d3fc42af8c2d 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -42,7 +42,9 @@ #include #include #include -#include +#include +#include +#include using namespace ::com::sun::star; @@ -643,64 +645,51 @@ static sal_uInt16 parseChar( sal_Unicode c ) return nVclKey; } -namespace { +namespace +{ -struct KeyCodeEntry +constexpr frozen::unordered_map s_KeyCodes { - const char* sName; - sal_uInt16 nCode; +{ u"BACKSPACE", KEY_BACKSPACE }, +{ u"BS", KEY_BACKSPACE }, +{ u"DELETE", KEY_DELETE }, +{ u"DEL", KEY_DELETE }, +{ u"DOWN", KEY_DOWN }, +{ u"UP", KEY_UP }, +{ u"LEFT", KEY_LEFT }, +{ u"RIGHT", KEY_RIGHT }, +{ u"END", KEY_END }, +{ u"ESCAPE", KEY_ESCAPE }, +{ u"ESC", KEY_ESCAPE }, +{ u"HELP", KEY_HELP }, +{ u"HOME", KEY_HOME }, +{ u"PGDN", KEY_PAGEDOWN }, +{ u"PGUP", KEY_PAGEUP }, +{ u"INSERT", KEY_INSERT }, +{ u"SCROLLLOCK", KEY_SCROLLLOCK }, +{ u"NUMLOCK", KEY_NUMLOCK }, +{ u"TAB", KEY_TAB }, +{ u"F1", KEY_F1 }, +{ u"F2", KEY_F2 }, +{ u"F3", KEY_F3 }, +{ u"F4", KEY_F4 }, +{ u"F5", KEY_F5 }, +{ u"F6", KEY_F6 }, +{ u"F7", KEY_F7 }, +{ u"F8", KEY_F8 }, +{ u"F9", KEY_F9 }, +{ u"F10", KEY_F10 }, +{ u"F11", KEY_F11 }, +{ u"F12", KEY_F12 }, +{ u"F13", KEY_F13 }, +{ u"F14", KEY_F14 }, +{ u"F15", KEY_F15 } }; -} - -KeyCodeEntry const aMSKeyCodesData[] = { -{ "BACKSPACE", KEY_BACKSPACE }, -{ "BS", KEY_BACKSPACE }, -{ "DELETE", KEY_DELETE }, -{ "DEL", KEY_DELETE }, -{ "DOWN", KEY_DOWN }, -{ "UP", KEY_UP }, -{ "LEFT", KEY_LEFT }, -{ "RIGHT", KEY_RIGHT }, -{ "END", KEY_END }, -{ "ESCAPE", KEY_ESCAPE }, -{ "ESC", KEY_ESCAPE }, -{ "HELP", KEY_HELP }, -{ "HOME", KEY_HOME }, -{ "PGDN", KEY_PAGEDOWN }, -{ "PGUP", KEY_PAGEUP }, -{ "INSERT", KEY_INSERT }, -{ "SCROLLLOCK", KEY_SCROLLLOCK }, -{ "NUMLOCK", KEY_NUMLOCK }, -{
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - 3 commits - download.lst external/frozen external/Module_external.mk include/svx Makefile.fetch RepositoryExternal.mk sc/source svx/source sw
Makefile.fetch |1 RepositoryExternal.mk | 10 ++ download.lst |5 +++ external/Module_external.mk|1 external/frozen/Module_frozen.mk | 16 ++ external/frozen/README.md |7 external/frozen/UnpackedTarball_frozen.mk | 18 +++ external/frozen/defines_h_constexpr_string.patch.0 | 11 +++ include/svx/dialog/ThemeDialog.hxx |7 +--- include/svx/theme/IThemeColorChanger.hxx |2 - include/svx/theme/ThemeColorChanger.hxx|2 - sc/source/ui/inc/ThemeColorChanger.hxx |2 - sc/source/ui/theme/ThemeColorChanger.cxx | 27 +++-- sc/source/ui/view/tabvwsh3.cxx |7 +--- svx/source/dialog/ThemeDialog.cxx | 11 +++ svx/source/svdraw/svdpage.cxx | 17 --- svx/source/theme/ThemeColorChanger.cxx |6 +-- sw/qa/core/theme/ThemeTest.cxx |6 +-- sw/source/core/inc/ThemeColorChanger.hxx |2 - sw/source/core/model/ThemeColorChanger.cxx | 32 ++--- sw/source/uibase/shells/basesh.cxx | 16 +++--- sw/source/uibase/sidebar/ThemePanel.cxx|2 - 22 files changed, 143 insertions(+), 65 deletions(-) New commits: commit b31e885e987025fba953ce9d6cb713a48a853d6a Author: Tomaž Vajngerl AuthorDate: Sat Jul 16 12:17:20 2022 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 22 20:59:56 2023 +0200 Add frozen library support - for compile-time dict, set support Change-Id: I8fa02569ba02048cc3ef02b349aafba1c0cbebb4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153173 Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153442 diff --git a/Makefile.fetch b/Makefile.fetch index c8c5c91941f2..625e781dc36a 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -125,6 +125,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,FONTCONFIG,FONTCONFIG_TARBALL) \ $(call fetch_Optional,FREEHAND,FREEHAND_TARBALL) \ $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ + FROZEN_TARBALL \ $(call fetch_Optional,EPOXY,EPOXY_TARBALL) \ $(call fetch_Optional,GLM,GLM_TARBALL) \ $(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3ec3cd924395..631466f0001a 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4297,4 +4297,14 @@ endif # ENABLE_ZXING endif # SYSTEM_ZXING + +define gb_LinkTarget__use_frozen +$(call gb_LinkTarget_use_unpacked,$(1),frozen) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,frozen/include/)\ + $$(INCLUDE) \ +) +endef + + # vim: set noet sw=4 ts=4: diff --git a/download.lst b/download.lst index e8ce2bfc67aa..7111b41795c9 100644 --- a/download.lst +++ b/download.lst @@ -202,6 +202,11 @@ FREETYPE_TARBALL := freetype-2.13.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts +FROZEN_SHA256SUM := f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45 +FROZEN_TARBALL := frozen-1.1.1.tar.gz +# three static lines +# so that git cherry-pick +# will not run into conflicts GLM_SHA256SUM := 6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad GLM_TARBALL := glm-0.9.9.8.zip # three static lines diff --git a/external/Module_external.mk b/external/Module_external.mk index 73d6530ac10f..cd9c5924d71d 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,FONTCONFIG,fontconfig) \ $(call gb_Helper_optional,FREEHAND,libfreehand) \ $(call gb_Helper_optional,FREETYPE,freetype) \ + frozen \ $(call gb_Helper_optional,GLM,glm) \ $(call gb_Helper_optional,GPGMEPP,gpgmepp) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ diff --git a/external/frozen/Module_frozen.mk b/external/frozen/Module_frozen.mk new file mode 100644 index ..10fa0997e0ed --- /dev/null +++ b/external/frozen/Module_frozen.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t; fill-column: 100 -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call
[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - basegfx/source basegfx/test include/basegfx svgio/inc svgio/qa svgio/source
basegfx/source/color/bcolormodifier.cxx | 32 + basegfx/test/BColorModifierTest.cxx | 85 include/basegfx/color/bcolormodifier.hxx| 28 +++ svgio/inc/svgfecolormatrixnode.hxx |3 svgio/inc/svgtools.hxx |2 svgio/qa/cppunit/SvgImportTest.cxx |8 +- svgio/source/svgreader/svgfecolormatrixnode.cxx | 13 +++ svgio/source/svgreader/svgtools.cxx | 34 + 8 files changed, 200 insertions(+), 5 deletions(-) New commits: commit 8395acfec900ea23d25632909eb22e02763bbe37 Author: Xisco Fauli AuthorDate: Fri Jun 16 11:50:57 2023 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 22 20:58:09 2023 +0200 tdf#155735: Add support for matrix type Change-Id: Icc172c5f47731ddcf0beca64c72c2022313e74a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153177 Tested-by: Jenkins Reviewed-by: Xisco Fauli (cherry picked from commit 40371d9fe99d9588e2717b24e44b1ff846e6fe7e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153425 diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx index 8d6f99a3faf5..829b0abda659 100644 --- a/basegfx/source/color/bcolormodifier.cxx +++ b/basegfx/source/color/bcolormodifier.cxx @@ -142,6 +142,38 @@ namespace basegfx return "interpolate"; } +BColorModifier_matrix::~BColorModifier_matrix() +{ +} + +bool BColorModifier_matrix::operator==(const BColorModifier& rCompare) const +{ +const BColorModifier_matrix* pCompare = dynamic_cast< const BColorModifier_matrix* >(); + +if(!pCompare) +{ +return false; +} + +return maMatrix == pCompare->maMatrix; +} + +::basegfx::BColor BColorModifier_matrix::getModifiedColor(const ::basegfx::BColor& aSourceColor) const +{ +basegfx::B3DHomMatrix aColorMatrix; +aColorMatrix.set(0, 0, aSourceColor.getRed()); +aColorMatrix.set(1, 0, aSourceColor.getGreen()); +aColorMatrix.set(2, 0, aSourceColor.getBlue()); + +aColorMatrix = maMatrix * aColorMatrix; +return ::basegfx::BColor(aColorMatrix.get(0, 0), aColorMatrix.get(1, 0), aColorMatrix.get(2, 0)); +} + +OUString BColorModifier_matrix::getModifierName() const +{ +return "matrix"; +} + BColorModifier_saturate::BColorModifier_saturate(double fValue) { maSatMatrix.set(0, 0, 0.213 + 0.787 * fValue); diff --git a/basegfx/test/BColorModifierTest.cxx b/basegfx/test/BColorModifierTest.cxx index d6e0648d2c17..17b6a0c22257 100755 --- a/basegfx/test/BColorModifierTest.cxx +++ b/basegfx/test/BColorModifierTest.cxx @@ -269,6 +269,89 @@ public: CPPUNIT_ASSERT(aBColorModifier->operator==(*aBColorModifier2)); } +void testMatrix() +{ +// green matrix +basegfx::B3DHomMatrix aMatrix; +aMatrix.set(0, 0, 0.0); +aMatrix.set(0, 1, 0.0); +aMatrix.set(0, 2, 0.0); +aMatrix.set(0, 3, 0.0); +aMatrix.set(1, 0, 1.0); +aMatrix.set(1, 1, 1.0); +aMatrix.set(1, 2, 1.0); +aMatrix.set(1, 3, 1.0); +aMatrix.set(2, 0, 0.0); +aMatrix.set(2, 1, 0.0); +aMatrix.set(2, 2, 0.0); +aMatrix.set(2, 3, 0.0); + +const basegfx::BColorModifierSharedPtr aBColorModifier += std::make_shared(aMatrix); + +BColor aExpectedWhite(0.0, 3.0, 0.0); +CPPUNIT_ASSERT_EQUAL(aExpectedWhite, aBColorModifier->getModifiedColor(maWhite)); +BColor aExpectedGray(0.0, 1.5, 0.0); +CPPUNIT_ASSERT_EQUAL(aExpectedGray, aBColorModifier->getModifiedColor(maGray)); +CPPUNIT_ASSERT_EQUAL(maBlack, aBColorModifier->getModifiedColor(maBlack)); + +CPPUNIT_ASSERT_EQUAL(maGreen, aBColorModifier->getModifiedColor(maRed)); +CPPUNIT_ASSERT_EQUAL(maGreen, aBColorModifier->getModifiedColor(maGreen)); +CPPUNIT_ASSERT_EQUAL(maGreen, aBColorModifier->getModifiedColor(maBlue)); +BColor aExpectedYellow(0.0, 2.0, 0.0); +CPPUNIT_ASSERT_EQUAL(aExpectedYellow, aBColorModifier->getModifiedColor(maYellow)); +BColor aExpectedMagenta = aExpectedYellow; +CPPUNIT_ASSERT_EQUAL(aExpectedMagenta, aBColorModifier->getModifiedColor(maMagenta)); +BColor aExpectedCyan = aExpectedYellow; +CPPUNIT_ASSERT_EQUAL(aExpectedCyan, aBColorModifier->getModifiedColor(maCyan)); + +CPPUNIT_ASSERT(aBColorModifier->operator==(*aBColorModifier)); +const basegfx::BColorModifierSharedPtr aBColorModifierInvert += std::make_shared(); +CPPUNIT_ASSERT(*aBColorModifier != *aBColorModifierInvert); + +const basegfx::BColorModifierSharedPtr aBColorModifier2 += std::make_shared(aMatrix); +CPPUNIT_ASSERT(aBColorModifier->operator==(*aBColorModifier2)); +} + +void testIdentityMatrix() +{
[Libreoffice-bugs] [Bug 156025] FILEOPEN PPTX: horizontal lines disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=156025 --- Comment #1 from Gerald Pfeifer --- Created attachment 188059 --> https://bugs.documentfoundation.org/attachment.cgi?id=188059=edit Visual comparison Impress (left) vs PowerPoint (right) -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156025] New: FILEOPEN PPTX: horizontal lines disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=156025 Bug ID: 156025 Summary: FILEOPEN PPTX: horizontal lines disappear Product: LibreOffice Version: 24.2.0.0 alpha0+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: ger...@pfeifer.com Created attachment 188058 --> https://bugs.documentfoundation.org/attachment.cgi?id=188058=edit Sample slide (PPTX) Open the sample document in Impress and PowerPoint and notice how the two horizontal lines (red and blue, marked with yellow ellipses) are gone. -- You are receiving this mail because: You are the assignee for the bug.
ESC budget ranking vote
Per the decision in the ESC budget review meeting today, below is the ranking of budget items to be submitted to TDF board of directors. Non-conflicted ESC members: please give your approval of the ranking by replying to this mail. + Cleanup & further improve ODF conformance (2021) + Convert Impress slideshow to drawinglayer primitives (2021) + Writer tables: support cell margins (next to cell padding) (2021) + Font subsetter for font embedding (2022) + XLSX Aggressive Competitors tracker: gridlines for 3d line charts (2022) + Look-ahead styleref field for Writer (2022) + Normalized spell checking (2022) + Remove/Replace usages of XOR-Paint (2022) + ODT export nondeterminism (2022) + Bitmaps in vcl: Merge RGB and A layer into one (2022) + Allow inline graphics, formulas in impress (and draw), open equation with inline formulas from PPT, PPS, PPTX, PPSX (ranked 1 in Feb 2023) + Make Firebird implementation production-ready (ranked 3 in Feb 2023) + SVG rendering improvements (ranked 4 in Feb 2023) + Rotated Writer TextFrames (ranked 9 in Feb 2023) + XLSX Aggressive Competitors tracker: support math equations in Calc shapes (ranked 12 in Feb 2023) + Slideshow: rendering content on top of videos (ranked 19 in Feb 2023) + Missing ODF Features: Attribute svg:d of some of the possible commands are missing (ranked 30 in Feb 2023) + Missing ODF Features: The attribute draw:text-rotate-angle is interpreted, but there exists no user interface to change it. (ranked 33 in Feb 2023) + Missing ODF Feature: missing completely (ranked 33 in Feb 2023) + Missing ODF Features: Draw:shadow-offset-x/y only partially implemented (ranked 38 in Feb 2023) + Replace remaining Carbon functions with non-Carbon functions (macOS) (ranked 38 in Feb 2023) + Tests for drawinglayer and basegfx (ranked 41 in Feb 2023) Regards, Ilmari Lauhakangas
[Libreoffice-bugs] [Bug 156024] .docx containing Rich Text Content Control Remains interactive after converting to PDF via CLI
https://bugs.documentfoundation.org/show_bug.cgi?id=156024 Nolan changed: What|Removed |Added Component|LibreOffice |Printing and PDF export -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156022] [DOCUMENTATION] Typo error in Help page for TEXTJOIN in pt-BR
https://bugs.documentfoundation.org/show_bug.cgi?id=156022 Olivier Hallot changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #2 from Olivier Hallot --- Good catch. Commas were changed into semi colons. Thanks for reporting -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156024] New: .docx containing Rich Text Content Control Remains interactive after converting to PDF via CLI
https://bugs.documentfoundation.org/show_bug.cgi?id=156024 Bug ID: 156024 Summary: .docx containing Rich Text Content Control Remains interactive after converting to PDF via CLI Product: LibreOffice Version: 7.5.2.2 release Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: nolan.king...@d2l.com Description: .docx files containing rich text content control fields remain as interactive fields when converting to .pdf using the core CLI version 7.5.n. Previous versions (We have previously used 7.0 to 7.4) did not appear to have this issue. Steps to Reproduce: 1. Create a .docx file that contains a Rich Text Content field 2. Run the following command: libreoffice --headless --nolockcheck --nodefault --nofirststartwizard --nologo --norestore --convert-to pdf:writer_pdf_Export:PDFUACompliance=True 3. Open the resulting PDF Actual Results: Rich Text Content Fields remain as interactive - user is able to change the content of the fields from the PDF file view. Expected Results: The Rich Text Content Fields are no longer interactive, and contain the content from the .docx file. The user cannot change the content of the field from the PDF view Reproducible: Always User Profile Reset: No Additional Info: Command is run on headless Ubuntu 20.04.1 LTS 7.5.2.2 Libreoffice CLI -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 104945] Problems copying two different list styles - both added to same existing list on paste (comment 9)
https://bugs.documentfoundation.org/show_bug.cgi?id=104945 --- Comment #32 from Ganton --- The bug still exists using Libreoffice 7.5.4.2 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/xistyle.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0af60a8c7c98069d8f070f8bf2eea368ca129c4f Author: Henry Castro AuthorDate: Tue Feb 28 09:44:27 2023 -0400 Commit: Henry Castro CommitDate: Thu Jun 22 20:17:28 2023 +0200 sc: filter: excel: add getter function LineBreak Signed-off-by: Henry Castro Change-Id: I17646ed53f663fd72a10437d7a3a4407df0c176e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148003 Tested-by: Jenkins CollaboraOffice Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153468 Tested-by: Jenkins diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index 1d0f0e04c5b1..b4e5250dc37f 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -387,6 +387,7 @@ public: /** Reads an XF record. */ voidReadXF( XclImpStream& rStrm ); +bool GetLineBreak() const { return maAlignment.mbLineBreak; } sal_uInt8GetHorAlign() const { return maAlignment.mnHorAlign; } sal_uInt16 GetFontIndex() const { return mnXclFont; }
[Libreoffice-bugs] [Bug 156023] New: Add visual hints (scroll and highlight) when fixing an accessibility check issue
https://bugs.documentfoundation.org/show_bug.cgi?id=156023 Bug ID: 156023 Summary: Add visual hints (scroll and highlight) when fixing an accessibility check issue Product: LibreOffice Version: 7.6.0.0 beta1+ Hardware: All OS: All Status: UNCONFIRMED Keywords: accessibility Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: stephane.guil...@libreoffice.org Blocks: 154929 Created attachment 188057 --> https://bugs.documentfoundation.org/attachment.cgi?id=188057=edit test document When using the Accessibility check sidebar and clicking a "Fix" button, there is nothing visual hinting at which object is being edited. This is particularly important if the fix is about describing the object. Steps: 1. Open attachment 2. Open the accessibility sidebar 3. Click on "Fix" for the issue "Missing alternative or description text" Results: dialog opens but object that's edited is not focused, not highlighted. Expected: a. Document scrolls to object so it is visible, and b. Object is highlighted in some way, useful if no scroll is needed. Could be the same as the "photo negative" effect used when hovering over object names in the Navigator. Tested in: Version: 7.6.0.0.beta1 (X86_64) / LibreOffice Community Build ID: be55b15d98c5f059483845a183fcb5ea8023d27c CPU threads: 8; OS: Linux 5.15; UI render: default; VCL: gtk3 Locale: en-AU (en_AU.UTF-8); UI: en-US Calc: threaded Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=154929 [Bug 154929] [META] Accessibility Check sidebar deck, Automatic Accessibility Checking -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 154929] [META] Accessibility Check sidebar deck, Automatic Accessibility Checking
https://bugs.documentfoundation.org/show_bug.cgi?id=154929 Stéphane Guillou (stragu) changed: What|Removed |Added Depends on||156023 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=156023 [Bug 156023] Add visual hints (scroll and highlight) when fixing an accessibility check issue -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156022] [DOCUMENTATION] Typo error in Help page for TEXTJOIN in pt-BR
https://bugs.documentfoundation.org/show_bug.cgi?id=156022 Julien Nabet changed: What|Removed |Added CC||serval2...@yahoo.fr --- Comment #1 from Julien Nabet --- Done here: https://translations.documentfoundation.org/translate/libo_help-master/textscalc01/pt_BR/?q=note%3AQaJCw_by=-priority%2Cposition=1 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: svgio/inc svgio/qa svgio/source
svgio/inc/svgtoken.hxx |1 + svgio/qa/cppunit/SvgImportTest.cxx | 17 + svgio/qa/cppunit/data/tdf156018.svg | 11 +++ svgio/source/svgreader/svgnode.cxx | 15 +++ svgio/source/svgreader/svgtoken.cxx | 13 + 5 files changed, 57 insertions(+) New commits: commit 079cd3429ace2f9568d42368bb0c56487335d44d Author: Xisco Fauli AuthorDate: Thu Jun 22 18:00:01 2023 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 22 19:50:25 2023 +0200 tdf#156018: check if there is a css style with element inside element Change-Id: I54fa5bea42560eec5ae51dd7ba07de11f418c75c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153466 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx index a28be73df50a..9c28674b1cfb 100644 --- a/svgio/inc/svgtoken.hxx +++ b/svgio/inc/svgtoken.hxx @@ -187,6 +187,7 @@ namespace svgio::svgreader }; SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent); +OUString SVGTokenToStr(const SVGToken& rToken); OUString getStrTitle(); OUString getStrDesc(); diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index df1337090ff3..d29cc30bf41c 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -320,6 +320,23 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf145896) assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[3]", "color", "#ff"); } +CPPUNIT_TEST_FIXTURE(Test, testTdf156018) +{ +Primitive2DSequence aSequence = parseSvg(u"/svgio/qa/cppunit/data/tdf156018.svg"); +CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); + +drawinglayer::Primitive2dXmlDump dumper; +xmlDocUniquePtr pDocument = dumper.dumpAndParse(aSequence); + +CPPUNIT_ASSERT (pDocument); + +// Without the fix in place, this test would have failed with +// - Expected: #008000 +// - Actual : #ff +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[1]", "color", "#008000"); +assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor[2]", "color", "#ff"); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf155932) { Primitive2DSequence aSequence = parseSvg(u"/svgio/qa/cppunit/data/tdf155932.svg"); diff --git a/svgio/qa/cppunit/data/tdf156018.svg b/svgio/qa/cppunit/data/tdf156018.svg new file mode 100644 index ..cff3f924a589 --- /dev/null +++ b/svgio/qa/cppunit/data/tdf156018.svg @@ -0,0 +1,11 @@ +http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; viewBox="-0 0 300 300"> + + +g rect {fill:green;} + + + + + + + diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx index d45624d3edc6..2137209d5599 100644 --- a/svgio/source/svgreader/svgnode.cxx +++ b/svgio/source/svgreader/svgnode.cxx @@ -160,6 +160,21 @@ namespace svgio::svgreader // add CssStyle if found maCssStyleVector.push_back(pNew); } + +// check if there is a css style with element inside element +if(pParent) +{ +OUString sParentType(SVGTokenToStr(pParent->getType())); + +aNewConcatenated = sParentType + rClassStr; +pNew = rDocument.findGlobalCssStyleAttributes(aNewConcatenated); + +if(pNew) +{ +// add CssStyle if found +maCssStyleVector.push_back(pNew); +} +} } void SvgNode::fillCssStyleVector(const OUString& rClassStr, const SvgStyleAttributes& rOriginal) diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index 45af658b1ebd..ed50612323e5 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -243,6 +243,19 @@ SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent) } } +OUString SVGTokenToStr(const SVGToken& rToken) +{ +for (auto it = aSVGTokenMapperList.begin(); it != aSVGTokenMapperList.end(); ++it) +{ +if (it->second == rToken) +{ +OUString aFirst(it->first); +return aFirst; +} +} +return OUString(); +} + OUString getStrTitle() { return OUString(constToken_Title);
[Libreoffice-commits] core.git: basegfx/test include/basegfx
basegfx/test/BColorModifierTest.cxx | 27 +++ include/basegfx/color/bcolormodifier.hxx |2 +- 2 files changed, 28 insertions(+), 1 deletion(-) New commits: commit 83ff25f09c4b897a19b9de14980c83c1236813c1 Author: Xisco Fauli AuthorDate: Thu Jun 22 13:01:27 2023 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 22 19:49:43 2023 +0200 basegfx: Add test for BColorModifier_black_and_white Change-Id: I35193c68034e5500f12a2e474886c6aa9c2307ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153457 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/basegfx/test/BColorModifierTest.cxx b/basegfx/test/BColorModifierTest.cxx index 17b6a0c22257..6be160ce43ae 100755 --- a/basegfx/test/BColorModifierTest.cxx +++ b/basegfx/test/BColorModifierTest.cxx @@ -352,6 +352,32 @@ public: CPPUNIT_ASSERT(aBColorModifier->operator==(*aBColorModifier2)); } +void testBlackAndWhite() +{ +const basegfx::BColorModifierSharedPtr aBColorModifier += std::make_shared(0.5); + +CPPUNIT_ASSERT_EQUAL(maWhite, aBColorModifier->getModifiedColor(maWhite)); +CPPUNIT_ASSERT_EQUAL(maWhite, aBColorModifier->getModifiedColor(maGray)); +CPPUNIT_ASSERT_EQUAL(maBlack, aBColorModifier->getModifiedColor(maBlack)); + +CPPUNIT_ASSERT_EQUAL(maBlack, aBColorModifier->getModifiedColor(maRed)); +CPPUNIT_ASSERT_EQUAL(maWhite, aBColorModifier->getModifiedColor(maGreen)); +CPPUNIT_ASSERT_EQUAL(maBlack, aBColorModifier->getModifiedColor(maBlue)); +CPPUNIT_ASSERT_EQUAL(maWhite, aBColorModifier->getModifiedColor(maYellow)); +CPPUNIT_ASSERT_EQUAL(maBlack, aBColorModifier->getModifiedColor(maMagenta)); +CPPUNIT_ASSERT_EQUAL(maWhite, aBColorModifier->getModifiedColor(maCyan)); + +CPPUNIT_ASSERT(aBColorModifier->operator==(*aBColorModifier)); +const basegfx::BColorModifierSharedPtr aBColorModifierInvert += std::make_shared(); +CPPUNIT_ASSERT(*aBColorModifier != *aBColorModifierInvert); + +const basegfx::BColorModifierSharedPtr aBColorModifier2 += std::make_shared(0.5); +CPPUNIT_ASSERT(aBColorModifier->operator==(*aBColorModifier2)); +} + CPPUNIT_TEST_SUITE(bcolormodifier); CPPUNIT_TEST(testGray); CPPUNIT_TEST(testInvert); @@ -362,6 +388,7 @@ public: CPPUNIT_TEST(testHueRotate); CPPUNIT_TEST(testMatrix); CPPUNIT_TEST(testIdentityMatrix); +CPPUNIT_TEST(testBlackAndWhite); CPPUNIT_TEST_SUITE_END(); }; diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index ceffae841847..586e203ae66b 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -294,7 +294,7 @@ namespace basegfx returns black when the luminance of the given color is less than the given threshold value in the range [0.0 .. 1.0], else white */ -class SAL_WARN_UNUSED UNLESS_MERGELIBS(BASEGFX_DLLPUBLIC) BColorModifier_black_and_white final : public BColorModifier +class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC BColorModifier_black_and_white final : public BColorModifier { private: double mfValue;
[Libreoffice-bugs] [Bug 149284] LO Base freeze when using a form with macro to enter MySQL data
https://bugs.documentfoundation.org/show_bug.cgi?id=149284 --- Comment #6 from Alex Thurgood --- @J-Paul: if you're using a distrib-provided version of LO, you might be able to install the corresponding debug packet, and then run LO in a lldb debugger or gdb session until it crashes to get a full backtrace with symbols, and then paste the output to a text file which you could attach to this bug report. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/richstring.hxx|7 ++- sc/source/filter/oox/richstring.cxx| 12 +++- sc/source/filter/oox/richstringcontext.cxx |4 +++- 3 files changed, 20 insertions(+), 3 deletions(-) New commits: commit 94297e037dd963b7e74dfff369145d0e0db30c97 Author: Henry Castro AuthorDate: Tue May 9 17:43:48 2023 -0400 Commit: Henry Castro CommitDate: Thu Jun 22 19:29:38 2023 +0200 sc: filter: oox: fix preserve space, single line case The unit test testPreserveTextWhitespace2XLSX fails when a single line is enabled Test name: ScExportTest::testPreserveTextWhitespace2XLSX equality assertion failed - Expected: 1 - Actual : 0 - In <>, XPath '/x:sst/x:si[2]/x:r[1]/x:t' number of nodes is incorrect In order to fix, the single line cell should not be enabled and import the attribute: abc Signed-off-by: Henry Castro Change-Id: I380ba8726c03abc40bdc745ea74eceb80fec6e54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151599 Tested-by: Jenkins CollaboraOffice (cherry picked from commit 2dd86aa3f365057494bf41f4da7f2f410ea3bf2e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151615 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153459 Tested-by: Jenkins diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 7c233507b419..b74e3036f473 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -208,7 +208,7 @@ class RichString public: /** Appends and returns an index of a portion object for a plain string (t element). */ -sal_Int32 importText(); +sal_Int32 importText(const AttributeList& rAttribs); /** Appends and returns an index of a portion object for a new formatting run (r element). */ sal_Int32 importRun(); /** Appends and returns a phonetic text object for a new phonetic run (rPh element). */ @@ -236,6 +236,10 @@ public: RichStringPortion& getPortion(sal_Int32 nPortionIdx) { return maTextPortions[nPortionIdx]; } +voidsetAttributes(const AttributeList& rAttribs); + +boolisPreserveSpace() const { return mbPreserveSpace; } + private: /** Creates, appends, and returns a new empty string portion. */ sal_Int32 createPortion(); @@ -253,6 +257,7 @@ private: std::vector maTextPortions; /// String portions with font data. std::unique_ptr mxPhonSettings; /// Phonetic settings for this string. PhoneticVector maPhonPortions; /// Phonetic text portions. +bool mbPreserveSpace = false; }; typedef std::shared_ptr< RichString > RichStringRef; diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 8d2f964362d0..a1345179c19a 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -293,8 +294,10 @@ void PhoneticPortionModelList::importPortions( SequenceInputStream& rStrm ) } } -sal_Int32 RichString::importText() +sal_Int32 RichString::importText(const AttributeList& rAttribs) { +setAttributes(rAttribs); + return createPortion(); } @@ -303,6 +306,13 @@ sal_Int32 RichString::importRun() return createPortion(); } +void RichString::setAttributes(const AttributeList& rAttribs) +{ +auto aAttrSpace = rAttribs.getString(oox::NMSP_xml | oox::XML_space); +if (aAttrSpace && *aAttrSpace == "preserve") +mbPreserveSpace = true; +} + RichStringPhoneticRef RichString::importPhoneticRun( const AttributeList& rAttribs ) { RichStringPhoneticRef xPhonetic = createPhonetic(); diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index 280ac293a390..0c83fff2e9f3 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -33,7 +33,7 @@ ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const switch( nElement ) { case XLS_TOKEN( t ): -mnPortionIdx = mxString->importText(); +mnPortionIdx = mxString->importText(rAttribs); return this;// collect text in onCharacters() case XLS_TOKEN( r ): mnPortionIdx = mxString->importRun(); @@ -57,6 +57,7 @@ ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const break; case XLS_TOKEN( t ): +mxString->setAttributes(rAttribs); return this;// collect portion text in onCharacters() } break; @@ -65,6 +66,7 @@ ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const switch( nElement ) { case XLS_TOKEN( t ): +
[Libreoffice-bugs] [Bug 156022] [DOCUMENTATION] Typo error in Help page for TEXTJOIN in pt-BR
https://bugs.documentfoundation.org/show_bug.cgi?id=156022 LeroyG changed: What|Removed |Added Summary|[DOCUMENTATION] Typo error |[DOCUMENTATION] Typo error |in Help page for TEXTJOIN |in Help page for TEXTJOIN |in Portuguese |in pt-BR -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156022] New: [DOCUMENTATION] Typo error in Help page for TEXTJOIN in Portuguese
https://bugs.documentfoundation.org/show_bug.cgi?id=156022 Bug ID: 156022 Summary: [DOCUMENTATION] Typo error in Help page for TEXTJOIN in Portuguese Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Documentation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: iavs.le...@gmail.com CC: olivier.hal...@libreoffice.org Description: The function name in the example lack an R: instead of Steps to Reproduce: See at: https://help.libreoffice.org/latest/pt-BR/text/scalc/01/func_textjoin.html Actual Results: =UNITEXTO(" ",1, "Vovô", "viu", "a", "uva") Expected Results: =UNIRTEXTO(" ",1, "Vovô", "viu", "a", "uva") Reproducible: Always User Profile Reset: No Additional Info: By the way, ¿why comma as separators instead of semicolon? -- You are receiving this mail because: You are the assignee for the bug.
ESC budget item review meeting minutes: 2023-06-22
* Present: + Affiliated with TDF: Ilmari Lauhakangas, Xisco Faulí, Heiko Tietze, Florian Effenberger, Italo Vignoli, Khaled Hosny, Sophie Gautier, Olivier Hallot, Christian Lohmaier, Stéphane Guillou, Hossein Nourikhah + Affiliated with Collabora: Tomaž Vajngerl, Justin Luth + Affiliated with allotropia: Thorsten Behrens + Affiliated with Omnis Cloud Sarl (or TDF Board?): Paolo Vecchi + Affiliated with Red Hat: Stephan Bergmann + Unaffiliated: V Stuart Foote, Regina Henschel, Simon Phipps, Gerald Pfeifer * current version of the proposal was sent to board at 15.06.23, 11:24 * starts with section "Preamble" and ends with "Database Rights On The Transparency Section" * 2.823 words, 16.737 characters * tdf_budget_2023-06-12_comments_CP-clean.odt * SHA256: 4890a4f9c5bec212ea56997c4056af0389d99e618ebeac66e1abf25c6f67e14e * shared with the ESC end of April (27/04/2023) was this: https://nextcloud.documentfoundation.org/s/YprpsFP45z7a7p3 * ESC version is ~4-5 weeks, w/o preamble and w/o board decision bits Registration of Affiliation "Means a person: • acting as a representative of; • OR is a legal representative of; • OR is an employee of; • OR is a current consultant to; • OR is a former employee of OR former consultant (unless a sufficient amount of time has elapsed since the relevant relationship has ended) to a relevant entity OR of an entity which is • controlled by; • OR controls; • OR is under a common control with; • OR shares substantial business interest, including by way of ◦ long term economic relationship; ◦ OR commercial partnership, distributorship or similar; ◦ OR business coordination agreements, including consortia; ◦ OR any kind of agreement that limit the competition against each other – especially in the same fields as where the TDF operates – with; • OR operates in a joint venture with a relevant entity. For the sake of clarification, being a member of a general business association (such as a guild) OR of a Free Software association (such as the FSFE, OSI and OSI Affiliates, Open Forum Europe, OpenUK, OW2, Eclipse Foundation, FFII, SFC, KDE, The Linux Foundation) would not create an Affiliation." "In order to avoid COI for those participating in ESC voting as per this Section, a voting member or a member applying to participate in the select committee as provided by the Ranking section MUST declare whether they are Affiliate to an entity which intends to place bids on the tenders resulting from the Technical Budgeting OR, on their honour, whether they are aware of any such potential situation could reasonably materialize between the date of the vote and the date of tendering." "Voting on a matter OR making a determination while being in a COI situation on the subject matter, OR not declaring a potential COI as per the Declaration Of Potential Conflict Section is per se a COI and ground for exclusion from the tendering procedure, if at least one of the entities to which the member is Affiliate places a bid in a tender resulting form the Technical Budgeting." Preparations * blogpost with call for proposals was published with more than 15 days deadline * wiki page was available for everyone to edit * ESC minutes were shared publicly and sent to mailing lists * today's call was announced publicly * ranking spreadsheet was always public in an up to date version Pending items * transparency section of the website must be in place before tendering starts, Italo is working on it * blogpost with ranking spreadsheet must be published as soon as that one is finalized Proposals * No paid external expert was requested. * No urgency request was made. * Do all proposals on today's list have a sufficient description and cost estimate? Yes. * Have all cost estimates been re-evaluated by only non-conflicted members of the ESC? Yes. Ranking * ALL proposals must be ranked. * Proposal by a committee that has a majority of non-Conflicted members. * Decision then by CONSENSUS of only the non-Conflicted members. * Failing that, majority VOTE by only non-Conflicted members. * Spreadsheet with comments from TDF staff: https://nextcloud.documentfoundation.org/s/i9CSEs2gjFisc2y * Budget pages for reference: + https://wiki.documentfoundation.org/Development/Budget2021 + https://wiki.documentfoundation.org/Development/Budget2022 + https://wiki.documentfoundation.org/Development/Budget2023 * Thorsten noticed this item from 2022 was not estimated: https://wiki.documentfoundation.org/Development/Budget2022#Missing_ODF_Features:_Concentric_gradient_fill_of_custom-shapes there's likely more - e.g.Bridge the gap between drawinglayer and VCL, Bitmaps in vcl: Use a native format/depth etc.. * Procedure to rank: go through the items and arrive at a consensus, for 2023, use ranking from February 2023
[Libreoffice-qa] ESC budget item review meeting minutes: 2023-06-22
* Present: + Affiliated with TDF: Ilmari Lauhakangas, Xisco Faulí, Heiko Tietze, Florian Effenberger, Italo Vignoli, Khaled Hosny, Sophie Gautier, Olivier Hallot, Christian Lohmaier, Stéphane Guillou, Hossein Nourikhah + Affiliated with Collabora: Tomaž Vajngerl, Justin Luth + Affiliated with allotropia: Thorsten Behrens + Affiliated with Omnis Cloud Sarl (or TDF Board?): Paolo Vecchi + Affiliated with Red Hat: Stephan Bergmann + Unaffiliated: V Stuart Foote, Regina Henschel, Simon Phipps, Gerald Pfeifer * current version of the proposal was sent to board at 15.06.23, 11:24 * starts with section "Preamble" and ends with "Database Rights On The Transparency Section" * 2.823 words, 16.737 characters * tdf_budget_2023-06-12_comments_CP-clean.odt * SHA256: 4890a4f9c5bec212ea56997c4056af0389d99e618ebeac66e1abf25c6f67e14e * shared with the ESC end of April (27/04/2023) was this: https://nextcloud.documentfoundation.org/s/YprpsFP45z7a7p3 * ESC version is ~4-5 weeks, w/o preamble and w/o board decision bits Registration of Affiliation "Means a person: • acting as a representative of; • OR is a legal representative of; • OR is an employee of; • OR is a current consultant to; • OR is a former employee of OR former consultant (unless a sufficient amount of time has elapsed since the relevant relationship has ended) to a relevant entity OR of an entity which is • controlled by; • OR controls; • OR is under a common control with; • OR shares substantial business interest, including by way of ◦ long term economic relationship; ◦ OR commercial partnership, distributorship or similar; ◦ OR business coordination agreements, including consortia; ◦ OR any kind of agreement that limit the competition against each other – especially in the same fields as where the TDF operates – with; • OR operates in a joint venture with a relevant entity. For the sake of clarification, being a member of a general business association (such as a guild) OR of a Free Software association (such as the FSFE, OSI and OSI Affiliates, Open Forum Europe, OpenUK, OW2, Eclipse Foundation, FFII, SFC, KDE, The Linux Foundation) would not create an Affiliation." "In order to avoid COI for those participating in ESC voting as per this Section, a voting member or a member applying to participate in the select committee as provided by the Ranking section MUST declare whether they are Affiliate to an entity which intends to place bids on the tenders resulting from the Technical Budgeting OR, on their honour, whether they are aware of any such potential situation could reasonably materialize between the date of the vote and the date of tendering." "Voting on a matter OR making a determination while being in a COI situation on the subject matter, OR not declaring a potential COI as per the Declaration Of Potential Conflict Section is per se a COI and ground for exclusion from the tendering procedure, if at least one of the entities to which the member is Affiliate places a bid in a tender resulting form the Technical Budgeting." Preparations * blogpost with call for proposals was published with more than 15 days deadline * wiki page was available for everyone to edit * ESC minutes were shared publicly and sent to mailing lists * today's call was announced publicly * ranking spreadsheet was always public in an up to date version Pending items * transparency section of the website must be in place before tendering starts, Italo is working on it * blogpost with ranking spreadsheet must be published as soon as that one is finalized Proposals * No paid external expert was requested. * No urgency request was made. * Do all proposals on today's list have a sufficient description and cost estimate? Yes. * Have all cost estimates been re-evaluated by only non-conflicted members of the ESC? Yes. Ranking * ALL proposals must be ranked. * Proposal by a committee that has a majority of non-Conflicted members. * Decision then by CONSENSUS of only the non-Conflicted members. * Failing that, majority VOTE by only non-Conflicted members. * Spreadsheet with comments from TDF staff: https://nextcloud.documentfoundation.org/s/i9CSEs2gjFisc2y * Budget pages for reference: + https://wiki.documentfoundation.org/Development/Budget2021 + https://wiki.documentfoundation.org/Development/Budget2022 + https://wiki.documentfoundation.org/Development/Budget2023 * Thorsten noticed this item from 2022 was not estimated: https://wiki.documentfoundation.org/Development/Budget2022#Missing_ODF_Features:_Concentric_gradient_fill_of_custom-shapes there's likely more - e.g.Bridge the gap between drawinglayer and VCL, Bitmaps in vcl: Use a native format/depth etc.. * Procedure to rank: go through the items and arrive at a consensus, for 2023, use ranking from February 2023
[Libreoffice-bugs] [Bug 107158] [META] Notebookbar Groupedbar
https://bugs.documentfoundation.org/show_bug.cgi?id=107158 Bug 107158 depends on bug 147056, which changed state. Bug 147056 Summary: Groupedbar Compact UI : add submenu for Print Ranges https://bugs.documentfoundation.org/show_bug.cgi?id=147056 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147056] Groupedbar Compact UI : add submenu for Print Ranges
https://bugs.documentfoundation.org/show_bug.cgi?id=147056 Justin L changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkframe.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit be53ee28d7435809e71e7e6b2ce929c87f07ba33 Author: Vladislav Tarakanov AuthorDate: Thu Jun 22 14:58:06 2023 +0400 Commit: Caolán McNamara CommitDate: Thu Jun 22 18:35:24 2023 +0200 tdf#155955 - small Calc window size after deleting the configuration file Set the default window size for the case when the configuration file is missing Change-Id: I58391590557678e927fcefd49a8f43511c08e3ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153430 Tested-by: Jenkins Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index ea13a70ad0ca..516ada842a8c 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -990,6 +990,11 @@ void GtkSalFrame::InitCommon() #endif m_pDrawingArea = GTK_DRAWING_AREA(gtk_drawing_area_new()); #endif +if (GTK_IS_WINDOW(m_pWindow)) +{ +Size aDefWindowSize = calcDefaultSize(); +gtk_window_set_default_size(GTK_WINDOW(m_pWindow), aDefWindowSize.Width(), aDefWindowSize.Height()); +} gtk_widget_set_can_focus(GTK_WIDGET(m_pFixedContainer), true); gtk_widget_set_size_request(GTK_WIDGET(m_pFixedContainer), 1, 1); #if !GTK_CHECK_VERSION(4,0,0)
[Libreoffice-bugs] [Bug 147056] Groupedbar Compact UI : add submenu for Print Ranges
https://bugs.documentfoundation.org/show_bug.cgi?id=147056 Commit Notification changed: What|Removed |Added Whiteboard||target:24.2.0 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147056] Groupedbar Compact UI : add submenu for Print Ranges
https://bugs.documentfoundation.org/show_bug.cgi?id=147056 --- Comment #5 from Commit Notification --- Justin Luth committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/1310ce65f18c0b03051c6f23e40b8b39b8053fec tdf#147056 sc: convert xml menu to popupmenu .uno:PrintRangesMenu It will be available in 24.2.0. 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-commits] core.git: officecfg/registry sc/uiconfig sc/UIConfig_scalc.mk
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 14 + sc/UIConfig_scalc.mk|1 sc/uiconfig/scalc/menubar/menubar.xml |9 --- sc/uiconfig/scalc/popupmenu/printranges.xml | 15 ++ sc/uiconfig/scalc/ui/notebookbar.ui | 25 -- sc/uiconfig/scalc/ui/notebookbar_compact.ui | 25 -- sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui | 25 -- sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui | 25 -- 8 files changed, 39 insertions(+), 100 deletions(-) New commits: commit 1310ce65f18c0b03051c6f23e40b8b39b8053fec Author: Justin Luth AuthorDate: Wed Jun 21 11:40:03 2023 -0400 Commit: Caolán McNamara CommitDate: Thu Jun 22 18:34:24 2023 +0200 tdf#147056 sc: convert xml menu to popupmenu .uno:PrintRangesMenu The labelling in the notebookbar left much to be desired when adding the print ranges separately in the "context menus". Making this into a proper submenu fixes the problem. Thanks to Maxim for reviewing and for the commit template: commit 0e7cd653ea90da388820220bf6a3eb140b57bbd6 Author: Maxim Monastirsky on Mon Jan 25 01:09:03 2016 +0200 tdf#86567 Dropdown for conditional formatting Change-Id: If92836ee29d322f5a2fca1e27d2e034e5cc995e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153402 Tested-by: Justin Luth Reviewed-by: Justin Luth Reviewed-by: Caolán McNamara diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index de6221954ab0..b0e17643905d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -523,6 +523,20 @@ showtrackedchanges + + + .uno:PrintRangesMenu + + + + + + com.sun.star.comp.framework.ResourceMenuController + + + printranges + + .uno:WindowList diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 214a300a04d9..637a1ac2eca6 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\ sc/uiconfig/scalc/popupmenu/pagebreak \ sc/uiconfig/scalc/popupmenu/pivot \ sc/uiconfig/scalc/popupmenu/preview \ + sc/uiconfig/scalc/popupmenu/printranges \ sc/uiconfig/scalc/popupmenu/rowheader \ sc/uiconfig/scalc/popupmenu/row_operations \ sc/uiconfig/scalc/popupmenu/sheettab \ diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 413e2e5ce11c..cbb352c7ac6a 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -409,14 +409,7 @@ - - - - - - - - + diff --git a/sc/uiconfig/scalc/popupmenu/printranges.xml b/sc/uiconfig/scalc/popupmenu/printranges.xml new file mode 100644 index ..7bd89fdef765 --- /dev/null +++ b/sc/uiconfig/scalc/popupmenu/printranges.xml @@ -0,0 +1,15 @@ + + +http://openoffice.org/2001/menu;> + + + + + diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 0adc829feab4..5f9ea5dff8cc 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -1380,31 +1380,10 @@ - + True False -.uno:DefinePrintArea - - - - -True -False -.uno:AddPrintArea - - - - -True -False -.uno:EditPrintArea - - - - -True -False -.uno:DeletePrintArea +.uno:PrintRangesMenu diff --git a/sc/uiconfig/scalc/ui/notebookbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_compact.ui index 8991949ac917..5da5b2f23216 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_compact.ui @@ -1542,31 +1542,10 @@ - + True False -.uno:DefinePrintArea - - - - -True -False -.uno:AddPrintArea - - - - -True -False -.uno:EditPrintArea - - - - -True -False -.uno:DeletePrintArea +.uno:PrintRangesMenu diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index dc0bb54cdc2f..94f115231801 100644
[Libreoffice-bugs] [Bug 155947] Korean word default font size is 10pt.
https://bugs.documentfoundation.org/show_bug.cgi?id=155947 V Stuart Foote changed: What|Removed |Added CC||kha...@libreoffice.org, ||mark...@gmail.com, ||shanshandehongxing@outlook. ||com --- Comment #16 from V Stuart Foote --- I think we are going to need more nuanced approach than the one-off hardcoding 대현 suggests--kind of the gist of see also bug 115970 Setting a specific CJK (as well as CTL and Western) font-size selection by language will lead to odd ODF. Korean Hangul text runs will be at 10pt, but so would any Hanja or mixed script paragraphs holding unified CJK ideographs. Also, the templates are loaded with instances of hard coded "font-size-asian" strings still at 12pt even though the 10.5pt for CJK made it into LO at 3.3 [1] I think there is more to be done to support the ROK stylistic norms, and the broader CJK locale user community. @Khaled, as I recall you've mentioned inclination to abandon our inherited CJK, CTL, Western segregation for something else --e.g. https://bugs.documentfoundation.org/show_bug.cgi?id=104318#c19 something you'll be able to coordinate? =-ref-= [1] https://opengrok.libreoffice.org/search?project=core=%22font-size-asian%22+ko===1=full=full -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 156018] SVG: css style fails with element inside element
https://bugs.documentfoundation.org/show_bug.cgi?id=156018 Xisco Faulí changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED CC||xiscofa...@libreoffice.org Assignee|libreoffice-b...@lists.free |xiscofa...@libreoffice.org |desktop.org | Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 115122] In specific XLS file in drop-down autofilter's list there aren't any items (workaround: turn off-on autofilter)
https://bugs.documentfoundation.org/show_bug.cgi?id=115122 --- Comment #8 from Roman Kuznetsov <79045_79...@mail.ru> --- So strange... now there are items in Autofilter's list, but they are all grey and you can't select/deselect it. I'm not sure what should I do now with this report Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 63627c174778f7d435a540c43ec0498c76e739ab CPU threads: 16; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: ru-RU (ru_RU); UI: en-US Calc: CL threaded I'll try to bisect that change may be... -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 142718] DOCX: Writer try to show thousands pages instead only three
https://bugs.documentfoundation.org/show_bug.cgi?id=142718 --- Comment #7 from Roman Kuznetsov <79045_79...@mail.ru> --- still repro in Version: 24.2.0.0.alpha0+ (X86_64) / LibreOffice Community Build ID: 63627c174778f7d435a540c43ec0498c76e739ab CPU threads: 16; OS: Windows 10.0 Build 19045; UI render: Skia/Raster; VCL: win Locale: ru-RU (ru_RU); UI: en-US Calc: CL threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 104790] [META] Database connectivity interfaces (ODBC, JDBC..) and external databases
https://bugs.documentfoundation.org/show_bug.cgi?id=104790 Buovjaga changed: What|Removed |Added Depends on||149284 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=149284 [Bug 149284] LO Base freeze when using a form with macro to enter MySQL data -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 143317] Base crashes viewing / browsing mysql database table using direct mysql connector
https://bugs.documentfoundation.org/show_bug.cgi?id=143317 Buovjaga changed: What|Removed |Added Blocks||104790 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=104790 [Bug 104790] [META] Database connectivity interfaces (ODBC, JDBC..) and external databases -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 104790] [META] Database connectivity interfaces (ODBC, JDBC..) and external databases
https://bugs.documentfoundation.org/show_bug.cgi?id=104790 Buovjaga changed: What|Removed |Added Depends on||143317 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=143317 [Bug 143317] Base crashes viewing / browsing mysql database table using direct mysql connector -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 149284] LO Base freeze when using a form with macro to enter MySQL data
https://bugs.documentfoundation.org/show_bug.cgi?id=149284 Buovjaga changed: What|Removed |Added Blocks||104790 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=104790 [Bug 104790] [META] Database connectivity interfaces (ODBC, JDBC..) and external databases -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 104790] [META] Database connectivity interfaces (ODBC, JDBC..) and external databases
https://bugs.documentfoundation.org/show_bug.cgi?id=104790 Buovjaga changed: What|Removed |Added Depends on||152370 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=152370 [Bug 152370] MariaDB direct connection: Access through socket to separate instance of MariaDB impossible -- You are receiving this mail because: You are the assignee for the bug.