[Libreoffice-commits] core.git: sw/source
sw/source/ui/config/optpage.cxx |6 -- sw/source/uibase/inc/optpage.hxx |4 2 files changed, 10 deletions(-) New commits: commit 52a9e4f0361e63f744e14f47c7c09b9407320c72 Author: Noel Grandin AuthorDate: Fri Mar 25 14:17:22 2022 +0200 Commit: Noel Grandin CommitDate: Fri Mar 25 14:47:20 2022 +0100 loplugin:unusedfields Change-Id: Ic34f6ac671cd80375085a3c9f858854ff74e2db2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132116 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 374ba9c5bb2d..bfdbc877c869 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -507,9 +507,6 @@ SwStdFontTabPage::SwStdFontTabPage(weld::Container* pPage, weld::DialogControlle , m_bIdxDefault(false) , m_bSetIdxDefault(true) , m_bDisposePrinter(false) -, m_bListHeightDefault(false) -, m_bLabelHeightDefault(false) -, m_bIndexHeightDefault(false) , m_nFontGroup(FONT_GROUP_DEFAULT) , m_sScriptWestern(SwResId(ST_SCRIPT_WESTERN)) , m_sScriptAsian(SwResId(ST_SCRIPT_ASIAN)) @@ -847,7 +844,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) const SvxFontHeightItem& rFontHeightList = static_cast(pColl->GetFormatAttr(nFontHeightWhich)); nListHeight = static_cast(rFontHeightList.GetHeight()); -m_bListHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_LABEL); m_bLabelDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); @@ -856,7 +852,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) m_sShellLabel = sCapBackup = rFontCP.GetFamilyName(); const SvxFontHeightItem& rFontHeightLabel = static_cast(pColl->GetFormatAttr(nFontHeightWhich)); nLabelHeight = static_cast(rFontHeightLabel.GetHeight()); -m_bLabelHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); pColl = m_pWrtShell->GetTextCollFromPool(RES_POOLCOLL_REGISTER_BASE); m_bIdxDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); @@ -865,7 +860,6 @@ void SwStdFontTabPage::Reset( const SfxItemSet* rSet) m_sShellIndex = sIdxBackup = rFontIDX.GetFamilyName(); const SvxFontHeightItem& rFontHeightIndex = static_cast(pColl->GetFormatAttr(nFontHeightWhich)); nIndexHeight = static_cast(rFontHeightIndex.GetHeight()); -m_bIndexHeightDefault = SfxItemState::DEFAULT == pColl->GetAttrSet().GetItemState(nFontWhich, false); } m_xStandardBox->set_entry_text(sStdBackup ); m_xTitleBox->set_entry_text(sOutBackup ); diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 99e24ed7f487..7bb77695140f 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -143,10 +143,6 @@ class SwStdFontTabPage final : public SfxTabPage boolm_bSetIdxDefault :1; boolm_bDisposePrinter :1; -boolm_bListHeightDefault:1; -boolm_bLabelHeightDefault :1; -boolm_bIndexHeightDefault :1; - sal_uInt8 m_nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL] OUString m_sScriptWestern;
[Libreoffice-bugs] [Bug 69795] Macros: Copying a cell form one table to another looks different on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=69795 Andreas Heinisch changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |andreas.heini...@yahoo.de |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 144869] Feature Request for export format Similar to SVG
https://bugs.documentfoundation.org/show_bug.cgi?id=144869 --- Comment #2 from 1820204_1@ebbinghaus.world --- Hi Andy and Thank you for answering. I am sorry, I do not know what the different export methods are. I do not remember to have any basic macro installed. What I did was always under "File -> Export ... " (The one above "Export as" where you can create PDFs. What is tha macro-thing? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148184] New: FORMATTING create a means to represent an integer as an IP Address
https://bugs.documentfoundation.org/show_bug.cgi?id=148184 Bug ID: 148184 Summary: FORMATTING create a means to represent an integer as an IP Address Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: umine...@gmail.com An IP address, be it an IPv4 or IPv6 is an integer number, being a 32bit integer if IPv4 or a 128bit if IPv6. Since Calc is well suited to perform number operations, it would be nice to add a formatting option to represent an integer as an Human readable IP Address and to accept a valid IP address and stora in the cell as an integer, as it is done with the DATE and TIME formats. There is an excelent set of Libreoffice Basic functions from Thomas Rohmer-Kretz in http://trk.free.fr/ipcalc/ to perform this task among various other IP related functions, but it would be better to have a native conversion in place, since going the Basic functions way is slow and cumbersome. Alternatively, a means to create a personalized format representation with a module function would be also be a way to enhance the personalized format feature. -- You are receiving this mail because: You are the assignee for the bug.
Re: Improve WriteCustomGeometry in oox export; review of patch
Hi Regina, On Thu, Mar 24, 2022 at 07:33:24PM +0100, Regina Henschel wrote: > The commit message is quite detailed. If something is still unclear, please > send me a mail. Not only that, but the various test files you added in the tests also helped to understand the problem you solve. Thanks for that. > BTW, Jenkins fails for a reason I don't know. But I want to first > incorporate your suggestions before I start a next try with Jenkins. It was just a one-off failure, it went away after a "resume". Regards, Miklos
[Libreoffice-bugs] [Bug 138147] [EMF] Shapes/Annotations on DOCX files drawn with Microsoft Surface Pen are lighter due to missing SETPOLYFILLMODE implementation
https://bugs.documentfoundation.org/show_bug.cgi?id=138147 Bartosz changed: What|Removed |Added Attachment #167218|0 |1 is obsolete|| Attachment #167219|0 |1 is obsolete|| Attachment #167220|0 |1 is obsolete|| Attachment #167221|0 |1 is obsolete|| --- Comment #11 from Bartosz --- Created attachment 179102 --> https://bugs.documentfoundation.org/attachment.cgi?id=179102=edit Minimal EMF image where issue is visible (needs to be zoomed in) -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: include/oox oox/qa oox/source sd/qa sw/qa sw/source
include/oox/export/drawingml.hxx | 13 oox/qa/unit/data/tdf147978_endsubpath.odp|binary oox/qa/unit/data/tdf147978_enhancedPath_commandA.odp |binary oox/qa/unit/data/tdf147978_enhancedPath_commandHIJK.odp |binary oox/qa/unit/data/tdf147978_enhancedPath_commandT.odp |binary oox/qa/unit/data/tdf147978_enhancedPath_commandXY.odp|binary oox/qa/unit/data/tdf147978_enhancedPath_subpath.pptx |binary oox/qa/unit/export.cxx | 155 + oox/source/export/drawingml.cxx | 919 ++ oox/source/export/shapes.cxx | 31 sd/qa/unit/data/odp/tdf147978_enhancedPath_viewBox.odp |binary sd/qa/unit/data/xml/tdf92001_0.xml | 42 sd/qa/unit/export-tests-ooxml2.cxx | 32 sd/qa/unit/export-tests-ooxml3.cxx | 16 sw/qa/extras/ooxmlexport/data/tdf147978_enhancedPath_commandABVW.odt |binary sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 16 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx| 24 sw/source/filter/ww8/docxsdrexport.cxx | 20 18 files changed, 861 insertions(+), 407 deletions(-) New commits: commit 2029b2f6dd0109c5892e5ac5640022b31fe42fd2 Author: Regina Henschel AuthorDate: Fri Mar 18 18:31:05 2022 +0100 Commit: Miklos Vajna CommitDate: Fri Mar 25 14:00:23 2022 +0100 tdf#147978 export subpaths individually in custGeom ...and implement export of all missing commands, use existing viewBox if suitable, use one EnhancedCustomShape2d move WriteCustomGeometryPoint to protected, make GetCustomGeometryPointValue local The fix solves tdf#100390 too. Without the fix the entire enhanced-path was exported as one element . The command F was applied to the whole drawing but should affect only the subpath. The implementation is changed so that each subpath gets its own element and command F acts only on its subpath. Support for export of handles and equations is still a long way off. Thus there is no reason to tread shapes with and without handles different. Shapes with handles had used method WritePolyPolygon, but that is not able to handle subpaths. So have desided to use method WriteCustomGeometry for all cases. To get shapes exported regardless of path commands I have added the export for the missing commands. I have removed the no longer used method WritePolyPolygon. The special treatment of shapes "moon" and "mso-spt89" (right up arrow) in export is no longer needed. Related code parts are removed. The unit test testFlipAndRotateCustomShape is adapted. In case the method WriteCustomGeometry fails, the enhanced-path is invalid. In that case an minimal custGeom is written in case of docx. Shapes whose drawing does not touch all edges of the snap rectangle were exported with wrong position and size of the drawing inside the snap rectangle. That is fixed by using an existing ViewBox for the OOXML path size. The old way of creating a path size from point coordinates is only used if the shape has no suitable ViewBox. The point values in unit test SdOOXMLExportTest2::testTdf111798 are adapted to path size 21600 x 21600 and traverse direction of the points is corrected. The resulting shape outline is still the same as before. The expected xml is updated for file tdf92001.odp in SdImportTest::testDocumentLayout. The resulting shape outline is the same, because the shape touches the edges of the snap rectangle. The case, that the shape outline does not touch a edge of the snap rectangle is tested in SdOOXMLExportTest3::testEnhancedPathViewBox. Still missing is the case, that ViewBox has other left,top than 0,0. In that case all coordinates would have to be shifted because the path size in OOXML has only width and height but not left,top. That will not be included in this patch. Change-Id: Ib1736d6a08371f4d98411d2769275f0580cd0030 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131837 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index a128a812483c..b507a0e41b60 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -44,6 +44,7 @@ #include #include #include +#include class Graphic; class SdrObjCustomShape; @@ -199,7 +200,8 @@ protected: void WriteGlowEffect(const css::uno::Reference& rXPropSet); void WriteSoftEdgeEffect(const
[Libreoffice-bugs] [Bug 147668] Writer crashes shortly after loading document with LanguageTool extension active
https://bugs.documentfoundation.org/show_bug.cgi?id=147668 Stephan Bergmann changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |sberg...@redhat.com |desktop.org | Status|NEW |ASSIGNED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf147861_customField.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 19 +++ sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|2 - writerfilter/source/dmapper/DomainMapper_Impl.cxx| 25 ++- writerfilter/source/dmapper/DomainMapper_Impl.hxx|4 ++ 5 files changed, 48 insertions(+), 2 deletions(-) New commits: commit c4cb1d1dd581a5f120d9cf8b1d4274ec38f3eabe Author: Justin Luth AuthorDate: Sat Mar 12 11:11:01 2022 +0200 Commit: Miklos Vajna CommitDate: Fri Mar 25 13:48:12 2022 +0100 tdf#147861 writerfilter: use GetFieldResult, not current DocProperty Import DOCX and RTF DocProperty fields as "fixed" if the displayed text does not match the File - Properties - Custom variable's content. Otherwise LO will automatically update the field and show the wrong contents (because MS Word requires the user to manually refresh via F9). Change-Id: Id5d3d0794e81b13465c5e824f1e994f563e62c1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131415 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: Miklos Vajna diff --git a/sw/qa/extras/ooxmlexport/data/tdf147861_customField.docx b/sw/qa/extras/ooxmlexport/data/tdf147861_customField.docx new file mode 100644 index ..70071fa7e8a3 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf147861_customField.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index a33da51048b8..bbc5ec25da07 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -18,6 +18,7 @@ #include #include +#include constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/"; @@ -48,6 +49,24 @@ DECLARE_OOXMLEXPORT_TEST(testTdf135164_cancelledNumbering, "tdf135164_cancelledN CPPUNIT_ASSERT_EQUAL(OUString("i"), getProperty(xPara, "ListLabelString")); } +DECLARE_OOXMLEXPORT_TEST(testTdf147861_customField, "tdf147861_customField.docx") +{ +// These should each be specific values, not a shared DocProperty +getParagraph(1, "CustomEditedTitle"); // edited +// A couple of nulls at the end of the string thwarted all attemps at an "equals" comparison. +CPPUNIT_ASSERT(getParagraph(2)->getString().startsWith(" INSERT Custom Title here")); +getParagraph(3, "My Title"); // edited + +// Verify that these are fields, and not just plain text +uno::Reference xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); +auto xFieldsAccess(xTextFieldsSupplier->getTextFields()); +uno::Reference xFields(xFieldsAccess->createEnumeration()); +uno::Reference xField(xFields->nextElement(), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(OUString("CustomEditedTitle"), xField->getPresentation(false)); +// The " (fixed)" part is unnecessary, but it must be consistent across a round-trip +CPPUNIT_ASSERT_EQUAL(OUString("DocInformation:Title (fixed)"), xField->getPresentation(true)); +} + CPPUNIT_TEST_FIXTURE(Test, testTdf135906) { loadAndReload("tdf135906.docx"); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index 3d0b23f9e71e..415138bc5e28 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -129,7 +129,7 @@ DECLARE_OOXMLEXPORT_TEST(testN751117, "n751117.docx") DECLARE_OOXMLEXPORT_TEST(testFdo74745, "fdo74745.docx") { uno::Reference paragraph = getParagraph(3); -CPPUNIT_ASSERT_EQUAL(OUString("09/02/14"), paragraph->getString()); +CPPUNIT_ASSERT_EQUAL(OUString("09/02/2014"), paragraph->getString()); } DECLARE_OOXMLEXPORT_TEST(testFdo81486, "fdo81486.docx") diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index a4d59a8b7fdb..a3d6a4f69498 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -4792,6 +4792,11 @@ void FieldContext::SetTextField(uno::Reference const& xTextFie m_xTextField = xTextField; } +void FieldContext::CacheVariableValue(const uno::Any& rAny) +{ +rAny >>= m_sVariableValue; +} + void FieldContext::AppendCommand(std::u16string_view rPart) { m_sCommand += rPart; @@ -5425,6 +5430,9 @@ void DomainMapper_Impl::handleAuthor } } } +else + pContext->CacheVariableValue(xUserDefinedProps->getPropertyValue(rFirstParam)); + OUString sServiceName("com.sun.star.text.TextField."); bool bIsCustomField = false; if(sFieldServiceName.isEmpty()) @@ -7044,7 +7052,22 @@ void DomainMapper_Impl::SetFieldResult(OUString const& rResult) getPropertyName(bHasContent && sValue.isEmpty()? PROP_CONTENT : PROP_CURRENT_PRESENTATION), uno::makeAny( rResult ));
[Libreoffice-commits] help.git: source/text
source/text/swriter/01/0401.xhp |3 +++ 1 file changed, 3 insertions(+) New commits: commit f7fb73ebe42a4f7e5b00583aa38e7bcbd86911d7 Author: Miklos Vajna AuthorDate: Fri Mar 25 13:38:23 2022 +0100 Commit: Miklos Vajna CommitDate: Fri Mar 25 13:45:12 2022 +0100 sw clearing breaks: add help for this Explain what the 3 non-default options do. Change-Id: Ic94d09dd05dd6319f26120784e7bc6d1025f850c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/132118 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/source/text/swriter/01/0401.xhp b/source/text/swriter/01/0401.xhp index 3db8209a5..3c39f593f 100644 --- a/source/text/swriter/01/0401.xhp +++ b/source/text/swriter/01/0401.xhp @@ -44,6 +44,9 @@ Line Break Ends the current line, and moves the text found to the right of the cursor to the next line, without creating a new paragraph. +The restart location specifies if +the next line will start immediately after the previous line, at the first unblocked line on the +left, at the first unblocked line on the right or at the first full line. You can also insert a line break by pressing Shift+Enter.
[Libreoffice-bugs] [Bug 142021] [EMF] SetPolyfilMode Mode = 2 ("winding") is ignored
https://bugs.documentfoundation.org/show_bug.cgi?id=142021 Bartosz changed: What|Removed |Added Blocks||138147 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=138147 [Bug 138147] [EMF] Shapes/Annotations on DOCX files drawn with Microsoft Surface Pen are lighter due to missing SETPOLYFILLMODE implementation -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1fdd27398006baa03c2e45b4ca2412b74ef7ee62 Author: Miklos Vajna AuthorDate: Fri Mar 25 13:45:13 2022 +0100 Commit: Gerrit Code Review CommitDate: Fri Mar 25 13:45:13 2022 +0100 Update git submodules * Update helpcontent2 from branch 'master' to f7fb73ebe42a4f7e5b00583aa38e7bcbd86911d7 - tdf#145752 Correction to CompatibilityMode() help page Change-Id: Ie7ca911d8d445c57ad94458711164bdb18be1f13 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/129946 Tested-by: Jenkins Reviewed-by: Mike Kaganski Reviewed-by: Alain Romedenne - sw clearing breaks: add help for this Explain what the 3 non-default options do. Change-Id: Ic94d09dd05dd6319f26120784e7bc6d1025f850c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/132118 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/helpcontent2 b/helpcontent2 index 6565914b3808..f7fb73ebe42a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6565914b3808f621a36ebe1fb3872a7fd54e5c15 +Subproject commit f7fb73ebe42a4f7e5b00583aa38e7bcbd86911d7
[Libreoffice-bugs] [Bug 103859] [META] EMF/WMF (Enhanced/Windows Metafile) bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103859 Bartosz changed: What|Removed |Added Depends on||138147 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=138147 [Bug 138147] [EMF] Shapes/Annotations on DOCX files drawn with Microsoft Surface Pen are lighter due to missing SETPOLYFILLMODE implementation -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/inc sw/Library_sw.mk sw/qa sw/source
sw/Library_sw.mk |1 sw/inc/unocoll.hxx |1 sw/qa/core/unocore/unocore.cxx | 32 sw/source/core/bastyp/init.cxx |2 sw/source/core/inc/unolinebreak.hxx | 91 +++ sw/source/core/txtnode/attrlinebreak.cxx |1 sw/source/core/txtnode/thints.cxx|5 sw/source/core/unocore/unocoll.cxx |7 sw/source/core/unocore/unolinebreak.cxx | 236 +++ 9 files changed, 374 insertions(+), 2 deletions(-) New commits: commit 461de6f712ebdc5a5a3f0e0563c50d92614f0760 Author: Miklos Vajna AuthorDate: Tue Mar 1 16:44:03 2022 +0100 Commit: Miklos Vajna CommitDate: Fri Mar 25 13:41:59 2022 +0100 sw clearing breaks: add UNO API to insert this This only allows the clear=all break type, the others are not yet handled. (cherry picked from commit 5028e5670da25ec1e862789b744c32e6108b) Conflicts: sw/qa/core/unocore/unocore.cxx Change-Id: Id4981b3cc0a8faca2166ad93827ae547f5539095 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132106 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 0f594e203f59..ef3a27b74458 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -482,6 +482,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/unocore/unoframe \ sw/source/core/unocore/unoftn \ sw/source/core/unocore/unoidx \ +sw/source/core/unocore/unolinebreak \ sw/source/core/unocore/unomap \ sw/source/core/unocore/unomap1 \ sw/source/core/unocore/unoobj \ diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index ae16ab4ab7bc..821d50ab4a2c 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -176,6 +176,7 @@ enum class SwServiceType { VbaGlobals = 113, StyleTable = 114, StyleCell = 115, +LineBreak = 116, Invalid = USHRT_MAX }; diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx index a480a082f975..ddf8d4bb5362 100644 --- a/sw/qa/core/unocore/unocore.cxx +++ b/sw/qa/core/unocore/unocore.cxx @@ -23,6 +23,8 @@ #include #include #include +#include +#include using namespace ::com::sun::star; @@ -215,6 +217,36 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testBrokenEmbeddedObject) xEmbeddedObject->supportsService("com.sun.star.comp.embed.OCommonEmbeddedObject")); } +CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testLineBreakInsert) +{ +// Given an empty document: +SwDoc* pDoc = createSwDoc(); + +// When inserting a line-break with properties: +uno::Reference xMSF(mxComponent, uno::UNO_QUERY); +uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); +uno::Reference xLineBreak( +xMSF->createInstance("com.sun.star.text.LineBreak"), uno::UNO_QUERY); +uno::Reference xText = xTextDocument->getText(); +uno::Reference xCursor = xText->createTextCursor(); +xText->insertTextContent(xCursor, xLineBreak, /*bAbsorb=*/false); + +// Then make sure that both the line break and its matching text attribute is inserted: +SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); +SwNodeOffset nIndex = pWrtShell->GetCursor()->GetNode().GetIndex(); +SwTextNode* pTextNode = pDoc->GetNodes()[nIndex]->GetTextNode(); +// Without the accompanying fix in place, this test would have failed with: +// - Expected: "\n" (newline) +// - Actual : "" (empty string) +// i.e. SwXLineBreak::attach() did not insert the newline + its text attribute. +CPPUNIT_ASSERT_EQUAL(OUString("\n"), pTextNode->GetText()); +SwTextAttr* pAttr = pTextNode->GetTextAttrForCharAt(0, RES_TXTATR_LINEBREAK); +CPPUNIT_ASSERT(pAttr); +auto pTextLineBreak = static_cast(pAttr); +auto& rFormatLineBreak = static_cast(pTextLineBreak->GetAttr()); +CPPUNIT_ASSERT_EQUAL(SwLineBreakClear::ALL, rFormatLineBreak.GetValue()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index b6703dcd1d0d..87cb7dfa3127 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -319,7 +319,7 @@ SfxItemInfo aSlotTab[] = { 0, false }, // RES_TXTATR_FLYCNT { 0, false }, // RES_TXTATR_FTN { 0, false }, // RES_TXTATR_ANNOTATION -{ 0, true }, // RES_TXTATR_LINEBREAK +{ 0, false }, // RES_TXTATR_LINEBREAK { 0, true }, // RES_TXTATR_DUMMY1 { 0, true }, // RES_TXTATR_DUMMY2 diff --git a/sw/source/core/inc/unolinebreak.hxx
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/inc sw/Library_sw.mk sw/source
sw/Library_sw.mk |1 sw/inc/formatlinebreak.hxx | 96 + sw/inc/hintids.hxx |3 sw/inc/textlinebreak.hxx | 45 +++ sw/inc/txatbase.hxx |8 ++ sw/source/core/bastyp/init.cxx |5 - sw/source/core/doc/dbgoutsw.cxx |2 sw/source/core/txtnode/attrlinebreak.cxx | 118 +++ sw/source/core/txtnode/thints.cxx|4 + sw/source/core/txtnode/txatbase.cxx |4 + sw/source/filter/html/css1atr.cxx|2 sw/source/filter/html/htmlatr.cxx|2 12 files changed, 284 insertions(+), 6 deletions(-) New commits: commit 864e9258ce61842091d7b37ee0a7b1d54b906289 Author: Miklos Vajna AuthorDate: Mon Feb 28 10:59:49 2022 +0100 Commit: Miklos Vajna CommitDate: Fri Mar 25 13:41:45 2022 +0100 sw clearing breaks: add document model This is meant to represent clearing breaks, as in HTML's and DOCX's . The new pool item is in the RES_TXTATR_NOEND section as this property can be only specified on a single document model position: linebreak characters. (cherry picked from commit 24732bb12bfe0124d49733701226a34044c001a8) Change-Id: I6c86097a049e489e1292f42fc8446eb7282c816a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132105 Tested-by: Jenkins CollaboraOffice Reviewed-by: Miklos Vajna diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 70385f964c9b..0f594e203f59 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -425,6 +425,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/core/txtnode/atrftn \ sw/source/core/txtnode/atrref \ sw/source/core/txtnode/atrtox \ +sw/source/core/txtnode/attrlinebreak \ sw/source/core/txtnode/chrfmt \ sw/source/core/txtnode/fmtatr2 \ sw/source/core/txtnode/fntcache \ diff --git a/sw/inc/formatlinebreak.hxx b/sw/inc/formatlinebreak.hxx new file mode 100644 index ..9e26ab11351f --- /dev/null +++ b/sw/inc/formatlinebreak.hxx @@ -0,0 +1,96 @@ +/* -*- 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 . + */ +#ifndef INCLUDED_SW_INC_FORMATLINEBREAK_HXX +#define INCLUDED_SW_INC_FORMATLINEBREAK_HXX + +#include "swdllapi.h" +#include +#include "calbck.hxx" + +#include +#include +#include + +class SwDoc; +class SwTextLineBreak; + +/// Defines the location of a line break text wrapping restart. +enum class SwLineBreakClear +{ +NONE, +LEFT, +RIGHT, +ALL, +LAST = ALL +}; + +/// SfxPoolItem subclass that wraps an SwLineBreakClear. +class SW_DLLPUBLIC SwFormatLineBreak final : public SfxEnumItem, + public sw::BroadcastingModify +{ +/// The SwTextAttr that knows the position of the line break in the doc model. +SwTextLineBreak* m_pTextAttr; + +css::uno::WeakReference m_wXLineBreak; + +SwFormatLineBreak& operator=(const SwFormatLineBreak& rLineBreak) = delete; + +SwFormatLineBreak(const SwFormatLineBreak&) = delete; + +public: +SwFormatLineBreak(SwLineBreakClear eClear); +virtual ~SwFormatLineBreak() override; + +/// See SfxPoolItem::operator ==(). +bool operator==(const SfxPoolItem&) const override; + +/// See SfxPoolItem::Clone(). +SwFormatLineBreak* Clone(SfxItemPool* pPool = nullptr) const override; + +/// See SwModify::SwClientNotify(). +void SwClientNotify(const SwModify&, const SfxHint&) override; + +sal_uInt16 GetValueCount() const override; + +void InvalidateLineBreak(); + +css::uno::Reference getAnchor(SwDoc& rDoc) const; + +void SetTextLineBreak(SwTextLineBreak* pTextAttr) { m_pTextAttr = pTextAttr; } + +const SwTextLineBreak* GetTextLineBreak() const { return m_pTextAttr; } + +SwTextLineBreak* GetTextLineBreak() { return m_pTextAttr; } + +css::uno::WeakReference const& GetXTextContent() const +{ +return m_wXLineBreak; +} + +void SetXLineBreak(css::uno::Reference const& xLineBreak) +{ +m_wXLineBreak = xLineBreak; +
[Libreoffice-commits] core.git: connectivity/source dbaccess/qa
connectivity/source/drivers/firebird/ResultSetMetaData.cxx | 12 - dbaccess/qa/unit/data/tdf132924.odb|binary dbaccess/qa/unit/firebird.cxx | 28 + 3 files changed, 37 insertions(+), 3 deletions(-) New commits: commit 4590048952a9e62124641c512dc2d19122f7fb2d Author: Andreas Heinisch AuthorDate: Wed Mar 23 21:14:46 2022 +0100 Commit: Andreas Heinisch CommitDate: Fri Mar 25 13:37:57 2022 +0100 tdf#132924 - Firebird findColumn: return column alias if specified The function findColumn in a Basic macro should also find aliases for columns specified in an SQL query using a Firebird database. Change-Id: I96adb2564da1e18cee58f1c6803526d8ff4deabb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131990 Tested-by: Jenkins Reviewed-by: Andreas Heinisch diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 78d684a725a2..5653d29c4211 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -128,9 +128,15 @@ OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32) OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) { verifyValidColumn(column); -OUString sRet(m_pSqlda->sqlvar[column-1].sqlname, -m_pSqlda->sqlvar[column-1].sqlname_length, -RTL_TEXTENCODING_UTF8); +char* pColumnName = m_pSqlda->sqlvar[column - 1].sqlname; +sal_Int32 nColumnNameLength = m_pSqlda->sqlvar[column - 1].sqlname_length; +// tdf#132924 - return column alias if specified +if (m_pSqlda->sqlvar[column - 1].aliasname_length > 0) +{ +pColumnName = m_pSqlda->sqlvar[column - 1].aliasname; +nColumnNameLength = m_pSqlda->sqlvar[column - 1].aliasname_length; +} +OUString sRet(pColumnName, nColumnNameLength, RTL_TEXTENCODING_UTF8); sanitizeIdentifier(sRet); return sRet; } diff --git a/dbaccess/qa/unit/data/tdf132924.odb b/dbaccess/qa/unit/data/tdf132924.odb new file mode 100644 index ..8cee7bcbabfd Binary files /dev/null and b/dbaccess/qa/unit/data/tdf132924.odb differ diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx index e67a4d10c097..7a8143810097 100644 --- a/dbaccess/qa/unit/firebird.cxx +++ b/dbaccess/qa/unit/firebird.cxx @@ -27,10 +27,12 @@ class FirebirdTest public: void testEmptyDBConnection(); void testIntegerDatabase(); +void testTdf132924(); CPPUNIT_TEST_SUITE(FirebirdTest); CPPUNIT_TEST(testEmptyDBConnection); CPPUNIT_TEST(testIntegerDatabase); +CPPUNIT_TEST(testTdf132924); CPPUNIT_TEST_SUITE_END(); }; @@ -90,6 +92,32 @@ void FirebirdTest::testIntegerDatabase() closeDocument(uno::Reference(xDocument, uno::UNO_QUERY)); } +void FirebirdTest::testTdf132924() +{ +uno::Reference xDocument = getDocumentForFileName(u"tdf132924.odb"); +uno::Reference xConnection = getConnectionForDocument(xDocument); + +uno::Reference xStatement = xConnection->createStatement(); +CPPUNIT_ASSERT(xStatement.is()); + +uno::Reference xResultSet = xStatement->executeQuery("SELECT * FROM AliasTest"); +CPPUNIT_ASSERT(xResultSet.is()); +CPPUNIT_ASSERT(xResultSet->next()); + +uno::Reference xRow(xResultSet, UNO_QUERY); +CPPUNIT_ASSERT(xRow.is()); +uno::Reference xColumnLocate(xRow, UNO_QUERY); +CPPUNIT_ASSERT(xColumnLocate.is()); + +// Without the fix in place, this test would have failed with: +// - Expected: 1 +// - Actual : The column name 'TestId' is not valid +CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xRow->getShort(xColumnLocate->findColumn("TestId"))); +CPPUNIT_ASSERT_EQUAL(OUString("TestName"), xRow->getString(xColumnLocate->findColumn("TestName"))); + +closeDocument(uno::Reference(xDocument, uno::UNO_QUERY)); +} + CPPUNIT_TEST_SUITE_REGISTRATION(FirebirdTest); CPPUNIT_PLUGIN_IMPLEMENT();
[Libreoffice-bugs] [Bug 138147] [EMF] Shapes/Annotations on DOCX files drawn with Microsoft Surface Pen are lighter due to missing SETPOLYFILLMODE implementation
https://bugs.documentfoundation.org/show_bug.cgi?id=138147 Bartosz changed: What|Removed |Added Depends on||142021, 84199 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=84199 [Bug 84199] [EMF] FILEOPEN Wrong Bezier curve display https://bugs.documentfoundation.org/show_bug.cgi?id=142021 [Bug 142021] [EMF] SetPolyfilMode Mode = 2 ("winding") is ignored -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 138147] [EMF] Shapes/Annotations on DOCX files drawn with Microsoft Surface Pen are lighter due to missing SETPOLYFILLMODE implementation
https://bugs.documentfoundation.org/show_bug.cgi?id=138147 Bartosz changed: What|Removed |Added Summary|Shapes/Annotations on DOCX |[EMF] Shapes/Annotations on |files drawn with Microsoft |DOCX files drawn with |Surface Pen are lighter in |Microsoft Surface Pen are |color when opening with |lighter due to missing |Libre |SETPOLYFILLMODE ||implementation -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 138147] [EMF] Shapes/Annotations on DOCX files drawn with Microsoft Surface Pen are lighter due to missing SETPOLYFILLMODE implementation
https://bugs.documentfoundation.org/show_bug.cgi?id=138147 Bartosz changed: What|Removed |Added Blocks||103859 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103859 [Bug 103859] [META] EMF/WMF (Enhanced/Windows Metafile) bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/gdimtf.cxx |4 1 file changed, 4 insertions(+) New commits: commit a07e91a5a76546863ccf71462446e8d16d07d21b Author: Caolán McNamara AuthorDate: Fri Mar 25 11:07:30 2022 + Commit: Caolán McNamara CommitDate: Fri Mar 25 13:18:33 2022 +0100 ofz#45963 Integer-overflow Change-Id: I4e402a4803013fe2aee0737e1e021e657554403a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132110 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 11950bbe44e7..3fa9ea3d24e3 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -462,6 +462,10 @@ void GDIMetaFile::Play(OutputDevice& rOut, const Point& rPos, if (aDestSize.Width() <= 0 || aDestSize.Height() <= 0) return; +if (aDestSize.Width() > std::numeric_limits::max() || +aDestSize.Height() > std::numeric_limits::max()) +return; + GDIMetaFile* pMtf = rOut.GetConnectMetaFile(); if (ImplPlayWithRenderer(rOut, rPos, rSize))
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - configure.ac
configure.ac |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit a137a43f18803406a2cdecd2b715ed8f459bb972 Author: Xisco Fauli AuthorDate: Fri Mar 25 11:29:19 2022 +0100 Commit: Xisco Fauli CommitDate: Fri Mar 25 13:05:08 2022 +0100 configure.ac: add missing MAC_OS_X_VERSION_MAX_ALLOWED for macOS SDK 12.3 Support for macOS SDK 12.3 was backported to libreoffice-7-3 in 1d875592eb4a2ca78b94c959f1acbc3552db608f "Accept macOS SDK 12.3" but MAC_OS_X_VERSION_MAX_ALLOWED was missing in the commit because it was removed in master after b0ab07ba89c88006932c68e0ca08dffcd0a4621e "Always set MAC_OS_X_VERSION_MAX_ALLOWED = MAC_OS_X_VERSION_MIN_REQUIRED" Change-Id: Ic7d8581bebad12bfe7f23b06c24d3b8ea2fdde43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132104 Reviewed-by: Stephan Bergmann Tested-by: Xisco Fauli diff --git a/configure.ac b/configure.ac index d5c7cb76c917..f04806fc935f 100644 --- a/configure.ac +++ b/configure.ac @@ -3455,8 +3455,11 @@ if test $_os = Darwin; then 12.1) MAC_OS_X_VERSION_MAX_ALLOWED="120100" ;; +12.3) +MAC_OS_X_VERSION_MAX_ALLOWED="120300" +;; *) -AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.12--12.1]) +AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.12--12.3]) ;; esac
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 8 commits - cui/source sc/source sw/qa sw/source vcl/source writerfilter/source
cui/source/dialogs/SpellDialog.cxx |2 sc/source/ui/docshell/impex.cxx| 73 +++-- sw/qa/extras/rtfexport/data/tdf104390.rtf |6 ++ sw/qa/extras/rtfexport/data/tdf118047.rtf | 14 sw/qa/extras/rtfexport/data/tdf131234.rtf | 12 sw/qa/extras/rtfexport/rtfexport5.cxx | 47 sw/qa/extras/uiwriter/uiwriter3.cxx| 45 +++ sw/source/core/frmedt/fetab.cxx| 22 +-- sw/source/core/txtnode/fntcache.cxx|4 + vcl/source/gdi/pdfwriter_impl.cxx |4 - writerfilter/source/rtftok/rtfdispatchflag.cxx |6 -- writerfilter/source/rtftok/rtfdocumentimpl.cxx | 47 +--- writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 - writerfilter/source/rtftok/rtfsprm.cxx | 12 14 files changed, 223 insertions(+), 74 deletions(-) New commits: commit 4d2d9cf9c3165e2460466cc75e5a8453346610c8 Author: Vasily Melenchuk AuthorDate: Mon Mar 21 17:12:12 2022 +0300 Commit: Andras Timar CommitDate: Fri Mar 25 12:59:34 2022 +0100 tdf#104390: rtf import: init default font for entire state stack If first document element is buried deep in destinations and thus deep in state stack (m_aStates) initialization of default font is very local and will be lost after closing these destinations. So let's initialize entire states stack with default font if none is provided istead of initialization just a top element. Change-Id: I966c282f43b84baece909a4c3cd359cbcd317e63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131906 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit 24b5490cb0fd8de19415509fbf452874669106ad) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131864 Reviewed-by: Xisco Fauli diff --git a/sw/qa/extras/rtfexport/data/tdf104390.rtf b/sw/qa/extras/rtfexport/data/tdf104390.rtf new file mode 100644 index ..842e73e19a85 --- /dev/null +++ b/sw/qa/extras/rtfexport/data/tdf104390.rtf @@ -0,0 +1,6 @@ +{\rtf1\deff0 +{\fonttbl +{\f0 Courier New;}} +\fs72 +Hello }}}{World!}} +} \ No newline at end of file diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx b/sw/qa/extras/rtfexport/rtfexport5.cxx index 36bf6c839b65..297635fce37e 100644 --- a/sw/qa/extras/rtfexport/rtfexport5.cxx +++ b/sw/qa/extras/rtfexport/rtfexport5.cxx @@ -1339,6 +1339,21 @@ DECLARE_RTFEXPORT_TEST(testTdf118047, "tdf118047.rtf") CPPUNIT_ASSERT_MESSAGE("Header is too large", 1000 > nHeight); } +DECLARE_RTFEXPORT_TEST(testTdf104390, "tdf104390.rtf") +{ +uno::Reference xPara = getParagraph(1); +uno::Reference xRunEnumAccess(xPara, uno::UNO_QUERY); +uno::Reference xRunEnum = xRunEnumAccess->createEnumeration(); + +// Check font in first run +uno::Reference xRun(xRunEnum->nextElement(), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(36.f, getProperty(xRun, "CharHeight")); +CPPUNIT_ASSERT_EQUAL(OUString("Courier New"), getProperty(xRun, "CharFontName")); + +// Ensure there is only one run +CPPUNIT_ASSERT_MESSAGE("Extra elements in paragraph", !xRunEnum->hasMoreElements()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 072430ebe15f..af4ba47158c3 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -397,16 +397,22 @@ void RTFDocumentImpl::checkFirstRun() assert(!m_bNeedSect || m_bFirstRunException); setNeedSect(true); // first call that succeeds -// set the requested default font, if there are none +// set the requested default font, if there are none for each state in stack RTFValue::Pointer_t pFont = getNestedAttribute(m_aDefaultState.getCharacterSprms(), NS_ooxml::LN_EG_RPrBase_rFonts, NS_ooxml::LN_CT_Fonts_ascii); -RTFValue::Pointer_t pCurrentFont -= getNestedAttribute(m_aStates.top().getCharacterSprms(), NS_ooxml::LN_EG_RPrBase_rFonts, - NS_ooxml::LN_CT_Fonts_ascii); -if (pFont && !pCurrentFont) -putNestedAttribute(m_aStates.top().getCharacterSprms(), NS_ooxml::LN_EG_RPrBase_rFonts, - NS_ooxml::LN_CT_Fonts_ascii, pFont); +if (!pFont) +return; + +for (size_t i = 0; i < m_aStates.size(); i++) +{ +RTFValue::Pointer_t pCurrentFont += getNestedAttribute(m_aStates[i].getCharacterSprms(), NS_ooxml::LN_EG_RPrBase_rFonts, + NS_ooxml::LN_CT_Fonts_ascii); +if (!pCurrentFont) +putNestedAttribute(m_aStates[i].getCharacterSprms(), NS_ooxml::LN_EG_RPrBase_rFonts, + NS_ooxml::LN_CT_Fonts_ascii, pFont); +} } void
[Libreoffice-bugs] [Bug 96389] Default tab size wrong on pptx import
https://bugs.documentfoundation.org/show_bug.cgi?id=96389 --- Comment #8 from Commit Notification --- Gülşah Köse committed a patch related to this issue. It has been pushed to "libreoffice-7-3": https://git.libreoffice.org/core/commit/0d65d4c6b7272f4ca8e413e025db234e5c8c7722 tdf#96389 Use default tab stop value of MSO for pptx import. It will be available in 7.3.3. 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 96389] Default tab size wrong on pptx import
https://bugs.documentfoundation.org/show_bug.cgi?id=96389 Commit Notification changed: What|Removed |Added Whiteboard|target:7.4.0|target:7.4.0 target:7.3.3 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sd/qa sd/source
sd/qa/unit/data/pptx/deftabstop.pptx |binary sd/qa/unit/import-tests2.cxx | 14 ++ sd/source/ui/docshell/docshel4.cxx | 12 3 files changed, 26 insertions(+) New commits: commit 0d65d4c6b7272f4ca8e413e025db234e5c8c7722 Author: Gülşah Köse AuthorDate: Thu Mar 24 11:19:03 2022 +0300 Commit: Gülşah Köse CommitDate: Fri Mar 25 12:57:46 2022 +0100 tdf#96389 Use default tab stop value of MSO for pptx import. Change-Id: Ib3dde68c672b44d8b60f121fb0e637942b5986b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131698 Tested-by: Jenkins Reviewed-by: Gülşah Köse Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132103 diff --git a/sd/qa/unit/data/pptx/deftabstop.pptx b/sd/qa/unit/data/pptx/deftabstop.pptx new file mode 100644 index ..5cfe71794446 Binary files /dev/null and b/sd/qa/unit/data/pptx/deftabstop.pptx differ diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx index b62573ec354b..3ecbec200c6e 100644 --- a/sd/qa/unit/import-tests2.cxx +++ b/sd/qa/unit/import-tests2.cxx @@ -172,6 +172,7 @@ public: void testTdf103347(); void testHyperlinksOnShapes(); void testTdf112209(); +void testDefaultTabStop(); CPPUNIT_TEST_SUITE(SdImportTest2); @@ -236,6 +237,7 @@ public: CPPUNIT_TEST(testTdf103347); CPPUNIT_TEST(testHyperlinksOnShapes); CPPUNIT_TEST(testTdf112209); +CPPUNIT_TEST(testDefaultTabStop); CPPUNIT_TEST_SUITE_END(); }; @@ -1934,6 +1936,18 @@ void SdImportTest2::testTdf112209() xDocShRef->DoClose(); } +void SdImportTest2::testDefaultTabStop() +{ +sd::DrawDocShellRef xDocShRef += loadURL(m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/deftabstop.pptx"), PPTX); +SdDrawDocument* pDoc = xDocShRef->GetDoc(); +sal_Int32 nDefTab = pDoc->GetDefaultTabulator(); + +CPPUNIT_ASSERT_EQUAL(sal_Int32(2540), nDefTab); + +xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 622d35c7f1eb..b57b06bce617 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -399,6 +399,18 @@ bool DrawDocShell::ImportFrom(SfxMedium , mpDoc->SetSummationOfParagraphs(); } +if (aFilterName == "Impress MS PowerPoint 2007 XML" || +aFilterName == "Impress MS PowerPoint 2007 XML AutoPlay" || +aFilterName == "Impress MS PowerPoint 2007 XML VBA" || +aFilterName == "Impress Office Open XML") +{ +// We need to be able to set the default tab size for each text object. +// This is possible at the moment only for the whole document. See +// TextParagraphPropertiesContext constructor. So default tab width +// of the LibreOffice is 1270 but MSO is 2540 on general settings. +mpDoc->SetDefaultTabulator( 2540 ); +} + const bool bRet = SfxObjectShell::ImportFrom(rMedium, xInsertPosition); SfxItemSet* pSet = rMedium.GetItemSet();
[Libreoffice-bugs] [Bug 148183] Dragging widgets in the Dialog Editor should preview the full widget size
https://bugs.documentfoundation.org/show_bug.cgi?id=148183 Rafael Lima changed: What|Removed |Added Blocks||97233 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=97233 [Bug 97233] [META] Dialog Designer bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 97233] [META] Dialog Designer bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=97233 Rafael Lima changed: What|Removed |Added Depends on||148183 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148183 [Bug 148183] Dragging widgets in the Dialog Editor should preview the full widget size -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148183] Dragging widgets in the Dialog Editor should preview the full widget size
https://bugs.documentfoundation.org/show_bug.cgi?id=148183 --- Comment #1 from Rafael Lima --- Minor typo in the original message: The preview should have the same size as the widget, so that when the user drags the widget to some other place, it will be possible to know exactly the AREA that it will occupy. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148183] New: Dragging widgets in the Dialog Editor should preview the full widget size
https://bugs.documentfoundation.org/show_bug.cgi?id=148183 Bug ID: 148183 Summary: Dragging widgets in the Dialog Editor should preview the full widget size Product: LibreOffice Version: 7.3.1.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: BASIC Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: rafael.palma.l...@gmail.com Created attachment 179101 --> https://bugs.documentfoundation.org/attachment.cgi?id=179101=edit Video showing the bug Suppose you add a widget to a Basic dialog using the Dialog Editor (in the Basic IDE). If you drag this widget to another place in the dialog, a preview of the widget is drawn, however with a much smaller size. See the attached video for a better explanation. The preview should have the same size as the widget, so that when the user drags the widget to some other place, it will be possible to know exactly the are that it will occupy. This issue has been a big problem for me while designing Basic dialogs. This bug seems to be around for a long time, at least since 6.4, but I cannot tell if it is inherited from OO. System info: Version: 7.3.1.3 / LibreOffice Community Build ID: 30(Build:3) CPU threads: 16; OS: Linux 5.13; UI render: default; VCL: kf5 (cairo+xcb) Locale: pt-BR (pt_BR.UTF-8); UI: en-US Ubuntu package version: 1:7.3.1~rc3-0ubuntu0.21.10.1~lo2 Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 120052] Pen annotations are not shown in documents created with Microsoft Word
https://bugs.documentfoundation.org/show_bug.cgi?id=120052 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=13 ||8147 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 138147] Shapes/Annotations on DOCX files drawn with Microsoft Surface Pen are lighter in color when opening with Libre
https://bugs.documentfoundation.org/show_bug.cgi?id=138147 Timur changed: What|Removed |Added CC||gan...@poczta.onet.pl See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=12 ||0052 Keywords|bibisectRequest | --- Comment #10 from Timur --- Annotations appear from LO 7.0 source sha:1c399bb1dc9af8d591258e936508200d38d3bb5a Bartosz, you fixed this, please see if you can why these are lighter than in MSO. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 97233] [META] Dialog Designer bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=97233 Rafael Lima changed: What|Removed |Added Depends on||147097 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=147097 [Bug 147097] Text boxes in Basic dialogs are being rendered without borders -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147097] Text boxes in Basic dialogs are being rendered without borders
https://bugs.documentfoundation.org/show_bug.cgi?id=147097 Rafael Lima changed: What|Removed |Added Blocks||97233 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=97233 [Bug 97233] [META] Dialog Designer bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: bridges/source
bridges/source/jni_uno/jni_info.cxx | 18 +- bridges/source/jni_uno/jni_info.h |4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) New commits: commit 370b5dbe0d5e62c71b90c795f936dd7c9c240f36 Author: Arnaud Versini AuthorDate: Fri Mar 25 10:29:37 2022 +0100 Commit: Noel Grandin CommitDate: Fri Mar 25 12:35:12 2022 +0100 bridges : use std::mutex in java brige Change-Id: I07b215067b1cefc87919680fad3299d702ff6d1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132100 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx index 70839e168eb2..16a5a1ac4d5c 100644 --- a/bridges/source/jni_uno/jni_info.cxx +++ b/bridges/source/jni_uno/jni_info.cxx @@ -369,18 +369,18 @@ JNI_type_info const * JNI_info::create_type_info( // look up JNI_type_info * info; -ClearableMutexGuard guard( m_mutex ); +std::unique_lock guard( m_mutex ); JNI_type_info_holder & holder = m_type_map[ uno_name ]; if (holder.m_info == nullptr) // new insertion { holder.m_info = new_info; -guard.clear(); +guard.unlock(); info = new_info; } else // inserted in the meantime { info = holder.m_info; -guard.clear(); +guard.unlock(); new_info->destroy( jni.get_jni_env() ); } return info; @@ -397,12 +397,12 @@ JNI_type_info const * JNI_info::get_type_info( OUString const & uno_name = OUString::unacquired( >pTypeName ); JNI_type_info const * info; -ClearableMutexGuard guard( m_mutex ); +std::unique_lock guard( m_mutex ); t_str2type::const_iterator iFind( m_type_map.find( uno_name ) ); if (iFind == m_type_map.end()) { -guard.clear(); +guard.unlock(); info = create_type_info( jni, td ); } else @@ -424,11 +424,11 @@ JNI_type_info const * JNI_info::get_type_info( OUString const & uno_name = OUString::unacquired( >pTypeName ); JNI_type_info const * info; -ClearableMutexGuard guard( m_mutex ); +std::unique_lock guard( m_mutex ); t_str2type::const_iterator iFind( m_type_map.find( uno_name ) ); if (iFind == m_type_map.end()) { -guard.clear(); +guard.unlock(); TypeDescr td( type ); info = create_type_info( jni, td.get() ); } @@ -450,11 +450,11 @@ JNI_type_info const * JNI_info::get_type_info( } JNI_type_info const * info; -ClearableMutexGuard guard( m_mutex ); +std::unique_lock guard( m_mutex ); t_str2type::const_iterator iFind( m_type_map.find( uno_name ) ); if (iFind == m_type_map.end()) { -guard.clear(); +guard.unlock(); css::uno::TypeDescription td( uno_name ); if (! td.is()) { diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index ede5f1718316..7a18e553e400 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -25,7 +25,7 @@ #include "jni_base.h" -#include +#include #include #include #include @@ -122,7 +122,7 @@ typedef std::unordered_map< class JNI_info { -mutable ::osl::Mutexm_mutex; +mutable std::mutex m_mutex; mutable t_str2type m_type_map; public:
[Libreoffice-bugs] [Bug 143193] Clean up Basic 'Format' implementation
https://bugs.documentfoundation.org/show_bug.cgi?id=143193 Paris Oplopoios changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |parisop...@gmail.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148182] New: Page number and page count mess up in exported SVG
https://bugs.documentfoundation.org/show_bug.cgi?id=148182 Bug ID: 148182 Summary: Page number and page count mess up in exported SVG Product: LibreOffice Version: 7.2.5.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: andygp...@gmail.com Description: The page number and page count fields really screw up export to SVG of a LibreOffice Draw page, especially the page count field. Steps to Reproduce: Create a new LibreOffice Draw document. Do not insert any elements or text fields. Instead, directly insert a page count field (menu: Insert > Field > Page Count). Click somewhere in the page to deselect the inserted item, and insert a page number field (menu: Insert > Page Number). Add a page (menu: Page > New Page). Insert a text box, and in the text box type: "Some words, page ", then insert the page number (menu: Insert > Page Number), then type " of total " and insert the page count (menu: Insert > Field > Page Count). Make sure the text box is wide enough that everything fits on one line. Add a third page. On this page, create two text boxes. In the first, type "Page " and then insert the page number field. In the second text box, type "Page count " and the insert the page count field. Export all three pages to SVG. Open them in a text editor to verify that they're saved as SVG 1.2 (search for '3 It gets worse. In LibreOffice, go to the master page (menu: View > Master Page) and insert a text box. In it, type "Page ", insert the page number field (it will show as ), then type " of " and insert the page count field (it will show as ). Close the master view. The text shows as it should, for example "Page 2 of 3" on the second page. Now export to SVG. Open the SVG with a text editor and search for class="BackgroundObjects". The exported text box looks like this (skipping TextParagraph and TextPosition): Page number of 3 Whereas the page count is exported correctly, the page number is exported as "number" Actual Results: The SVG contains numbers that are meaningless, or not representative of the element Expected Results: (1) The element that holds the page number field should always be exported with the attribute class="PageNumber". (2) In a text box that has a line with multiple fields, each field should be identified correctly, and they should not be overwritten with the page count. Certainly, parts of text should not be overwritten by the page count. (3) The page number field, in master view, should not be exported as number but as 0 Why it matters: Correct export will make a document look good in SVG editors, and will also make it possible to re-import in other drawing editors, such as Visio. (I'll make Visio import macros available for interested parties). Reproducible: Always User Profile Reset: No OpenGL enabled: Yes Additional Info: xxx -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148181] New: Libreoffice dosn't work with JAWS
https://bugs.documentfoundation.org/show_bug.cgi?id=148181 Bug ID: 148181 Summary: Libreoffice dosn't work with JAWS Product: LibreOffice Version: 7.3.0.3 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: bakfitt...@gmail.com Description: I have JAWS 2022 screenreader and Libreoffice 7.3.0 on my PC (under Windows 10 system). I can't use Libreoffice with JAWS, because Libreoffice crashes. What is the probleme? Steps to Reproduce: 1. Start JAWS 2. Start Libreoffice 3. Start Writer or Calc Actual Results: 1. Start JAWS 2. Start Libreoffice 3. Start Writer or Calc Expected Results: Libreoffice crashed. Reproducible: Always User Profile Reset: No Additional Info: Microsot Office 20XX -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148170] Calc: setting print range not remember
https://bugs.documentfoundation.org/show_bug.cgi?id=148170 --- Comment #1 from Timur --- I don't reproduce. Do you reproduce in any file or just some, which file type? Or you maybe have filtered rows there? -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148180] New: Overline text decoration misses in exported SVG
https://bugs.documentfoundation.org/show_bug.cgi?id=148180 Bug ID: 148180 Summary: Overline text decoration misses in exported SVG Product: LibreOffice Version: 7.2.5.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: andygp...@gmail.com Description: Although LibreOffice correctly exports two of the three text decorations (underline and strike-through), overlines are missing. There are two places (that I know of) where text decoration attributes may occur, dependent on whether a whole paragraph line is decorated, or just part of a paragraph line. Steps to Reproduce: On a blank LibreOffice Draw page, insert a text box. In the text box, enter the following sentences: First full line, underlined Second full line, struck through Third full line, overlined First partial line, underlined Second partial line, struck through Third partial line, overlined Fully underline, strike through, and overline the first through third sentences, respectively. In the second set, underline, strike through, and overline the respective "partial line" phrases. Manually export to SVG (File > Export… with Save as type: SVG) to get an SVG 1.2 file. Open the file in (for example) Inkscape to quickly see that underlining and strike-through are correct, but overlining is missing. Actual Results: Overlines are missing Expected Results: Open the SVG file in a text editor, and verify that you exported . Skip the embedded definitions and any Master_Slide, or search for the element . That element contains the following section, where details of x, y placement and font may be different: First full line, underlined Second full line, struck through Third full line, overlined First partial line , underlined Second partial line , struck through Third partial line , overlined The third TextParagraph tspan should read: The middle tspan in the TextPosition element in the sixth TextParagraph should read: partial line Why it matters: In circuit diagrams of digital systems, inverted signals are sometimes denoted by overlines. A missing overline makes a circuit or system diagram faulty and meaningless. Reproducible: Always User Profile Reset: No OpenGL enabled: Yes Additional Info: It seems that both the SVG standard and LibreOffice Draw internally handle overlines similar to underlining and strike-through. Both systems call them "text decorations". So it is remarkable that the overlines are missing from exported SVGs. Draw has quite a few options: single line, double line, bold, etc. But SVG has only one option, so it would be correct to channel any option of overlining into the same SVG result (same as is done for underlines and strikethrough). -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148166] Chart is empty when using data ranges from another document and the current document is empty
https://bugs.documentfoundation.org/show_bug.cgi?id=148166 Timur changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #3 from Timur --- I tried in Windows and chart was always empty, regardless if there was some data or if 2nd file was new or saved. I guess it's new. I enabled links after saving and message: "Automatic update of external links has been disabled". I noticed that help https://help.libreoffice.org/latest/he/text/schart/01/wiz_data_range.html doesn't contain instructions how to use range from other file. So people ask: https://ask.libreoffice.org/t/how-to-refer-range-of-cells-from-other-libreoffice-excelsheet/21066/8 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148179] New: Dashed boxes, lines and polygons appear solid in exported SVG
https://bugs.documentfoundation.org/show_bug.cgi?id=148179 Bug ID: 148179 Summary: Dashed boxes, lines and polygons appear solid in exported SVG Product: LibreOffice Version: 7.2.5.2 release Hardware: x86-64 (AMD64) OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: andygp...@gmail.com Description: Dashed boxes, lines, and polygons appear as solid if their line width is anything but 0.0pt. Steps to Reproduce: On a blank LibreOffice Draw page, draw two dashed boxes, two lines, and two polygons. Give one set a line width of 0.0 points and the other set any line width bigger than 0.0 points. Export the page to SVG. Open the SVG page in Inkscape, or even in a text editor, and see that the set with the non-zero line widths now has solid lines. Actual Results: Solid lines, etc. Expected Results: In the exported SVG v1.2 file, dashed lines etc. should be dashed regardless of their width. Why it matters: Currently, SVG files are not a true representation of the exported drawing. Reproducible: Always User Profile Reset: No OpenGL enabled: Yes Additional Info: Currently, if the line width is specified as 0.0pt, the dashed line, polygon, etc. is exported as a whole bunch of short lines (the dashes). If the line width is more, it is exported as a single line, polygon, curve, rectangle, etc. -- You are receiving this mail because: You are the assignee for the bug.
Re: 回复:回复:回复:回复:libreoffice-7.3.2 compile in arm system
On 25/03/2022 11.50, gcxyw1314 wrote: rebuilt it based on 7.06 Modifying find-requires-x11.sh can be installed successfully Thanks for testing, I've merged the change to master now: https://git.libreoffice.org/core/+/d6ea4b8ffce91d7956cea0267c95ca69e208db24%5E%21 ("Depend on 64-bit packages for aarch64 as well") Backport for 7.3 pending here: https://gerrit.libreoffice.org/c/core/+/132044 but building LibreOffice 7.3 和7.1 fails on aarch64 following: https://paste.debian.net/1235553/ To narrow that issue down, please answer the remaining questions in my email of 11:37 today. Also, did the patch you mention change anything (or was the error just the same before)?
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/unix/find-requires-x11.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d6ea4b8ffce91d7956cea0267c95ca69e208db24 Author: Michael Weghorn AuthorDate: Fri Mar 25 08:37:37 2022 +0100 Commit: Michael Weghorn CommitDate: Fri Mar 25 12:06:37 2022 +0100 Depend on 64-bit packages for aarch64 as well As Christian Lohmaier pointed out in [1]: > When building packages using the epm method, the dependency gets added > by instsetoo_native/inc_openoffice/unix/find-requires-x11.sh - and it > looks like it should also add the ()(64bit) marker to the dependency > when PLATFORMID is linux_aarch64 and not only for linux_x86_64 > > check with rpm -q --provides libXinerama-1.1.3-2.1.el7.aarch64 whether > it provides "libXinerama.so.1()(64bit)" The reply of 2022-03-25T10:41 (public mailing list version probably still pending in some moderator queue) shows it does: > [root@1 rpm2]# `rpm -q --provides > > ^CbXinerama-1.1.3-2.1.el7.aarch64 > [root@1 rpm2]# rpm -q --provides libXinerama-1.1.3-2.1.el7.aarch64 > libXinerama = 1.1.3-2.1.el7 > libXinerama(aarch-64) = 1.1.3-2.1.el7 > libXinerama.so.1()(64bit) [1] https://lists.freedesktop.org/archives/libreoffice/2022-March/088637.html Change-Id: I1b9a4025399d82ac5f5e51ea5523417e3e6cf395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132094 Tested-by: Michael Weghorn Reviewed-by: Michael Weghorn diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh index 6808b3631d73..9fec571f5f99 100644 --- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh +++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh @@ -18,7 +18,7 @@ # cat > /dev/null -[[ "${PLATFORMID}" == "linux_x86_64" ]] && mark64="()(64bit)" +[[ "${PLATFORMID}" == "linux_x86_64" || "${PLATFORMID}" == "linux_aarch64" ]] && mark64="()(64bit)" if [[ "${OS}" == "AIX" ]]; then echo "libfreetype.a(libfreetype.so.6${mark64})" else
[Libreoffice-bugs] [Bug 148178] New: SVG Export from macro in old version of SVG
https://bugs.documentfoundation.org/show_bug.cgi?id=148178 Bug ID: 148178 Summary: SVG Export from macro in old version of SVG Product: LibreOffice Version: 7.2.5.2 release Hardware: x86-64 (AMD64) OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: andygp...@gmail.com Description: SVG export in LibreOffice Draw uses an older module for export from a macro than for manual export (SVG 1.1 versus 1.2). The older module does not adequately describe shapes made in Draw and exports only the formal draw area rather than the whole page. This behavior is seen both in Windows (11) and Linux (openSUSE) versions. Why it matters: Although LibreOffice has an import filter for Visio files, there is no export filter. Transfer to Visio currently relies on SVG 1v.2 files. But manual export of many pages takes much time. A LibreOffice macro can speed it up significantly. For those who are interested in importing SVG in Visio, I can make SVG import macros available. Steps to Reproduce: (A) Start from a LibreOffice Draw page with various drawing objects. Manually export the file to an SVG from the menu: File > Export… In the Export dialog, select SVG and enter a first file name. Press Save. Open the first saved file in a text editor. Its first three elements will be something like: http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> http://www.w3.org/2000/svg; xmlns:ooo="http://xml.openoffice.org/svg/export; xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:presentation="http://sun.com/xmlns/staroffice/presentation; xmlns:smil="http://www.w3.org/2001/SMIL20/; xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xml:space="preserve"> The elements has attribute version="1.2" (B) Save the same page from a macro. Open this second saved file in a text editor. Its first three elements will be something like: http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;> http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink; stroke-width="28.222" stroke-linejoin="round" xml:space="preserve"> The macro I used for export: Sub ExportSVGPage dim oDoc, oPage, oFilter, i as integer dim args(1) as new com.sun.star.beans.PropertyValue dim msg as string, filename as string, path as string, c as string oDoc = ThisComponent path = oDoc.location path = replace(path, "%20", " ") path = replace(path, "\", "/") for i = len(path) to 1 step -1 c = mid(path, i, 1) if c = "/" then path = left(path, i) exit for end if next i filename = inputbox("Please enter the filename:", "SVG Automated Export", path & "LO examples B.svg") if filename = "" then exit sub filename = replace(filename, "\", "/") oPage = oDoc.getcurrentcontroller.getcurrentpage oFilter=CreateUnoService("com.sun.star.drawing.GraphicExportFilter") oFilter.setSourceDocument(opage) args(0).Name = "URL" args(0).Value = filename args(1).Name = "MediaType" args(1).Value = "image/svg+xml" oFilter.filter(args()) msg = "Exported " & filename msgbox msg End Sub Actual Results: SVG 1.2 when manually exported, SVG1.1 when exported by a macro Expected Results: Required behavior: Because the way that SVG export in LibreOffice has evolved between versions 1.1 and 1.2, it should always be in SVG version 1.2. Thus, the Uno service com.sun.star.drawing.GraphicExportFilter should use the current module, not the older one. Why it matters: Although LibreOffice has an import filter for Visio files, there is no export filter. Transfer to Visio currently relies on SVG 1v.2 files. But manual export of many pages takes much time. A LibreOffice macro can speed it up significantly. For those who are interested in importing SVG in Visio, I can make SVG import macros available. Reproducible: Always User Profile Reset: No OpenGL enabled: Yes Additional Info: If having both SVG1.1 and SVG1.2 export is seen as a feature rather than a bug, a user should be able to choose, both for manual export and for macro export. But I suggest focusing on SVG1.2 only and removing the older export filter. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 133092] [META] Crash bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=133092 Bug 133092 depends on bug 126961, which changed state. Bug 126961 Summary: Cannot link to macOS address book - crashes and restarts https://bugs.documentfoundation.org/show_bug.cgi?id=126961 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 114293] [META] Address Book Data Source bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=114293 Bug 114293 depends on bug 126961, which changed state. Bug 126961 Summary: Cannot link to macOS address book - crashes and restarts https://bugs.documentfoundation.org/show_bug.cgi?id=126961 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 111634] Multiple memory leaks in libmacabdrv1
https://bugs.documentfoundation.org/show_bug.cgi?id=111634 Bug 111634 depends on bug 126961, which changed state. Bug 126961 Summary: Cannot link to macOS address book - crashes and restarts https://bugs.documentfoundation.org/show_bug.cgi?id=126961 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 64641] EDITING: Filtering in Mac-Addressbook is not possible
https://bugs.documentfoundation.org/show_bug.cgi?id=64641 Bug 64641 depends on bug 126961, which changed state. Bug 126961 Summary: Cannot link to macOS address book - crashes and restarts https://bugs.documentfoundation.org/show_bug.cgi?id=126961 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 50626] EDITING: Query on Mac OS X Addressbook doesn't display data for fields other than CHAR datatype
https://bugs.documentfoundation.org/show_bug.cgi?id=50626 Bug 50626 depends on bug 126961, which changed state. Bug 126961 Summary: Cannot link to macOS address book - crashes and restarts https://bugs.documentfoundation.org/show_bug.cgi?id=126961 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 126961] Cannot link to macOS address book - crashes and restarts
https://bugs.documentfoundation.org/show_bug.cgi?id=126961 Alex Thurgood changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEW |RESOLVED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 126961] Cannot link to macOS address book - crashes and restarts
https://bugs.documentfoundation.org/show_bug.cgi?id=126961 --- Comment #60 from Alex Thurgood --- Also works on Version: 7.3.1.3 / LibreOffice Community - Arm build for M1 processor Build ID: a69ca51ded25f3eefd52d7bf9a5fad8c90b87951 CPU threads: 8; OS: Mac OS X 12.2.1; UI render: default; VCL: osx Locale: fr-FR (fr_FR.UTF-8); UI: fr-FR Calc: threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 126961] Cannot link to macOS address book - crashes and restarts
https://bugs.documentfoundation.org/show_bug.cgi?id=126961 --- Comment #59 from Alex Thurgood --- Bug seems to be worksforme in Version: 7.2.6.2 / LibreOffice Community - Intel version on Arm M1 processor Build ID: b0ec3a565991f7569a5a7f5d24fed7f52653d754 CPU threads: 8; OS: Mac OS X 10.16; UI render: default; VCL: osx Locale: fr-FR (fr_FR.UTF-8); UI: fr-FR Calc: threaded I can create an ODB file that connects to the Mac addressbook, and will display the basic addressbook table in the list of tables. I can open that table view and see the entries (read only as ever, but still an improvement on the previous crashing). -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148177] New: Border Shadow Style; add a "Blur" property (like LO Draw)
https://bugs.documentfoundation.org/show_bug.cgi?id=148177 Bug ID: 148177 Summary: Border Shadow Style; add a "Blur" property (like LO Draw) Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: greenandpleasant2000-supp...@yahoo.co.uk Version: 7.1.5.2 / LibreOffice Community Build ID: 85f04e9f809797b8199d13c421bd8a2b025d52b5 CPU threads: 2; OS: Linux 5.4; UI render: default; VCL: gtk3 Locale: en-GB (en_GB.UTF-8); UI: en-GB Calc: threaded In LO Draw it is possible to add "Blur" to a shadow. However, this is currently not supported in LO Writer (see Paragraph / Character Style > Borders > Shadow Style). My guess it would add more realism to text and table shadows. SUGGESTION: Add a Blur property to Borders Shadow Style. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/chart/tdf122011.py | 50 1 file changed, 50 insertions(+) New commits: commit bcdb92870bdfe6f44b0d571ded756ba59fe09b87 Author: Xisco Fauli AuthorDate: Fri Mar 25 10:27:31 2022 +0100 Commit: Xisco Fauli CommitDate: Fri Mar 25 11:45:26 2022 +0100 tdf#122011: sc: Add UItest Change-Id: I67938dc8863e5c36bfe9e4a78059d6c467981945 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132099 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/qa/uitest/chart/tdf122011.py b/sc/qa/uitest/chart/tdf122011.py new file mode 100644 index ..af1e09940812 --- /dev/null +++ b/sc/qa/uitest/chart/tdf122011.py @@ -0,0 +1,50 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/. +# +from uitest.framework import UITestCase +from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file +from libreoffice.uno.propertyvalue import mkPropertyValues +from uitest.uihelper.calc import enter_text_to_cell + +class tdf122011(UITestCase): + +def test_tdf122011(self): + +with self.ui_test.create_doc_in_start_center("calc") as document: +xCalcDoc = self.xUITest.getTopFocusWindow() +gridwin = xCalcDoc.getChild("grid_window") + +# FIXME: tdf#148166 +enter_text_to_cell(gridwin, "A2", "4") + +# use an existing document +xReference = "'" + get_url_for_data_file("tdf119954.ods") + "'#$Sheet1.$A$1" + +with self.ui_test.execute_dialog_through_command(".uno:InsertObjectChart", close_button="finish") as xChartDlg: +xNextBtn = xChartDlg.getChild("next") +xNextBtn.executeAction("CLICK", tuple()) + +xRange = xChartDlg.getChild("ED_RANGE") +xRange.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"})) +xRange.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"})) +xRange.executeAction("TYPE", mkPropertyValues({"TEXT": xReference})) + +# Without the fix in place, this test would have gotten stack here because the dialog is not closed +# as the reference to an external file is incorrect + +xChart = document.Sheets[0].Charts[0] +xDataSeries = xChart.getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries + +self.assertEqual(1, len(xDataSeries)) + +xDS = xDataSeries[0].DataSequences + +self.assertEqual(1, len(xDS)) +self.assertEqual(xReference, xDS[0].Values.SourceRangeRepresentation) + +# vim: set shiftwidth=4 softtabstop=4 expandtab:
Re: 回复:回复:回复:libreoffice-7.3.2 compile in arm system
On 25/03/2022 11.20, gcxyw1314 wrote: I have rebuilt it based on 7.06 and it can be installed normally. e rebuilt it based on 7.06 and it can be installed normally. Is that with the change mentioned earlier applied, i.e. an answer to one question in the email I sent just now: On 25/03/2022 11.37, Michael Weghorn wrote: Thanks, that shows that the package actually provides "libXinerama.so.1()(64bit)" on aarch64 and change https://gerrit.libreoffice.org/c/core/+/132094 is needed. This should solve issue 2). Can you confirm that the installation works if you apply the above change before doing your 7.0 build?
Re: 回复:回复:回复:libreoffice-7.3.2 compile in arm system
Do I correctly understand the discussion so far that there are 2 different issues that you are encountering on aarch64? (This thread jumps back and forth between the two a bit): 1) building LibreOffice 7.3 fails on aarch64 2) building LibreOffice 7.0 works, but installation of RPM packages fails On 25/03/2022 10.41, gcxyw1314 wrote: [root@1 rpm2]# `rpm -q --provides ^CbXinerama-1.1.3-2.1.el7.aarch64 [root@1 rpm2]# rpm -q --provides libXinerama-1.1.3-2.1.el7.aarch64 libXinerama = 1.1.3-2.1.el7 libXinerama(aarch-64) = 1.1.3-2.1.el7 libXinerama.so.1()(64bit) Thanks, that shows that the package actually provides "libXinerama.so.1()(64bit)" on aarch64 and change https://gerrit.libreoffice.org/c/core/+/132094 is needed. This should solve issue 2). Can you confirm that the installation works if you apply the above change before doing your 7.0 build? When I built versions 7.3 and 7.1, I kept reporting /home/logsaas/libreoffice-7-1/workdir/CxxObject/xmloff/source/core/xmlimp. o: In function `SvXMLImport::SetAutoStyles(SvXMLStylesContext*)': xmlimp. cxx:(.text+0x8b90): undefined reference to `non-virtual thunk to cppu::WeakImplHelper::acquire()' Now we're at issue 1). Some questions to try to narrow the issue down: Can you please try whether the same happens with the current git master branch instead of 7.3 (run "make distclean" first after switching branches), and if so, submit a more detailed error output to paste.debian.net, with the expiration date set to "never"? What does your autogen.input look like? Or if you're not using that, what options are you passing to `./autogen.sh`? This is on CentOS 7.7, aarch64 architecture, right? Can you share the file `config.log` from your build directory? But I am https://bug-attachments.documentfoundation.org/attachment.cgi?id=172646 No modification method was found above, so I compiled on 7.06 and didn't encounter this error, Where does that patch come from? Is there a related Bugzilla issue it is attached to?
[Libreoffice-bugs] [Bug 105537] [META] Assertion failed crashes
https://bugs.documentfoundation.org/show_bug.cgi?id=105537 Bug 105537 depends on bug 148157, which changed state. Bug 148157 Summary: Assertion after having chosen "Between tick marks", click outside the chart https://bugs.documentfoundation.org/show_bug.cgi?id=148157 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 62366] SLIDESHOW: Pen on the presenter console
https://bugs.documentfoundation.org/show_bug.cgi?id=62366 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=96 ||886 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/StatusBarCommandDispatch.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 70cda6eff03ea186bff65318ed8d4cbeff7cbc48 Author: Julien Nabet AuthorDate: Thu Mar 24 09:19:37 2022 +0100 Commit: Julien Nabet CommitDate: Fri Mar 25 11:33:54 2022 +0100 tdf#148157: assertion after set "Between tick marks", click outside the chart See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=179065 Change-Id: Id21f52d5cc33bbe99c27b7a8bdff056249c4d4fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132027 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 1b867cb562f8..26fcc45b4a30 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -66,7 +66,7 @@ void StatusBarCommandDispatch::fireStatusEvent( bool bFireContext( bFireAll || rURL == ".uno:Context" ); bool bFireModified( bFireAll || rURL == ".uno:ModifiedStatus" ); -if( bFireContext ) +if( bFireContext && m_xChartModel.is()) { uno::Any aArg; aArg <<= ObjectNameProvider::getSelectedObjectText( m_aSelectedOID.getObjectCID(), m_xChartModel );
[Libreoffice-bugs] [Bug 96886] Support Laser Pen
https://bugs.documentfoundation.org/show_bug.cgi?id=96886 Timur changed: What|Removed |Added URL||https://oneminuteofficemagi ||c.com/2017/02/14/using-the- ||electronic-laser-pointer-in ||-powerpoint/ CC||gti...@gmail.com See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=62 ||366 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148170] Calc: setting print range not remember
https://bugs.documentfoundation.org/show_bug.cgi?id=148170 Julien Nabet changed: What|Removed |Added Summary|Calc: setting print rage|Calc: setting print range |not remember|not remember -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sw/source
sw/source/core/attr/format.cxx|4 ++-- sw/source/core/crsr/crstrvl.cxx |4 ++-- sw/source/core/doc/docfmt.cxx |2 +- sw/source/core/text/atrstck.cxx |8 sw/source/core/tox/ToxTabStopTokenHandler.cxx |2 +- sw/source/core/txtnode/ndtxt.cxx |8 +++- sw/source/filter/ww8/docxattributeoutput.cxx |7 +++ sw/source/filter/ww8/rtfattributeoutput.cxx |4 ++-- sw/source/filter/ww8/wrtww8.hxx | 14 +- sw/source/filter/ww8/ww8atr.cxx | 15 +++ sw/source/uibase/utlui/uitool.cxx | 11 +-- 11 files changed, 43 insertions(+), 36 deletions(-) New commits: commit 9ca53dfa9b6d1ccdf632bec23b45bb588021f1e9 Author: Noel Grandin AuthorDate: Fri Mar 25 11:21:03 2022 +0200 Commit: Noel Grandin CommitDate: Fri Mar 25 11:21:10 2022 +0100 simplify some TypedWhichId code Change-Id: I7c908bac2217fb1e1a10dbd1fe8fe4d3cb253eff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132098 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 2ce4c9aa7dc6..bbb1cddd1576 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -440,10 +440,10 @@ SfxItemState SwFormat::GetBackgroundState(std::unique_ptr& rItem) return SfxItemState::DEFAULT; } -const SfxPoolItem* pItem = nullptr; +const SvxBrushItem* pItem = nullptr; SfxItemState eRet = m_aSet.GetItemState(RES_BACKGROUND, true, ); if (pItem) -rItem.reset(>Clone()->StaticWhichCast(RES_BACKGROUND)); +rItem.reset(pItem->Clone()); return eRet; } diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 7934ad3bc5da..f1a0d4e742ac 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -2216,12 +2216,12 @@ bool SwCursorShell::SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode ) SfxItemSetFixed< RES_PARATR_ADJUST, RES_PARATR_ADJUST, RES_LR_SPACE, RES_LR_SPACE> aSet( GetDoc()->GetAttrPool() ); -SvxLRSpaceItem aLR(pCNd->GetAttr(RES_LR_SPACE).StaticWhichCast(RES_LR_SPACE)); +SvxLRSpaceItem aLR(pCNd->GetAttr(RES_LR_SPACE)); aLR.SetTextLeft( aFPos.nTabCnt ); aLR.SetTextFirstLineOffset( 0 ); aSet.Put( aLR ); -const SvxAdjustItem& rAdj = pCNd->GetAttr(RES_PARATR_ADJUST).StaticWhichCast(RES_PARATR_ADJUST); +const SvxAdjustItem& rAdj = pCNd->GetAttr(RES_PARATR_ADJUST); if( SvxAdjust::Left != rAdj.GetAdjust() ) aSet.Put( SvxAdjustItem( SvxAdjust::Left, RES_PARATR_ADJUST ) ); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 257e5707cff4..bbdd0b1ea6fb 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1658,7 +1658,7 @@ void SwDoc::MoveLeftMargin(const SwPaM& rPam, bool bRight, bool bModulus, if( pTNd ) { pTNd = sw::GetParaPropsNode(*pLayout, aIdx); -SvxLRSpaceItem aLS(pTNd->SwContentNode::GetAttr(RES_LR_SPACE).StaticWhichCast(RES_LR_SPACE)); +SvxLRSpaceItem aLS(pTNd->SwContentNode::GetAttr(RES_LR_SPACE)); // #i93873# See also lcl_MergeListLevelIndentAsLRSpaceItem in thints.cxx if ( pTNd->AreListLevelIndentsApplicable() ) diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx index 8c64b1dd5f45..f5cb36cb03f6 100644 --- a/sw/source/core/text/atrstck.cxx +++ b/sw/source/core/text/atrstck.cxx @@ -526,7 +526,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr ) if ( pTwoLineAttr ) { - const auto& rTwoLineItem = CharFormat::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES )->StaticWhichCast(RES_CHRATR_TWO_LINES); + const auto& rTwoLineItem = *CharFormat::GetItem( *pTwoLineAttr, RES_CHRATR_TWO_LINES ); bTwoLineAct = rTwoLineItem.GetValue(); } else @@ -541,7 +541,7 @@ void SwAttrHandler::ActivateTop( SwFont& rFnt, const sal_uInt16 nAttr ) if ( pRotateAttr ) { -const auto& rRotateItem = CharFormat::GetItem( *pRotateAttr, RES_CHRATR_ROTATE )->StaticWhichCast(RES_CHRATR_ROTATE); +const auto& rRotateItem = *CharFormat::GetItem( *pRotateAttr, RES_CHRATR_ROTATE ); rFnt.SetVertical( rRotateItem.GetValue(), m_bVertLayout ); } else @@ -746,7 +746,7 @@ void SwAttrHandler::FontChg(const SfxPoolItem& rItem, SwFont& rFnt, bool bPush ) if ( pTwoLineAttr ) { -const auto& rTwoLineItem = CharFormat::GetItem(
[Libreoffice-bugs] [Bug 143484] FILEOPEN DOCX contour wrap on diagram (SmartArt) is different from Word
https://bugs.documentfoundation.org/show_bug.cgi?id=143484 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=14 ||6681 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 146681] Group shapes with "contour wrap" in DOCX worse and split since LO 7.3
https://bugs.documentfoundation.org/show_bug.cgi?id=146681 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=14 ||3484 Summary|Shapes in DOCX worse and|Group shapes with "contour |split since LO 7.3 |wrap" in DOCX worse and ||split since LO 7.3 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 102378] Notebookbar should provide an optional interface for touch screen
https://bugs.documentfoundation.org/show_bug.cgi?id=102378 --- Comment #12 from andreas_k --- I don't think it's a Notebookbar "issue". Notebookbar use NO additional padding or hardcoded elements. So it can be easy adapted by additional padding. But again, this is no notebookbar issue it's a global issue that will effect (even more) the sidebar cause there are the icons smaler and I think also the classic toolbar mode. So from my point of view Touch should be handled global as part of the desktop integration OR as setting somewhere in the configuration. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - offapi/com sw/inc sw/qa sw/source
offapi/com/sun/star/text/TextField.idl |6 ++ sw/inc/fldbas.hxx |4 sw/qa/core/unocore/unocore.cxx | 29 + sw/source/core/fields/fldbas.cxx | 15 +++ sw/source/core/fields/usrfld.cxx |1 + sw/source/core/inc/unofldmid.h |1 + sw/source/core/unocore/unomap.cxx |1 + sw/source/uibase/docvw/edtwin2.cxx | 12 8 files changed, 69 insertions(+) New commits: commit 7744b464ed0efe66b65bf8eb5c6fdf6cd5bc867b Author: Miklos Vajna AuthorDate: Thu Mar 24 15:18:28 2022 +0100 Commit: Miklos Vajna CommitDate: Fri Mar 25 11:00:32 2022 +0100 sw fields: add Title uno property The use-case is user fields, which are kind of variables in the document. They have a name and a value, but the name might be only readable to an extension or macro, not to the user. In this case, it makes sense to have a way to specify a user-readable tooltip. Be consistent with TextFrames which already have a Title property. (cherry picked from commit 1acf8e3cfaf1ef92008e39514a32ace0d036e552) Conflicts: sw/inc/fldbas.hxx sw/qa/core/unocore/unocore.cxx sw/source/core/fields/fldbas.cxx sw/source/core/unocore/unomap.cxx Change-Id: I986792f5e55e0b96489347be482d640d155113cc diff --git a/offapi/com/sun/star/text/TextField.idl b/offapi/com/sun/star/text/TextField.idl index 38c58e9afb1e..5499792b8c41 100644 --- a/offapi/com/sun/star/text/TextField.idl +++ b/offapi/com/sun/star/text/TextField.idl @@ -66,6 +66,12 @@ published service TextField */ [optional, property, readonly] boolean IsFieldDisplayed; +/** Contains short title for the field, used to for tooltip purposes if it's non-empty. + +@since LibreOffice 7.4 +*/ +[optional, property] string Title; + }; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 4f275e792fb9..08169564b0f9 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -299,6 +299,8 @@ private: boolm_bIsAutomaticLanguage; sal_uInt32 m_nFormat; /// this can be either SvxNumType or SwChapterFormat depending on the subtype SwFieldType*m_pType; +/// Used for tooltip purposes when it's not-empty. +OUString m_aTitle; virtual OUStringExpandImpl(SwRootFrame const* pLayout) const = 0; virtual std::unique_ptr Copy() const = 0; @@ -391,6 +393,8 @@ public: /// Is this field clickable? bool IsClickable() const; virtual void dumpAsXml(xmlTextWriterPtr pWriter) const; +OUString GetTitle() const { return m_aTitle; } +void SetTitle(const OUString& rTitle) { m_aTitle = rTitle; } }; inline SwFieldType* SwField::GetTyp() const diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx index e5df225828ae..d86e28fcc170 100644 --- a/sw/qa/core/unocore/unocore.cxx +++ b/sw/qa/core/unocore/unocore.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -165,6 +166,34 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testBrokenEmbeddedObject) xEmbeddedObject->supportsService("com.sun.star.comp.embed.OCommonEmbeddedObject")); } +CPPUNIT_TEST_FIXTURE(SwModelTestBase, testUserFieldTooltip) +{ +// Given a document with a user field: +loadURL("private:factory/swriter", nullptr); +uno::Reference xFactory(mxComponent, uno::UNO_QUERY); +uno::Reference xField( +xFactory->createInstance("com.sun.star.text.TextField.User"), uno::UNO_QUERY); +uno::Reference xMaster( +xFactory->createInstance("com.sun.star.text.FieldMaster.User"), uno::UNO_QUERY); +xMaster->setPropertyValue("Name", uno::makeAny(OUString("a_user_field"))); +xField->attachTextFieldMaster(xMaster); +xField->getTextFieldMaster()->setPropertyValue("Content", uno::makeAny(OUString("42"))); +uno::Reference xDocument(mxComponent, uno::UNO_QUERY); +uno::Reference xText = xDocument->getText(); +xText->insertTextContent(xText->createTextCursor(), xField, /*bAbsorb=*/false); +uno::Reference xFieldProps(xField, uno::UNO_QUERY); + +// When setting a tooltip on the field: +OUString aExpected("first line\nsecond line"); +xFieldProps->setPropertyValue("Title", uno::makeAny(aExpected)); + +// Then make sure that the tooltip we read back matches the one previously specified: +// Without the accompanying fix in place, this test would have failed with: +// - the property is of unexpected type or void: Title +// i.e. reading of the tooltip was broken. +CPPUNIT_ASSERT_EQUAL(aExpected, getProperty(xFieldProps, "Title")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 382880ecd8f4..5ba77adbc56b 100644 ---
[Libreoffice-bugs] [Bug 102378] Notebookbar should provide an optional interface for touch screen
https://bugs.documentfoundation.org/show_bug.cgi?id=102378 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=97 ||767 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 97767] working in tablet mode LO should automatically open the onscreen-keyboard
https://bugs.documentfoundation.org/show_bug.cgi?id=97767 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=10 ||2378 -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148176] Elements in the margin of master view are not showing on individual pages
https://bugs.documentfoundation.org/show_bug.cgi?id=148176 Mike Kaganski changed: What|Removed |Added OS|Windows (All) |All Version|7.2.5.2 release |Inherited From OOo Status|UNCONFIRMED |NEW Hardware|x86-64 (AMD64) |All Ever confirmed|0 |1 --- Comment #1 from Mike Kaganski --- It had changed from the wanted behavior into the current behavior somewhere between OOo 1.0 and OOo 2.2. Completely agree that the clipping behavior is unexpected and unjustified. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147721] Autostart not functioning when running a presentation on loop and repeat
https://bugs.documentfoundation.org/show_bug.cgi?id=147721 PeeWee changed: What|Removed |Added Ever confirmed|1 |0 Status|NEEDINFO|UNCONFIRMED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 147721] Autostart not functioning when running a presentation on loop and repeat
https://bugs.documentfoundation.org/show_bug.cgi?id=147721 --- Comment #3 from PeeWee --- Hello Scott The document used is libreoffice-presentation-template-community.odp and this document can be downloaded from https://extensions.libreoffice.org/en/extensions/show/libreoffice-presentation-templates. I use this document as a test document when writing and updating the Impress User Guide. The slide show settings used in Impress are as follows:- Presentation Mode - Loop and repeat after - the pause time is set to 5secs. Options - Animations allowed This has been tested using LO 7.3.1 on macOS 12.2.1, Windows 11, and Ubuntu 20.04.4LTS. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148176] New: Elements in the margin of master view are not showing on individual pages
https://bugs.documentfoundation.org/show_bug.cgi?id=148176 Bug ID: 148176 Summary: Elements in the margin of master view are not showing on individual pages Product: LibreOffice Version: 7.2.5.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: andygp...@gmail.com Description: Description: Elements shown on a LibreOffice Draw page are a combination of objects from the master view, combined with the objects of the individual page. All pages show the same master view objects. However, this applies only to objects in the drawing canvas. Objects in the margin of the page are not shown. How to reproduce: In an empty LibreOffice Draw document that has a blank page in it, go to the master view (menu: View > Master Page). Draw two objects, one on the canvas (shown by its grid) and one in the margin. Close the master view. Then, on the page formerly blank page, only the object on the canvas shows. Required behavior: All objects on the page should show. Why it matters: The canvas is a great help for making individual drawings. It allows easy alignment of objects. The master page allows for making a background template, for example something with a document title, page numbers, other identifiers, a box that allows entering particulars about a drawing, etc. Many of these background objects are placed outside of the drawing canvas, so as not to interfere with drawing objects on the individual pages. There is no benefit in hiding master page objects that are in the margin, because if those objects would be unwanted, they wouldn't be drawn. Steps to Reproduce: In an empty LibreOffice Draw document that has a blank page in it, go to the master view (menu: View > Master Page). Draw two objects, one on the canvas (shown by its grid) and one in the margin. Close the master view. Then, on the page formerly blank page, only the object on the canvas shows. Actual Results: Objects in the page margin of the master view don't show on individual pages Expected Results: All objects from the master view should show on each individual page Reproducible: Always User Profile Reset: No OpenGL enabled: Yes Additional Info: There seems to be a clip path on the canvas, that should not apply to objects from the master view. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: Branch 'feature/cib_contract57d' - 4 commits - dtrans/source fpicker/source include/o3tl include/sal include/systools offapi/com offapi/UnoApi_offapi.mk Repository.mk s
Repository.mk |1 dtrans/source/win32/dtobj/FmtFilter.cxx | 11 fpicker/source/win32/VistaFilePickerImpl.cxx| 13 fpicker/source/win32/VistaFilePickerImpl.hxx|4 include/o3tl/safeCoInitUninit.hxx | 58 include/sal/log-areas.dox |1 include/systools/win32/comtools.hxx | 74 - offapi/UnoApi_offapi.mk |7 offapi/com/sun/star/system/windows/JumpList.idl | 33 ++ offapi/com/sun/star/system/windows/JumpListItem.idl | 45 +++ offapi/com/sun/star/system/windows/XJumpList.idl| 88 ++ shell/Library_jumplist.mk | 37 ++ shell/Module_shell.mk |1 shell/source/win32/SysShExec.cxx| 16 - shell/source/win32/jumplist/JumpList.cxx| 290 shell/source/win32/jumplist/jumplist.component | 17 + 16 files changed, 663 insertions(+), 33 deletions(-) New commits: commit b54d0d262bbafbc08efd1cbc93af61b786f89821 Author: Samuel Mehrbrodt AuthorDate: Mon Mar 14 10:04:17 2022 +0100 Commit: Samuel Mehrbrodt CommitDate: Fri Mar 25 10:27:06 2022 +0100 Add UNO API for custom Jump Lists Allows adding custom jump list categories to Windows Task Bar Change-Id: I13b6c3ad5de386cf74e2b346f10889bc46a8ad4e diff --git a/Repository.mk b/Repository.mk index 639c0db413eb..49a46b454409 100644 --- a/Repository.mk +++ b/Repository.mk @@ -391,6 +391,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ hyphen \ icg \ $(if $(ENABLE_JAVA),jdbc) \ + jumplist \ $(if $(ENABLE_LDAP),ldapbe2) \ $(if $(filter WNT,$(OS)),WinUserInfoBe) \ localebe1 \ diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 9a0c43587bc9..40575f96e69a 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -625,6 +625,7 @@ certain functionality. @li @c scripting @li @c scripting.provider @li @c shell +@li @c shell.jumplist @li @c stoc @li @c store @li @c svg diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index c86e7d5a7800..aa85f3a525e9 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -3621,6 +3621,13 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/system,\ XSimpleMailMessage2 \ XSystemShellExecute \ )) + +$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/system/windows,\ + JumpList \ + JumpListItem \ + XJumpList \ +)) + $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/table,\ BorderLine \ BorderLine2 \ diff --git a/offapi/com/sun/star/system/windows/JumpList.idl b/offapi/com/sun/star/system/windows/JumpList.idl new file mode 100755 index ..82becd522b69 --- /dev/null +++ b/offapi/com/sun/star/system/windows/JumpList.idl @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef __com_sun_star_system_windows_JumpList_idl__ +#define __com_sun_star_system_windows_JumpList_idl__ + + +module com { module sun { module star { module system { module windows { + + +interface XJumpList; + +/** Specifies a Jump List service. Allows to add custom commands to the Windows Jump List. + +@since LibreOffice 7.4 + +@see com::sun::star::system::windows::XJumpList +*/ + +service JumpList : XJumpList; + + +}; }; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/offapi/com/sun/star/system/windows/JumpListItem.idl b/offapi/com/sun/star/system/windows/JumpListItem.idl new file mode 100755 index ..310e5551911a --- /dev/null +++ b/offapi/com/sun/star/system/windows/JumpListItem.idl @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef __com_sun_star_system_windows_JumpListItem_idl__ +#define __com_sun_star_system_windows_JumpListItem_idl__ + +#include +#include +#include + + +module com { module sun { module star { module system { module windows { + +/** Specifies an item for com::sun::star::system::windows::XJumpList . + +@since LibreOffice 7.4 +*/ + +struct JumpListItem +{ +/** Item name. Appears in the JumpList. Has to be unique
[Libreoffice-bugs] [Bug 144869] Feature Request for export format Similar to SVG
https://bugs.documentfoundation.org/show_bug.cgi?id=144869 --- Comment #1 from AndyG --- I've observed the same behavior, but haven't paid great attention to it yet. Note that currently LO Draw exports SVG in two different versions. If you export manually (menu: File > Export...) it will export in SVG v1.2. But if you export from an OOO Basic macro, it will export in SVG1.1. The two SVG files look radically different. For SVG export problems, you probably need to specify how you exported the file. I also think that improvements should only be made in v1.2. I'm planning to file a bug report for macros using v1.1. AndyG -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 116082] [META] Image issues related to image DPI
https://bugs.documentfoundation.org/show_bug.cgi?id=116082 Bug 116082 depends on bug 118299, which changed state. Bug 118299 Summary: Impress distorts embedded PNG dep. on X11 font DPI setting https://bugs.documentfoundation.org/show_bug.cgi?id=118299 What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 118299] Impress distorts embedded PNG dep. on X11 font DPI setting
https://bugs.documentfoundation.org/show_bug.cgi?id=118299 Lars Jødal changed: What|Removed |Added Resolution|WORKSFORME |--- Status|RESOLVED|REOPENED --- Comment #18 from Lars Jødal --- Sorry to say, testing on Windows 10, I find the bug to be still present with LO 7.3.1.3 The testing was on the original file, attachment 142990, with scaling changed from 100% to 150% as described in comment 13. Changing status back to REOPENED. -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148167] Writer does not display SVG file correctly when inserted as image
https://bugs.documentfoundation.org/show_bug.cgi?id=148167 Xisco Faulí changed: What|Removed |Added Keywords||filter:svg -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148167] Writer does not display SVG file correctly when inserted as image
https://bugs.documentfoundation.org/show_bug.cgi?id=148167 Xisco Faulí changed: What|Removed |Added Keywords||bibisectRequest, regression --- Comment #4 from Xisco Faulí --- Not reproduced in Version 4.0.0.3 (Build ID: 7545bee9c2a0782548772a21bc84a9dcc583b89) -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148167] Writer does not display SVG file correctly when inserted as image
https://bugs.documentfoundation.org/show_bug.cgi?id=148167 Xisco Faulí changed: What|Removed |Added Version|7.3.1.3 release |6.1 all versions Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #3 from Xisco Faulí --- Reproduced in Version: 7.4.0.0.alpha0+ / LibreOffice Community Build ID: 4a46a74a3de0ac7df5d3ce949dda5e809c1729ab CPU threads: 8; OS: Linux 5.10; UI render: default; VCL: gtk3 Locale: es-ES (es_ES.UTF-8); UI: en-US Calc: threaded and Version: 6.0.0.0.alpha1+ Build ID: 6eeac3539ea4cac32d126c5e24141f262eb5a4d9 CPU threads: 8; OS: Linux 5.10; UI render: default; VCL: gtk3; Locale: es-ES (es_ES.UTF-8); Calc: group threaded -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148167] Writer does not display SVG file correctly when inserted as image
https://bugs.documentfoundation.org/show_bug.cgi?id=148167 Xisco Faulí changed: What|Removed |Added CC||xiscofa...@libreoffice.org --- Comment #2 from Xisco Faulí --- Created attachment 179100 --> https://bugs.documentfoundation.org/attachment.cgi?id=179100=edit Firefox (top) vs LibreOffice 7.4 (bottom) -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/column.hxx|3 -- sc/inc/document.hxx |3 -- sc/source/core/data/column3.cxx | 46 --- sc/source/core/data/column4.cxx |2 - sc/source/core/data/document.cxx |4 +-- sc/source/core/data/table2.cxx |2 - 6 files changed, 7 insertions(+), 53 deletions(-) New commits: commit f8334fedbd92da41932ed5c4875fda9fdc19aaad Author: Noel Grandin AuthorDate: Thu Mar 24 13:06:50 2022 +0200 Commit: Noel Grandin CommitDate: Fri Mar 25 09:58:48 2022 +0100 loplugin:constantparam Change-Id: Id89c74fcd6c6332f5da9f57986bfc2fe075d71c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132087 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 689f0c0ccbd0..f04d54aca739 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -721,8 +721,7 @@ public: std::vector* pNewSharedRows ); void AttachFormulaCells( sc::StartListeningContext& rCxt, SCROW nRow1, SCROW nRow2 ); -void DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, - std::vector* pNewSharedRows ); +void DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2 ); /** * Regroup formula cells for the entire column. diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index d5df933e1cfc..cd7138b3e945 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1210,8 +1210,7 @@ public: { mbFormulaGroupCxtBlockDiscard = block; } // Note that if pShared is set and a value is returned that way, the returned OUString is empty. -SC_DLLPUBLIC OUString GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, - const svl::SharedString** pShared = nullptr ) const; +SC_DLLPUBLIC OUString GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; FormulaError GetStringForFormula( const ScAddress& rPos, OUString& rString ); SC_DLLPUBLIC double GetValue( const ScAddress& rPos ) const; SC_DLLPUBLIC double GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 2f4b7a2c0774..4aa91b89d919 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -495,59 +495,15 @@ void ScColumn::AttachFormulaCells( sc::StartListeningContext& rCxt, SCROW nRow1, sc::ProcessFormula(it, maCells, nRow1, nRow2, aFunc); } -void ScColumn::DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, -std::vector* pNewSharedRows ) +void ScColumn::DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2 ) { sc::CellStoreType::position_type aPos = maCells.position(nRow1); sc::CellStoreType::iterator it = aPos.first; -bool bLowerSplitOff = false; -if (pNewSharedRows && !GetDoc().IsClipOrUndo()) -{ -const ScFormulaCell* pFC = sc::SharedFormulaUtil::getSharedTopFormulaCell(aPos); -if (pFC) -{ -const SCROW nTopRow = pFC->GetSharedTopRow(); -const SCROW nBotRow = nTopRow + pFC->GetSharedLength() - 1; -// nTopRow <= nRow1 <= nBotRow, because otherwise pFC would not exist. -if (nTopRow < nRow1) -{ -// Upper part will be split off. -pNewSharedRows->push_back(nTopRow); -pNewSharedRows->push_back(nRow1 - 1); -} -if (nRow2 < nBotRow) -{ -// Lower part will be split off. -pNewSharedRows->push_back(nRow2 + 1); -pNewSharedRows->push_back(nBotRow); -bLowerSplitOff = true; -} -} -} - // Split formula grouping at the top and bottom boundaries. sc::SharedFormulaUtil::splitFormulaCellGroup(aPos, ); if (GetDoc().ValidRow(nRow2+1)) { -if (pNewSharedRows && !bLowerSplitOff && !GetDoc().IsClipOrUndo()) -{ -sc::CellStoreType::position_type aPos2 = maCells.position(aPos.first, nRow2); -const ScFormulaCell* pFC = sc::SharedFormulaUtil::getSharedTopFormulaCell(aPos2); -if (pFC) -{ -const SCROW nTopRow = pFC->GetSharedTopRow(); -const SCROW nBotRow = nTopRow + pFC->GetSharedLength() - 1; -// nRow1 < nTopRow <= nRow2 < nBotRow -if (nRow2 < nBotRow) -{ -// Lower part will be split off. -pNewSharedRows->push_back(nRow2 + 1); -pNewSharedRows->push_back(nBotRow); -} -} -} - aPos =
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/dbdata.cxx |7 +++ sc/source/ui/cctrl/checklistmenu.cxx |6 +++--- sc/source/ui/inc/checklistmenu.hxx |2 +- 3 files changed, 7 insertions(+), 8 deletions(-) New commits: commit 2a5ba6ff05d94065c37324b32fa463c7373a4755 Author: Noel Grandin AuthorDate: Thu Mar 24 12:48:42 2022 +0200 Commit: Noel Grandin CommitDate: Fri Mar 25 09:58:22 2022 +0100 loplugin:constantparam Change-Id: Ic2c93bca1b77c29e547473f889f53a2af8755fe4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132086 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 3042404e0eaa..b62d3b76b8bf 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -1010,7 +1010,7 @@ public: }; OUString lcl_IncrementNumberInNamedRange(ScDBCollection::NamedDBs& namedDBs, - const OUString& sOldName, bool bIsUpperName) + const OUString& sOldName) { sal_Int32 nLastIndex = sOldName.lastIndexOf('_') + 1; sal_Int32 nOldNumber = 1; @@ -1034,8 +1034,7 @@ OUString lcl_IncrementNumberInNamedRange(ScDBCollection::NamedDBs& namedDBs, do { sNewName = sOldName.subView(0, nLastIndex) + OUString::number(++nOldNumber); -} while ((bIsUpperName ? namedDBs.findByUpperName(sNewName) : namedDBs.findByName(sNewName)) - != nullptr); +} while (namedDBs.findByName(sNewName) != nullptr); return sNewName; } @@ -1553,7 +1552,7 @@ void ScDBCollection::CopyToTable(SCTAB nOldPos, SCTAB nNewPos) return; OUString newName -= lcl_IncrementNumberInNamedRange(getNamedDBs(), rxNamedDB->GetName(), false); += lcl_IncrementNumberInNamedRange(getNamedDBs(), rxNamedDB->GetName()); std::unique_ptr pDataCopy = std::make_unique(newName, *rxNamedDB); pDataCopy->UpdateMoveTab(nOldPos, nNewPos); pDataCopy->SetIndex(0); diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index a3ecb34b5f7d..3e9420ecd05b 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -114,7 +114,7 @@ IMPL_LINK_NOARG(ScCheckListMenuControl, SelectHdl, weld::TreeView&, void) else nSelectedMenu = mxMenu->get_iter_index_in_parent(*mxScratchIter); -setSelectedMenuItem(nSelectedMenu, true); +setSelectedMenuItem(nSelectedMenu); } void ScCheckListMenuControl::addMenuItem(const OUString& rText, Action* pAction) @@ -216,13 +216,13 @@ void ScCheckListMenuControl::executeMenuItem(size_t nPos) terminateAllPopupMenus(); } -void ScCheckListMenuControl::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer) +void ScCheckListMenuControl::setSelectedMenuItem(size_t nPos) { if (mnSelectedMenu == nPos) // nothing to do. return; -selectMenuItem(nPos, bSubMenuTimer); +selectMenuItem(nPos, /*bSubMenuTimer*/true); } void ScCheckListMenuControl::handleMenuTimeout(const SubMenuItemData* pTimer) diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 55525bac96f0..eaad396bee1a 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -204,7 +204,7 @@ private: int GetCheckedEntryCount() const; void CheckAllChildren(const weld::TreeIter& rEntry, bool bCheck); -void setSelectedMenuItem(size_t nPos, bool bSubMenuTimer); +void setSelectedMenuItem(size_t nPos); std::unique_ptr FindEntry(const weld::TreeIter* pParent, std::u16string_view sNode);
[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/qa writerfilter/source
sw/qa/core/data/rtf/fail/forcepoint-82.rtf | 28 +++ writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 + 2 files changed, 30 insertions(+) New commits: commit 2cc8d314123353c5fb9ece2fefd82fb3bce25ec2 Author: Caolán McNamara AuthorDate: Wed Mar 23 10:45:15 2022 + Commit: Xisco Fauli CommitDate: Fri Mar 25 09:58:03 2022 +0100 forcepoint#82 back() called on empty vector Change-Id: I801a58f1fef41d1545899868e333c2184c5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131866 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sw/qa/core/data/rtf/fail/forcepoint-82.rtf b/sw/qa/core/data/rtf/fail/forcepoint-82.rtf new file mode 100644 index ..54b1dee42c5b --- /dev/null +++ b/sw/qa/core/data/rtf/fail/forcepoint-82.rtf @@ -0,0 +1,28 @@ +{\rtf1 +{\trowd +\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000 +\pard +Text 1 +\itap0 +\cell +\row} +\pard +\par +\itap0 +{\trowd +\clbrdrl\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clbrdrt\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\cellx2000 +\pard +Text 2 +\itap0 +\cell +\row} +\itap-1 +{\trowd +\clbrdrl\brdrs\brdrw2147483649\clbrdrr\brdrs\brdrw9\clbrdrt\brdrs\brdrw10\clPbrdrb\brdrs\brdrw185\cellx1000 +\nestro)w} +\itap0 +\cell +\row} +\itap0 +\par +} \ No newline at end of file diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 3b927642348d..127f9b067c4d 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -387,6 +387,8 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) DomainMapperTableManager::IntVectorPtr const & DomainMapperTableManager::getCurrentGrid( ) { +if (m_aTableGrid.empty()) +throw std::out_of_range("no current grid"); return m_aTableGrid.back( ); }
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/content.hxx|2 +- sc/source/ui/navipi/content.cxx |5 + 2 files changed, 2 insertions(+), 5 deletions(-) New commits: commit 891c7fbbf201b90ae65ca0a33e68b1f788cbb7ff Author: Noel Grandin AuthorDate: Thu Mar 24 11:25:41 2022 +0200 Commit: Noel Grandin CommitDate: Fri Mar 25 09:58:00 2022 +0100 loplugin:constantparam Change-Id: I3a3f78896a1483aa07d2ca2350a7c01ab860083a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132085 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 2a31d1d38056..9cd7e977319d 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -153,7 +153,7 @@ public: const OUString& GetHiddenTitle() const{ return aHiddenTitle; } /** Applies the navigator settings to the listbox. */ -void ApplyNavigatorSettings(bool bRestoreScrollPos = false, int nScrollPos = 0); +void ApplyNavigatorSettings(); /** Stores the current listbox state in the navigator settings. */ void StoreNavigatorSettings(); }; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index c6fa3fcc7eab..2c8336fd3662 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -1548,7 +1548,7 @@ void ScContentTree::SelectEntryByName(const ScContentId nRoot, std::u16string_vi } } -void ScContentTree::ApplyNavigatorSettings(bool bRestorePos, int nScrollPos) +void ScContentTree::ApplyNavigatorSettings() { const ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings(); if( !pSettings ) @@ -1589,9 +1589,6 @@ void ScContentTree::ApplyNavigatorSettings(bool bRestorePos, int nScrollPos) // select if( nRootSel == nEntry ) { -if (bRestorePos) -m_xTreeView->vadjustment_set_value(nScrollPos); - std::unique_ptr xEntry; if (bExp && (nChildSel != SC_CONTENT_NOCHILD)) {
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/inftxt.cxx | 27 ++- 1 file changed, 26 insertions(+), 1 deletion(-) New commits: commit eb53efed80302c4ca6409c6dbd023d8ba1eb8e47 Author: Miklos Vajna AuthorDate: Fri Mar 25 08:37:22 2022 +0100 Commit: Miklos Vajna CommitDate: Fri Mar 25 09:36:38 2022 +0100 sw clearing breaks: add clearing indicator during rendering A left / right line around the break portion now allows seeing if the clearing is none, left, right or all (somewhat familiar from Word). No test for this, SwBreakPortion::Paint() is a NOP unless rendering on a window, so the metafile-based rendering used for testing won't detect the difference. Change-Id: I3ff0c89bc4bb45deb03bea43c3ee4589887dee7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132093 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 6b1c68bf3313..7408e17f43c0 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -67,6 +67,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::linguistic2; @@ -964,6 +965,13 @@ void SwTextPaintInfo::DrawLineBreak( const SwLinePortion ) const if( !OnWin() ) return; +SwLineBreakClear eClear = SwLineBreakClear::NONE; +if (rPor.IsBreakPortion()) +{ +const auto& rBreakPortion = static_cast(rPor); +eClear = rBreakPortion.GetClear(); +} + sal_uInt16 nOldWidth = rPor.Width(); const_cast(rPor).Width( LINE_BREAK_WIDTH ); @@ -976,7 +984,24 @@ void SwTextPaintInfo::DrawLineBreak( const SwLinePortion ) const CHAR_LINEBREAK_RTL : CHAR_LINEBREAK; const sal_uInt8 nOptions = 0; -lcl_DrawSpecial( *this, rPor, aRect, NON_PRINTING_CHARACTER_COLOR, cChar, nOptions ); +SwRect aTextRect(aRect); +if (eClear == SwLineBreakClear::LEFT || eClear == SwLineBreakClear::ALL) +aTextRect.AddLeft(30); +if (eClear == SwLineBreakClear::RIGHT || eClear == SwLineBreakClear::ALL) +aTextRect.AddRight(-30); +lcl_DrawSpecial( *this, rPor, aTextRect, NON_PRINTING_CHARACTER_COLOR, cChar, nOptions ); + +if (eClear != SwLineBreakClear::NONE) +{ +// Paint indicator if this clear is left/right/all. +m_pOut->Push(vcl::PushFlags::LINECOLOR); +m_pOut->SetLineColor(NON_PRINTING_CHARACTER_COLOR); +if (eClear != SwLineBreakClear::RIGHT) +m_pOut->DrawLine(aRect.BottomLeft(), aRect.TopLeft()); +if (eClear != SwLineBreakClear::LEFT) +m_pOut->DrawLine(aRect.BottomRight(), aRect.TopRight()); +m_pOut->Pop(); +} } const_cast(rPor).Width( nOldWidth );
[Libreoffice-bugs] [Bug 148175] Libre Office Draw converts in text boxes centimeters in inches
https://bugs.documentfoundation.org/show_bug.cgi?id=148175 --- Comment #2 from Yvon FICHEN --- Created attachment 179099 --> https://bugs.documentfoundation.org/attachment.cgi?id=179099=edit Same housing Draw drawing -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148175] Libre Office Draw converts in text boxes centimeters in inches
https://bugs.documentfoundation.org/show_bug.cgi?id=148175 --- Comment #1 from Yvon FICHEN --- Created attachment 179098 --> https://bugs.documentfoundation.org/attachment.cgi?id=179098=edit Housing Visio drawing -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148175] New: Libre Office Draw converts in text boxes centimeters in inches
https://bugs.documentfoundation.org/show_bug.cgi?id=148175 Bug ID: 148175 Summary: Libre Office Draw converts in text boxes centimeters in inches Product: LibreOffice Version: 7.3.1.3 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: minor Priority: medium Component: Draw Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: y...@fichen.bzh Description: Upon opening a Visio drawing (.vsd) containing original text boxes such as (room dimensions,48) "180,0 cm x 394,0 cm" are displayed in LibreOffice Draw "70.9 x 394.0 cm". 70.9 is exactly, in inches, 180,0 centimeters. The first dimension is converted in inches (without showing its unit), while the second dimension is kept unchanged (except the decimal separator). LibreOffice 7.3.1.3 Windows 10 Bug already present in a previous release 7.1.?.? Steps to Reproduce: 1.Open a .vsd file for a house drawing containing "Room Dimensions" in cm text boxes using Microsoft Visio or IE 2.Open the same file with LibreOffice Draw 3.Compare both boxes Actual Results: Trivial Expected Results: Trivial Reproducible: Always User Profile Reset: No Additional Info: In Draw options, the normal unit is set to cm -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: binaryurp/source
binaryurp/source/bridge.cxx | 44 ++-- binaryurp/source/bridge.hxx |3 ++- binaryurp/source/writer.cxx |9 - binaryurp/source/writer.hxx |4 ++-- 4 files changed, 30 insertions(+), 30 deletions(-) New commits: commit 34df7e2cb95385d513e9c74cda5178e3a68d27df Author: Arnaud Versini AuthorDate: Thu Mar 24 12:56:28 2022 +0100 Commit: Noel Grandin CommitDate: Fri Mar 25 09:20:48 2022 +0100 binaryurp: use more std::mutex Change-Id: I1d16c4cbf60e78323b74e7df049736bd0d0ab591 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132072 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index 3299cd0ed519..050ebec7403c 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -207,7 +207,7 @@ void Bridge::start() { rtl::Reference r(new Reader(this)); rtl::Reference w(new Writer(this)); { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); assert( state_ == STATE_INITIAL && threadPool_ == nullptr && !writer_.is() && !reader_.is()); @@ -237,7 +237,7 @@ void Bridge::terminate(bool final) { bool joinW; Listeners ls; { -osl::ClearableMutexGuard g(mutex_); +std::unique_lock g(mutex_); switch (state_) { case STATE_INITIAL: // via ~Bridge -> dispose -> terminate case STATE_FINAL: @@ -246,10 +246,10 @@ void Bridge::terminate(bool final) { break; case STATE_TERMINATED: if (final) { -g.clear(); +g.unlock(); terminated_.wait(); { -osl::MutexGuard g2(mutex_); +std::lock_guard g2(mutex_); tp = threadPool_; threadPool_ = nullptr; if (reader_.is()) { @@ -309,7 +309,7 @@ void Bridge::terminate(bool final) { uno_threadpool_dispose(tp); Stubs s; { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); s.swap(stubs_); } for (auto & stub : s) @@ -340,7 +340,7 @@ void Bridge::terminate(bool final) { uno_threadpool_destroy(tp); } { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); if (final) { threadPool_ = nullptr; } @@ -361,14 +361,14 @@ BinaryAny Bridge::mapCppToBinaryAny(css::uno::Any const & cppAny) { } uno_ThreadPool Bridge::getThreadPool() { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); checkDisposed(); assert(threadPool_ != nullptr); return threadPool_; } rtl::Reference< Writer > Bridge::getWriter() { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); checkDisposed(); assert(writer_.is()); return writer_; @@ -392,7 +392,7 @@ css::uno::UnoInterfaceReference Bridge::registerIncomingInterface( } else { obj.set(new Proxy(this, oid, type), SAL_NO_ACQUIRE); { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); assert(proxies_ < std::numeric_limits< std::size_t >::max()); ++proxies_; } @@ -419,7 +419,7 @@ OUString Bridge::registerOutgoingInterface( if (!Proxy::isProxy(this, object, )) { binaryUno_.get()->pExtEnv->getObjectIdentifier( binaryUno_.get()->pExtEnv, , object.get()); -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); Stubs::iterator i(stubs_.find(oid)); Stub newStub; Stub * stub = i == stubs_.end() ? : >second; @@ -458,7 +458,7 @@ css::uno::UnoInterfaceReference Bridge::findStub( OUString const & oid, css::uno::TypeDescription const & type) { assert(!oid.isEmpty() && type.is()); -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); Stubs::iterator i(stubs_.find(oid)); if (i != stubs_.end()) { Stub::iterator j(i->second.find(type)); @@ -484,7 +484,7 @@ void Bridge::releaseStub( css::uno::UnoInterfaceReference obj; bool unused; { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); Stubs::iterator i(stubs_.find(oid)); if (i == stubs_.end()) { throw css::uno::RuntimeException("URP: release unknown stub"); @@ -538,7 +538,7 @@ void Bridge::freeProxy(Proxy & proxy) { } bool unused; { -osl::MutexGuard g(mutex_); +std::lock_guard g(mutex_); assert(proxies_ > 0); --proxies_; unused = becameUnused(); @@ -547,7 +547,7 @@ void Bridge::freeProxy(Proxy & proxy) { } void Bridge::incrementCalls(bool normalCall) noexcept { -osl::MutexGuard g(mutex_); +std::lock_guard
[Libreoffice-bugs] [Bug 68733] Can't select an object and a picture in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=68733 --- Comment #5 from David --- Looking for fast and professional assignments help ? Choose GreatAssignmentHelper.com and enjoy high-quality assignment help and low rates! https://greatassignmenthelper.com/au/ -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/viewfunc.hxx |2 +- sc/source/ui/view/viewfun3.cxx | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 38b8ca62dd07f119ad78f738d706cb1a80e23517 Author: Noel Grandin AuthorDate: Thu Mar 24 11:24:43 2022 +0200 Commit: Noel Grandin CommitDate: Fri Mar 25 09:15:26 2022 +0100 loplugin:constantparam Change-Id: If19a34e7f358e213d8827a107cc744a968ac6c54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132084 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 80b9b090bcad..2b72ce50ff73 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -356,7 +356,7 @@ private: bool PasteMultiRangesFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, -ScPasteFunc nFunction, bool bSkipEmptyCells, bool bIncludeFiltered, +ScPasteFunc nFunction, bool bSkipEmptyCells, bool bTranspose, bool bAsLink, bool bAllowDialogs, InsCellCmd eMoveMode, InsertDeleteFlags nUndoFlags ); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 031a5b34b3cf..d2afed84d0b1 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -900,7 +900,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, if (rClipParam.isMultiRange()) { // Source data is multi-range. -return PasteMultiRangesFromClip(nFlags, pClipDoc, nFunction, bSkipEmptyCells, false, bTranspose, +return PasteMultiRangesFromClip(nFlags, pClipDoc, nFunction, bSkipEmptyCells, bTranspose, bAsLink, bAllowDialogs, eMoveMode, nUndoFlags); } @@ -1464,7 +1464,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, bool ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument* pClipDoc, ScPasteFunc nFunction, bool bSkipEmptyCells, - bool bIncludeFiltered, bool bTranspose, bool bAsLink, + bool bTranspose, bool bAsLink, bool bAllowDialogs, InsCellCmd eMoveMode, InsertDeleteFlags nUndoFlags) { @@ -1475,7 +1475,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument* const ScAddress& rCurPos = rViewData.GetCurPos(); ScClipParam& rClipParam = pClipDoc->GetClipParam(); SCCOL nColSize = rClipParam.getPasteColSize(); -SCROW nRowSize = rClipParam.getPasteRowSize(*pClipDoc, bIncludeFiltered); +SCROW nRowSize = rClipParam.getPasteRowSize(*pClipDoc, /*bIncludeFiltered*/false); if (bTranspose) { @@ -1486,7 +1486,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument* } ScDocumentUniquePtr pTransClip(new ScDocument(SCDOCMODE_CLIP)); -pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink, bIncludeFiltered); +pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink, /*bIncludeFiltered*/false); pClipDoc = pTransClip.release(); SCCOL nTempColSize = nColSize; nColSize = static_cast(nRowSize); @@ -1577,7 +1577,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument* if (bAsLink && bTranspose) nCopyFlags |= InsertDeleteFlags::FORMULA; rDoc.CopyMultiRangeFromClip(rCurPos, aMark, nCopyFlags, pClipDoc, true, bAsLink && !bTranspose, -bIncludeFiltered, bSkipEmptyCells); +/*bIncludeFiltered*/false, bSkipEmptyCells); if (pMixDoc) rDoc.MixDocument(aMarkedRange, nFunction, bSkipEmptyCells, *pMixDoc); @@ -1588,7 +1588,7 @@ bool ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument* { // Paste the drawing objects after the row heights have been updated. rDoc.CopyMultiRangeFromClip(rCurPos, aMark, InsertDeleteFlags::OBJECTS, pClipDoc, true, -false, bIncludeFiltered, true); +false, /*bIncludeFiltered*/false, true); } if (bRowInfo)
[Libreoffice-bugs] [Bug 80430] [META] Documentation gap for new features
https://bugs.documentfoundation.org/show_bug.cgi?id=80430 Bug 80430 depends on bug 146847, which changed state. Bug 146847 Summary: No documentation for integer division operator \ in Basic https://bugs.documentfoundation.org/show_bug.cgi?id=146847 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148173] FILEOPEN DOCX Ref field incorrect with "Paragraph # from marked paragraph" and "Relative position of paragraph" enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=148173 Gabor Kelemen (allotropia) changed: What|Removed |Added Summary|FILEOPEN DOCX Ref field |FILEOPEN DOCX Ref field |incorrect with "# of|incorrect with "Paragraph # |paragraph in relative |from marked paragraph" and |context" and "Relative |"Relative position of |position of paragraph" |paragraph" enabled |enabled | -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 127592] [META] LibreOffice Basic incl."Option Compatible" modules
https://bugs.documentfoundation.org/show_bug.cgi?id=127592 Bug 127592 depends on bug 145752, which changed state. Bug 145752 Summary: CompatibilityMode Basic function documentation is incomplete https://bugs.documentfoundation.org/show_bug.cgi?id=145752 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 108908] [META] Visual Basic for Applications (VBA) macro issues
https://bugs.documentfoundation.org/show_bug.cgi?id=108908 Bug 108908 depends on bug 145752, which changed state. Bug 145752 Summary: CompatibilityMode Basic function documentation is incomplete https://bugs.documentfoundation.org/show_bug.cgi?id=145752 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 145752] CompatibilityMode Basic function documentation is incomplete
https://bugs.documentfoundation.org/show_bug.cgi?id=145752 Alain Romedenne changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148160] Return carriage in a cell in Calc breaks french autocorrect
https://bugs.documentfoundation.org/show_bug.cgi?id=148160 remi.berna...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED --- Comment #5 from remi.berna...@gmail.com --- Hello, Bug seems to be corrected in the latest 7.3.3 daily build. Thanks a lot guys -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 112969] [META] DOCX (OOXML) field-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=112969 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||148174 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148174 [Bug 148174] FILEOPEN DOCX Ref field incorrect with "Paragraph # in full context" and "Relative position of paragraph" enabled -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 148174] New: FILEOPEN DOCX Ref field incorrect with "Paragraph # in full context" and "Relative position of paragraph" enabled
https://bugs.documentfoundation.org/show_bug.cgi?id=148174 Bug ID: 148174 Summary: FILEOPEN DOCX Ref field incorrect with "Paragraph # in full context" and "Relative position of paragraph" enabled Product: LibreOffice Version: Inherited From OOo Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: kelem...@ubuntu.com Blocks: 112969 Created attachment 179097 --> https://bugs.documentfoundation.org/attachment.cgi?id=179097=edit The paragraph numbered 10 in Word and Writer This is a followup to bug 145215 attachment 175829 contains some example fields on page 51 under title "Schedule 99" Many of these are appearing the same as in Word, this report focuses on the "Ref" field of paragraph 10. The common pattern in the paragraphs 8-10 is they have the field option "Relative position of paragraph" enabled. Since this option is not supported in Writer, all of these are mapped to the option "Above/below". The paragraph 4 has the same field settings except this "Relative position of paragraph" setting is disabled. Paragraph 10 has the "Paragraph # in full context" plus "Relative position of paragraph" which results in "2.2.1 (i) above" in Word. This is imported incorrectly as "above" in Writer. Paragraph 4 has only the "Paragraph # in full context" field option enabled, which results in "2.2.1 (i)" in Word. This is imported correctly in Writer. -> Writer should have a similar option for the Bookmarks field that gives the referenced bookmarks position in full context. Version: 7.4.0.0.alpha0+ (x64) / LibreOffice Community Build ID: a2c3ef6d8108355ce5daf6ff72310ac93ae745f0 CPU threads: 14; OS: Windows 10.0 Build 19044; UI render: default; VCL: win Locale: en-US (hu_HU); UI: en-US Calc: threaded Jumbo Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=112969 [Bug 112969] [META] DOCX (OOXML) field-related issues -- You are receiving this mail because: You are the assignee for the bug.
[Libreoffice-bugs] [Bug 112969] [META] DOCX (OOXML) field-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=112969 Gabor Kelemen (allotropia) changed: What|Removed |Added Depends on||148173 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=148173 [Bug 148173] FILEOPEN DOCX Ref field incorrect with "# of paragraph in relative context" and "Relative position of paragraph" enabled -- You are receiving this mail because: You are the assignee for the bug.