[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/BitmapPalette.hxx | 11 +++
vcl/source/bitmap/bitmap.cxx| 51
vcl/source/bitmap/bitmappalette.cxx |9 ++
3 files changed, 37 insertions(+), 34 deletions(-)
New commits:
commit 1987aa7b597650930e32c274240fdec68617d903
Author: Mike Kaganski
AuthorDate: Fri Jul 22 17:11:44 2022 +0300
Commit: Mike Kaganski
CommitDate: Sat Jul 23 07:40:30 2022 +0200
Simplify greyscale palette initialization further
Change-Id: Iaab6a493e0a0c329f6b6e229f0ce0cdabb188112
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137361
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/vcl/BitmapPalette.hxx b/include/vcl/BitmapPalette.hxx
index d470dfbb5521..4f20970e15ec 100644
--- a/include/vcl/BitmapPalette.hxx
+++ b/include/vcl/BitmapPalette.hxx
@@ -24,6 +24,8 @@
#include
#include
+#include
+
class ImplBitmapPalette;
class VCL_DLLPUBLIC BitmapPalette
@@ -43,6 +45,7 @@ public:
BitmapPalette( const BitmapPalette& );
BitmapPalette( BitmapPalette&& ) noexcept;
BitmapPalette(std::initializer_list aBitmapColor);
+template BitmapPalette(const std::array&
colors);
explicit BitmapPalette(sal_uInt16 nCount);
~BitmapPalette();
@@ -72,7 +75,15 @@ public:
typedef o3tl::cow_wrapper< ImplBitmapPalette > ImplType;
private:
+BitmapPalette(const BitmapColor* first, const BitmapColor* last);
+
ImplType mpImpl;
};
+template
+BitmapPalette::BitmapPalette(const std::array& colors)
+: BitmapPalette(colors.data(), colors.data() + N)
+{
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index f96bad8cb0f9..2a9f949ac1fe 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -169,6 +169,19 @@ Bitmap::~Bitmap()
#endif
}
+namespace
+{
+template
+constexpr std::enable_if_t<255 % (N - 1) == 0, std::array>
getGreyscalePalette()
+{
+const int step = 255 / (N - 1);
+std::array a;
+for (size_t i = 0; i < N; ++i)
+a[i] = BitmapColor(i * step, i * step, i * step);
+return a;
+}
+}
+
const BitmapPalette& Bitmap::GetGreyPalette( int nEntries )
{
// Create greyscale palette with 2, 4, 16 or 256 entries
@@ -176,52 +189,22 @@ const BitmapPalette& Bitmap::GetGreyPalette( int nEntries
)
{
case 2:
{
-static const BitmapPalette aGreyPalette2 = {
-BitmapColor(0, 0, 0),
-BitmapColor(255, 255, 255),
-};
-
+static const BitmapPalette aGreyPalette2 =
getGreyscalePalette<2>();
return aGreyPalette2;
}
case 4:
{
-static const BitmapPalette aGreyPalette4 = {
-BitmapColor(0, 0, 0),
-BitmapColor(85, 85, 85),
-BitmapColor(170, 170, 170),
-BitmapColor(255, 255, 255),
-};
-
+static const BitmapPalette aGreyPalette4 =
getGreyscalePalette<4>();
return aGreyPalette4;
}
case 16:
{
-static const BitmapPalette aGreyPalette16 = [] {
-sal_uInt8 cGrey = 0;
-sal_uInt8 const cGreyInc = 17;
-
-BitmapPalette aPalette(16);
-
-for (sal_uInt16 i = 0; i < 16; ++i, cGrey += cGreyInc)
-aPalette[i] = BitmapColor(cGrey, cGrey, cGrey);
-
-return aPalette;
-}();
-
+static const BitmapPalette aGreyPalette16 =
getGreyscalePalette<16>();
return aGreyPalette16;
}
case 256:
{
-static const BitmapPalette aGreyPalette256 = [] {
-BitmapPalette aPalette(256);
-
-for (sal_uInt16 i = 0; i < 256; ++i)
-aPalette[i] = BitmapColor(static_cast(i),
static_cast(i),
- static_cast(i));
-
-return aPalette;
-}();
-
+static const BitmapPalette aGreyPalette256 =
getGreyscalePalette<256>();
return aGreyPalette256;
}
}
diff --git a/vcl/source/bitmap/bitmappalette.cxx
b/vcl/source/bitmap/bitmappalette.cxx
index 61a8a8252794..e0bf53db033e 100644
--- a/vcl/source/bitmap/bitmappalette.cxx
+++ b/vcl/source/bitmap/bitmappalette.cxx
@@ -37,6 +37,10 @@ public:
: maBitmapColor(aBitmapColor)
{
}
+ImplBitmapPalette(const BitmapColor* first, const BitmapColor* last)
+: maBitmapColor(first, last)
+{
+}
ImplBitmapPalette() {}
ImplBitmapPalette(sal_uInt16 nCount)
: maBitmapColor(nCount)
@@ -82,6 +86,11 @@
BitmapPalette::BitmapPalette(std::initializer_list aBitmapColor)
{
}
+BitmapPalette::BitmapPalette(const BitmapColor* first, const BitmapColor* last)
+: mpImpl({ first, last })
+{
+}
+
BitmapPalette::BitmapPalette(sal_uInt16
[Libreoffice-bugs] [Bug 149612] LibreOffice Writer stops working after 15-120 minutes
https://bugs.documentfoundation.org/show_bug.cgi?id=149612 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 149921] WebDAV TLS not working with self signed CA and host cert
https://bugs.documentfoundation.org/show_bug.cgi?id=149921 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 149917] LineStartName / LineEndName "Symmetric Arrow" vanished.
https://bugs.documentfoundation.org/show_bug.cgi?id=149917 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 149914] CALC - compare document changes dialog resizes automatically back to default size when switching app/desktop focus (macOS) (Arm)
https://bugs.documentfoundation.org/show_bug.cgi?id=149914 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 149909] [FILEOPEN] NUMBERS Date values sometimes have erroneous time component
https://bugs.documentfoundation.org/show_bug.cgi?id=149909 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 149916] Seeing _RefHeading_ in cross-ref field listing in Navigator
https://bugs.documentfoundation.org/show_bug.cgi?id=149916 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 103378] [META] PDF export bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103378 Bug 103378 depends on bug 133903, which changed state. Bug 133903 Summary: Slow PDF export of sheet with charts based on large dataset (Print to PDF is fast) https://bugs.documentfoundation.org/show_bug.cgi?id=133903 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |INSUFFICIENTDATA -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 133903] Slow PDF export of sheet with charts based on large dataset (Print to PDF is fast)
https://bugs.documentfoundation.org/show_bug.cgi?id=133903 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 133903] Slow PDF export of sheet with charts based on large dataset (Print to PDF is fast)
https://bugs.documentfoundation.org/show_bug.cgi?id=133903 --- Comment #8 from QA Administrators --- Dear Telesto, 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 145908] Faulty display
https://bugs.documentfoundation.org/show_bug.cgi?id=145908 --- Comment #2 from QA Administrators --- Dear Max, 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-commits] core.git: Branch 'libreoffice-7-4' - sc/uiconfig
sc/uiconfig/scalc/ui/scgeneralpage.ui | 534 +- 1 file changed, 276 insertions(+), 258 deletions(-) New commits: commit 7c7d318f5a9afdc8cc08625dd595a74d8d0253e7 Author: Caolán McNamara AuthorDate: Fri Jul 22 09:47:18 2022 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sat Jul 23 05:19:40 2022 +0200 tdf#150093 add scrollbar to calc general options for the case it doesn't fit Change-Id: I5099244153f38fc8393aaa6a09e74dcbd0a995bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137326 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui b/sc/uiconfig/scalc/ui/scgeneralpage.ui index 492f425df6a9..c078b2240197 100644 --- a/sc/uiconfig/scalc/ui/scgeneralpage.ui +++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui @@ -1,70 +1,70 @@ - + 0.5 99.99 1.25 -0.1 -0.1 +0.10 +0.10 True -False -6 +False +6 vertical 12 True -False -0 -none +False +0 +none - + True -False -3 -6 +False 12 6 +3 +6 True -False +False Measurement _unit: -True -unitlb +True +unitlb 0 -0 -0 +0 +0 True -False +False _Tab stops: -True -tabmf +True +tabmf 0 -0 -1 +0 +1 True -True +True +True adjustment1 2 -True Defines the tab stops distance. @@ -72,14 +72,14 @@ -1 -1 +1 +1 True -False +False Defines the unit of measure in spreadsheets. @@ -87,8 +87,8 @@ -1 -0 +1 +0 @@ -96,7 +96,7 @@ True -False +False Metrics @@ -113,26 +113,26 @@ True -False -0 -none +False +0 +none True -False -vertical -3 +False 12 6 +vertical +3 _Always (from trusted locations) True -True -False -True +True +False +True True -True +True False @@ -144,10 +144,10 @@ _On request True -True -False -True -True +True +False +True +True alwaysrb @@ -160,10 +160,10 @@ _Never True -True -False -True -True +True +False +True +True alwaysrb @@ -177,7 +177,7 @@ True -False +False Update links when opening 0 @@ -195,229 +195,247 @@ True -False -0 -none +False +True +0 +none - - + True -False -3 -6 -12 -6 - - -Press Enter to switch to _edit mode -True -True -False -
[Libreoffice-bugs] [Bug 108760] [META] DOCX (OOXML) style bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108760 Bug 108760 depends on bug 145998, which changed state. Bug 145998 Summary: Page styles in docx-file revert to previous settings after reopening the document https://bugs.documentfoundation.org/show_bug.cgi?id=145998 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 108576] [META] Writer page style bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108576 Bug 108576 depends on bug 145998, which changed state. Bug 145998 Summary: Page styles in docx-file revert to previous settings after reopening the document https://bugs.documentfoundation.org/show_bug.cgi?id=145998 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145998] Page styles in docx-file revert to previous settings after reopening the document
https://bugs.documentfoundation.org/show_bug.cgi?id=145998 Justin L changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |jl...@mail.com |desktop.org | --- Comment #11 from Justin L --- (In reply to Justin L from comment #6) > Perhaps we can be smarter on export? Three improvements made here (one more on the way) so I'm going to mark this as fixed. Please do not backport any of this. I want lots of space to back-pedal. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145998] Page styles in docx-file revert to previous settings after reopening the document
https://bugs.documentfoundation.org/show_bug.cgi?id=145998 --- Comment #10 from Commit Notification --- Justin Luth committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/fa5d80106080fa305479758dd43d0defb684376a related tdf#145998 docx export: fix writing blank headers/footers It will be available in 7.5.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: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |2 ++
sw/source/filter/ww8/docxexport.cxx| 29 ++---
2 files changed, 16 insertions(+), 15 deletions(-)
New commits:
commit fa5d80106080fa305479758dd43d0defb684376a
Author: Justin Luth
AuthorDate: Fri Jul 22 13:31:33 2022 -0400
Commit: Justin Luth
CommitDate: Sat Jul 23 04:45:23 2022 +0200
related tdf#145998 docx export: fix writing blank headers/footers
That perpetual m_bHasHdr variable was really confusing,
and it was completely misused (by me). This change should make
it much easier to understand the purpose.
To do this completely efficiently would require multiple variables
for each type, but this is good enough.
(It just means we might create a few more empty headers than is
absolutely necessary.)
Change-Id: I0686fe2af81203021ff1bd58d79d9cd3bc81a89f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137375
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index d1c565e1fbc4..5838f8dcb93e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -493,6 +493,7 @@ CPPUNIT_TEST_FIXTURE(Test,
testTdf145998_unnecessaryPageStyles)
CPPUNIT_ASSERT_EQUAL(uno::Any(), xPara->getPropertyValue("PageDescName"));
// CPPUNIT_ASSERT_EQUAL(OUString("Default page style - first page style"),
// parseDump("/root/page[3]/header/txt"));
+CPPUNIT_ASSERT_EQUAL(OUString(), parseDump("/root/page[3]/footer/txt"));
// Page Style is converted into a page break instead. Shows the "normal"
header.
xPara.set(getParagraph(5, "4"), uno::UNO_QUERY_THROW);
@@ -503,6 +504,7 @@ CPPUNIT_TEST_FIXTURE(Test,
testTdf145998_unnecessaryPageStyles)
// Page Style is retained (with wrong header) in order to preserve page
re-numbering.
xPara.set(getParagraph(7, "1"), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(uno::Any() != xPara->getPropertyValue("PageDescName"));
+CPPUNIT_ASSERT_EQUAL(OUString(), parseDump("/root/page[5]/footer/txt"));
}
CPPUNIT_TEST_FIXTURE(Test, testTdf135216_evenOddFooter)
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index eddb4c2ea147..88f397026ff7 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -263,6 +263,10 @@ void DocxExport::WriteHeadersFooters( sal_uInt8
nHeadFootFlags,
// Turn ON flag for 'Writing Headers \ Footers'
m_pAttrOutput->SetWritingHeaderFooter( true );
+const bool bPrevSectionHadHeader = m_bHasHdr;
+const bool bPrevSectionHadFooter = m_bHasFtr;
+m_bHasHdr = m_bHasFtr = false;
+
// headers
if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_EVEN )
WriteHeaderFooter( , true, "even" );
@@ -270,22 +274,19 @@ void DocxExport::WriteHeadersFooters( sal_uInt8
nHeadFootFlags,
{
if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_ODD )
WriteHeaderFooter( , true, "even" );
-else if ( m_bHasHdr && nBreakCode == 2 )
+else if (bPrevSectionHadHeader && nBreakCode == 2)
WriteHeaderFooter( nullptr, true, "even" );
}
if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_ODD )
WriteHeaderFooter( , true, "default" );
+else if (bPrevSectionHadHeader && nBreakCode == 2) // 2: nextPage
+WriteHeaderFooter(nullptr, true, "default");
if ( nHeadFootFlags & nsHdFtFlags::WW8_HEADER_FIRST )
WriteHeaderFooter( , true, "first" );
-
-if( (nHeadFootFlags & (nsHdFtFlags::WW8_HEADER_EVEN
- | nsHdFtFlags::WW8_HEADER_ODD
- | nsHdFtFlags::WW8_HEADER_FIRST)) == 0
-&& m_bHasHdr && nBreakCode == 2 ) // 2: nexPage
-WriteHeaderFooter( nullptr, true, "default" );
-
+else if (bPrevSectionHadHeader && nBreakCode == 2)
+WriteHeaderFooter(nullptr, true, "first");
// footers
if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_EVEN )
@@ -294,21 +295,19 @@ void DocxExport::WriteHeadersFooters( sal_uInt8
nHeadFootFlags,
{
if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_ODD )
WriteHeaderFooter( , false, "even" );
-else if ( m_bHasFtr && nBreakCode == 2 )
+else if (bPrevSectionHadFooter && nBreakCode == 2)
WriteHeaderFooter( nullptr, false, "even");
}
if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_ODD )
WriteHeaderFooter( , false, "default" );
+else if (bPrevSectionHadFooter && nBreakCode == 2)
+WriteHeaderFooter(nullptr, false, "default");
if ( nHeadFootFlags & nsHdFtFlags::WW8_FOOTER_FIRST )
WriteHeaderFooter( , false, "first" );
-
-if( (nHeadFootFlags & (nsHdFtFlags::WW8_FOOTER_EVEN
- | nsHdFtFlags::WW8_FOOTER_ODD
- |
[Libreoffice-commits] core.git: wizards/source
wizards/source/euro/Init.xba| 16 wizards/source/resources/resources_en_US.properties |1 + 2 files changed, 17 insertions(+) New commits: commit b1a2f727ca99ecd3402d4b051b99cbfd24266e59 Author: Eike Rathke AuthorDate: Fri Jul 22 22:17:11 2022 +0200 Commit: Eike Rathke CommitDate: Sat Jul 23 02:18:41 2022 +0200 Related: tdf#150011 Add HRK Croatian Kuna to Euro conversion wizard Maybe just for completeness, it's removed from menu but might be callable as macro. Change-Id: Iade0be845186d3deb2f00f4aaa230c0b344cea72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137372 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba index 623a0a53be46..9f56c503a347 100644 --- a/wizards/source/euro/Init.xba +++ b/wizards/source/euro/Init.xba @@ -89,6 +89,7 @@ Public sCurrSLOVAK as String Public sCurrESTONIAN as String Public sCurrLATVIAN as String Public sCurrLITHUANIAN as String +Public sCurrCROATIAN as String Public sPrgsRETRIEVAL as String Public sPrgsCONVERTING as String @@ -214,6 +215,7 @@ Dim LocWorkPath as String sCurrESTONIAN = GetResText(CURRENCIES_16) sCurrLATVIAN = GetResText(CURRENCIES_17) sCurrLITHUANIAN = GetResText(CURRENCIES_18) + sCurrCROATIAN = GetResText(CURRENCIES_19) .cmdCancel.Label = sCANCEL .cmdHelp.Label = sHELP .cmdBack.Label = GetResText(STEP_ZERO_2) @@ -393,6 +395,11 @@ Sub InitializeLanguages() LangIDValue(18,0,1) = LT LangIDValue(18,0,2) = -427 + CURRENCIES_CROATIAN +LangIDValue(19,0,0) = hr +LangIDValue(19,0,1) = HR +LangIDValue(19,0,2) = -41A + End Sub @@ -572,6 +579,15 @@ Dim i as Integer CurrValue(18,4) = Lt CurrValue(18,5) = LTL + CurrValue(19,0) = sCurrCROATIAN +real conversion rate + CurrValue(19,1) = 7.53450 +rounded conversion rate + CurrValue(19,2) = 7.5 + CurrValue(19,3) = kn + CurrValue(19,4) = kn + CurrValue(19,5) = HRK + i = -1 CurrSymbolList(0) = CurrSymbolList(1) = diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties index 32f9104e97e0..8649b2500e6a 100644 --- a/wizards/source/resources/resources_en_US.properties +++ b/wizards/source/resources/resources_en_US.properties @@ -448,6 +448,7 @@ CURRENCIES_15=Slovak Koruna CURRENCIES_16=Estonian Kroon CURRENCIES_17=Latvian Lats CURRENCIES_18=Lithuanian Litas +CURRENCIES_19=Croatian Kuna STEP_LASTPAGE_0=Progress STEP_LASTPAGE_1=Retrieving the relevant documents... STEP_LASTPAGE_2=Converting the documents...
[Libreoffice-bugs] [Bug 150107] hyperlink target masked by intervening selected frame
https://bugs.documentfoundation.org/show_bug.cgi?id=150107 --- Comment #2 from tor...@yahoo.com --- Created attachment 181380 --> https://bugs.documentfoundation.org/attachment.cgi?id=181380=edit file with hyperlinks -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150107] hyperlink target masked by intervening selected frame
https://bugs.documentfoundation.org/show_bug.cgi?id=150107 --- Comment #1 from tor...@yahoo.com --- Created attachment 181379 --> https://bugs.documentfoundation.org/attachment.cgi?id=181379=edit file with hyperlink targets -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150098] Evaluate formula inputs in Validity...
https://bugs.documentfoundation.org/show_bug.cgi?id=150098 Óvári changed: What|Removed |Added Summary|TODAY() function and|Evaluate formula inputs in |Validity... combination |Validity... |does not work | -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150107] New: hyperlink target masked by intervening selected frame
https://bugs.documentfoundation.org/show_bug.cgi?id=150107 Bug ID: 150107 Summary: hyperlink target masked by intervening selected frame Product: LibreOffice Version: 7.4.0.0 alpha0+ Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tor...@yahoo.com Description: A highlighted frame bars access to a bookmark but not to an OLE object hyperlink Steps to Reproduce: 0: Open hplnkTst.odt, ^click Rel·34; hplnk.odt opens at eqn 34. OK. 1: Return to hplnkTst, ^click Rel·14; hplnk.odt opens, with frame 14 highlighted. OK. 2: Return to hplnkTst, ^click Rel·34; hplnk.odt stops at frame 14 —it should not. 3: click frame 14 to de-select it; return to hplnkTst, ^click Rel·34 (step 0); hplnk.odt opens at eqn 34. OK 4: Click frame 12, return to hplnkTst, and repeat step 1: OK. Actual Results: see above Expected Results: Hyperlink should always succeed Reproducible: Always User Profile Reset: No Additional Info: Version: 7.4.0.1 (x64) / LibreOffice Community Build ID: 43e5fcfbbadd18fccee5a6f42ddd533e40151bcf CPU threads: 4; OS: Windows 10.0 Build 19043; UI render: Skia/Raster; VCL: win Locale: en-CA (en_CA); UI: en-US Calc: CL -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 32419] When inserted on Writer, get "Base size" for formulas from underlying paragraph
https://bugs.documentfoundation.org/show_bug.cgi?id=32419 Hossein changed: What|Removed |Added Whiteboard||reviewed:2022 --- Comment #29 from Hossein --- Re-evaluating the EasyHack in 2022 This enhancement is still relevant. I think it will be very useful, because in many cases one may need to change the font size of math formulas. Using the base size from the paragraph would be a good idea here. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148435] LibreOffice on macOS hanges on using window snapping / window manager (BetterTouchTool, Rectangle, Raycast, Amethyst, ...)
https://bugs.documentfoundation.org/show_bug.cgi?id=148435 --- Comment #18 from Peter Hagen --- Is there any progress with finding the issue? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: i18npool/source officecfg/registry sc/source
i18npool/source/localedata/data/hr_HR.xml |8
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 11 +++
sc/source/core/tool/interpr2.cxx |3 ++-
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 7c4b2db21ef77b37daf234ac1ab9989234606a22
Author: Eike Rathke
AuthorDate: Fri Jul 22 22:12:02 2022 +0200
Commit: Eike Rathke
CommitDate: Fri Jul 22 23:04:58 2022 +0200
Resolves: tdf#150011 Add HRK Croatian Kuna conversion to EUR Euro
TODO: switch defaults before 2023-01-01 in
i18npool/source/localedata/data/hr_HR.xml
Change-Id: Ifc62aefbc8c9fe8bbf044f61ae4fd6eeff692185
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137371
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/i18npool/source/localedata/data/hr_HR.xml
b/i18npool/source/localedata/data/hr_HR.xml
index 0c493131e16b..4de83e5535cd 100644
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -421,6 +421,14 @@
Hrvatska Kuna
2
+
+
+ EUR
+ €
+ EUR
+ Euro
+ 2
+
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index a62d06512704..eda60fe6c434 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -228,6 +228,17 @@
3.45280
+
+
+EUR
+
+
+HRK
+
+
+7.53450
+
+
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 31c42a4b728a..67fcd9f787f8 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3235,7 +3235,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit,
double& rfRate, int& r
{ "SKK", 30.1260, 2 },
{ "EEK", 15.6466, 2 },
{ "LVL", 0.702804, 2 },
-{ "LTL", 3.45280, 2 }
+{ "LTL", 3.45280, 2 },
+{ "HRK", 7.53450, 2 }
};
for (const auto & i : aConvertTable)
[Libreoffice-bugs] [Bug 119840] FILEOPEN DOCX: Long file open and post-processing time after file open
https://bugs.documentfoundation.org/show_bug.cgi?id=119840 --- Comment #22 from Commit Notification --- Noel Grandin committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/2053fac9a81927a92aac016eab1b4525c058ce95 tdf#119840 tweak SwPosition::operator< It will be available in 7.5.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: sw/source
sw/source/core/crsr/pam.cxx | 20
1 file changed, 8 insertions(+), 12 deletions(-)
New commits:
commit 2053fac9a81927a92aac016eab1b4525c058ce95
Author: Noel Grandin
AuthorDate: Fri Jul 22 11:49:07 2022 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 22 22:01:35 2022 +0200
tdf#119840 tweak SwPosition::operator<
It is slightly cheaper to check for == first, because that doesn't
require fetching data via a pointer to another object.
Shaves 7% off load time
Change-Id: I4e22e55ed10198a8fadc49de708a5a6b55afc0ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137356
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index f771e09f5739..16c7e6ec21d8 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -79,8 +79,7 @@ SwPosition::SwPosition( SwContentNode & rNode, const
sal_Int32 nOffset )
bool SwPosition::operator<(const SwPosition ) const
{
-if( nNode < rPos.nNode )
-return true;
+// cheaper to check for == first
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -96,13 +95,12 @@ bool SwPosition::operator<(const SwPosition ) const
return pOtherReg != nullptr;
}
}
-return false;
+return nNode < rPos.nNode;
}
bool SwPosition::operator>(const SwPosition ) const
{
-if(nNode > rPos.nNode )
-return true;
+// cheaper to check for == first
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -118,13 +116,12 @@ bool SwPosition::operator>(const SwPosition ) const
return pThisReg != nullptr;
}
}
-return false;
+return nNode > rPos.nNode;
}
bool SwPosition::operator<=(const SwPosition ) const
{
-if(nNode < rPos.nNode )
-return true;
+// cheaper to check for == first
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -140,13 +137,12 @@ bool SwPosition::operator<=(const SwPosition ) const
return pThisReg == nullptr;
}
}
-return false;
+return nNode < rPos.nNode;
}
bool SwPosition::operator>=(const SwPosition ) const
{
-if(nNode > rPos.nNode )
-return true;
+// cheaper to check for == first
if( nNode == rPos.nNode )
{
// note that positions with text node but no SwIndex registered are
@@ -162,7 +158,7 @@ bool SwPosition::operator>=(const SwPosition ) const
return pOtherReg == nullptr;
}
}
-return false;
+return nNode > rPos.nNode;
}
bool SwPosition::operator==(const SwPosition ) const
[Libreoffice-bugs] [Bug 150100] UI Calc Double cell border has minimum width at import
https://bugs.documentfoundation.org/show_bug.cgi?id=150100 Rafael Lima changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #3 from Rafael Lima --- Repro with Version: 7.5.0.0.alpha0+ / LibreOffice Community Build ID: 21a31eefab1401d288dbb8220f3df3365be9efaf CPU threads: 16; OS: Linux 5.15; UI render: default; VCL: kf5 (cairo+xcb) Locale: pt-BR (pt_BR.UTF-8); UI: en-US Calc: threaded If I set the border width to any value <= 1pt and then save the file and reopen it, I get the 1.1 pt border width as reported by the OP. The only weird thing here is that the 1.1 pt value should have been shown while Calc was still opened (before saving the document). For instance, when I apply the border with 0.5 pt width and then open the Border dialog again, the 1.1 pt value should already be there. Why does it only appear after saving and reopening? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150009] FORMATTING: Cells do not display background colors in GTK3 downloaded LO
https://bugs.documentfoundation.org/show_bug.cgi?id=150009 --- Comment #13 from Caolán McNamara --- my local 7-4 gtk3 libreoffice doesn't reproduce so not sure what is causing this. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 131916] CALC, editing: 'select data area' option (ctrl+*) keybinding does not work; menu use is ok
https://bugs.documentfoundation.org/show_bug.cgi?id=131916 --- Comment #9 from casa --- "m.a.riosv", you are the only other CC on this bug. You read my bug report and then mis-interpreted it and said it wasn't a bug (when it is). Now this report just sits with no attention because of your bad dismissal. Can you please re-read the situation and correct your dismissal of this bug? Can you remove or fix what you said so that people know a problem exists? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx | 53 +++
1 file changed, 40 insertions(+), 13 deletions(-)
New commits:
commit ed2e37de2d2d26d996e001a3eaade802a2d716fa
Author: Caolán McNamara
AuthorDate: Fri Jul 22 15:29:34 2022 +0100
Commit: Caolán McNamara
CommitDate: Fri Jul 22 21:06:23 2022 +0200
gtk: honour disabled columns from set_column_editable for start_editing
Change-Id: I3b49254b9bdaee1e10e82cc2cff0c4cbf52f74fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137363
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 08cc2b6a7ef1..05a0622577c2 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -15890,32 +15890,59 @@ public:
virtual void start_editing(const weld::TreeIter& rIter) override
{
-GtkTreeViewColumn* pColumn =
GTK_TREE_VIEW_COLUMN(g_list_nth_data(m_pColumns, m_nTextView));
-assert(pColumn && "wrong column");
-
const GtkInstanceTreeIter& rGtkIter = static_cast(rIter);
GtkTreePath* path = gtk_tree_model_get_path(m_pTreeModel,
const_cast());
-// allow editing of cells which are not usually editable, so we can
have double click
-// do its usual row-activate but if we explicitly want to edit (remote
files dialog)
+GtkTreeViewColumn* pColumn = nullptr;
+
+for (GList* pEntry = g_list_first(m_pColumns); pEntry; pEntry =
g_list_next(pEntry))
+{
+GtkTreeViewColumn* pTestColumn =
GTK_TREE_VIEW_COLUMN(pEntry->data);
+
+// see if this column is editable
+gboolean is_editable(false);
+GList *pRenderers =
gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(pTestColumn));
+for (GList* pRenderer = g_list_first(pRenderers); pRenderer;
pRenderer = g_list_next(pRenderer))
+{
+GtkCellRenderer* pCellRenderer =
GTK_CELL_RENDERER(pRenderer->data);
+if (GTK_IS_CELL_RENDERER_TEXT(pCellRenderer))
+{
+g_object_get(pCellRenderer, "editable", _editable,
nullptr);
+if (is_editable)
+{
+pColumn = pTestColumn;
+break;
+}
+}
+}
+g_list_free(pRenderers);
+
+if (is_editable)
+break;
+}
+
+// if nothing explicit editable, allow editing of cells which are not
+// usually editable, so we can have double click do its usual
+// row-activate but if we explicitly want to edit (remote files dialog)
// we can still do that
-GList *pRenderers =
gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(pColumn));
-for (GList* pRenderer = g_list_first(pRenderers); pRenderer; pRenderer
= g_list_next(pRenderer))
+if (!pColumn)
{
-GtkCellRenderer* pCellRenderer =
GTK_CELL_RENDERER(pRenderer->data);
-if (GTK_IS_CELL_RENDERER_TEXT(pCellRenderer))
+pColumn = GTK_TREE_VIEW_COLUMN(g_list_nth_data(m_pColumns,
m_nTextView));
+assert(pColumn && "wrong column");
+
+GList *pRenderers =
gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(pColumn));
+for (GList* pRenderer = g_list_first(pRenderers); pRenderer;
pRenderer = g_list_next(pRenderer))
{
-gboolean is_editable(false);
-g_object_get(pCellRenderer, "editable", _editable, nullptr);
-if (!is_editable)
+GtkCellRenderer* pCellRenderer =
GTK_CELL_RENDERER(pRenderer->data);
+if (GTK_IS_CELL_RENDERER_TEXT(pCellRenderer))
{
g_object_set(pCellRenderer, "editable", true,
"editable-set", true, nullptr);
g_object_set_data(G_OBJECT(pCellRenderer),
"g-lo-RestoreNonEditable", reinterpret_cast(true));
break;
}
}
+g_list_free(pRenderers);
}
-g_list_free(pRenderers);
gtk_tree_view_scroll_to_cell(m_pTreeView, path, pColumn, false, 0, 0);
gtk_tree_view_set_cursor(m_pTreeView, path, pColumn, true);
[Libreoffice-commits] core.git: vcl/source
vcl/source/treelist/svtabbx.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit fe38553aef2121f358fb58e450ec69314aad851e
Author: Michael Stahl
AuthorDate: Fri Jul 22 16:19:02 2022 +0200
Commit: Caolán McNamara
CommitDate: Fri Jul 22 21:04:34 2022 +0200
vcl: allow editing a column other than the first one in SvTabListBox
There are 2 members mvTabList and aTabs in SvTabListBox and
SvTreeListBox, and only aTabs is evaluated to determine which column
should be edited when calling start_editing().
This solution is probably not ideal; it would be better to have a
parameter to select the column because one might want multiple editable
columns with multiple buttons...
Also, the native GTK implementation has the same bug (but there
double-clicking the column works).
Change-Id: I727792e635d3b610a2132ee5f4155e3ee610aaf2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137362
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index d4fb5db37c39..f1277eafd41a 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -153,6 +153,16 @@ void SvTabListBox::SetTabs()
}
*/
+// the 1st column (index 1 or 2 depending on button flags) is always set
+// editable by SvTreeListBox::SetTabs(),
+// which prevents setting a different column to editable as the first
+// one with the flag is picked in SvTreeListBox::ImplEditEntry()
+assert(aTabs.back()->nFlags & SvLBoxTabFlags::EDITABLE);
+if (!(mvTabList[0].nFlags & SvLBoxTabFlags::EDITABLE))
+{
+aTabs.back()->nFlags &= ~SvLBoxTabFlags::EDITABLE;
+}
+
// append all other tabs to the list
for( sal_uInt16 nCurTab = 1; nCurTab < sal_uInt16(mvTabList.size());
nCurTab++ )
{
[Libreoffice-bugs] [Bug 150061] FILEOPEN: DOCX: Incorrect images displayed
https://bugs.documentfoundation.org/show_bug.cgi?id=150061 --- Comment #6 from Justin L --- Please revert my patch if Gulsah does not take ownership of this within a week. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145998] Page styles in docx-file revert to previous settings after reopening the document
https://bugs.documentfoundation.org/show_bug.cgi?id=145998 --- Comment #9 from Commit Notification --- Justin Luth committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/c37f62b71fa59917ef85ff98480dff18aa936e41 tdf#145998 sw ms export: use page break, not section break It will be available in 7.5.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-bugs] [Bug 145998] Page styles in docx-file revert to previous settings after reopening the document
https://bugs.documentfoundation.org/show_bug.cgi?id=145998 Commit Notification changed: What|Removed |Added Whiteboard||target:7.5.0 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf145998_unnecessaryPageStyles.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 30
++
sw/source/filter/ww8/ww8atr.cxx | 18 +-
3 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit c37f62b71fa59917ef85ff98480dff18aa936e41
Author: Justin Luth
AuthorDate: Wed Jul 20 13:03:13 2022 -0400
Commit: Justin Luth
CommitDate: Fri Jul 22 20:12:19 2022 +0200
tdf#145998 sw ms export: use page break, not section break
If possible, use a simple page break instead of a section break.
Eliminate unnecessary "page style" changes. If the page will
become that style anyway, then a simple page break will suffice.
The benefit is primarily for LO import, since it is virtually
impossible on import to know if a section is identical
to the previous section. Thus we have previously multiplied
page styles - often redundantly.
This also starts to fix a real problem with first headers showing up
on an unnecessary new page style. Unit test deals with this.
Change-Id: Ib9e24bbd579b29aa21efb2b85750ecfcb8c7e5cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137273
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/data/tdf145998_unnecessaryPageStyles.odt
b/sw/qa/extras/ooxmlexport/data/tdf145998_unnecessaryPageStyles.odt
new file mode 100644
index ..82087eb6919f
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf145998_unnecessaryPageStyles.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 1537739acd1c..d1c565e1fbc4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -475,6 +475,36 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf98000_changePageStyle)
CPPUNIT_ASSERT_MESSAGE("Different page1/page2 styles", sPageOneStyle !=
sPageTwoStyle);
}
+CPPUNIT_TEST_FIXTURE(Test, testTdf145998_unnecessaryPageStyles)
+{
+loadAndReload("tdf145998_unnecessaryPageStyles.odt");
+
+// Sanity check - always good to test when dealing with page styles and
breaks.
+CPPUNIT_ASSERT_EQUAL(5, getPages());
+
+// Page Style should be explicitly mentioned - otherwise it would be a
"follow" style
+uno::Reference xPara(getParagraph(2, "2"),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(uno::Any() != xPara->getPropertyValue("PageDescName"));
+// CPPUNIT_ASSERT_EQUAL(OUString("First Page header"),
+// parseDump("/root/page[2]/header/txt"));
+
+// Page Style is converted into a page break instead. Still shows "first"
header.
+xPara.set(getParagraph(3, "3"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(uno::Any(), xPara->getPropertyValue("PageDescName"));
+// CPPUNIT_ASSERT_EQUAL(OUString("Default page style - first page style"),
+// parseDump("/root/page[3]/header/txt"));
+
+// Page Style is converted into a page break instead. Shows the "normal"
header.
+xPara.set(getParagraph(5, "4"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(uno::Any(), xPara->getPropertyValue("PageDescName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Default page style"),
+ parseDump("/root/page[4]/header/txt"));
+
+// Page Style is retained (with wrong header) in order to preserve page
re-numbering.
+xPara.set(getParagraph(7, "1"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT(uno::Any() != xPara->getPropertyValue("PageDescName"));
+}
+
CPPUNIT_TEST_FIXTURE(Test, testTdf135216_evenOddFooter)
{
loadAndReload("tdf135216_evenOddFooter.odt");
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 3ee28ea30140..cb86dd31973e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -520,7 +520,23 @@ void MSWordExportBase::OutputSectionBreaks( const
SfxItemSet *pSet, const SwNode
if ( pItem && pItem->GetRegisteredIn() != nullptr)
{
bBreakSet = true;
-bNewPageDesc = true;
+// Avoid unnecessary section breaks if possible. LO can't notice
identical
+// sections during import, so minimize unnecessary duplication
+// by substituting a simple page break when the resulting section
is identical,
+// unless this is needed to re-number the page.
+if (!bNewPageDesc && !pItem->GetNumOffset() && m_pCurrentPageDesc
+&& m_pCurrentPageDesc->GetFollow() == pItem->GetPageDesc())
+{
+// A section break on the very first paragraph is ignored by
LO/Word
+// and should NOT be turned into a page break.
+SwNodeIndex aDocEnd(m_rDoc.GetNodes().GetEndOfContent());
+SwNodeIndex aStart(*aDocEnd.GetNode().StartOfSectionNode(), 2);
+
[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-2' - sw/source
sw/source/uibase/dbui/dbmgr.cxx | 37 ++---
1 file changed, 18 insertions(+), 19 deletions(-)
New commits:
commit e954b945536fdf0fd4aa3d56aec5c1e2ce4c6196
Author: Gülşah Köse
AuthorDate: Fri Jul 8 14:48:27 2022 +0300
Commit: Aron Budea
CommitDate: Fri Jul 22 19:06:37 2022 +0200
tdf#149915 Proper creation of vnd.sun.star.pkg:// URL
Using different methods of creation (one using DecodeMechanism::NONE,
another using DecodeMechanism::WithCharset) gave differently encoded
end results, comparing unequal.
The proper way is using DecodeMechanism::NONE on the document's URL,
as implemented in commit 06756e412b2a02030ce3355b3fe4e2ecc71d2301
Author Mike Kaganski
Date Sat Nov 18 22:41:40 2017 +0300
One more proper construction of vnd.sun.star.pkg URL
Co-authored-by: Mike Kaganski
Change-Id: I272f277ef8b4bd23e6cb7884e68f3c79f742683a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136901
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
(cherry picked from commit 9790585a62cb55e0e0024819596592193a6de269)
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 475388d2134e..9ad6184de3ac 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -134,6 +134,21 @@ void lcl_emitEvent(SfxEventHintId nEventId, sal_Int32
nStrId, SfxObjectShell* pD
pDocShell));
}
+// Construct vnd.sun.star.pkg:// URL
+OUString ConstructVndSunStarPkgUrl(const OUString& rMainURL,
std::u16string_view rStreamRelPath)
+{
+auto xContext(comphelper::getProcessComponentContext());
+auto xUri =
css::uri::UriReferenceFactory::create(xContext)->parse(rMainURL);
+assert(xUri.is());
+xUri = css::uri::VndSunStarPkgUrlReferenceFactory::create(xContext)
+->createVndSunStarPkgUrlReference(xUri);
+assert(xUri.is());
+return xUri->getUriReference() + "/"
++ INetURLObject::encode(
+rStreamRelPath, INetURLObject::PART_FPATH,
+INetURLObject::EncodeMechanism::All);
+}
+
}
std::vector>
SwDBManager::m_aUncommittedRegistrations;
@@ -254,10 +269,9 @@ void SAL_CALL
SwDataSourceRemovedListener::revokedDatabaseLocation(const sdb::Da
if (!pDocShell)
return;
-OUString aOwnURL =
pDocShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::WithCharset);
-OUString sTmpName = "vnd.sun.star.pkg://" +
-INetURLObject::encode(aOwnURL, INetURLObject::PART_AUTHORITY,
INetURLObject::EncodeMechanism::All);
-sTmpName += "/" + m_pDBManager->getEmbeddedName();
+const OUString sTmpName = ConstructVndSunStarPkgUrl(
+
pDocShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::NONE),
+m_pDBManager->getEmbeddedName());
if (sTmpName != rEvent.OldLocation)
return;
@@ -2760,21 +2774,6 @@ OUString LoadAndRegisterDataSource_Impl(DBConnURIType
type, const uno::Reference
}
return sFind;
}
-
-// Construct vnd.sun.star.pkg:// URL
-OUString ConstructVndSunStarPkgUrl(const OUString& rMainURL,
std::u16string_view rStreamRelPath)
-{
-auto xContext(comphelper::getProcessComponentContext());
-auto xUri =
css::uri::UriReferenceFactory::create(xContext)->parse(rMainURL);
-assert(xUri.is());
-xUri = css::uri::VndSunStarPkgUrlReferenceFactory::create(xContext)
-->createVndSunStarPkgUrlReference(xUri);
-assert(xUri.is());
-return xUri->getUriReference() + "/"
-+ INetURLObject::encode(
-rStreamRelPath, INetURLObject::PART_FPATH,
-INetURLObject::EncodeMechanism::All);
-}
}
OUString SwDBManager::LoadAndRegisterDataSource(weld::Window* pParent,
SwDocShell* pDocShell)
[Libreoffice-bugs] [Bug 143148] Use pragma once instead of include guards (Episode 2: Endgame)
https://bugs.documentfoundation.org/show_bug.cgi?id=143148 --- Comment #49 from Commit Notification --- PoonamShokeen committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/commit/053f470316b89b6fcea1fac69e6bffd4f65f91ee tdf#143148 Use pragma once instead of include guards It will be available in 7.5.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: include/framework
include/framework/interaction.hxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 053f470316b89b6fcea1fac69e6bffd4f65f91ee Author: PoonamShokeen AuthorDate: Wed Jul 20 22:25:14 2022 -0500 Commit: Ilmari Lauhakangas CommitDate: Fri Jul 22 19:53:13 2022 +0200 tdf#143148 Use pragma once instead of include guards Change-Id: I7061e0985c51910ba6a8b862cd755b8b4f7016bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137279 Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx old mode 100644 new mode 100755 index 4700d19200c9..33647e241b89 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FRAMEWORK_INTERACTION_HXX -#define INCLUDED_FRAMEWORK_INTERACTION_HXX +#pragma once #include #include @@ -100,6 +99,4 @@ public: } // namespace framework -#endif // #define INCLUDED_FRAMEWORK_INTERACTION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8a97da679bbccf81e73dc5d2e864b5f40adfc0eb Author: Luboš Luňák AuthorDate: Thu Jul 21 17:01:38 2022 +0200 Commit: Luboš Luňák CommitDate: Fri Jul 22 19:17:30 2022 +0200 fix clang-cl check on WSL Change-Id: Id357ee8e27eb3e8b6f5f076350c43bb75e7d0683 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137348 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/configure.ac b/configure.ac index f81492852b8c..33dc0fb96316 100644 --- a/configure.ac +++ b/configure.ac @@ -12193,9 +12193,9 @@ if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then AC_MSG_CHECKING([for clang-cl]) if test -x "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"; then LO_CLANG_CC=`win_short_path_for_make "$VC_PRODUCT_DIR/Tools/Llvm/bin/clang-cl.exe"` -elif test -n "$PROGRAMFILES" -a -x "$PROGRAMFILES/LLVM/bin/clang-cl.exe"; then +elif test -n "$PROGRAMFILES" -a -x "$(cygpath -u "$PROGRAMFILES/LLVM/bin/clang-cl.exe")"; then LO_CLANG_CC=`win_short_path_for_make "$PROGRAMFILES/LLVM/bin/clang-cl.exe"` -elif test -x "c:/Program Files/LLVM/bin/clang-cl.exe"; then +elif test -x "$(cygpath -u "c:/Program Files/LLVM/bin/clang-cl.exe")"; then LO_CLANG_CC=`win_short_path_for_make "c:/Program Files/LLVM/bin/clang-cl.exe"` fi if test -n "$LO_CLANG_CC"; then
[Libreoffice-commits] core.git: 2 commits - configure.ac
configure.ac | 112 +--
1 file changed, 78 insertions(+), 34 deletions(-)
New commits:
commit f6882d91ad8d2219aa6fdc1583507910ee103e2b
Author: Luboš Luňák
AuthorDate: Thu Jul 21 16:53:32 2022 +0200
Commit: Luboš Luňák
CommitDate: Fri Jul 22 19:16:59 2022 +0200
fix configure handling of tarball path on WSL
Change-Id: Ie33eb8e256a38c5120fdd713b3fc34160a8728b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137347
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/configure.ac b/configure.ac
index 3b96ba195226..f81492852b8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,9 @@ AbsolutePath()
# Args: $1: A possibly relative pathname
# Return value: $absolute_path
-local rel="$1"
+# Convert to unix path, mkdir would treat c:/path as a relative path.
+PathFormat "$1"
+local rel="$formatted_path_unix"
absolute_path=""
test ! -e "$rel" && mkdir -p "$rel"
if test -d "$rel" ; then
@@ -6081,7 +6083,7 @@ if test -z "$TARFILE_LOCATION"; then
else
AbsolutePath "$TARFILE_LOCATION"
PathFormat "${absolute_path}"
-TARFILE_LOCATION="${formatted_path}"
+TARFILE_LOCATION="${formatted_path_unix}"
fi
AC_SUBST(TARFILE_LOCATION)
commit c93e40ea0be17b586c30fc3b53c5f8193f26cd79
Author: Luboš Luňák
AuthorDate: Thu Jul 21 16:31:03 2022 +0200
Commit: Luboš Luňák
CommitDate: Fri Jul 22 19:16:45 2022 +0200
configure fixes for WSL
- Enabling some Cygwin checks also for WSL.
- Handling of Windows paths as needed for WSL.
- Reading of registry using wsl-lo-helper as WSL doesn't provide registry
in /proc the way Cygwin does.
Configure now passes for me (with Skia and Java disabled).
Change-Id: I325c4e6f9f825b3b6d0aa6cb350bafabc4011ce5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137346
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/configure.ac b/configure.ac
index 67493ea442e7..3b96ba195226 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3849,6 +3849,31 @@ reg_get_value_64()
reg_get_value "64" "$1"
}
+reg_list_values()
+{
+# Return value: $reglist
+unset reglist
+
+if test "$build_os" = "wsl"; then
+reglist=$($WSL_LO_HELPER --list-registry $1 "$2" 2>/dev/null | tr -d
'\r')
+return
+fi
+
+reglist=$(ls "/proc/registry${1}/${2}")
+}
+
+# List values from the 32-bit side of the Registry
+reg_list_values_32()
+{
+reg_list_values "32" "$1"
+}
+
+# List values from the 64-bit side of the Registry
+reg_list_values_64()
+{
+reg_list_values "64" "$1"
+}
+
case "$host_os" in
cygwin*|wsl*)
COM=MSC
@@ -6510,15 +6535,18 @@ find_al()
# We need this check to detect 4.6.1 or above.
for ver in 4.8 4.7.2 4.7.1 4.7 4.6.2 4.6.1; do
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/NETFXSDK/$ver/WinSDK-NetFx40Tools/InstallationFolder"
-if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f
"$regvalue/bin/al.exe" \); then
+PathFormat "$regvalue"
+if test -n "$regvalue" -a \( -f "$formatted_path_unix/al.exe" -o -f
"$formatted_path_unix/bin/al.exe" \); then
altest=$regvalue
return
fi
done
-for x in `ls
/proc/registry32/HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft\
SDKs/Windows`; do
+reg_list_values_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows"
+for x in $reglist; do
reg_get_value_32 "HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/Microsoft
SDKs/Windows/$x/WinSDK-NetFx40Tools/InstallationFolder"
-if test -n "$regvalue" -a \( -f "$regvalue/al.exe" -o -f
"$regvalue/bin/al.exe" \); then
+PathFormat "$regvalue"
+if test -n "$regvalue" -a \( -f "$formatted_path_unix/al.exe" -o -f
"$formatted_path_unix/bin/al.exe" \); then
altest=$regvalue
return
fi
@@ -6804,26 +6832,30 @@ AC_SUBST(WINDOWS_SDK_LIB_SUBDIR)
AC_SUBST(WINDOWS_SDK_VERSION)
AC_SUBST(WINDOWS_SDK_WILANGID)
-if test "$build_os" = "cygwin"; then
+if test "$build_os" = "cygwin" -o "$build_os" = "wsl"; then
dnl Check midl.exe; this being the first check for a tool in the SDK bin
dnl dir, it also determines that dir's path w/o an arch segment if any,
dnl WINDOWS_SDK_BINDIR_NO_ARCH:
AC_MSG_CHECKING([for midl.exe])
find_winsdk
+PathFormat "$winsdktest"
+winsdktest_unix="$formatted_path_unix"
+
if test -n "$winsdkbinsubdir" \
--a -f "$winsdktest/Bin/$winsdkbinsubdir/$WIN_BUILD_ARCH/midl.exe"
+-a -f "$winsdktest_unix/Bin/$winsdkbinsubdir/$WIN_BUILD_ARCH/midl.exe"
then
MIDL_PATH=$winsdktest/Bin/$winsdkbinsubdir/$WIN_BUILD_ARCH
-WINDOWS_SDK_BINDIR_NO_ARCH=$WINDOWS_SDK_HOME/Bin/$winsdkbinsubdir
-elif test -f "$winsdktest/Bin/$WIN_BUILD_ARCH/midl.exe"; then
+
[Libreoffice-commits] core.git: 2 commits - configure.ac solenv/wsl
configure.ac | 20 +---
solenv/wsl/README|8
solenv/wsl/wsl-lo-helper.cpp |8
3 files changed, 25 insertions(+), 11 deletions(-)
New commits:
commit 981ba02267af461792c3ff30b8fecc5cd73497a3
Author: Luboš Luňák
AuthorDate: Thu Jul 21 15:59:50 2022 +0200
Commit: Luboš Luňák
CommitDate: Fri Jul 22 19:16:29 2022 +0200
add fallback for $PROGRAMFILESX86
It's not set in my WSL, but since it's going to be c:\program files (x86)
in the vast majority of cases, just hardcode a fallback.
Change-Id: I3bf41d6bae0e5bb36c53f0a4cf913a980a058fcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137345
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/configure.ac b/configure.ac
index eca0ab405c85..67493ea442e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4052,6 +4052,9 @@ find_msvc()
vs_versions_to_check "$1"
if test "$build_os" = wsl; then
vswhere="$PROGRAMFILESX86"
+if test -z "$vswhere"; then
+vswhere="c:\\Program Files (x86)"
+fi
else
vswhere="$(perl -e 'print $ENV{"ProgramFiles(x86)"}')"
fi
commit 4fbcededefa07a97aa9ca55986241a0dd0146806
Author: Luboš Luňák
AuthorDate: Thu Jul 21 15:57:53 2022 +0200
Commit: Luboš Luňák
CommitDate: Fri Jul 22 19:16:16 2022 +0200
require wsl-lo-helper to be preinstalled, like 'make'
It is needed to even find MSVC, so configure cannot easily build it.
Change-Id: Ie4e950cf01b9d8778cdc3e9a53718954b0c3c166
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137344
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/configure.ac b/configure.ac
index 2bf56df211d9..eca0ab405c85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ PathFormat()
formatted_path=$(wslpath -w "$formatted_path")
;;
esac
-formatted_path=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --8.3
"$formatted_path")
+formatted_path=$($WSL_LO_HELPER --8.3 "$formatted_path")
elif test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then
formatted_path=`cygpath -sm "$formatted_path"`
else
@@ -355,7 +355,7 @@ if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i
Microsoft 2>/dev/null
;;
esac
if test -n "$opt_d" -o -n "$opt_s"; then
-input=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --8.3 "$input")
+input=$($WSL_LO_HELPER --8.3 "$input")
fi
if test -n "$opt_m"; then
input="${input//\\//}"
@@ -399,6 +399,17 @@ if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i
Microsoft 2>/dev/null
exit 0
fi
+
+if test -z "$WSL_LO_HELPER"; then
+if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/wsl-lo-helper" ; then
+WSL_LO_HELPER="$LODE_HOME/opt/bin/wsl-lo-helper"
+elif test -x "/opt/lo/bin/wsl-lo-helper"; then
+WSL_LO_HELPER="/opt/lo/bin/wsl-lo-helper"
+fi
+fi
+if test -z "$WSL_LO_HELPER"; then
+AC_MSG_ERROR([wsl-lo-helper not found. See solenv/wsl/README.])
+fi
fi
AC_CANONICAL_HOST
@@ -3811,7 +3822,7 @@ reg_get_value()
unset regvalue
if test "$build_os" = "wsl"; then
-regvalue=$($BUILDDIR/solenv/wsl/wsl-lo-helper.exe --read-registry $1
"$2" 2>/dev/null)
+regvalue=$($WSL_LO_HELPER --read-registry $1 "$2" 2>/dev/null)
return
fi
diff --git a/solenv/wsl/README b/solenv/wsl/README
new file mode 100644
index ..a9609f08dce9
--- /dev/null
+++ b/solenv/wsl/README
@@ -0,0 +1,8 @@
+This is a tool that will be useful for various tasks when building LO on WSL.
+
+It is a Win32 program, not a Linux (WSL) one.
+
+Compile using the Developer Command Prompt from MSVC as:
+cl wsl-lo-helper.cpp advapi32.lib
+and the copy the executable to /opt/lo/bin (e.g. from shell as):
+sudo mv wsl-lo-helper.exe /opt/lo/bin/wsl-lo-helper
diff --git a/solenv/wsl/wsl-lo-helper.cpp b/solenv/wsl/wsl-lo-helper.cpp
index 1a90580b6f19..87285dcb1d3c 100644
--- a/solenv/wsl/wsl-lo-helper.cpp
+++ b/solenv/wsl/wsl-lo-helper.cpp
@@ -7,14 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-/*
- * This is a tool that will be useful for various tasks if/when we build LO on
WSL
- *
- * It is a Win32 program, not a Linux (WSL) one.
- *
- * Compile as: cl -MD wsl-lo-helper.cpp advapi32.lib
- */
-
#include
#include
[Libreoffice-commits] core.git: configure.ac
configure.ac |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5a8a1c4a86938b65c5ea7807f60e721946d7d8de Author: Luboš Luňák AuthorDate: Thu Jul 21 14:55:28 2022 +0200 Commit: Luboš Luňák CommitDate: Fri Jul 22 19:15:53 2022 +0200 use uname for detecting WSL There's no wslsys in my WSL setup. I also don't see why WSL should be at least version 2, they both should(?) work and it is recommended to use version 1 with NTFS (and version 2 also doesn't work e.g. inside VirtualBox). Change-Id: I5b9440f65624f49e331d84235046e4dd2e31af4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137343 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/configure.ac b/configure.ac index 6b7070c78d87..2bf56df211d9 100644 --- a/configure.ac +++ b/configure.ac @@ -288,9 +288,9 @@ dnl checks build and host OSes dnl do this before argument processing to allow for platform dependent defaults dnl === -# Check for WSL (version 2, at least). But if --host is explicitly specified (to really do build for +# Check for WSL. But if --host is explicitly specified (to really do build for # Linux on WSL) trust that. -if test -z "$host" -a -z "$build" -a "`wslsys -v 2>/dev/null`" != ""; then +if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i Microsoft 2>/dev/null)" != ""; then ac_cv_host="x86_64-pc-wsl" ac_cv_host_cpu="x86_64" ac_cv_host_os="wsl"
Re: Import of short values of textDirection, used by OOXML strict
Hi Miklos, thank you. writerfilter/documentation/ooxml/model.rng makes indeed the relationships clearer. I have added a link to your mail to the bug report. Kind regards, Regina Miklos Vajna schrieb am 22.07.2022 um 08:27: Hi Regina, On Thu, Jul 21, 2022 at 08:47:14PM +0200, Regina Henschel wrote: I can fix bug 149556 by adding the missing values to in core/writerfilter/source/ooxml/model.xml. Is that really all to do? Or do I miss something? If you search for ST_TextDirection, there is also a matching . If that is really all, it would be an Easyhack. The issue is about the fact, that a short value 'lr' instead of the long value 'btLr', for example, is not interpreted. It's likely that you indeed just need a new entry in the relevant and elements, see writerfilter/documentation/ooxml/model.rng for details, where I tried to document my understanding of that complex model.xml file. Regards, Miklos
[Libreoffice-bugs] [Bug 149556] OOXML Better support of element in Writer table
https://bugs.documentfoundation.org/show_bug.cgi?id=149556 --- Comment #6 from Regina Henschel --- I have ask on the dev-list, whether this might be an easyHack, read https://lists.freedesktop.org/archives/libreoffice/2022-July/089178.html It seems it is usable as easyHack for persons interested in parser. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 57187] EDITING: Justified text looks wrong as right aligned when breaking line with shift+enter
https://bugs.documentfoundation.org/show_bug.cgi?id=57187 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=35 ||021 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 57187] EDITING: Justified text looks wrong as right aligned when breaking line with shift+enter
https://bugs.documentfoundation.org/show_bug.cgi?id=57187 Mike Kaganski changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||4668 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150106] New: using link external data fails after upgrade to 7.3
https://bugs.documentfoundation.org/show_bug.cgi?id=150106 Bug ID: 150106 Summary: using link external data fails after upgrade to 7.3 Product: LibreOffice Version: 7.3.2.2 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: rqu...@gmail.com Description: when using link external data the data field names are not visible reinstalled 7.2 and everything went back to working. I was using old files that had linked b4 then i created new files with test data when creating link would show range data names. i then verified names in file that i was trying to liunk two ok then reinstalled 7.2 and everything worked fine. Let me know if you need further info Actual Results: see disc Expected Results: see disc Reproducible: Always User Profile Reset: No Additional Info: see disc -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147021] Use std::size() instead of SAL_N_ELEMENTS() macro
https://bugs.documentfoundation.org/show_bug.cgi?id=147021 Hossein changed: What|Removed |Added Whiteboard|target:7.4.0 reviewed:2022 |target:7.4.0 reviewed:2022 |target:7.5.0|target:7.5.0 reviewed:2022 --- Comment #14 from Hossein --- Re-evaluating the EasyHack in 2022 This issue is still relevant. There are still several instances of SAL_N_ELEMENTS() macro in use: $ git grep SAL_N_ELEMENTS|wc -l 1897 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148537] Writer Email settings not saved (Mail merge Email)
https://bugs.documentfoundation.org/show_bug.cgi?id=148537 --- Comment #9 from Timur --- You may follow bug 148823. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 102998] [META] Mail merge bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102998 Bug 102998 depends on bug 148537, which changed state. Bug 148537 Summary: Writer Email settings not saved (Mail merge Email) https://bugs.documentfoundation.org/show_bug.cgi?id=148537 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148537] Writer Email settings not saved (Mail merge Email)
https://bugs.documentfoundation.org/show_bug.cgi?id=148537 Timur changed: What|Removed |Added Resolution|--- |WORKSFORME Status|REOPENED|RESOLVED --- Comment #8 from Timur --- This doesn't seem to tbe mail merge problem. Rather, Options doesn't apply the value immediately, only on LO restart. Seen if Options is open again. I confirm it doesn't work in LO 7.3 but it does in 7.4 and 7.5+. So I close again. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147021] Use std::size() instead of SAL_N_ELEMENTS() macro
https://bugs.documentfoundation.org/show_bug.cgi?id=147021
--- Comment #13 from Commit Notification
---
Michael Weghorn committed a patch related to this issue.
It has been pushed to "master":
https://git.libreoffice.org/core/commit/5b04eed4d22c9e3caa76e195582b15862e9261b6
tdf#147021 Use std::size in {Read,Write}JobSetup
It will be available in 7.5.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: vcl/source
vcl/source/gdi/jobset.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 5b04eed4d22c9e3caa76e195582b15862e9261b6
Author: Michael Weghorn
AuthorDate: Fri Jul 22 13:45:53 2022 +0100
Commit: Michael Weghorn
CommitDate: Fri Jul 22 16:50:02 2022 +0200
tdf#147021 Use std::size in {Read,Write}JobSetup
Change-Id: I6db569b8c5fb94dcd0e7ad629738ded8ba53e80c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137359
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 04ba708ef9a3..04bc9daf98a6 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -259,9 +259,9 @@ SvStream& ReadJobSetup( SvStream& rIStream, JobSetup&
rJobSetup )
ImplJobSetup& rJobData = rJobSetup.ImplGetData();
-pData->cPrinterName[SAL_N_ELEMENTS(pData->cPrinterName) - 1] = 0;
+pData->cPrinterName[std::size(pData->cPrinterName) - 1] = 0;
rJobData.SetPrinterName( OStringToOUString(pData->cPrinterName,
aStreamEncoding) );
-pData->cDriverName[SAL_N_ELEMENTS(pData->cDriverName) - 1] = 0;
+pData->cDriverName[std::size(pData->cDriverName) - 1] = 0;
rJobData.SetDriver( OStringToOUString(pData->cDriverName,
aStreamEncoding) );
// Are these our new JobSetup files?
@@ -363,9 +363,9 @@ SvStream& WriteJobSetup( SvStream& rOStream, const
JobSetup& rJobSetup )
ImplOldJobSetupData aOldData = {};
OString aPrnByteName(OUStringToOString(rJobData.GetPrinterName(),
RTL_TEXTENCODING_UTF8));
-strncpy(aOldData.cPrinterName, aPrnByteName.getStr(),
SAL_N_ELEMENTS(aOldData.cPrinterName) - 1);
+strncpy(aOldData.cPrinterName, aPrnByteName.getStr(),
std::size(aOldData.cPrinterName) - 1);
OString aDriverByteName(OUStringToOString(rJobData.GetDriver(),
RTL_TEXTENCODING_UTF8));
-strncpy(aOldData.cDriverName, aDriverByteName.getStr(),
SAL_N_ELEMENTS(aOldData.cDriverName) - 1);
+strncpy(aOldData.cDriverName, aDriverByteName.getStr(),
std::size(aOldData.cDriverName) - 1);
int nPos = rOStream.Tell();
rOStream.WriteUInt16( 0 );
rOStream.WriteUInt16( JOBSET_FILE605_SYSTEM );
[Libreoffice-bugs] [Bug 148537] Writer Email settings not saved (Mail merge Email)
https://bugs.documentfoundation.org/show_bug.cgi?id=148537 --- Comment #7 from Axel Braun --- I used the RPM coming with openSUSE Tumbleweed and started the program with soffice -env:UserInstallation=file:///tmp/test -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 108226] [META] PPTX (OOXML) bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=108226 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||148268 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148268 [Bug 148268] Fileopen PPTX: freehand drawing with the pen tool in ms office doesn't show up in impress -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148268] Fileopen PPTX: freehand drawing with the pen tool in ms office doesn't show up in impress
https://bugs.documentfoundation.org/show_bug.cgi?id=148268 Gabor Kelemen (allotropia) changed: What|Removed |Added Blocks||108226 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=108226 [Bug 108226] [META] PPTX (OOXML) bug tracker -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 142306] Impress Inspiration Template has Different Image Element Style from Previous Version
https://bugs.documentfoundation.org/show_bug.cgi?id=142306 Laurent BP changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |jumbo4...@yahoo.fr |desktop.org | Status|NEW |ASSIGNED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 102261] FILEOPEN PPTX Badly aligned text, using spaces as indentation
https://bugs.documentfoundation.org/show_bug.cgi?id=102261 Gabor Kelemen (allotropia) changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=14 ||8925 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 107899] [META] PPTX paragraph-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=107899 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||148925 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148925 [Bug 148925] FILEOPEN: PPTX: Incorrect indent in text -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148925] FILEOPEN: PPTX: Incorrect indent in text
https://bugs.documentfoundation.org/show_bug.cgi?id=148925 Gabor Kelemen (allotropia) changed: What|Removed |Added CC||kelem...@ubuntu.com See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||2261 Blocks||107899 --- Comment #3 from Gabor Kelemen (allotropia) --- Underlying issue is bug 102261 - there is no paragraph level tab setting in Impress, so whatever workaround is implemented, it will be flaky here or there. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=107899 [Bug 107899] [META] PPTX paragraph-related issues -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148537] Writer Email settings not saved (Mail merge Email)
https://bugs.documentfoundation.org/show_bug.cgi?id=148537 --- Comment #6 from Timur --- If higher version works fine, then no point in opening bug for older version. But here is interesting that "problem is back" in the same 7.3. First step is to reset/rename LO user profile. Please explain how you install, do you build or deb or PPA. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 102998] [META] Mail merge bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102998 Bug 102998 depends on bug 148480, which changed state. Bug 148480 Summary: LO freezes when sending Mail Merge Email https://bugs.documentfoundation.org/show_bug.cgi?id=148480 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148480] LO freezes when sending Mail Merge Email
https://bugs.documentfoundation.org/show_bug.cgi?id=148480 Timur changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |WORKSFORME --- Comment #10 from Timur --- If higher version works fine, then no point in opening bug for older version. So I close again. If you can find something that's different, that's causing a bug, then set Unconfirmed. Per https://bugs.documentfoundation.org/page.cgi?id=fields.html#bug_status Reopened is for a fix that doesn't work, and here we didn't find a specific fix. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150105] Impress: Vertical text not showing up in animations
https://bugs.documentfoundation.org/show_bug.cgi?id=150105 --- Comment #1 from Massimo --- Created attachment 181378 --> https://bugs.documentfoundation.org/attachment.cgi?id=181378=edit A very simple presentation with horizontal and vertical text Just open the file and hit F5. To reproduce the bug you should have skia inactive but hardware accelerator active. If I turn off hardware accelerator or turn on skia, the bug seems gone BUT each animation blanks the screen content and shows it up again, which is fastidious and time consuming. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150105] New: Impress: Vertical text not showing up in animations
https://bugs.documentfoundation.org/show_bug.cgi?id=150105 Bug ID: 150105 Summary: Impress: Vertical text not showing up in animations Product: LibreOffice Version: 7.3.4.2 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: pincopall...@orange.fr Description: Vertical text does not show up in animations if hardware accelerator is on but skia is off Steps to Reproduce: 1. Open the file attached 2. Hit F5 for screenshow Note: in the "Version" menu, 7.3.5 is not available, so I have chosen 7.3.4.2 release. But the bug occur in both versions, and for sure in earlier versions as well. Actual Results: Only the horizontal text shows up; the vertical text is not shown Expected Results: Both texts should show up Reproducible: Always User Profile Reset: No OpenGL enabled: Yes Additional Info: Version: 7.3.5.2 (x64) / LibreOffice Community Build ID: 184fe81b8c8c30d8b5082578aee2fed2ea847c01 CPU threads: 6; OS: Windows 10.0 Build 22000; UI render: default; VCL: win Locale: ja-JP (ja_JP); UI: en-GB Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150086] DOCX import: Lost text part of tracked insertion, resulting that every part of inserted TOC won't be rejected after we use the Reject All option.
https://bugs.documentfoundation.org/show_bug.cgi?id=150086 Gabor Kelemen (allotropia) changed: What|Removed |Added Blocks||115709 CC||kelem...@ubuntu.com Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=115709 [Bug 115709] [META] DOCX (OOXML) Tracking changes-related issues -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 115709] [META] DOCX (OOXML) Tracking changes-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=115709 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||150086 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=150086 [Bug 150086] DOCX import: Lost text part of tracked insertion, resulting that every part of inserted TOC won't be rejected after we use the Reject All option. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - vcl/qa vcl/source
vcl/qa/cppunit/pdfexport/data/reduce-small-image.fodt | 21 +
vcl/qa/cppunit/pdfexport/pdfexport.cxx| 41 ++
vcl/source/gdi/pdfwriter_impl2.cxx|6 +-
3 files changed, 66 insertions(+), 2 deletions(-)
New commits:
commit 44f7eed9d4f9f9634e85e757172d5d3b5a5d534a
Author: Miklos Vajna
AuthorDate: Mon Jan 20 17:53:25 2020 +0100
Commit: Gabor Kelemen
CommitDate: Fri Jul 22 16:02:35 2022 +0200
PDF export: skip pointless downsampling for very small images
Regression from commit b6588bd7c831ce88a29131ca7ea8d3f3e082564e (Reduce
image resolution by default in PDF Export, 2014-03-02) the problem is
that in case you have small enough bitmaps, then these used to look
OK at reasonable zoom levels, but now we intentionally scale down
bitmaps by default.
That makes little sense for tiny images, do this only for large ones.
Change-Id: Iff15325b842b47d9285a7c0f83f402897498392d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87086
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/vcl/qa/cppunit/pdfexport/data/reduce-small-image.fodt
b/vcl/qa/cppunit/pdfexport/data/reduce-small-image.fodt
new file mode 100644
index ..99ff22746e48
--- /dev/null
+++ b/vcl/qa/cppunit/pdfexport/data/reduce-small-image.fodt
@@ -0,0 +1,21 @@
+
+http://www.w3.org/2003/g/data-view#;
xmlns:xhtml="http://www.w3.org/1999/xhtml;
xmlns:css3t="http://www.w3.org/TR/css3-text/;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xmlns:xsd="http://www.w3.org/2001/XMLSchema;
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:xforms="http://www.w3.org/2002/xforms;
xmlns:dom="http://www.w3.org/2001/xml-events;
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML;
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:oooc="http://openoffice.org/2004/calc;
xmlns:ooow="http://openoffice.org/2004/writer;
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:tableooo="http://openoffice.org/2009/table;
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.
0"
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/;
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink;
xmlns:ooo="http://openoffice.org/2004/office;
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:officeooo="http://openoffice.org/2009/office;
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:drawooo="http://openoffice.org/2010/draw;
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:rpt="http://op
enoffice.org/2005/report"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+ iVBORw0KGgoNSUhEUgAAABAQCAYf8/9hMklEQVR42mP4//8/AyWYYXAZ
+ wHSK+z8pbOoaAJIgBWM1gFh/jxqAxwCKYmHgE9KAZSYAhK3Dgc2FxfUASUVORK5CYII=
+
+
+
+
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 32288d569728..602dd6a4a0b7 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -149,6 +149,7 @@ public:
//BAD CPPUNIT_TEST(testTdf106972Pdf17);
//BAD CPPUNIT_TEST(testTdf107018);
//BAD CPPUNIT_TEST(testTdf107089);
+void testReduceSmallImage();
CPPUNIT_TEST_SUITE(PdfExportTest);
// CPPUNIT_TEST(testTdf106059);
@@ -186,6 +187,7 @@ public:
CPPUNIT_TEST(testTdf115967);
CPPUNIT_TEST(testTdf121615);
CPPUNIT_TEST(testTocLink);
+CPPUNIT_TEST(testReduceSmallImage);
CPPUNIT_TEST_SUITE_END();
};
@@ -1830,6 +1832,45 @@ void PdfExportTest::testTocLink()
CPPUNIT_ASSERT(FPDFLink_Enumerate(pPdfPage.get(), ,
));
}
+void PdfExportTest::testReduceSmallImage()
+{
+// Load the Writer document.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"reduce-small-image.fodt";
+mxComponent = loadFromDesktop(aURL);
+
+// Save as PDF.
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+
[Libreoffice-bugs] [Bug 148207] 'Accessibility' options panel localized text strings truncated in UI
https://bugs.documentfoundation.org/show_bug.cgi?id=148207 --- Comment #4 from Łukasz --- the same in Polish, it is( -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150104] Printer settings not loaded from doc for long printer/driver name
https://bugs.documentfoundation.org/show_bug.cgi?id=150104
Michael Weghorn changed:
What|Removed |Added
Ever confirmed|0 |1
CC||m.wegh...@posteo.de
Status|UNCONFIRMED |ASSIGNED
Assignee|libreoffice-b...@lists.free |m.wegh...@posteo.de
|desktop.org |
--- Comment #1 from Michael Weghorn ---
This was originally reported by a different user within our organization.
The problem was originally observed in a slightly different setup, but the
cause is similar: There, a printer with a shorter ("normal") name was used, but
the driver name exceeds 32 characters: "LRS Universal Printer Driver
(1.1.0.28)".
(The driver name would get truncated to the first 31 characters ("LRS Universal
Printer Driver (1") when opening the file again, and previously selected
printer settings would get lost.
I'm working on a fix.
--
You are receiving this mail because:
You are the assignee for the bug.
[Libreoffice-bugs] [Bug 64679] [META] Printer settings related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=64679 Michael Weghorn changed: What|Removed |Added Depends on||150104 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=150104 [Bug 150104] Printer settings not loaded from doc for long printer/driver name -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150104] New: Printer settings not loaded from doc for long printer/driver name
https://bugs.documentfoundation.org/show_bug.cgi?id=150104 Bug ID: 150104 Summary: Printer settings not loaded from doc for long printer/driver name Product: LibreOffice Version: 7.5.0.0 alpha0+ Master Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Printing and PDF export Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: m.wegh...@posteo.de Blocks: 64679 When saving printer settings to a document, those are not correctly restored when opening the document again on Windows when the printer name is longer than 63 characters or the driver name is longer than 31 characters (ASCII characters, number is even lower when non-ASCII characters are involved). = Steps to reproduce: = 1) install PDF Creator, available from here: https://www.pdfforge.org/pdfcreator 2) rename the "PDFCreator" printer to a name longer than 64 characters: a) Go to "Printers & scanners" module in Windows system settings b) select the "PDFCreator" printer -> "Manage" -> "Printer properties" c) in the "General" tab, set the following new name: "PDFCreator_abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" 3) optional, but makes the problem even clearer: Set another printer as default printer in Windows settings, e.g. "Microsoft Print do PDF" 4) make sure that the following two options are enabled in LO settings under "Load" -> "General" (which they are by default): * "Load user-specific settings with the document" * Load printer settings with the document 3) open a new Writer doc 4) go to "File" -> "Printer Settings" 5) select the printer renamed above 6) go to "Properties..." -> "Paper/Quality" and select "Black & White" instead of "Color" (the default set for the printer in Windows settings) in the "Paper/Quality" tab 7) confirm all open dialogs 8) save the document 9) close the document 10) open the saved document again 11) check the printer settings under "File" -> "Printer Settings" = Actual result: = * the system default printer is selected * when selecting the printer set up above, "Color" is selected in the printer properties = Expected result: = The printer settings previously set should be restored, i.e. * "PDFCreator_abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz" should be preselected as printer * "black & white" should be selected in the color settings in the printer properties Version: 7.3.4.2 (x64) / LibreOffice Community Build ID: 728fec16bd5f605073805c3c9e7c4212a0120dc5 CPU threads: 4; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win Locale: en-US (en_US); UI: en-US Calc: threaded Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=64679 [Bug 64679] [META] Printer settings related issues -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150065] FILEOPEN PPTX wrong font color in smartArt
https://bugs.documentfoundation.org/show_bug.cgi?id=150065 Gabor Kelemen (allotropia) changed: What|Removed |Added CC||ger...@pfeifer.com --- Comment #2 from Gabor Kelemen (allotropia) --- *** Bug 150103 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150103] FILEOPEN PPTX: text in "diamond" SmartArt shows white (on white) instead of black (on white)
https://bugs.documentfoundation.org/show_bug.cgi?id=150103 Gabor Kelemen (allotropia) changed: What|Removed |Added Resolution|--- |DUPLICATE Status|UNCONFIRMED |RESOLVED --- Comment #1 from Gabor Kelemen (allotropia) --- *** This bug has been marked as a duplicate of bug 150065 *** -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 149918] PPTX FILEOPEN position and size of text in pie shape is wrong
https://bugs.documentfoundation.org/show_bug.cgi?id=149918 Gabor Kelemen (allotropia) changed: What|Removed |Added Blocks||136372 CC||kelem...@ubuntu.com Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=136372 [Bug 136372] [META] PPTX shape related issues -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 136372] [META] PPTX shape related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=136372 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||149918 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=149918 [Bug 149918] PPTX FILEOPEN position and size of text in pie shape is wrong -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 136372] [META] PPTX shape related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=136372 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||148926 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148926 [Bug 148926] FILEOPEN PPTX: Incorrect position of line connectors -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 136372] [META] PPTX shape related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=136372 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||149784 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=149784 [Bug 149784] FILEOPEN: PPTX: Incorrect position of line connectors in grouped shapes -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 136372] [META] PPTX shape related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=136372 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||149788 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=149788 [Bug 149788] FILESAVE: PPTX: Shape changes after roundtrip -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148207] 'Accessibility' options panel localized text strings truncated in UI
https://bugs.documentfoundation.org/show_bug.cgi?id=148207 V Stuart Foote changed: What|Removed |Added CC||so...@libreoffice.org Status|UNCONFIRMED |NEW Ever confirmed|0 |1 Summary|settings window too small |'Accessibility' options ||panel localized text ||strings truncated in UI Whiteboard| QA:needsComment| Version|7.3.4.2 release |7.3.1.3 release --- Comment #3 from V Stuart Foote --- Not language specific, attachment 164004 (see also bug 134791) shows issue for the panel with de-DE locale. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 149612] LibreOffice Writer stops working after 15-120 minutes
https://bugs.documentfoundation.org/show_bug.cgi?id=149612 --- Comment #1 from Dieter --- I think it will be difficult to reproduce it. (Can't test, because i don't use MAC OS). Could you pleaecopy and paste informations from Help -> About LibreOffice? Thank you. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'private/mert/wip_deepl' - cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk desktop/source include/sfx2 include/svtools include/svx include
Rebased ref, commits from common ancestor:
commit 4407e3ce7334b179f777b043931ec071dbd7d3b0
Author: Mert Tumer
AuthorDate: Tue Jul 5 12:03:27 2022 +0300
Commit: Mert Tumer
CommitDate: Fri Jul 22 16:22:48 2022 +0300
new uno command uno:Translate with deepl api
New Uno command added for translation
right now it is only using deepl translation api
There's a section in the options > language settings
for setting up the api url and auth key
uno:Translate is a menu button under Format tab
which will bring up Language Selection dialog for translation.
DeepL can accept html as the input for translation, this new
feature leverages that by exporting paragraphs/selections to
html and paste them back without losing the formatting (in theory)
This works good in general but we may lose formatting in very complex
styled sentences.
Translation works in two ways;
1) Whole document
when there is no selection, it assumes that we want to translate whole
document. Each paragraphs is sent one by one so that the output timeout
can be minimum for each paragraph.
2) Selection
Signed-off-by: Mert Tumer
Change-Id: Ia2d3ab2f6757faf565b939e1d670a7dedac33390
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index d455a64ab266..c4c0a52b2ef4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -181,6 +181,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/optgenrl \
cui/source/options/opthtml \
cui/source/options/optlanguagetool \
+cui/source/options/optdeepl \
cui/source/options/optinet2 \
cui/source/options/optjava \
cui/source/options/optjsearch \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 806779daaa9d..0ed879e2b228 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -139,6 +139,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/opthtmlpage \
cui/uiconfig/ui/langtoolconfigpage \
+ cui/uiconfig/ui/deepltabpage \
cui/uiconfig/ui/optionsdialog \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index 952b79ea92d4..6d5bc4004a53 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -55,7 +55,8 @@ const std::pair
SID_LANGUAGE_OPTIONS_RES[] =
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Searching in Japanese"),
RID_SVXPAGE_JSEARCH_OPTIONS },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Asian Layout"),
RID_SVXPAGE_ASIAN_LAYOUT },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"),
RID_SVXPAGE_OPTIONS_CTL },
-{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS }
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS },
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "DeepL Server Settings"),
RID_SVXPAGE_DEEPL_OPTIONS }
};
const std::pair SID_INET_DLG_RES[] =
diff --git a/cui/source/options/optdeepl.cxx b/cui/source/options/optdeepl.cxx
new file mode 100644
index ..94b48ccc2f43
--- /dev/null
+++ b/cui/source/options/optdeepl.cxx
@@ -0,0 +1,55 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "optdeepl.hxx"
+#include
+
+OptDeeplTabPage::OptDeeplTabPage(weld::Container* pPage,
+ weld::DialogController*
pController,
+ const SfxItemSet& rSet)
+: SfxTabPage(pPage, pController, "cui/ui/deepltabpage.ui", "OptDeeplPage",
)
+, m_xAPIUrl(m_xBuilder->weld_entry("apiurl"))
+, m_xAuthKey(m_xBuilder->weld_entry("authkey"))
+{
+
+}
+
+OptDeeplTabPage::~OptDeeplTabPage() {}
+
+void OptDeeplTabPage::Reset(const SfxItemSet*)
+{
+SvxDeeplOptions& rDeeplOptions = SvxDeeplOptions::Get();
+m_xAPIUrl->set_text(rDeeplOptions.getAPIUrl());
+m_xAuthKey->set_text(rDeeplOptions.getAuthKey());
+}
+
+bool OptDeeplTabPage::FillItemSet(SfxItemSet*)
+{
+SvxDeeplOptions& rDeeplOptions =
[Libreoffice-bugs] [Bug 149674] Quote field missing from Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=149674 Dieter changed: What|Removed |Added CC||dgp-m...@gmx.de, ||libreoffice-ux-advise@lists ||.freedesktop.org Keywords||needsUXEval -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-ux-advise] [Bug 149674] Quote field missing from Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=149674 Dieter changed: What|Removed |Added CC||dgp-m...@gmx.de, ||libreoffice-ux-advise@lists ||.freedesktop.org Keywords||needsUXEval -- You are receiving this mail because: You are on the CC list for the bug.
[Libreoffice-commits] core.git: Branch 'private/mert/wip_deepl' - cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk desktop/source include/sfx2 include/svtools include/svx include
Rebased ref, commits from common ancestor:
commit dcd9ddaa3f9d5f379fd4d786da825debdbb43db6
Author: Mert Tumer
AuthorDate: Tue Jul 5 12:03:27 2022 +0300
Commit: Mert Tumer
CommitDate: Fri Jul 22 16:13:10 2022 +0300
new uno command uno:Translate with deepl api
New Uno command added for translation
right now it is only using deepl translation api
There's a section in the options > language settings
for setting up the api url and auth key
uno:Translate is a menu button under Format tab
which will bring up Language Selection dialog for translation.
DeepL can accept html as the input for translation, this new
feature leverages that by exporting paragraphs/selections to
html and paste them back without losing the formatting (in theory)
This works good in general but we may lose formatting in very complex
styled sentences.
Translation works in two ways;
1) Whole document
when there is no selection, it assumes that we want to translate whole
document. Each paragraphs is sent one by one so that the output timeout
can be minimum for each paragraph.
2) Selection
Signed-off-by: Mert Tumer
Change-Id: Ia2d3ab2f6757faf565b939e1d670a7dedac33390
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index d455a64ab266..c4c0a52b2ef4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -181,6 +181,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/optgenrl \
cui/source/options/opthtml \
cui/source/options/optlanguagetool \
+cui/source/options/optdeepl \
cui/source/options/optinet2 \
cui/source/options/optjava \
cui/source/options/optjsearch \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 806779daaa9d..0ed879e2b228 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -139,6 +139,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/opthtmlpage \
cui/uiconfig/ui/langtoolconfigpage \
+ cui/uiconfig/ui/deepltabpage \
cui/uiconfig/ui/optionsdialog \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index 952b79ea92d4..6d5bc4004a53 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -55,7 +55,8 @@ const std::pair
SID_LANGUAGE_OPTIONS_RES[] =
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Searching in Japanese"),
RID_SVXPAGE_JSEARCH_OPTIONS },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Asian Layout"),
RID_SVXPAGE_ASIAN_LAYOUT },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"),
RID_SVXPAGE_OPTIONS_CTL },
-{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS }
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS },
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "DeepL Server Settings"),
RID_SVXPAGE_DEEPL_OPTIONS }
};
const std::pair SID_INET_DLG_RES[] =
diff --git a/cui/source/options/optdeepl.cxx b/cui/source/options/optdeepl.cxx
new file mode 100644
index ..94b48ccc2f43
--- /dev/null
+++ b/cui/source/options/optdeepl.cxx
@@ -0,0 +1,55 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "optdeepl.hxx"
+#include
+
+OptDeeplTabPage::OptDeeplTabPage(weld::Container* pPage,
+ weld::DialogController*
pController,
+ const SfxItemSet& rSet)
+: SfxTabPage(pPage, pController, "cui/ui/deepltabpage.ui", "OptDeeplPage",
)
+, m_xAPIUrl(m_xBuilder->weld_entry("apiurl"))
+, m_xAuthKey(m_xBuilder->weld_entry("authkey"))
+{
+
+}
+
+OptDeeplTabPage::~OptDeeplTabPage() {}
+
+void OptDeeplTabPage::Reset(const SfxItemSet*)
+{
+SvxDeeplOptions& rDeeplOptions = SvxDeeplOptions::Get();
+m_xAPIUrl->set_text(rDeeplOptions.getAPIUrl());
+m_xAuthKey->set_text(rDeeplOptions.getAuthKey());
+}
+
+bool OptDeeplTabPage::FillItemSet(SfxItemSet*)
+{
+SvxDeeplOptions& rDeeplOptions =
[Libreoffice-commits] core.git: vcl/source
vcl/source/bitmap/bitmap.cxx | 59 ++-
1 file changed, 31 insertions(+), 28 deletions(-)
New commits:
commit 4be04385c5e9838687ecade94dae9e59fcc30621
Author: Mike Kaganski
AuthorDate: Fri Jul 22 10:18:26 2022 +0200
Commit: Mike Kaganski
CommitDate: Fri Jul 22 14:59:27 2022 +0200
Simplify paletted ctor logic
Change-Id: I2c04eaf758fe9050a023061746cb342f2b862952
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137324
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index ff5110a8ded1..f96bad8cb0f9 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -80,22 +80,19 @@ Bitmap::Bitmap( const Size& rSizePixel, vcl::PixelFormat
ePixelFormat, const Bit
if (!(rSizePixel.Width() && rSizePixel.Height()))
return;
-BitmapPalette aPal;
-BitmapPalette* pRealPal = nullptr;
-
-if (vcl::isPalettePixelFormat(ePixelFormat))
+switch (ePixelFormat)
{
-if( !pPal )
+case vcl::PixelFormat::N1_BPP:
{
-if (ePixelFormat == vcl::PixelFormat::N1_BPP)
-{
-aPal.SetEntryCount( 2 );
-aPal[ 0 ] = COL_BLACK;
-aPal[ 1 ] = COL_WHITE;
-}
-else if (ePixelFormat == vcl::PixelFormat::N8_BPP)
-{
-aPal.SetEntryCount(1 << sal_uInt16(ePixelFormat));
+static const BitmapPalette aPalN1_BPP = { COL_BLACK, COL_WHITE };
+if (!pPal)
+pPal = _BPP;
+break;
+}
+case vcl::PixelFormat::N8_BPP:
+{
+static const BitmapPalette aPalN8_BPP = [] {
+BitmapPalette aPal(1 << sal_uInt16(vcl::PixelFormat::N8_BPP));
aPal[ 0 ] = COL_BLACK;
aPal[ 1 ] = COL_BLUE;
aPal[ 2 ] = COL_GREEN;
@@ -114,26 +111,32 @@ Bitmap::Bitmap( const Size& rSizePixel, vcl::PixelFormat
ePixelFormat, const Bit
aPal[ 15 ] = COL_WHITE;
// Create dither palette
-if (ePixelFormat == vcl::PixelFormat::N8_BPP)
-{
-sal_uInt16 nActCol = 16;
+sal_uInt16 nActCol = 16;
-for( sal_uInt16 nB = 0; nB < 256; nB += 51 )
-for( sal_uInt16 nG = 0; nG < 256; nG += 51 )
-for( sal_uInt16 nR = 0; nR < 256; nR += 51 )
-aPal[ nActCol++ ] = BitmapColor(
static_cast(nR), static_cast(nG),
static_cast(nB) );
+for( sal_uInt16 nB = 0; nB < 256; nB += 51 )
+for( sal_uInt16 nG = 0; nG < 256; nG += 51 )
+for( sal_uInt16 nR = 0; nR < 256; nR += 51 )
+aPal[ nActCol++ ] = BitmapColor(
static_cast(nR), static_cast(nG),
static_cast(nB) );
-// Set standard Office colors
-aPal[ nActCol++ ] = BitmapColor( 0, 184, 255 );
-}
-}
+// Set standard Office colors
+aPal[ nActCol++ ] = BitmapColor( 0, 184, 255 );
+return aPal;
+}();
+if (!pPal)
+pPal = _BPP;
+break;
+}
+default:
+{
+static const BitmapPalette aPalEmpty;
+if (!pPal || !vcl::isPalettePixelFormat(ePixelFormat))
+pPal =
+break;
}
-else
-pRealPal = const_cast(pPal);
}
mxSalBmp = ImplGetSVData()->mpDefInst->CreateSalBitmap();
-mxSalBmp->Create(rSizePixel, ePixelFormat, pRealPal ? *pRealPal : aPal);
+mxSalBmp->Create(rSizePixel, ePixelFormat, *pPal);
}
#ifdef DBG_UTIL
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0-10.0' - sw/qa sw/source
sw/qa/extras/htmlexport/htmlexport.cxx | 24
sw/source/filter/html/css1atr.cxx | 11 +++
sw/source/filter/html/css1kywd.cxx |1 +
sw/source/filter/html/css1kywd.hxx |1 +
sw/source/filter/html/wrthtml.cxx |7 +--
5 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit 12269c021e785b8dca7e57a378d02023f7863d62
Author: Miklos Vajna
AuthorDate: Thu Jul 21 15:40:58 2022 +0200
Commit: Miklos Vajna
CommitDate: Fri Jul 22 14:55:05 2022 +0200
sw XHTML export: fix writing of section direction
The XHTML export behavior was the same as the HTML one for section text
direction, the markup was used.
This shares code with the HTML filter, but it's not valid in
reqif-xhtml, while the CSS markup would be fine: .
Fix the problem by keeping the behavior unchanged for HTML, but switch
to inline CSS for XHTML.
The other similar attribute was "id", but that's fine even in XHTML.
(cherry picked from commit 3b7c18a579f3165c9d425d172d697f8978d6cd84)
Conflicts:
sw/qa/extras/htmlexport/htmlexport.cxx
Change-Id: I5797c90f9cf957dec7fc4074dd6e79dce11fada7
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index af92c6e1859c..7e674160c4f8 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1734,6 +1734,30 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testLeadingTabHTML)
assertXPathContent(pHtmlDoc, "/html/body/p", SAL_NEWLINE_STRING u"\xa0\xa0
test");
}
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testSectionDir)
+{
+// Given a document with a section:
+loadURL("private:factory/swriter", nullptr);
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Insert("test");
+pWrtShell->SelAll();
+SwSectionData aSectionData(SectionType::Content, "mysect");
+pWrtShell->InsertSection(aSectionData);
+
+// When exporting to (reqif-)xhtml:
+ExportToReqif();
+
+// Then make sure CSS is used to export the text direction of the section:
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocUniquePtr pXmlDoc = parseXmlStream();
+// Without the accompanying fix in place, this test would have failed with:
+// - XPath '//reqif-xhtml:div[@id='mysect']' no attribute 'style' exist
+// i.e. the dir="ltr" HTML attribute was used instead.
+assertXPath(pXmlDoc, "//reqif-xhtml:div[@id='mysect']", "style", "dir:
ltr");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 18ee264324f6..8a0bc881e1c8 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2143,6 +2143,17 @@ void SwHTMLWriter::OutCSS1_SectionFormatOptions( const
SwFrameFormat& rFrameForm
if( SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, false,
) )
OutCSS1_SvxBrush( *this, *pItem, sw::Css1Background::Section, nullptr
);
+if (mbXHTML)
+{
+SvxFrameDirection nDir = GetHTMLDirection(rFrameFormat.GetAttrSet());
+OString sConvertedDirection = convertDirection(nDir);
+if (!sConvertedDirection.isEmpty())
+{
+OutCSS1_Property(sCSS1_P_dir, sConvertedDirection.getStr(),
nullptr,
+ sw::Css1Background::Section);
+}
+}
+
if (pCol)
{
OString
sColumnCount(OString::number(static_cast(pCol->GetNumCols(;
diff --git a/sw/source/filter/html/css1kywd.cxx
b/sw/source/filter/html/css1kywd.cxx
index f8914dedb274..c0299e28c958 100644
--- a/sw/source/filter/html/css1kywd.cxx
+++ b/sw/source/filter/html/css1kywd.cxx
@@ -197,6 +197,7 @@ const char* const sCSS1_P_height = "height";
const char* const sCSS1_P_float = "float";
const char* const sCSS1_P_column_count = "column-count";
+const char* const sCSS1_P_dir = "dir";
// Strings for positioning
diff --git a/sw/source/filter/html/css1kywd.hxx
b/sw/source/filter/html/css1kywd.hxx
index 7c0e326fd86a..c4609c5659b1 100644
--- a/sw/source/filter/html/css1kywd.hxx
+++ b/sw/source/filter/html/css1kywd.hxx
@@ -200,6 +200,7 @@ extern const char* const sCSS1_P_height;
extern const char* const sCSS1_P_float;
extern const char* const sCSS1_P_column_count;
+extern const char* const sCSS1_P_dir;
// Strings for positioning
diff --git a/sw/source/filter/html/wrthtml.cxx
b/sw/source/filter/html/wrthtml.cxx
index 995b1a291f3e..b8a48c2918f3 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -701,9 +701,12 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter&
rHTMLWrt,
sOut.append('\"');
}
-SvxFrameDirection nDir = rHTMLWrt.GetHTMLDirection(
[Libreoffice-commits] core.git: Branch 'private/mert/wip_deepl' - cui/inc cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk desktop/source include/sfx2 include/svtools include/svx include
Rebased ref, commits from common ancestor:
commit c7da5fa2929433652b5007eecc0655011f43a3e6
Author: Mert Tumer
AuthorDate: Tue Jul 5 12:03:27 2022 +0300
Commit: Mert Tumer
CommitDate: Fri Jul 22 15:50:26 2022 +0300
new uno command uno:Translate with deepl api
New Uno command added for translation
right now it is only using deepl translation api
There's a section in the options > language settings
for setting up the api url and auth key
uno:Translate is a menu button under Format tab
which will bring up Language Selection dialog for translation.
DeepL can accept html as the input for translation, this new
feature leverages that by exporting paragraphs/selections to
html and paste them back without losing the formatting (in theory)
This works good in general but we may lose formatting in very complex
styled sentences.
Translation works in two ways;
1) Whole document
when there is no selection, it assumes that we want to translate whole
document. Each paragraphs is sent one by one so that the output timeout
can be minimum for each paragraph.
2) Selection
Signed-off-by: Mert Tumer
Change-Id: Ia2d3ab2f6757faf565b939e1d670a7dedac33390
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index d455a64ab266..c4c0a52b2ef4 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -181,6 +181,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/options/optgenrl \
cui/source/options/opthtml \
cui/source/options/optlanguagetool \
+cui/source/options/optdeepl \
cui/source/options/optinet2 \
cui/source/options/optjava \
cui/source/options/optjsearch \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 806779daaa9d..0ed879e2b228 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -139,6 +139,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/opthtmlpage \
cui/uiconfig/ui/langtoolconfigpage \
+ cui/uiconfig/ui/deepltabpage \
cui/uiconfig/ui/optionsdialog \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index 952b79ea92d4..6d5bc4004a53 100644
--- a/cui/inc/treeopt.hrc
+++ b/cui/inc/treeopt.hrc
@@ -55,7 +55,8 @@ const std::pair
SID_LANGUAGE_OPTIONS_RES[] =
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Searching in Japanese"),
RID_SVXPAGE_JSEARCH_OPTIONS },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Asian Layout"),
RID_SVXPAGE_ASIAN_LAYOUT },
{ NC_("SID_LANGUAGE_OPTIONS_RES", "Complex Text Layout"),
RID_SVXPAGE_OPTIONS_CTL },
-{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS }
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "LanguageTool Server Settings"),
RID_SVXPAGE_LANGTOOL_OPTIONS },
+{ NC_("SID_LANGUAGE_OPTIONS_RES", "DeepL Server Settings"),
RID_SVXPAGE_DEEPL_OPTIONS }
};
const std::pair SID_INET_DLG_RES[] =
diff --git a/cui/source/options/optdeepl.cxx b/cui/source/options/optdeepl.cxx
new file mode 100644
index ..94b48ccc2f43
--- /dev/null
+++ b/cui/source/options/optdeepl.cxx
@@ -0,0 +1,55 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "optdeepl.hxx"
+#include
+
+OptDeeplTabPage::OptDeeplTabPage(weld::Container* pPage,
+ weld::DialogController*
pController,
+ const SfxItemSet& rSet)
+: SfxTabPage(pPage, pController, "cui/ui/deepltabpage.ui", "OptDeeplPage",
)
+, m_xAPIUrl(m_xBuilder->weld_entry("apiurl"))
+, m_xAuthKey(m_xBuilder->weld_entry("authkey"))
+{
+
+}
+
+OptDeeplTabPage::~OptDeeplTabPage() {}
+
+void OptDeeplTabPage::Reset(const SfxItemSet*)
+{
+SvxDeeplOptions& rDeeplOptions = SvxDeeplOptions::Get();
+m_xAPIUrl->set_text(rDeeplOptions.getAPIUrl());
+m_xAuthKey->set_text(rDeeplOptions.getAuthKey());
+}
+
+bool OptDeeplTabPage::FillItemSet(SfxItemSet*)
+{
+SvxDeeplOptions& rDeeplOptions =
[Libreoffice-bugs] [Bug 104271] New comment box should automatically re-position and re-size appropriately based on the shape of text pasted into it
https://bugs.documentfoundation.org/show_bug.cgi?id=104271 V Stuart Foote changed: What|Removed |Added URL|https://www.escortsindelhi. | |net/independent/| -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 150101] FILEOPEN: DOCX: misplaced bear image on page 1 top right
https://bugs.documentfoundation.org/show_bug.cgi?id=150101 --- Comment #3 from jindam, vani --- @Mike Kaganski installed ttf-mscorefonts-installer, thanks for heads up -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 138084] FILEOPEN DOCX Pasted TOC on reject is not entirely removed
https://bugs.documentfoundation.org/show_bug.cgi?id=138084 --- Comment #4 from Dieter --- Still same behaviour in Version: 7.5.0.0.alpha0+ (x64) / LibreOffice Community Build ID: ce29e6299932fc079b05b60662ba95c8342990bc CPU threads: 4; OS: Windows 10.0 Build 19044; UI render: Skia/Raster; VCL: win Locale: de-DE (de_DE); UI: en-GB Calc: CL But to me it looks, that there isn't any change recorded for title and TOc itself in LO. So perhaps it's not a problem of rejecting changes (if you acept all changes, font colour of title is still blue) -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source
sw/source/core/layout/layact.cxx | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 4d1135553d47d627cfc63761818e00d9042f9e18
Author: Luboš Luňák
AuthorDate: Thu Jul 21 13:31:17 2022 +0200
Commit: Miklos Vajna
CommitDate: Fri Jul 22 14:31:56 2022 +0200
Revert "avoid repeated writer layout calls with tiled rendering"
(tdf#145396)
This was incorrect, the proper fix was my previous Writer commit.
This reverts commit b9c2207e1b5247b4d3184b137be9a75a4b8c6c37.
Change-Id: I829da1633dd11cb0c6e944fbf5acef030fad7dc4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137294
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit 9dff8edf97f454f24a40acbed4a9297816f91da6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137318
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index b2b246e5eb2f..9375ca13cd51 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2275,16 +2275,7 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp
*pI ) :
{
--rSh.mnStartAction;
-// When using tiled rendering, idle painting is disabled and
paints are done
-// only later by tiled rendering. But paints call
SwViewShellImp::DeletePaintRegion()
-// to reset this HasPaintRegion(), and if it's done too late,
-// SwTiledRenderingTest::testTablePaintInvalidate() will end up in
an infinite
-// loop, because the idle layout will call this code repeatedly,
because there
-// will be no idle paints to reset HasPaintRegion().
-// This code dates back to the initial commit, and I find its
purpose unclear,
-// so I'm still leaving it here in case it turns out it serves a
purpose.
-static const bool blockOnRepaints = true;
-if (!blockOnRepaints && rSh.Imp()->HasPaintRegion())
+if ( rSh.Imp()->HasPaintRegion() )
bActions = true;
else
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source
sw/source/core/view/viewsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 50788a6e27e02fdb49f4e43a82b041e6a2a628db
Author: Luboš Luňák
AuthorDate: Thu Jul 21 13:27:45 2022 +0200
Commit: Miklos Vajna
CommitDate: Fri Jul 22 14:31:32 2022 +0200
Revert "do not draw directly in SwViewShell in LOK mode"
It is actually needed to process SwViewShellImp's paint region,
as otherwise testTablePaintInvalidate::TestBody from
CppunitTest_sw_tiledrendering will end up in an infinite loop
repeatedly calling SwLayIdle ctor. That's what I tried to handle
in b9c2207e1b5247b4d3184b137be9a75a4b8c6c37 and got it wrong.
This reverts commit 2aa2d03ec4e775d9399420c21cd1f2e972984154.
Change-Id: I25e897ea4e38db48cd969a3c21d677701f75a0aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137293
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit 94bde29634c095e40bfcf74d27821b48919595da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137317
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index b16b2d042727..7c4b55729ca7 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -478,7 +478,7 @@ void SwViewShell::ImplUnlockPaint( bool bVirDev )
CurrShell aCurr( this );
if ( GetWin() && GetWin()->IsVisible() )
{
-if ( (bInSizeNotify || bVirDev ) && VisArea().HasArea() &&
!comphelper::LibreOfficeKit::isActive())
+if ( (bInSizeNotify || bVirDev ) && VisArea().HasArea() )
{
//Refresh with virtual device to avoid flickering.
VclPtrInstance pVout( *mpOut );
[Libreoffice-bugs] [Bug 148537] Writer Email settings not saved (Mail merge Email)
https://bugs.documentfoundation.org/show_bug.cgi?id=148537 --- Comment #5 from Axel Braun --- Tested nightly build of 7.4.0.1, this is working -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/source
sw/source/core/txtnode/thints.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 5d68b3878fed165bf1bdc6aa47be1df4a8265b96
Author: Miklos Vajna
AuthorDate: Fri Jul 22 11:50:23 2022 +0200
Commit: Miklos Vajna
CommitDate: Fri Jul 22 14:15:21 2022 +0200
sw: fix heap-use-after-free in SwTextNode::InsertHint()
This is a problem since commit 1dce9ee7e12871ee63434499db805e806b9e9d3c
(sw content controls, plain text: apply formatting to the entire
contents, 2022-07-21), because I forgot to check if pAttr is still a
valid pointer after the input field code is executed.
Below code already uses this flag to make sure it's not accessing a
dangling pointer, apply the same fix here as well.
Change-Id: Ifcba0bc5e3a3c0abd81ff954fb10f6880163461b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137349
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index 3fade71120d2..e7fb33b8a1c8 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1684,6 +1684,7 @@ bool SwTextNode::InsertHint( SwTextAttr * const pAttr,
const SetAttrMode nMode )
}
}
+if (bInsertHint)
{
// Handle the invariant that a plain text content control has the same
character formatting
// for all of its content.
[Libreoffice-bugs] [Bug 102998] [META] Mail merge bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102998 Bug 102998 depends on bug 148480, which changed state. Bug 148480 Summary: LO freezes when sending Mail Merge Email https://bugs.documentfoundation.org/show_bug.cgi?id=148480 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148480] LO freezes when sending Mail Merge Email
https://bugs.documentfoundation.org/show_bug.cgi?id=148480 Axel Braun changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- Ever confirmed|0 |1 --- Comment #9 from Axel Braun --- I tried today with Version: 7.3.4.2 / LibreOffice Community Build ID: 30(Build:2) CPU threads: 12; OS: Linux 5.18; UI render: default; VCL: kf5 (cairo+xcb) Locale: de-DE (de_DE.UTF-8); UI: en-US Calc: threaded and have LO freezing again. Looks like the backport from 7.4 was not successful. Nightly build of 7.4.0.1 works fine! -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 102998] [META] Mail merge bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102998 Bug 102998 depends on bug 148537, which changed state. Bug 148537 Summary: Writer Email settings not saved (Mail merge Email) https://bugs.documentfoundation.org/show_bug.cgi?id=148537 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148537] Writer Email settings not saved (Mail merge Email)
https://bugs.documentfoundation.org/show_bug.cgi?id=148537 Axel Braun changed: What|Removed |Added Status|RESOLVED|REOPENED Ever confirmed|0 |1 Resolution|WORKSFORME |--- --- Comment #4 from Axel Braun --- Tested with Version: 7.3.4.2 / LibreOffice Community Build ID: 30(Build:2) CPU threads: 12; OS: Linux 5.18; UI render: default; VCL: kf5 (cairo+xcb) Locale: de-DE (de_DE.UTF-8); UI: de-DE Calc: CL (new profile) Problem is back -- You are receiving this mail because: You are the assignee for the bug.
