[Libreoffice-bugs] [Bug 104468] [META] DOCX (OOXML) image-related issues
https://bugs.documentfoundation.org/show_bug.cgi?id=104468 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added Depends on||121831 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=121831 [Bug 121831] Low raster quality when saving SVG as PNG to DOC(X) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121831] Low raster quality when saving SVG as PNG to DOC(X)
https://bugs.documentfoundation.org/show_bug.cgi?id=121831 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added Keywords||filter:docx, filter:svg Blocks||109323, 104468, 111450 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=104468 [Bug 104468] [META] DOCX (OOXML) image-related issues https://bugs.documentfoundation.org/show_bug.cgi?id=109323 [Bug 109323] [META] Graphic export bugs and enhancements (jpg, png, eps, tiff, gif ...) https://bugs.documentfoundation.org/show_bug.cgi?id=111450 [Bug 111450] [META] SVG fileSave filter (Draw) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 111450] [META] SVG fileSave filter (Draw)
https://bugs.documentfoundation.org/show_bug.cgi?id=111450 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added Depends on||121831 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=121831 [Bug 121831] Low raster quality when saving SVG as PNG to DOC(X) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 109323] [META] Graphic export bugs and enhancements (jpg, png, eps, tiff, gif ...)
https://bugs.documentfoundation.org/show_bug.cgi?id=109323 Roman Kuznetsov <79045_79...@mail.ru> changed: What|Removed |Added Depends on||121831 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=121831 [Bug 121831] Low raster quality when saving SVG as PNG to DOC(X) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 34 commits - sw/inc sw/qa sw/source sw/uiconfig
sw/inc/IDocumentContentOperations.hxx |8
sw/inc/doc.hxx | 14
sw/inc/ndtxt.hxx|7
sw/qa/extras/uiwriter/uiwriter.cxx | 49
sw/qa/extras/uiwriter/uiwriter2.cxx |1
sw/source/core/doc/DocumentContentOperationsManager.cxx | 168 ++
sw/source/core/doc/docfmt.cxx | 46
sw/source/core/doc/docnum.cxx | 26
sw/source/core/doc/notxtfrm.cxx |2
sw/source/core/edit/acorrect.cxx| 175 ++
sw/source/core/edit/autofmt.cxx | 964 +---
sw/source/core/edit/edatmisc.cxx| 10
sw/source/core/edit/edattr.cxx | 63 -
sw/source/core/edit/edfcol.cxx |9
sw/source/core/edit/edfmt.cxx |2
sw/source/core/edit/editsh.cxx | 31
sw/source/core/edit/ednumber.cxx|4
sw/source/core/edit/edws.cxx| 14
sw/source/core/fields/expfld.cxx|2
sw/source/core/frmedt/fedesc.cxx|3
sw/source/core/frmedt/fews.cxx |3
sw/source/core/inc/DocumentContentOperationsManager.hxx | 12
sw/source/core/inc/TextFrameIndex.hxx |6
sw/source/core/inc/acorrect.hxx | 12
sw/source/core/inc/frminf.hxx |6
sw/source/core/inc/txtfrm.hxx |4
sw/source/core/text/frminf.cxx | 39
sw/source/core/text/guess.cxx |7
sw/source/core/text/itratr.cxx | 121 --
sw/source/core/text/itrcrsr.cxx |2
sw/source/core/text/porfld.cxx |2
sw/source/core/text/porlay.cxx |2
sw/source/core/text/pormulti.cxx|8
sw/source/core/text/pormulti.hxx|1
sw/source/core/text/txtfrm.cxx | 56
sw/source/core/text/xmldump.cxx |6
sw/source/core/txtnode/ndtxt.cxx| 16
sw/source/core/txtnode/thints.cxx | 57
sw/source/core/unocore/unoobj.cxx |3
sw/source/core/unocore/unoobj2.cxx |2
sw/source/filter/basflt/fltshell.cxx|2
sw/source/filter/html/htmlfldw.cxx |2
sw/source/filter/ww8/wrtww8.cxx |3
sw/source/filter/ww8/ww8atr.cxx | 14
sw/source/filter/ww8/ww8par.cxx |2
sw/source/uibase/docvw/PageBreakWin.cxx |3
sw/uiconfig/swriter/ui/queryredlinedialog.ui|2
47 files changed, 1262 insertions(+), 729 deletions(-)
New commits:
commit c1d7cc390c6e095d6e58b856758ba86f7666195f
Author: Michael Stahl
AuthorDate: Fri Nov 30 16:28:04 2018 +0100
Commit: Michael Stahl
CommitDate: Sat Dec 1 08:44:46 2018 +0100
sw_redlinehide_4a: MoveDeletedPrevFrames() should only move
... frames from a layout with hidden redlines.
Change-Id: I8f5d5bbbc5bfd49a8a52579a1c34157b9c5c4515
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 8d721140cb37..a979650504e1 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -846,16 +846,22 @@ void MoveDeletedPrevFrames(SwTextNode & rDeletedPrev,
SwTextNode & rNode)
SwIterator
aIter(rDeletedPrev);
for (SwTextFrame* pFrame = aIter.First(); pFrame; pFrame = aIter.Next())
{
-frames.push_back(pFrame);
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+frames.push_back(pFrame);
+}
}
{
auto frames2(frames);
SwIterator
aIt(rNode);
for (SwTextFrame* pFrame = aIt.First(); pFrame; pFrame = aIt.Next())
{
-auto const it(std::find(frames2.begin(), frames2.end(), pFrame));
-assert(it != frames2.end());
-frames2.erase(it);
+if (pFrame->getRootFrame()->IsHideRedlines())
+{
+auto const it(std::find(frames2.begin(), frames2.end(),
pFrame));
+assert(it != frames2.end());
+frames2.erase(it);
+}
}
assert(frames2.empty());
}
commit c985eba6e9d6f9d3fece903a6b72eca611894b16
Author: Michael Stahl
AuthorDate: Thu Nov 29 15:56:18 2018 +0100
Commit: Michael Stahl
CommitDate: Sat Dec 1 08:44:46 2018 +0100
sw_redlinehide_4a: fix infinite loop in SwAttrIter::Seek()
It's actually possible
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4a' - 18 commits - sw/qa sw/source sw/uiconfig
Rebased ref, commits from common ancestor:
commit 856934c12e89c84bcf0ca67be0dd8dc03e45f95d
Author: Michael Stahl
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl
CommitDate: Sat Dec 1 08:43:01 2018 +0100
HACK: ODF import: always hide redlines
Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 138dc19981c8..5b10130d6e8f 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -889,8 +889,10 @@ ErrCode XMLReader::Read( SwDoc , const OUString&
rBaseURL, SwPaM , con
// restore redline mode from import info property set
RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
if ( *o3tl::doAccess(aAny) )
nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
aAny = xInfoSet->getPropertyValue( sRecordChanges );
if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
nRedlineFlags |= RedlineFlags::On;
commit a67261d125ba3ca3c456936c54f9bed17ed7510e
Author: Michael Stahl
AuthorDate: Fri Nov 30 17:54:41 2018 +0100
Commit: Michael Stahl
CommitDate: Sat Dec 1 08:43:01 2018 +0100
sw_redlinehide: make layout based Show/Hide mode the default
remove ExperimentalMode checks
Change-Id: Ie098eda0840bbd3231696cae43cc572ad61379fc
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 7089ce157de3..048706bbce41 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2267,21 +2267,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell,
SvxSwAutoFormatFlags const &
m_nEndNdIdx = m_aEndNdIdx.GetIndex(),
m_pDoc->GetDocShell() );
-uno::Reference const xContext(
-comphelper::getProcessComponentContext());
-bool const
isExp(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext));
RedlineFlags eRedlMode =
m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(), eOldMode = eRedlMode;
if( m_aFlags.bWithRedlining )
{
m_pDoc->SetAutoFormatRedline( true );
-eRedlMode = isExp
-? RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask)
-: RedlineFlags::On | RedlineFlags::ShowInsert;
+eRedlMode = RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask);
}
else
- eRedlMode = isExp
- ? RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask)
- : RedlineFlags::ShowInsert | RedlineFlags::Ignore;
+ eRedlMode = RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask);
m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( eRedlMode );
// save undo state (might be turned off)
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index ce3573b7b946..f956bbd85953 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -343,19 +343,12 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
aAny <<= bShowChanges;
if ( bHandleShowChanges )
{
-if (!utl::ConfigManager::IsFuzzing() &&
officecfg::Office::Common::Misc::ExperimentalMode::get(comphelper::getProcessComponentContext()))
-{
-aAny <<= true;
-xModelPropertySet->setPropertyValue( g_sShowChanges, aAny );
-// TODO maybe we need some property for the view-setting?
-SwDoc *const pDoc(SwImport::GetDocFromXMLImport(m_rImport));
-assert(pDoc);
-
pDoc->GetDocumentRedlineManager().SetHideRedlines(!bShowChanges);
-}
-else
-{
-xModelPropertySet->setPropertyValue( g_sShowChanges, aAny );
-}
+aAny <<= true;
+xModelPropertySet->setPropertyValue( g_sShowChanges, aAny );
+// TODO maybe we need some property for the view-setting?
+SwDoc *const pDoc(SwImport::GetDocFromXMLImport(m_rImport));
+assert(pDoc);
+pDoc->GetDocumentRedlineManager().SetHideRedlines(!bShowChanges);
}
else
xImportInfoPropertySet->setPropertyValue( g_sShowChanges, aAny );
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index f36ffb47a147..138dc19981c8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,8 +856,7 @@ ErrCode XMLReader::Read( SwDoc , const OUString&
rBaseURL, SwPaM , con
if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
m_aOption.IsFormatsOnly() ||
// sw_redlinehide: disable layout cache for now
- (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
-!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+
[Libreoffice-bugs] [Bug 121811] Paste location program
https://bugs.documentfoundation.org/show_bug.cgi?id=121811 --- Comment #3 from 和尚蟹 --- (In reply to 和尚蟹 from comment #0) > Paste the location program: > ◎, "copy pattern horizontal position" + "horizontal distance" (0.5cm) = > "posted horizontal position" > ◎, "copy pattern vertical position" + "vertical distance" (0.5cm) = "posted > vertical position" > ◎, moving the "Paste on the pattern" will change the "horizontal distance" > and "vertical distance". > 1. “Paste the pattern”, move to the left to reduce the “horizontal > distance”, and move to the right to increase the “horizontal distance”. > 2, "Paste the pattern", move up to reduce the "vertical distance", move > down to increase the "vertical distance". > 3, this function, can be arranged with the same distance, very easy to > use. > > Note: > 1. Click the left mouse button to select the pattern and the “Place Location > Program” will be enabled. > 2, leaving the "Paste on the pattern", will close the "post position > program". supplement Paste the location program: ◎, "copy pattern horizontal position" + "horizontal distance" (0.5cm) = "posted horizontal position" 1. The "Paste Pattern" will become "Copy Pattern Horizontal Position". ◎, "copy pattern vertical position" + "vertical distance" (0.5cm) = "posted vertical position" 1. "Paste the pattern" will become "copy pattern vertical position". ◎, moving the "Paste on the pattern" will change the "horizontal distance" and "vertical distance". 1. “Paste the pattern”, move to the left to reduce the “horizontal distance”, and move to the right to increase the “horizontal distance”. 2, "Paste the pattern", move up to reduce the "vertical distance", move down to increase the "vertical distance". 3, this function, can be arranged with the same distance, very easy to use. Note: 1. Click the left mouse button to select the pattern and the “Place Location Program” will be enabled. 2, leaving the "Paste on the pattern", will close the "post position program". -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #168 from Commit Notification --- Jens Carl committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/9be1f37fa2954191e06d570e98671868b47d4c76%5E%21 tdf#45904 Move XElementAccess Java tests to C++ It will be available in 6.3.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: framework/qa qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa
framework/qa/complex/api_internal/api.lst |1
qadevOOo/Jar_OOoRunner.mk |1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv |2
qadevOOo/tests/java/mod/_sc/ScCellsObj.java| 132 -
sc/qa/extras/sccellsobj.cxx| 12 +
sc/qa/unoapi/sc_3.sce |1
6 files changed, 11 insertions(+), 138 deletions(-)
New commits:
commit 9be1f37fa2954191e06d570e98671868b47d4c76
Author: Jens Carl
AuthorDate: Fri Nov 30 21:57:59 2018 +
Commit: Jens Carl
CommitDate: Sat Dec 1 05:49:44 2018 +0100
tdf#45904 Move XElementAccess Java tests to C++
Move XElementAccess Java tests to C++
for ScCellsObj.
Change-Id: If721582a36ef5a82fba20d4ec7e0806d1d0524d9
Reviewed-on: https://gerrit.libreoffice.org/64365
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/framework/qa/complex/api_internal/api.lst
b/framework/qa/complex/api_internal/api.lst
index 5c25127f8660..89361f5b9349 100644
--- a/framework/qa/complex/api_internal/api.lst
+++ b/framework/qa/complex/api_internal/api.lst
@@ -81,7 +81,6 @@ job81=sc.ScCellFieldObj
job82=sc.ScCellFieldsObj
job84=sc.ScCellFormatsObj
job85=sc.ScCellSearchObj
-job87=sc.ScCellsObj
job88=sc.ScDatabaseRangeObj
job89=sc.ScDatabaseRangesObj
job90=sc.ScDataPilotFieldObj
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 63ebd62f3844..a2e9b82e89f8 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -967,7 +967,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
qadevOOo/tests/java/mod/_sc/ScCellRangeObj \
qadevOOo/tests/java/mod/_sc/ScCellRangesObj \
qadevOOo/tests/java/mod/_sc/ScCellSearchObj \
-qadevOOo/tests/java/mod/_sc/ScCellsObj \
qadevOOo/tests/java/mod/_sc/ScCellTextCursor \
qadevOOo/tests/java/mod/_sc/ScChartObj \
qadevOOo/tests/java/mod/_sc/ScChartsObj \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv
deleted file mode 100644
index c8c8a23d9be7..
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"ScCellsObj";"com::sun::star::container::XElementAccess";"getElementType()"
-"ScCellsObj";"com::sun::star::container::XElementAccess";"hasElements()"
diff --git a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
b/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
deleted file mode 100644
index 2fb813995c24..
--- a/qadevOOo/tests/java/mod/_sc/ScCellsObj.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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 .
- */
-
-package mod._sc;
-
-import java.io.PrintWriter;
-
-import lib.TestCase;
-import lib.TestEnvironment;
-import lib.TestParameters;
-import util.SOfficeFactory;
-
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.lang.XComponent;
-import com.sun.star.sheet.XCellRangesQuery;
-import com.sun.star.sheet.XSheetCellRanges;
-import com.sun.star.sheet.XSpreadsheetDocument;
-import com.sun.star.sheet.XSpreadsheets;
-import com.sun.star.table.XCell;
-import com.sun.star.table.XCellRange;
-import com.sun.star.text.XTextRange;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.Type;
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XInterface;
-
-/**
-* Test for object which is represented by service
-* com.sun.star.sheet.Cells.
-* Object implements the following interfaces :
-*
-* com::sun::star::container::XEnumerationAccess
-* com::sun::star::container::XElementAccess
-*
-* @see com.sun.star.sheet.Cells
-* @see com.sun.star.container.XEnumerationAccess
-* @see com.sun.star.container.XElementAccess
-* @see ifc.container._XEnumerationAccess
-* @see ifc.container._XElementAccess
-*/
-public class ScCellsObj extends TestCase {
-private XSpreadsheetDocument xSheetDoc = null;
-
-/**
-* Creates Spreadsheet document.
-*/
-@Override
-protected void initialize( TestParameters tParam, PrintWriter log ) throws
Exception {
-// get a soffice factory object
-SOfficeFactory SOF =
[Libreoffice-bugs] [Bug 121581] Replace the "Organize Dialogs" command in the Tools tab in the Tabbed UI by the Organize Macros drop-down command
https://bugs.documentfoundation.org/show_bug.cgi?id=121581 --- Comment #6 from Commit Notification --- Rizal Muttaqin committed a patch related to this issue. It has been pushed to "libreoffice-6-2": https://git.libreoffice.org/core/+/5fd429a3e20d0fb91d96be9ded39f81325432509%5E%21 KJ & elementary: tdf#121581 change Organize Dialogs to Organize Macros; add Insert Layer It will be available in 6.2.0.1. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga
icon-themes/elementary/cmd/32/insertlayer.png |binary icon-themes/elementary/cmd/32/openhyperlinkoncursor.png |binary icon-themes/elementary/cmd/32/scriptorganizer.png |binary icon-themes/elementary/cmd/lc_insertlayer.png |binary icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png |binary icon-themes/elementary/cmd/lc_scriptorganizer.png |binary icon-themes/elementary/cmd/sc_insertlayer.png |binary icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png |binary icon-themes/elementary/cmd/sc_scriptorganizer.png |binary icon-themes/elementary/links.txt|3 icon-themes/elementary_svg/cmd/32/insertlayer.svg |1 icon-themes/elementary_svg/cmd/32/openhyperlinkoncursor.svg |1 icon-themes/elementary_svg/cmd/32/scriptorganizer.svg |1 icon-themes/elementary_svg/cmd/lc_inserthyperlink.svg | 320 icon-themes/elementary_svg/cmd/lc_insertlayer.svg |1 icon-themes/elementary_svg/cmd/lc_open.svg | 239 icon-themes/elementary_svg/cmd/lc_openhyperlinkoncursor.svg |1 icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg| 196 --- icon-themes/elementary_svg/cmd/lc_scriptorganizer.svg |1 icon-themes/elementary_svg/cmd/lc_zoomprevious.svg | 226 icon-themes/elementary_svg/cmd/sc_insertlayer.svg |6 icon-themes/elementary_svg/cmd/sc_open.svg | 140 - icon-themes/elementary_svg/cmd/sc_openhyperlinkoncursor.svg |1 icon-themes/elementary_svg/cmd/sc_scriptorganizer.svg |1 icon-themes/karasa_jaga/cmd/32/insertlayer.png |binary icon-themes/karasa_jaga/cmd/32/openhyperlinkoncursor.png|binary icon-themes/karasa_jaga/cmd/32/scriptorganizer.png |binary icon-themes/karasa_jaga/cmd/lc_openhyperlinkoncursor.png|binary icon-themes/karasa_jaga/cmd/lc_scriptorganizer.png |binary icon-themes/karasa_jaga/cmd/sc_openhyperlinkoncursor.png|binary icon-themes/karasa_jaga/cmd/sc_scriptorganizer.png |binary icon-themes/karasa_jaga/links.txt |3 32 files changed, 19 insertions(+), 1122 deletions(-) New commits: commit 5fd429a3e20d0fb91d96be9ded39f81325432509 Author: Rizal Muttaqin AuthorDate: Fri Nov 30 23:02:00 2018 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 1 05:08:25 2018 +0100 KJ & elementary: tdf#121581 change Organize Dialogs to Organize Macros; add Insert Layer Change-Id: I25bded0e5c1340ca61c747b0125825ed13a9150f Reviewed-on: https://gerrit.libreoffice.org/64349 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 262ba64960f6295e901dfeaa1de971e090a8a1dc) Reviewed-on: https://gerrit.libreoffice.org/64368 diff --git a/icon-themes/elementary/cmd/32/insertlayer.png b/icon-themes/elementary/cmd/32/insertlayer.png new file mode 100644 index ..39c2387cd58f Binary files /dev/null and b/icon-themes/elementary/cmd/32/insertlayer.png differ diff --git a/icon-themes/elementary/cmd/32/openhyperlinkoncursor.png b/icon-themes/elementary/cmd/32/openhyperlinkoncursor.png new file mode 100644 index ..30030042b2fc Binary files /dev/null and b/icon-themes/elementary/cmd/32/openhyperlinkoncursor.png differ diff --git a/icon-themes/elementary/cmd/32/scriptorganizer.png b/icon-themes/elementary/cmd/32/scriptorganizer.png new file mode 100644 index ..75e0c5fb1d5b Binary files /dev/null and b/icon-themes/elementary/cmd/32/scriptorganizer.png differ diff --git a/icon-themes/elementary/cmd/lc_insertlayer.png b/icon-themes/elementary/cmd/lc_insertlayer.png new file mode 100644 index ..d4d9f7083dd4 Binary files /dev/null and b/icon-themes/elementary/cmd/lc_insertlayer.png differ diff --git a/icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png b/icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png new file mode 100644 index ..cd99c0ced4fb Binary files /dev/null and b/icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png differ diff --git a/icon-themes/elementary/cmd/lc_scriptorganizer.png b/icon-themes/elementary/cmd/lc_scriptorganizer.png new file mode 100644 index ..d60c17604a64 Binary files /dev/null and b/icon-themes/elementary/cmd/lc_scriptorganizer.png differ diff --git a/icon-themes/elementary/cmd/sc_insertlayer.png b/icon-themes/elementary/cmd/sc_insertlayer.png new file mode 100644 index ..fcb62750cc4e Binary files /dev/null and b/icon-themes/elementary/cmd/sc_insertlayer.png differ diff --git a/icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png b/icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png new file mode 100644 index ..66f82ad38331 Binary files /dev/null and b/icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png differ diff --git
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - officecfg/registry sfx2/source
Rebased ref, commits from common ancestor:
commit 44d403ee1f4a07fc4c478c63a653ff74e376742e
Author: Katarina Behrens
AuthorDate: Tue Nov 27 15:30:24 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:39:25 2018 +0100
Option to turn off WebDAV file locking
Locking files on WebDAV shares was implemented in tdf#82744,
in particular:
commit 26e6d4b05ab444e6a7529ffcac7fbe592fc94833
tdf#82744: fix WebDAV lock/unlock behaviour - part 1
commit bc9a8ddbb7081f79e915c841e56fd1c40f0df6f9
tdf#82744: fix WebDAV lock/unlock behaviour - part 2
commit b4576f3da4d90139fc5140962d13cb91dab98797
tdf#82744: fix WebDAV lock/unlock behaviour - part 3
commit fed2984281a85a5a2f308841ec810f218c75f2ab
tdf#82744: fix WebDAV lock/unlock behaviour - part 4
Before that, files on WebDAV shares were accessed w/o locking since
the beginning of [OOo] time. This option allows to revert to
the old behaviour i.e. non-locking WebDAV access.
For concurrent read-write WebDAV access by multiple users it is
recommended to keep UseWebDAVFileLocking at default value (true)
Reviewed-on: https://gerrit.libreoffice.org/64116
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 297be63c8d1dd8f802b5216048d860c5b2661edc)
Reviewed-on: https://gerrit.libreoffice.org/64371
Tested-by: Thorsten Behrens
(cherry picked from commit 10dbbe46a4818b0fea4afbfe0fd66f75a2dd8eef)
Conflicts:
sfx2/source/doc/docfile.cxx
Change-Id: Id92177631d4854d6c7bf412164acbd9740db9592
Reviewed-on: https://gerrit.libreoffice.org/64372
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 74cbc1525e1a..e7b2dffa06b6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5624,6 +5624,15 @@
true
+
+
+ Determines if WebDAV-specific file locking is used for
documents
+ on WebDAV shares. It is not recommended to set this option to 'false'
in
+ scenarios where multi-user, concurrent read/write access to WebDAV
share
+ is required
+
+true
+
Allows to specify whether the OOo document file locking
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4c6cf3f60b4c..89ccdfcecbab 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -166,6 +166,11 @@ bool IsLockingUsed()
#endif
+bool IsWebDAVLockingUsed()
+{
+return officecfg::Office::Common::Misc::UseWebDAVFileLocking::get();
+}
+
} // anonymous namespace
class SfxMedium_Impl
@@ -1004,6 +1009,10 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading,
bool bNoUI )
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking is disabled
+if (!IsWebDAVLockingUsed())
+return;
+
try
{
bool bResult = pImpl->m_bLocked;
@@ -2789,6 +2798,12 @@ void SfxMedium::UnlockFile( bool bReleaseLockStream )
// check if webdav
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking if disabled
+// (shouldn't happen because we already skipped locking,
+// see LockOrigFileOnDemand, but just in case ...)
+if (!IsWebDAVLockingUsed())
+return;
+
if ( pImpl->m_bLocked )
{
// an interaction handler should be used for authentication, if
needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +++
sfx2/source/doc/docfile.cxx| 15 +
2 files changed, 24 insertions(+)
New commits:
commit 0afca7cea2de6d257f1e41a545323ff682ac332b
Author: Katarina Behrens
AuthorDate: Tue Nov 27 15:30:24 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:21:55 2018 +0100
Option to turn off WebDAV file locking
Locking files on WebDAV shares was implemented in tdf#82744,
in particular:
commit 26e6d4b05ab444e6a7529ffcac7fbe592fc94833
tdf#82744: fix WebDAV lock/unlock behaviour - part 1
commit bc9a8ddbb7081f79e915c841e56fd1c40f0df6f9
tdf#82744: fix WebDAV lock/unlock behaviour - part 2
commit b4576f3da4d90139fc5140962d13cb91dab98797
tdf#82744: fix WebDAV lock/unlock behaviour - part 3
commit fed2984281a85a5a2f308841ec810f218c75f2ab
tdf#82744: fix WebDAV lock/unlock behaviour - part 4
Before that, files on WebDAV shares were accessed w/o locking since
the beginning of [OOo] time. This option allows to revert to
the old behaviour i.e. non-locking WebDAV access.
For concurrent read-write WebDAV access by multiple users it is
recommended to keep UseWebDAVFileLocking at default value (true)
Reviewed-on: https://gerrit.libreoffice.org/64116
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 297be63c8d1dd8f802b5216048d860c5b2661edc)
Reviewed-on: https://gerrit.libreoffice.org/64371
Tested-by: Thorsten Behrens
(cherry picked from commit 10dbbe46a4818b0fea4afbfe0fd66f75a2dd8eef)
Conflicts:
sfx2/source/doc/docfile.cxx
Change-Id: Id92177631d4854d6c7bf412164acbd9740db9592
Reviewed-on: https://gerrit.libreoffice.org/64372
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 74cbc1525e1a..e7b2dffa06b6 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5624,6 +5624,15 @@
true
+
+
+ Determines if WebDAV-specific file locking is used for
documents
+ on WebDAV shares. It is not recommended to set this option to 'false'
in
+ scenarios where multi-user, concurrent read/write access to WebDAV
share
+ is required
+
+true
+
Allows to specify whether the OOo document file locking
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4c6cf3f60b4c..aa9ae6bff70f 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -166,6 +166,11 @@ bool IsLockingUsed()
#endif
+bool IsWebDAVLockingUsed()
+{
+return officecfg::Office::Common::Misc::UseWebDAVFileLocking::get();
+}
+
} // anonymous namespace
class SfxMedium_Impl
@@ -1004,6 +1009,10 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading,
bool bNoUI )
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking is disabled
+if (!IsWebDAVLockingUsed())
+return LockFileResult::Succeeded;
+
try
{
bool bResult = pImpl->m_bLocked;
@@ -2789,6 +2798,12 @@ void SfxMedium::UnlockFile( bool bReleaseLockStream )
// check if webdav
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking if disabled
+// (shouldn't happen because we already skipped locking,
+// see LockOrigFileOnDemand, but just in case ...)
+if (!IsWebDAVLockingUsed())
+return;
+
if ( pImpl->m_bLocked )
{
// an interaction handler should be used for authentication, if
needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +++
sfx2/source/doc/docfile.cxx| 15 +
2 files changed, 24 insertions(+)
New commits:
commit 10dbbe46a4818b0fea4afbfe0fd66f75a2dd8eef
Author: Katarina Behrens
AuthorDate: Tue Nov 27 15:30:24 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:17:28 2018 +0100
Option to turn off WebDAV file locking
Locking files on WebDAV shares was implemented in tdf#82744,
in particular:
commit 26e6d4b05ab444e6a7529ffcac7fbe592fc94833
tdf#82744: fix WebDAV lock/unlock behaviour - part 1
commit bc9a8ddbb7081f79e915c841e56fd1c40f0df6f9
tdf#82744: fix WebDAV lock/unlock behaviour - part 2
commit b4576f3da4d90139fc5140962d13cb91dab98797
tdf#82744: fix WebDAV lock/unlock behaviour - part 3
commit fed2984281a85a5a2f308841ec810f218c75f2ab
tdf#82744: fix WebDAV lock/unlock behaviour - part 4
Before that, files on WebDAV shares were accessed w/o locking since
the beginning of [OOo] time. This option allows to revert to
the old behaviour i.e. non-locking WebDAV access.
For concurrent read-write WebDAV access by multiple users it is
recommended to keep UseWebDAVFileLocking at default value (true)
Change-Id: Id92177631d4854d6c7bf412164acbd9740db9592
Reviewed-on: https://gerrit.libreoffice.org/64116
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 297be63c8d1dd8f802b5216048d860c5b2661edc)
Reviewed-on: https://gerrit.libreoffice.org/64371
Tested-by: Thorsten Behrens
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 3d73cc94deb2..432958100279 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5333,6 +5333,15 @@
true
+
+
+ Determines if WebDAV-specific file locking is used for
documents
+ on WebDAV shares. It is not recommended to set this option to 'false'
in
+ scenarios where multi-user, concurrent read/write access to WebDAV
share
+ is required
+
+true
+
Allows to specify whether the OOo document file locking
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 11d6fc293301..9212fabfeb6b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -171,6 +171,11 @@ bool IsLockingUsed()
#endif
+bool IsWebDAVLockingUsed()
+{
+return officecfg::Office::Common::Misc::UseWebDAVFileLocking::get();
+}
+
/// Gets default attributes of a file:// URL.
sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)
{
@@ -1103,6 +1108,10 @@ SfxMedium::LockFileResult
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking is disabled
+if (!IsWebDAVLockingUsed())
+return LockFileResult::Succeeded;
+
try
{
bool bResult = pImpl->m_bLocked;
@@ -2895,6 +2904,12 @@ void SfxMedium::UnlockFile( bool bReleaseLockStream )
// check if webdav
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking if disabled
+// (shouldn't happen because we already skipped locking,
+// see LockOrigFileOnDemand, but just in case ...)
+if (!IsWebDAVLockingUsed())
+return;
+
if ( pImpl->m_bLocked )
{
// an interaction handler should be used for authentication, if
needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 301 commits - basegfx/Library_basegfx.mk basegfx/source basegfx/test canvas/source chart2/inc chart2/qa chart2/source co
Rebased ref, commits from common ancestor:
commit ab5b828c862dd6177313035a30fbb7abd1007c6a
Author: Aleksei Nikiforov
AuthorDate: Fri Nov 30 10:42:38 2018 +0300
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:14:00 2018 +0100
KDE5: fix build with Qt-5.6
Change-Id: Ic4aef6b22d5b9c7262a534e26363c8f8cef99859
Reviewed-on: https://gerrit.libreoffice.org/64321
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index c93c1954e54a..8203a30c8112 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -53,7 +53,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem,
unsigned nPos)
// top-level menu
if (mpQMenuBar)
{
-pQMenu = new QMenu(toQString(aText));
+pQMenu = new QMenu(toQString(aText), nullptr);
pSalMenuItem->mpMenu.reset(pQMenu);
if ((nPos != MENU_APPEND)
@@ -77,7 +77,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem,
unsigned nPos)
if (pSalMenuItem->mpSubMenu)
{
// submenu
-QMenu* pTempQMenu = new QMenu(toQString(aText));
+QMenu* pTempQMenu = new QMenu(toQString(aText), nullptr);
pSalMenuItem->mpMenu.reset(pTempQMenu);
if ((nPos != MENU_APPEND)
@@ -102,7 +102,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem,
unsigned nPos)
{
if (pSalMenuItem->mnType == MenuItemType::SEPARATOR)
{
-QAction* pAction = new QAction();
+QAction* pAction = new QAction(nullptr);
pSalMenuItem->mpAction.reset(pAction);
pAction->setSeparator(true);
@@ -119,7 +119,7 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem,
unsigned nPos)
else
{
// leaf menu
-QAction* pAction = new QAction(toQString(aText));
+QAction* pAction = new QAction(toQString(aText), nullptr);
pSalMenuItem->mpAction.reset(pAction);
if ((nPos != MENU_APPEND)
commit 15ca59d3a3bf63093d888c87be99cc059434ce29
Author: Jan-Marek Glogowski
AuthorDate: Sun Sep 30 19:38:44 2018 +
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:14:00 2018 +0100
implicitboolconversion: ignore quint64 bitfield
Change-Id: I97380455b9f526b75c7d3855d188d2f659035ba2
Reviewed-on: https://gerrit.libreoffice.org/61170
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/implicitboolconversion.cxx
b/compilerplugins/clang/implicitboolconversion.cxx
index d7e80f56ab36..c3834c8054db 100644
--- a/compilerplugins/clang/implicitboolconversion.cxx
+++ b/compilerplugins/clang/implicitboolconversion.cxx
@@ -641,10 +641,12 @@ bool ImplicitBoolConversion::TraverseBinNE(BinaryOperator
* expr) {
bool ImplicitBoolConversion::TraverseBinAssign(BinaryOperator * expr) {
nested.push(std::vector());
bool bRet = RecursiveASTVisitor::TraverseBinAssign(expr);
-// /usr/include/gtk-2.0/gtk/gtktogglebutton.h: struct _GtkToggleButton:
+// gtk-2.0/gtk/gtktogglebutton.h: struct _GtkToggleButton:
// guint GSEAL (active) : 1;
// even though :
// "active" gboolean : Read / Write
+// qt5/QtGui/qaccessible.h: struct State:
+// quint64 disabled : 1;
bool bExt = false;
MemberExpr const * me = dyn_cast(expr->getLHS());
if (me != nullptr) {
@@ -653,7 +655,11 @@ bool
ImplicitBoolConversion::TraverseBinAssign(BinaryOperator * expr) {
&& fd->getBitWidthValue(compiler.getASTContext()) == 1)
{
TypedefType const * t = fd->getType()->getAs();
-bExt = t != nullptr && t->getDecl()->getNameAsString() == "guint";
+if (t != nullptr)
+{
+std::string sTypeName = t->getDecl()->getNameAsString();
+bExt = (sTypeName == "guint" || sTypeName == "quint64");
+}
}
}
assert(!nested.empty());
commit 36dd66602a9852ee9364bc6b488617c7b165e7f4
Author: Aleksei Nikiforov
AuthorDate: Fri Nov 23 12:08:08 2018 +0300
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:14:00 2018 +0100
tdf#120814 KDE5: Assign images to menu items on first build of menu
Treat submenu items similarly to action items.
Qt5MenuItem controls lifetime of menus and actions instead of QMenu or
QMenuBar.
Qt5MenuItem may need to remove menus, and thus it may need to delete it.
But if QMenu or QMenuBar owns menu, then on application exit a crash may
happen
due to order of destruction of objects.
Change-Id: I66138c5692bd4955e78a805cc774ff9fc8fefb99
Reviewed-on: https://gerrit.libreoffice.org/63886
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/sccellsobj.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 099772a10470e9125367e78ae77aa25bfd46cdc9
Author: Jens Carl
AuthorDate: Fri Nov 30 18:41:59 2018 +
Commit: Jens Carl
CommitDate: Sat Dec 1 03:13:38 2018 +0100
Correct class name
Change-Id: I76b440e72a80f20d05af477a38e9695cb17cb979
Reviewed-on: https://gerrit.libreoffice.org/64354
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/sc/qa/extras/sccellsobj.cxx b/sc/qa/extras/sccellsobj.cxx
index 93c9c9f8d259..ea63c4b444d9 100644
--- a/sc/qa/extras/sccellsobj.cxx
+++ b/sc/qa/extras/sccellsobj.cxx
@@ -28,16 +28,16 @@ using namespace css::uno;
namespace sc_apitest
{
-class ScCells : public CalcUnoApiTest, public apitest::XEnumerationAccess
+class ScCellsObj : public CalcUnoApiTest, public apitest::XEnumerationAccess
{
public:
-ScCells();
+ScCellsObj();
virtual uno::Reference init() override;
virtual void setUp() override;
virtual void tearDown() override;
-CPPUNIT_TEST_SUITE(ScCells);
+CPPUNIT_TEST_SUITE(ScCellsObj);
// XEnumerationAccess
CPPUNIT_TEST(testCreateEnumeration);
@@ -48,12 +48,12 @@ private:
uno::Reference m_xComponent;
};
-ScCells::ScCells()
+ScCellsObj::ScCellsObj()
: CalcUnoApiTest("/sc/qa/extras/testdocuments")
{
}
-uno::Reference ScCells::init()
+uno::Reference ScCellsObj::init()
{
uno::Reference xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
@@ -79,20 +79,20 @@ uno::Reference ScCells::init()
return xSCR->getCells();
}
-void ScCells::setUp()
+void ScCellsObj::setUp()
{
CalcUnoApiTest::setUp();
m_xComponent = loadFromDesktop("private:factory/scalc");
CPPUNIT_ASSERT_MESSAGE("no component", m_xComponent.is());
}
-void ScCells::tearDown()
+void ScCellsObj::tearDown()
{
closeDocument(m_xComponent);
CalcUnoApiTest::tearDown();
}
-CPPUNIT_TEST_SUITE_REGISTRATION(ScCells);
+CPPUNIT_TEST_SUITE_REGISTRATION(ScCellsObj);
} // namespace sc_apitest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data/collapsed_bookmark.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx| 304 ++
2 files changed, 304 insertions(+)
New commits:
commit a0abe5e7dd3a0175d03083bddf975e3cd9afcffe
Author: Serge Krot
AuthorDate: Wed Nov 28 18:56:09 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:11:45 2018 +0100
sw: new unit tests for editing text in bookmarks
Change-Id: Ia7b49c0ae685f6a18e9d372a689643422f1f6a04
Reviewed-on: https://gerrit.libreoffice.org/64189
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/uiwriter/data/collapsed_bookmark.odt
b/sw/qa/extras/uiwriter/data/collapsed_bookmark.odt
new file mode 100644
index ..66cc65dd1863
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/collapsed_bookmark.odt
differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index a636718275a3..06addd98598a 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -262,6 +262,10 @@ public:
void testTdf96943();
void testTdf96536();
void testTdf96479();
+void testBookmarkCollapsed();
+void testRemoveBookmarkText();
+void testRemoveBookmarkTextAndAddNew();
+void testRemoveBookmarkTextAndAddNewAfterReload();
void testTdf96961();
void testTdf88453();
void testTdf88453Table();
@@ -461,6 +465,10 @@ public:
CPPUNIT_TEST(testTdf96943);
CPPUNIT_TEST(testTdf96536);
CPPUNIT_TEST(testTdf96479);
+CPPUNIT_TEST(testBookmarkCollapsed);
+CPPUNIT_TEST(testRemoveBookmarkText);
+CPPUNIT_TEST(testRemoveBookmarkTextAndAddNew);
+CPPUNIT_TEST(testRemoveBookmarkTextAndAddNewAfterReload);
CPPUNIT_TEST(testTdf96961);
CPPUNIT_TEST(testTdf88453);
CPPUNIT_TEST(testTdf88453Table);
@@ -4604,6 +4612,302 @@ void SwUiWriterTest::testTdf96479()
}
}
+// If you resave original document the bookmark will be changed from
+//
+//
+//
+//
+// def
+//
+//
+// to
+//
+//
+//
+// def
+//
+//
+void SwUiWriterTest::testBookmarkCollapsed()
+{
+// load document
+SwDoc* pDoc = createDoc("collapsed_bookmark.odt");
+CPPUNIT_ASSERT(pDoc);
+
+// save original document
+utl::TempFile aTempFile;
+save("writer8", aTempFile);
+
+// load only content.xml from the resaved document
+if (xmlDocPtr pXmlDoc = parseExportInternal(aTempFile.GetURL(),
"content.xml"))
+{
+const OString
aPath("/office:document-content/office:body/office:text/text:p");
+
+const int pos1 = getXPathPosition(pXmlDoc, aPath, "bookmark");
+const int pos2 = getXPathPosition(pXmlDoc, aPath, "bookmark-start");
+const int pos3 = getXPathPosition(pXmlDoc, aPath, "bookmark-end");
+
+CPPUNIT_ASSERT_EQUAL(0, pos1); // found, and it is first
+CPPUNIT_ASSERT_EQUAL(2, pos2); // not found
+CPPUNIT_ASSERT_EQUAL(2, pos3); // not found
+}
+}
+
+// 1. Open a new writer document
+// 2. Enter the text "abcdef"
+// 3. Select "abc"
+// 4. Insert a bookmark on "abc" using Insert->Bookmark. Name the bookmark
"test".
+// 5. Open the navigator (F5)
+//Select the bookmark "test" using the navigator.
+// 6. Hit Del, thus deleting "abc" (The bookmark "test" is still there).
+// 7. Save the document:
+//
+//
+//
+// def
+//
+//
+void SwUiWriterTest::testRemoveBookmarkText()
+{
+// create document
+{
+// create a text document with "abcdef"
+SwDoc* pDoc = createDoc();
+SwXTextDocument *pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+{
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+pDoc->getIDocumentContentOperations().InsertString(aPaM, "abcdef");
+}
+
+// mark "abc" with "testBookmark" bookmark
+{
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+
+lcl_selectCharacters(aPaM, 0, 3);
+IDocumentMarkAccess = *pDoc->getIDocumentMarkAccess();
+sw::mark::IMark *pMark =
+rIDMA.makeMark(aPaM, "testBookmark",
+IDocumentMarkAccess::MarkType::BOOKMARK,
+::sw::mark::InsertMode::New);
+
+// verify
+CPPUNIT_ASSERT(pMark->IsExpanded());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount());
+}
+
+// remove text marked with bookmark
+{
+SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
+SwPaM aPaM(aIdx);
+
+lcl_selectCharacters(aPaM, 0, 3);
+pDoc->getIDocumentContentOperations().DeleteRange(aPaM);
+
+// verify: bookmark is still exist
+IDocumentMarkAccess = *pDoc->getIDocumentMarkAccess();
+
[Libreoffice-commits] core.git: officecfg/registry sfx2/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 +++
sfx2/source/doc/docfile.cxx| 15 +
2 files changed, 24 insertions(+)
New commits:
commit 297be63c8d1dd8f802b5216048d860c5b2661edc
Author: Katarina Behrens
AuthorDate: Tue Nov 27 15:30:24 2018 +0100
Commit: Thorsten Behrens
CommitDate: Sat Dec 1 03:08:36 2018 +0100
Option to turn off WebDAV file locking
Locking files on WebDAV shares was implemented in tdf#82744,
in particular:
commit 26e6d4b05ab444e6a7529ffcac7fbe592fc94833
tdf#82744: fix WebDAV lock/unlock behaviour - part 1
commit bc9a8ddbb7081f79e915c841e56fd1c40f0df6f9
tdf#82744: fix WebDAV lock/unlock behaviour - part 2
commit b4576f3da4d90139fc5140962d13cb91dab98797
tdf#82744: fix WebDAV lock/unlock behaviour - part 3
commit fed2984281a85a5a2f308841ec810f218c75f2ab
tdf#82744: fix WebDAV lock/unlock behaviour - part 4
Before that, files on WebDAV shares were accessed w/o locking since
the beginning of [OOo] time. This option allows to revert to
the old behaviour i.e. non-locking WebDAV access.
For concurrent read-write WebDAV access by multiple users it is
recommended to keep UseWebDAVFileLocking at default value (true)
Change-Id: Id92177631d4854d6c7bf412164acbd9740db9592
Reviewed-on: https://gerrit.libreoffice.org/64116
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 225567c53a06..6e7869bb8bf7 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5356,6 +5356,15 @@
true
+
+
+ Determines if WebDAV-specific file locking is used for
documents
+ on WebDAV shares. It is not recommended to set this option to 'false'
in
+ scenarios where multi-user, concurrent read/write access to WebDAV
share
+ is required
+
+true
+
Allows to specify whether the OOo document file locking
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 144fe50aa64c..f232cc0d2ba8 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -173,6 +173,11 @@ bool IsLockingUsed()
#endif
+bool IsWebDAVLockingUsed()
+{
+return officecfg::Office::Common::Misc::UseWebDAVFileLocking::get();
+}
+
/// Gets default attributes of a file:// URL.
sal_uInt64 GetDefaultFileAttributes(const OUString& rURL)
{
@@ -1088,6 +1093,10 @@ SfxMedium::LockFileResult
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking is disabled
+if (!IsWebDAVLockingUsed())
+return LockFileResult::Succeeded;
+
try
{
bool bResult = pImpl->m_bLocked;
@@ -2866,6 +2875,12 @@ void SfxMedium::UnlockFile( bool bReleaseLockStream )
// check if webdav
if ( GetURLObject().isAnyKnownWebDAVScheme() )
{
+// do nothing if WebDAV locking if disabled
+// (shouldn't happen because we already skipped locking,
+// see LockOrigFileOnDemand, but just in case ...)
+if (!IsWebDAVLockingUsed())
+return;
+
if ( pImpl->m_bLocked )
{
// an interaction handler should be used for authentication, if
needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test solenv/clang-format test/source
include/test/container/xelementaccess.hxx | 28 ++--
solenv/clang-format/blacklist |2 --
test/source/container/xelementaccess.cxx | 19 +++
3 files changed, 29 insertions(+), 20 deletions(-)
New commits:
commit 71636d5606116e432a69b03d85c4282a6452c7fb
Author: Jens Carl
AuthorDate: Fri Nov 30 20:55:34 2018 +
Commit: Jens Carl
CommitDate: Sat Dec 1 03:03:15 2018 +0100
Enable XElementAccess test cases
The class XElementAccess was missing the macro OOO_DLLPUBLIC_TEST,
and so it wasn't possible to use these test cases.
Change-Id: I358bb840c6088ea25b60ee57b8c69f31ab71ddbb
Reviewed-on: https://gerrit.libreoffice.org/64363
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/include/test/container/xelementaccess.hxx
b/include/test/container/xelementaccess.hxx
index efdca128fe79..d9796a2f6c86 100644
--- a/include/test/container/xelementaccess.hxx
+++ b/include/test/container/xelementaccess.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -10,29 +10,37 @@
#ifndef INCLUDED_TEST_CONTAINER_XELEMENTACCESS_HXX
#define INCLUDED_TEST_CONTAINER_XELEMENTACCESS_HXX
-#include
+#include
+
#include
+#include
-namespace apitest {
+#include
-class XElementAccess
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XElementAccess
{
public:
-XElementAccess(css::uno::Type const & rType): maType(rType) {}
+XElementAccess(css::uno::Type const& rType)
+: m_aType(rType)
+{
+}
void testGetElementType();
void testHasElements();
-virtual css::uno::Reference< css::uno::XInterface > init() = 0;
+virtual css::uno::Reference init() = 0;
-virtual ~XElementAccess() {}
+protected:
+~XElementAccess() {}
private:
-css::uno::Type const maType;
+css::uno::Type const m_aType;
};
-}
+} // namespace apitest
#endif // INCLUDED_TEST_CONTAINER_XELEMENTACCESS_HXX
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9b4f7770921d..4693499b7f0e 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7576,7 +7576,6 @@ include/test/beans/xpropertyset.hxx
include/test/bootstrapfixture.hxx
include/test/calc_unoapi_test.hxx
include/test/callgrind.hxx
-include/test/container/xelementaccess.hxx
include/test/container/xindexaccess.hxx
include/test/container/xnamecontainer.hxx
include/test/container/xnamed.hxx
@@ -16569,7 +16568,6 @@ test/source/beans/xpropertyset.cxx
test/source/bootstrapfixture.cxx
test/source/calc_unoapi_test.cxx
test/source/callgrind.cxx
-test/source/container/xelementaccess.cxx
test/source/container/xindexaccess.cxx
test/source/container/xnamecontainer.cxx
test/source/container/xnamed.cxx
diff --git a/test/source/container/xelementaccess.cxx
b/test/source/container/xelementaccess.cxx
index d6d4472e984f..d751fef4ff1b 100644
--- a/test/source/container/xelementaccess.cxx
+++ b/test/source/container/xelementaccess.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -8,26 +8,29 @@
*/
#include
+
#include
+#include
+
#include
using namespace css;
using namespace css::uno;
-namespace apitest {
-
+namespace apitest
+{
void XElementAccess::testGetElementType()
{
-uno::Reference< container::XElementAccess > xElementAccess(init(),
UNO_QUERY_THROW);
-CPPUNIT_ASSERT_EQUAL(maType, xElementAccess->getElementType());
+uno::Reference xElementAccess(init(),
UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(m_aType, xElementAccess->getElementType());
}
void XElementAccess::testHasElements()
{
-uno::Reference< container::XElementAccess > xElementAccess(init(),
UNO_QUERY_THROW);
+uno::Reference xElementAccess(init(),
UNO_QUERY_THROW);
CPPUNIT_ASSERT(xElementAccess->hasElements());
}
-}
+} // namespace apitest
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 121821] PDF as Email not working as before
https://bugs.documentfoundation.org/show_bug.cgi?id=121821 Reinhard changed: What|Removed |Added Resolution|--- |WORKSFORME Status|NEEDINFO|RESOLVED --- Comment #2 from Reinhard --- I use (X32) version and so far was updated as such. Seems this time I was updated from 6.0 (X32) to 6.1 (X64). Deinstalled 6.1 and reinstalled 6.0. Works as before. That's it. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121830] FILEOPEN PPTX Video file recognised as image (GTK3)
https://bugs.documentfoundation.org/show_bug.cgi?id=121830 --- Comment #1 from Durgapriyanka --- Slide no 4 appears blank with a Question mark(?) symbol in my Presentation. Version: 6.0.6.2 Build ID: 0c292870b25a325b5ed35f6b45599d2ea4458e77 CPU threads: 2; OS: Windows 6.1; UI render: default; Locale: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: basic/source
basic/source/classes/sbxmod.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ee8cba8591f2d610f8193d91039c9657e697f7db
Author: Andrea Gelmini
AuthorDate: Fri Nov 30 19:58:46 2018 +0100
Commit: Jens Carl
CommitDate: Sat Dec 1 02:13:11 2018 +0100
Fix typos
Change-Id: Ie85b3a61ded8c6fd7a1f8c463912062669b3719b
Reviewed-on: https://gerrit.libreoffice.org/64357
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c4a3267e1f56..8fb9d12a5ce0 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -429,7 +429,7 @@ SbModule::SbModule( const OUString& rName, bool bVBACompat )
SetFlag( SbxFlagBits::ExtSearch | SbxFlagBits::GlobalSearch );
SetModuleType( script::ModuleType::NORMAL );
-// #i92642: Set name property to intitial name
+// #i92642: Set name property to initial name
SbxVariable* pNameProp = pProps->Find( "Name", SbxClassType::Property );
if( pNameProp != nullptr )
{
@@ -2554,7 +2554,7 @@ void SbUserFormModule::Unload()
pMeth->Get( aVals);
if ( !bWaitForDispose )
{
-// we've either already got a dispose or we'er never going to get
one
+// we've either already got a dispose or we are never going to get
one
ResetApiObj();
} // else wait for dispose
SAL_INFO("basic", "UnloadObject completed ( we hope )");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 121740] PPT (1, 2 MB) with Equation 3.0 objects is slow to load (was better with OO and previous LO)
https://bugs.documentfoundation.org/show_bug.cgi?id=121740 Durgapriyanka changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #4 from Durgapriyanka --- I can confirm that the bug is present in Version: 6.0.6.2 Build ID: 0c292870b25a325b5ed35f6b45599d2ea4458e77 CPU threads: 2; OS: Windows 6.1; UI render: default; Locale: en-US (en_US); Calc: group It takes about 80 seconds to load -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 47 ++--
oox/source/drawingml/diagram/diagramlayoutatoms.hxx |2
oox/source/drawingml/diagram/layoutatomvisitors.cxx |2
sd/qa/unit/import-tests-smartart.cxx|6 ++
4 files changed, 51 insertions(+), 6 deletions(-)
New commits:
commit ddc2786831367577967e806d603f337a2e42806a
Author: Miklos Vajna
AuthorDate: Fri Nov 30 17:57:21 2018 +0100
Commit: Miklos Vajna
CommitDate: Sat Dec 1 02:04:36 2018 +0100
oox smartart, accent process: adjust size of connector from constraints
The constraints explicitly said that the width should be larger than the
height, but it was the opposite as constraints were not parsed.
Unfortunately it would be too brave for globally start handling all
constraints which lack a forName, so add a switch to opt in for this,
and use that with the conn algorithm. All clients should migrate to
bRequireForName=true at some stage, though.
Change-Id: I24ae79b141c0f7a11e4d19f141759fc1dd2169b0
Reviewed-on: https://gerrit.libreoffice.org/64350
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index f5a7b410de03..74cd2ed7d06c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -314,11 +314,14 @@ void ConstraintAtom::accept( LayoutAtomVisitor& rVisitor )
rVisitor.visit(*this);
}
-void ConstraintAtom::parseConstraint(std::vector& rConstraints)
const
+void ConstraintAtom::parseConstraint(std::vector& rConstraints,
+ bool bRequireForName) const
{
+if (bRequireForName && maConstraint.msForName.isEmpty())
+return;
+
// accepting only basic equality constraints
-if (!maConstraint.msForName.isEmpty()
-&& (maConstraint.mnOperator == XML_none || maConstraint.mnOperator ==
XML_equ)
+if ((maConstraint.mnOperator == XML_none || maConstraint.mnOperator ==
XML_equ)
&& maConstraint.mnType != XML_none)
{
rConstraints.push_back(maConstraint);
@@ -342,7 +345,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
{
auto pConstraintAtom = dynamic_cast(pChild.get());
if (pConstraintAtom)
-pConstraintAtom->parseConstraint(aMergedConstraints);
+pConstraintAtom->parseConstraint(aMergedConstraints,
/*bRequireForName=*/true);
}
}
aMergedConstraints.insert(aMergedConstraints.end(),
rOwnConstraints.begin(),
@@ -444,6 +447,42 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
rShape->setSubType(nType);
rShape->getCustomShapeProperties()->setShapePresetType(nType);
}
+
+// Parse constraints to adjust the size.
+std::vector aDirectConstraints;
+const LayoutNode& rLayoutNode = getLayoutNode();
+for (const auto& pChild : rLayoutNode.getChildren())
+{
+auto pConstraintAtom =
dynamic_cast(pChild.get());
+if (pConstraintAtom)
+pConstraintAtom->parseConstraint(aDirectConstraints,
/*bRequireForName=*/false);
+}
+
+LayoutPropertyMap aProperties;
+LayoutProperty& rParent = aProperties[""];
+rParent[XML_w] = rShape->getSize().Width;
+rParent[XML_h] = rShape->getSize().Height;
+rParent[XML_l] = 0;
+rParent[XML_t] = 0;
+rParent[XML_r] = rShape->getSize().Width;
+rParent[XML_b] = rShape->getSize().Height;
+for (const auto& rConstr : aDirectConstraints)
+{
+const LayoutPropertyMap::const_iterator aRef
+= aProperties.find(rConstr.msRefForName);
+if (aRef != aProperties.end())
+{
+const LayoutProperty::const_iterator aRefType
+= aRef->second.find(rConstr.mnRefType);
+if (aRefType != aRef->second.end())
+aProperties[rConstr.msForName][rConstr.mnType]
+= aRefType->second * rConstr.mfFactor;
+}
+}
+awt::Size aSize;
+aSize.Width = rParent[XML_w];
+aSize.Height = rParent[XML_h];
+rShape->setSize(aSize);
break;
}
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 024cdaa1b61a..440db0ef21ed 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -141,7 +141,7 @@ public:
virtual void accept( LayoutAtomVisitor& ) override;
Constraint& getConstraint()
{ return maConstraint; }
-
[Libreoffice-commits] core.git: sal/qa
sal/qa/rtl/math/test-rtl-math.cxx | 56 ++
1 file changed, 56 insertions(+)
New commits:
commit d43e48cabce7fa8235207288e66a06fce1c58975
Author: Eike Rathke
AuthorDate: Fri Nov 30 21:37:58 2018 +0100
Commit: Eike Rathke
CommitDate: Sat Dec 1 02:04:11 2018 +0100
Unit test for leading and trailing group separator characters
Change-Id: I10ff8b59ba707d5795338ff5e9037473d31337bc
Reviewed-on: https://gerrit.libreoffice.org/64361
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx
b/sal/qa/rtl/math/test-rtl-math.cxx
index 214ddb035177..5038b45a13c8 100644
--- a/sal/qa/rtl/math/test-rtl-math.cxx
+++ b/sal/qa/rtl/math/test-rtl-math.cxx
@@ -101,6 +101,54 @@ public:
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), end);
CPPUNIT_ASSERT_EQUAL(5.0, res);
+
+// Leading 0 and group separator.
+res = rtl::math::stringToDouble(
+OUString("0,123"),
+'.', ',', , );
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), end);
+CPPUNIT_ASSERT_EQUAL(123.0, res);
+
+// Leading 0 and two consecutive group separators are none.
+res = rtl::math::stringToDouble(
+OUString("0,,1"),
+'.', ',', , );
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
+
+// Leading 0 and group separator at end is none.
+res = rtl::math::stringToDouble(
+OUString("0,"),
+'.', ',', , );
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
+
+// Leading 0 and group separator before non-digit is none.
+res = rtl::math::stringToDouble(
+OUString("0,x"),
+'.', ',', , );
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
+
+// Trailing group separator is none.
+res = rtl::math::stringToDouble(
+OUString("1,234,"),
+'.', ',', , );
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), end);
+CPPUNIT_ASSERT_EQUAL(1234.0, res);
+
+// Group separator followed by non-digit is none.
+res = rtl::math::stringToDouble(
+OUString("1,234,x"),
+'.', ',', , );
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), end);
+CPPUNIT_ASSERT_EQUAL(1234.0, res);
}
void test_stringToDouble_bad() {
@@ -133,6 +181,14 @@ public:
CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
CPPUNIT_ASSERT_EQUAL(0.0, res);
+
+// Leading group separator is none.
+res = rtl::math::stringToDouble(
+OUString(",1234"),
+'.', ',', , );
+CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_Ok, status);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), end);
+CPPUNIT_ASSERT_EQUAL(0.0, res);
}
void test_stringToDouble_exponent_without_digit() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/qa sc/source
sc/qa/unit/data/functions/statistical/fods/large.fods | 16 ++-
sc/qa/unit/data/functions/statistical/fods/small.fods | 17 ++-
sc/source/core/inc/interpre.hxx |5
sc/source/core/tool/interpr3.cxx | 93 +-
sc/source/core/tool/interpr5.cxx | 33 --
5 files changed, 141 insertions(+), 23 deletions(-)
New commits:
commit 3f3c5dad9b41eb359fadf5aa81d4ed3f6dead46d
Author: Takeshi Abe
AuthorDate: Tue Nov 27 11:28:18 2018 +0900
Commit: Eike Rathke
CommitDate: Sat Dec 1 02:03:51 2018 +0100
i#32345 Support a matrix of rank argument for LARGE()/SMALL()
This is a followup of e22ab5e6f6b0ea49231ca454a567133996306116.
Change-Id: I7052e113173204f7cfcd40622f52c5d4e14b3aa9
Reviewed-on: https://gerrit.libreoffice.org/64139
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit e4c2d0bb57ab8ea8f5c400d103d01376b8140f22)
Reviewed-on: https://gerrit.libreoffice.org/64364
diff --git a/sc/qa/unit/data/functions/statistical/fods/large.fods
b/sc/qa/unit/data/functions/statistical/fods/large.fods
index 6e701e71671f..d72e3bde9a20 100644
--- a/sc/qa/unit/data/functions/statistical/fods/large.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/large.fods
@@ -4794,10 +4794,18 @@
-
-
-
-
+
+ -2
+
+
+ -2
+
+
+ TRUE
+
+
+ =MDETERM(LARGE(I30:I39,{1,2;3,4}))
+
2
diff --git a/sc/qa/unit/data/functions/statistical/fods/small.fods
b/sc/qa/unit/data/functions/statistical/fods/small.fods
index 94a6ae6344ef..549be5c7e187 100644
--- a/sc/qa/unit/data/functions/statistical/fods/small.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/small.fods
@@ -4186,10 +4186,19 @@
-
-
-
-
+
+
+ -13
+
+
+ -13
+
+
+ TRUE
+
+
+ =MDETERM(SMALL(F1:F11,{1,2;3,4}))
+
90012
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 7608098d53bb..b6c68dcdb264 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -175,6 +175,8 @@ public:
ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty = false);
+ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR, const std::vector&
rValues);
+
enum VolatileType {
VOLATILE,
VOLATILE_MACRO,
@@ -225,6 +227,8 @@ private:
VolatileType meVolatileType;
+void MakeMatNew(ScMatrixRef& rMat, SCSIZE nC, SCSIZE nR);
+
/// Merge global and document specific settings.
void MergeCalcConfig();
@@ -934,6 +938,7 @@ private:
void ScMedian();
double GetMedian( ::std::vector & rArray );
double GetPercentileExclusive( ::std::vector & rArray, double
fPercentile );
+std::vector GetTopNumberArray( SCSIZE& rCol, SCSIZE& rRow );
void GetNumberSequenceArray( sal_uInt8 nParamCount, ::std::vector&
rArray, bool bConvertTextInArray );
void GetSortArray( sal_uInt8 nParamCount, ::std::vector&
rSortArray, ::std::vector* pIndexOrder, bool bConvertTextInArray, bool
bAllowEmptyArray );
static void QuickSort(::std::vector& rSortArray,
::std::vector* pIndexOrder);
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 56078ea0b915..9d846f6bc158 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3639,14 +3639,15 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
if ( !MustHaveParamCount( GetByte(), 2 ) )
return;
-std::vector aArray;
-GetNumberSequenceArray(1, aArray, false);
+SCSIZE nCol = 0, nRow = 0;
+auto aArray = GetTopNumberArray(nCol, nRow);
auto aArraySize = aArray.size();
if (aArraySize == 0 || nGlobalError != FormulaError::NONE)
{
PushNoValue();
return;
}
+assert(aArraySize == nCol * nRow);
for (double fArg : aArray)
{
double f = ::rtl::math::approxFloor(fArg);
@@ -3701,8 +3702,7 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
aArray.clear();
for (SCSIZE n : aRankArray)
aArray.push_back(aSortArray[bSmall ? n-1 : nSize-n]);
-ScMatrixRef pResult = GetNewMat(1, aArraySize, true);
-pResult->PutDoubleVector(aArray, 0, 0);
+ScMatrixRef pResult = GetNewMat(nCol, nRow, aArray);
PushMatrix(pResult);
}
}
@@ -3841,6 +3841,91 @@ void ScInterpreter::ScTrimMean()
}
}
+std::vector ScInterpreter::GetTopNumberArray( SCSIZE& rCol, SCSIZE&
rRow )
+{
+std::vector aArray;
+switch (GetStackType())
+{
+case svDouble:
+aArray.push_back(PopDouble());
+rCol = rRow = 1;
+break;
+case svSingleRef:
+{
+ScAddress aAdr;
+PopSingleRef(aAdr);
+ScRefCellValue aCell(*pDok,
[Libreoffice-bugs] [Bug 61623] UI Data Validity List and icon drawing bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=61623 m.a.riosv changed: What|Removed |Added CC||minute.visit...@gmail.com --- Comment #13 from m.a.riosv --- *** Bug 121827 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121827] Validity - the dropdown menu is visible in another sheets
https://bugs.documentfoundation.org/show_bug.cgi?id=121827 m.a.riosv changed: What|Removed |Added CC||miguelangelrv@libreoffice.o ||rg Resolution|--- |DUPLICATE Status|UNCONFIRMED |RESOLVED --- Comment #2 from m.a.riosv --- https://bugs.documentfoundation.org/show_bug.cgi?id=61623 *** This bug has been marked as a duplicate of bug 61623 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121821] PDF as Email not working as before
https://bugs.documentfoundation.org/show_bug.cgi?id=121821 m.a.riosv changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||miguelangelrv@libreoffice.o ||rg Ever confirmed|0 |1 --- Comment #1 from m.a.riosv --- It works fine for me. Version: 6.1.3.2 (x64) Build ID: 86daf60bf00efa86ad547e59e09d6bb77c699acb CPU threads: 4; OS: Windows 10.0; UI render: GL; Locale: es-ES (es_ES); Calc: CL Please send a sample file and the exact steps to reproduce the issue with it. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108816] [META] Writer toolbar bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108816 Rizal Muttaqin changed: What|Removed |Added Depends on||121187 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=121187 [Bug 121187] Add Accept All Changes and Reject All Changes to Track Changes toolbar -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121581] Replace the "Organize Dialogs" command in the Tools tab in the Tabbed UI by the Organize Macros drop-down command
https://bugs.documentfoundation.org/show_bug.cgi?id=121581 --- Comment #5 from Commit Notification --- Rizal Muttaqin committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/262ba64960f6295e901dfeaa1de971e090a8a1dc%5E%21 KJ & elementary: tdf#121581 change Organize Dialogs to Organize Macros; add Insert Layer It will be available in 6.3.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg icon-themes/karasa_jaga
icon-themes/elementary/cmd/32/insertlayer.png |binary icon-themes/elementary/cmd/32/openhyperlinkoncursor.png |binary icon-themes/elementary/cmd/32/scriptorganizer.png |binary icon-themes/elementary/cmd/lc_insertlayer.png |binary icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png |binary icon-themes/elementary/cmd/lc_scriptorganizer.png |binary icon-themes/elementary/cmd/sc_insertlayer.png |binary icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png |binary icon-themes/elementary/cmd/sc_scriptorganizer.png |binary icon-themes/elementary/links.txt|3 icon-themes/elementary_svg/cmd/32/insertlayer.svg |1 icon-themes/elementary_svg/cmd/32/openhyperlinkoncursor.svg |1 icon-themes/elementary_svg/cmd/32/scriptorganizer.svg |1 icon-themes/elementary_svg/cmd/lc_inserthyperlink.svg | 320 icon-themes/elementary_svg/cmd/lc_insertlayer.svg |1 icon-themes/elementary_svg/cmd/lc_open.svg | 239 icon-themes/elementary_svg/cmd/lc_openhyperlinkoncursor.svg |1 icon-themes/elementary_svg/cmd/lc_pagecolumntype.svg| 196 --- icon-themes/elementary_svg/cmd/lc_scriptorganizer.svg |1 icon-themes/elementary_svg/cmd/lc_zoomprevious.svg | 226 icon-themes/elementary_svg/cmd/sc_insertlayer.svg |6 icon-themes/elementary_svg/cmd/sc_open.svg | 140 - icon-themes/elementary_svg/cmd/sc_openhyperlinkoncursor.svg |1 icon-themes/elementary_svg/cmd/sc_scriptorganizer.svg |1 icon-themes/karasa_jaga/cmd/32/insertlayer.png |binary icon-themes/karasa_jaga/cmd/32/openhyperlinkoncursor.png|binary icon-themes/karasa_jaga/cmd/32/scriptorganizer.png |binary icon-themes/karasa_jaga/cmd/lc_openhyperlinkoncursor.png|binary icon-themes/karasa_jaga/cmd/lc_scriptorganizer.png |binary icon-themes/karasa_jaga/cmd/sc_openhyperlinkoncursor.png|binary icon-themes/karasa_jaga/cmd/sc_scriptorganizer.png |binary icon-themes/karasa_jaga/links.txt |3 32 files changed, 19 insertions(+), 1122 deletions(-) New commits: commit 262ba64960f6295e901dfeaa1de971e090a8a1dc Author: Rizal Muttaqin AuthorDate: Fri Nov 30 23:02:00 2018 +0700 Commit: Rizal Muttaqin CommitDate: Sat Dec 1 01:14:34 2018 +0100 KJ & elementary: tdf#121581 change Organize Dialogs to Organize Macros; add Insert Layer Change-Id: I25bded0e5c1340ca61c747b0125825ed13a9150f Reviewed-on: https://gerrit.libreoffice.org/64349 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/insertlayer.png b/icon-themes/elementary/cmd/32/insertlayer.png new file mode 100644 index ..39c2387cd58f Binary files /dev/null and b/icon-themes/elementary/cmd/32/insertlayer.png differ diff --git a/icon-themes/elementary/cmd/32/openhyperlinkoncursor.png b/icon-themes/elementary/cmd/32/openhyperlinkoncursor.png new file mode 100644 index ..30030042b2fc Binary files /dev/null and b/icon-themes/elementary/cmd/32/openhyperlinkoncursor.png differ diff --git a/icon-themes/elementary/cmd/32/scriptorganizer.png b/icon-themes/elementary/cmd/32/scriptorganizer.png new file mode 100644 index ..75e0c5fb1d5b Binary files /dev/null and b/icon-themes/elementary/cmd/32/scriptorganizer.png differ diff --git a/icon-themes/elementary/cmd/lc_insertlayer.png b/icon-themes/elementary/cmd/lc_insertlayer.png new file mode 100644 index ..d4d9f7083dd4 Binary files /dev/null and b/icon-themes/elementary/cmd/lc_insertlayer.png differ diff --git a/icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png b/icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png new file mode 100644 index ..cd99c0ced4fb Binary files /dev/null and b/icon-themes/elementary/cmd/lc_openhyperlinkoncursor.png differ diff --git a/icon-themes/elementary/cmd/lc_scriptorganizer.png b/icon-themes/elementary/cmd/lc_scriptorganizer.png new file mode 100644 index ..d60c17604a64 Binary files /dev/null and b/icon-themes/elementary/cmd/lc_scriptorganizer.png differ diff --git a/icon-themes/elementary/cmd/sc_insertlayer.png b/icon-themes/elementary/cmd/sc_insertlayer.png new file mode 100644 index ..fcb62750cc4e Binary files /dev/null and b/icon-themes/elementary/cmd/sc_insertlayer.png differ diff --git a/icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png b/icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png new file mode 100644 index ..66f82ad38331 Binary files /dev/null and b/icon-themes/elementary/cmd/sc_openhyperlinkoncursor.png differ diff --git a/icon-themes/elementary/cmd/sc_scriptorganizer.png b/icon-themes/elementary/cmd/sc_scriptorganizer.png new file mode 100644 index
[Libreoffice-commits] core.git: i18npool/source sal/rtl
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 14
--
sal/rtl/math.cxx | 14
--
2 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit a4146c38a07ff51b37d40c2e953f54b0a746a8b7
Author: Eike Rathke
AuthorDate: Fri Nov 30 20:06:24 2018 +0100
Commit: Eike Rathke
CommitDate: Sat Dec 1 01:10:25 2018 +0100
A leading or trailing group separator character is not a group separator
Also a group separator character followed by a non-digit is not.
Change-Id: Id57e43fe7692706c5532fb05ad394224265c2750
Reviewed-on: https://gerrit.libreoffice.org/64358
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 3c040a5a0085..7af1dd8baf45 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -822,8 +822,18 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
if ( nMask & ParserFlags::VALUE )
{
if (current == cGroupSep)
-nParseTokensType |=
KParseTokens::GROUP_SEPARATOR_IN_NUMBER;
-if ((current == cDecimalSep || (bDecSepAltUsed =
(cDecimalSepAlt && current == cDecimalSepAlt))) &&
+{
+if (getFlags(nextChar) & ParserFlags::VALUE_DIGIT)
+nParseTokensType |=
KParseTokens::GROUP_SEPARATOR_IN_NUMBER;
+else
+{
+// Trailing group separator character is not a
+// group separator.
+eState = ssStopBack;
+}
+}
+else if ((current == cDecimalSep ||
+(bDecSepAltUsed = (cDecimalSepAlt && current
== cDecimalSepAlt))) &&
++nDecSeps > 1)
{
if (nCodePoints == 2)
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 14b0577532ab..46b7ef88f3d0 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -811,8 +811,12 @@ double stringToDouble(CharT const * pBegin, CharT const *
pEnd,
if (!bDone) // do not recognize e.g. NaN1.23
{
-// leading zeros and group separators may be safely ignored
-while (p != pEnd && (*p == CharT('0') || *p == cGroupSeparator))
+// Leading zeros and group separators between digits may be safely
+// ignored. p0 < p implies that there was a leading 0 already,
+// consecutive group separators may not happen as *(p+1) is checked for
+// digit.
+while (p != pEnd && (*p == CharT('0') || (*p == cGroupSeparator
+&& p0 < p && p+1 < pEnd && rtl::isAsciiDigit(*(p+1)
{
++p;
}
@@ -833,6 +837,12 @@ double stringToDouble(CharT const * pBegin, CharT const *
pEnd,
{
break;
}
+else if (p == p0 || (p+1 == pEnd) || !rtl::isAsciiDigit(*(p+1)))
+{
+// A leading or trailing (not followed by a digit) group
+// separator character is not a group separator.
+break;
+}
}
// fraction part of mantissa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 97455] Copied text appears with big delay in the clipboard
https://bugs.documentfoundation.org/show_bug.cgi?id=97455 Aron Budea changed: What|Removed |Added Version|5.0.4.2 release |Inherited From OOo --- Comment #12 from Aron Budea --- Thanks for retesting, let's keep version at earliest affected. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121834] FILEOPEN DOCX Word document looks much different in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=121834 Durgapriyanka changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #3 from Durgapriyanka --- I can confirm that the bug is present in Version: 6.0.6.2 Build ID: 0c292870b25a325b5ed35f6b45599d2ea4458e77 CPU threads: 2; OS: Windows 6.1; UI render: default; Locale: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 105254] Pivot table Filter field is lost if saved in Microsoft 2007-2013 XML file format, but if saved from ODF then whole pivot table is lost
https://bugs.documentfoundation.org/show_bug.cgi?id=105254 Aron Budea changed: What|Removed |Added Blocks|103381, 108897 |112416 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103381 [Bug 103381] [META] Pivot table (aka Data Pilot) bugs and enhancements https://bugs.documentfoundation.org/show_bug.cgi?id=108897 [Bug 108897] [META] XLSX (OOXML) bug tracker https://bugs.documentfoundation.org/show_bug.cgi?id=112416 [Bug 112416] [META] XLSX pivot table bugs -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103381] [META] Pivot table (aka Data Pilot) bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103381 Aron Budea changed: What|Removed |Added Depends on|105254 | Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=105254 [Bug 105254] Pivot table Filter field is lost if saved in Microsoft 2007-2013 XML file format, but if saved from ODF then whole pivot table is lost -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112416] [META] XLSX pivot table bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=112416 Aron Budea changed: What|Removed |Added Depends on||105254 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=105254 [Bug 105254] Pivot table Filter field is lost if saved in Microsoft 2007-2013 XML file format, but if saved from ODF then whole pivot table is lost -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108897] [META] XLSX (OOXML) bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=108897 Aron Budea changed: What|Removed |Added Depends on|105254 | Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=105254 [Bug 105254] Pivot table Filter field is lost if saved in Microsoft 2007-2013 XML file format, but if saved from ODF then whole pivot table is lost -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 46
oox/source/drawingml/diagram/diagramlayoutatoms.hxx |7 +++
sd/qa/unit/import-tests-smartart.cxx| 13 +
3 files changed, 66 insertions(+)
New commits:
commit 7f66a34099974b5c6d70af4ae3c17e4f001a
Author: Miklos Vajna
AuthorDate: Fri Nov 30 16:40:58 2018 +0100
Commit: Miklos Vajna
CommitDate: Sat Dec 1 00:10:20 2018 +0100
oox smartart, accent process: handle connector shape between pairs
The shape was created, but we literally tried to create a "conn" type,
while that has to be resolved to the relevant arrow type based on the
context.
This means now arrows show up between the parent-child pairs (but their
size is not yet correct).
Change-Id: I82594e46579e4ef723093e1dd0ba31bfcbbec4a0
Reviewed-on: https://gerrit.libreoffice.org/64348
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 52a05ccdb53d..f5a7b410de03 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -64,6 +64,41 @@ bool isFontUnit(sal_Int32 nUnit)
{
return nUnit == oox::XML_primFontSz || nUnit == oox::XML_secFontSz;
}
+
+/// Determines the connector shape type from a linear alg.
+sal_Int32 getConnectorType(const oox::drawingml::LayoutNode* pNode)
+{
+sal_Int32 nType = oox::XML_rightArrow;
+
+if (!pNode)
+return nType;
+
+for (const auto& pChild : pNode->getChildren())
+{
+auto pAlgAtom = dynamic_cast(pChild.get());
+if (!pAlgAtom)
+continue;
+
+if (pAlgAtom->getType() != oox::XML_lin)
+continue;
+
+sal_Int32 nDir = oox::XML_fromL;
+if (pAlgAtom->getMap().count(oox::XML_linDir))
+nDir = pAlgAtom->getMap().find(oox::XML_linDir)->second;
+
+switch (nDir)
+{
+case oox::XML_fromL:
+nType = oox::XML_rightArrow;
+break;
+case oox::XML_fromR:
+nType = oox::XML_leftArrow;
+break;
+}
+}
+
+return nType;
+}
}
namespace oox { namespace drawingml {
@@ -399,7 +434,18 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
}
case XML_conn:
+{
+if (rShape->getSubType() == XML_conn)
+{
+// There is no shape type "conn", replace it by an arrow based
+// on the direction of the parent linear layout.
+sal_Int32 nType = getConnectorType(pParent);
+
+rShape->setSubType(nType);
+rShape->getCustomShapeProperties()->setShapePresetType(nType);
+}
break;
+}
case XML_cycle:
{
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 50ff8a300ac5..024cdaa1b61a 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -162,6 +162,13 @@ public:
{ maMap[nType]=nVal; }
void layoutShape( const ShapePtr& rShape,
const std::vector& rConstraints ) const;
+
+/// Gives access to .
+sal_Int32 getType() const { return mnType; }
+
+/// Gives access to .
+const ParamMap& getMap() const { return maMap; }
+
private:
sal_Int32 mnType;
ParamMap maMap;
diff --git a/sd/qa/unit/import-tests-smartart.cxx
b/sd/qa/unit/import-tests-smartart.cxx
index aa8498b73ce9..be8ac42d3b45 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -14,6 +14,8 @@
#include
#include
+#include
+
using namespace ::com::sun::star;
class SdImportTestSmartArt : public SdModelTestBase
@@ -490,6 +492,17 @@ void SdImportTestSmartArt::testAccentProcess()
// below xFirstParent (a good position is 9081).
CPPUNIT_ASSERT_LESS(nFirstChildTop, nFirstParentTop);
+// Make sure that we have an arrow shape between the two pairs.
+uno::Reference xArrow(xGroup->getByIndex(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xArrow.is());
+comphelper::SequenceAsHashMap aCustomShapeGeometry(
+xArrow->getPropertyValue("CustomShapeGeometry"));
+// Without the accompanying fix in place, this test would have failed, i.e.
+// the custom shape lacked a type -> arrow was not visible.
+CPPUNIT_ASSERT(aCustomShapeGeometry["Type"].has());
+OUString aType = aCustomShapeGeometry["Type"].get();
+CPPUNIT_ASSERT_EQUAL(OUString("ooxml-rightArrow"), aType);
+
uno::Reference xSecondPair(xGroup->getByIndex(2),
uno::UNO_QUERY);
CPPUNIT_ASSERT(xSecondPair.is());
CPPUNIT_ASSERT_EQUAL(static_cast(3), xSecondPair->getCount());
___
[Libreoffice-bugs] [Bug 97455] Copied text appears with big delay in the clipboard
https://bugs.documentfoundation.org/show_bug.cgi?id=97455 Dmitry changed: What|Removed |Added Version|Inherited From OOo |5.0.4.2 release --- Comment #11 from Dmitry --- The problem is still there in v6.1.3.2. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121812] Colibre: Wrong icons for Roman Uppercase List
https://bugs.documentfoundation.org/show_bug.cgi?id=121812 --- Comment #4 from Rizal Muttaqin --- > 1. Click View > Toolbars > Formatting (Styles) > 2. View the icon in the 10th order from the left Edit: View the icon in the 10th order from the right -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121812] Colibre: Wrong icons for Roman Uppercase List
https://bugs.documentfoundation.org/show_bug.cgi?id=121812 --- Comment #3 from Rizal Muttaqin --- (In reply to V Stuart Foote from comment #2) > But also, Tango shows a Roman Lower case rather than Roman Upper case icon. Tango already use Roman Upper, but they seems use Sans type font instead of Serif/mono font which lack up & down horizontal line. Should we open a new ticket for Tango also? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
Re: tdf#69569 ODFFv1.2 part 2 incorrect
Hi Winfried, On Wednesday, 2018-11-14 10:37:33 +, Winfried Donkers wrote: > I have been studying ODFFv1.2 part 2 §4.11.7.7 with > https://bugs.documentfoundation.org/show_bug.cgi?id=69569#c17 , lines 1..5. > in mind. Many thanks for that! YEARFRAC() and its Basis algorithm also used in other functions is an annoyance that hopefully will end now soon.. > My conclusions are that > a) Line 8 should be > " 8.Otherwise, if _(not A)_ and is-leap-year(year(date1)) then return 366 > "; So, that with Evaluate A: year(date1) != year(date2) the if (not A) boils down to if (year(date1) == year(date2)) and is-leap-year(year(date1)) then return 366 Makes sense. > b) Lines 9 and 10 can be combined by appending inclusive to both dates, the > current line 9 is ambiguous and line 10 does not fully solve that; Sounds sensible. > c) The constraint date1 >= date2 is missing in §4.11.7. It's date1 <= date2, isn't it? As stated for the other procedures as "If date1> date2, then swap the values of date1 and date2." I think that's missing for procedure E. > I have made logical diagrams to cheack that all possible combinations of > date1 and date2 are covered - on the presumption that date1 >= date2. That date1 >= date2 confuses me, date1 <= date2? However, at https://dwheeler.com/yearfrac/ there still is a calc_yearfrac.py available. It *seems* to me that it already implements the correct algorithm with if (date1.year == date2.year and is_leap_year(date1.year)): year_length = 366. in the basis1() function, but I didn't investigate deeper detail. Also, it swaps date,date2 to get date1 <= date2 ... There's also a huge set of data available, yearfrac_data_basis_all.zip generated by Excel. It is said it was used to create the Python script. If the script already implements the correct algorithm there's probably nothing to do, but if not and needs modification, could you please verify the change with that data? Might be easiest to try with that before setting up Calc for it. Also two .ods files with some edge cases are there. > If you agree with my conclusions, would it be possible that you submit a > proposal for changing ODFF to reflect the above? > I think that a proposal from you is more effective than one from me ;-) Lol, I can do. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 121812] Colibre: Wrong icons for Roman Uppercase List
https://bugs.documentfoundation.org/show_bug.cgi?id=121812 --- Comment #2 from V Stuart Foote --- But also, Tango shows a Roman Lower case rather than Roman Upper case icon. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121812] Colibre: Wrong icons for Roman Uppercase List
https://bugs.documentfoundation.org/show_bug.cgi?id=121812 V Stuart Foote changed: What|Removed |Added CC||vstuart.fo...@utsa.edu --- Comment #1 from V Stuart Foote --- Confirmed on Windows 10 Ent 64-bit en-US with Version: 6.3.0.0.alpha0+ (x64) Build ID: 0f25a3c36f27fd51453b9a9115f236b83c143684 CPU threads: 8; OS: Windows 10.0; UI render: GL; VCL: win; TinderBox: Win-x86_64@42, Branch:master, Time: 2018-11-27_20:06:55 Locale: en-US (en_US); UI-Language: en-US Calc: CL Appears in the paragraph's context menu: Bullets and Numbering -> Roman Uppercase List. Wrong icon for PNG and also affects the Collibre (SVG) variant. Also the Breeze (SVG) icon, though the Breeze PNG does show the Roman Upper I. II. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121834] FILEOPEN DOCX Word document looks much different in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=121834 --- Comment #2 from Ettore Atalan --- Created attachment 147184 --> https://bugs.documentfoundation.org/attachment.cgi?id=147184=edit Exported from LO Writer -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121834] FILEOPEN DOCX Word document looks much different in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=121834 --- Comment #1 from Ettore Atalan --- Created attachment 147183 --> https://bugs.documentfoundation.org/attachment.cgi?id=147183=edit Source: https://karrierebibel.de/wp-content/uploads/2018/08/Lebenslauf-Vorlage-Muster-Beispiel-03.pdf -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121834] New: FILEOPEN DOCX Word document looks much different in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=121834 Bug ID: 121834 Summary: FILEOPEN DOCX Word document looks much different in Writer Product: LibreOffice Version: 6.1.2.1 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: atalantt...@googlemail.com Created attachment 147182 --> https://bugs.documentfoundation.org/attachment.cgi?id=147182=edit Source: https://karrierebibel.de/wp-content/uploads/2016/06/Lebenslauf-Muster-Design-03.docx Hi the imported DOCX looks much different in LibreOffice Writer and in Microsoft Word. See the exported PDFs. Regards, Ettore -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121819] Hybrid document
https://bugs.documentfoundation.org/show_bug.cgi?id=121819 V Stuart Foote changed: What|Removed |Added Resolution|--- |WONTFIX Status|UNCONFIRMED |RESOLVED CC||vstuart.fo...@utsa.edu --- Comment #1 from V Stuart Foote --- Out of project scope, constrained by ODF document specifications. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107575] [META] Number format bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=107575 Bug 107575 depends on bug 42518, which changed state. Bug 42518 Summary: No warning when wrong decimal separators are used, resulting in bad outcome for formulas in tables https://bugs.documentfoundation.org/show_bug.cgi?id=42518 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - i18npool/source offapi/com sw/qa
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 13 +
offapi/com/sun/star/i18n/KParseTokens.idl | 22
++
sw/qa/extras/rtfexport/rtfexport.cxx |2
3 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 9336286a7ea5385541344f444e6f8702c85bdacb
Author: Eike Rathke
AuthorDate: Fri Nov 30 14:20:49 2018 +0100
Commit: Eike Rathke
CommitDate: Fri Nov 30 22:15:22 2018 +0100
[API CHANGE] Resolves: tdf#42518 new KParseTokens::GROUP_SEPARATOR_IN_NUMBER
Default unset bit now does not accept/skip group separators in
numbers.
See .idl description comment for why this is incompatible and how.
This actually uncovered a "bug" (or at least unexpected) in the
Math parser that parsed "0," as one entity instead of "0" followed
by ",". As obtaining the text form appends a blank after each
entity the sw/qa/extras/rtfexport/rtfexport.cxx testMathEqarray()
testcase had to be adapted.
Change-Id: I2b605742ab3d8a9bb81ad6880faf050535dc80fa
Reviewed-on: https://gerrit.libreoffice.org/64270
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit 776f7e7463de3e97f3056712ee567f49a314829d)
Reviewed-on: https://gerrit.libreoffice.org/64355
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 8cca988607fd..3c040a5a0085 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -441,8 +441,15 @@ void cclass_Unicode::initParserTable( const Locale&
rLocale, sal_Int32 startChar
cDecimalSepAlt = aItem.decimalSeparatorAlternative.toChar();
}
-if ( cGroupSep < nDefCnt )
-pTable[cGroupSep] |= ParserFlags::VALUE;
+if (nContTypes & KParseTokens::GROUP_SEPARATOR_IN_NUMBER)
+{
+if ( cGroupSep < nDefCnt )
+pTable[cGroupSep] |= ParserFlags::VALUE;
+}
+else
+{
+cGroupSep = 0;
+}
if ( cDecimalSep < nDefCnt )
pTable[cDecimalSep] |= ParserFlags::CHAR_VALUE | ParserFlags::VALUE;
if ( cDecimalSepAlt && cDecimalSepAlt < nDefCnt )
@@ -814,6 +821,8 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
}
if ( nMask & ParserFlags::VALUE )
{
+if (current == cGroupSep)
+nParseTokensType |=
KParseTokens::GROUP_SEPARATOR_IN_NUMBER;
if ((current == cDecimalSep || (bDecSepAltUsed =
(cDecimalSepAlt && current == cDecimalSepAlt))) &&
++nDecSeps > 1)
{
diff --git a/offapi/com/sun/star/i18n/KParseTokens.idl
b/offapi/com/sun/star/i18n/KParseTokens.idl
index ce5d355f0430..bc0f92c42c83 100644
--- a/offapi/com/sun/star/i18n/KParseTokens.idl
+++ b/offapi/com/sun/star/i18n/KParseTokens.idl
@@ -95,6 +95,28 @@ published constants KParseTokens
/// Unicode (above 127) other number
const long UNI_OTHER_NUMBER = 0x0008;
+/** If this bit is set in nContCharFlags parameters, the
+locale's group separator characters in numbers are accepted and
+ignored/skipped. Else a group separator in a number ends the
+current token. A leading group separator is never accepted. If
+an accepted group separator was encountered in a number
+(ParseResult::TokenType is KParseType::ASC_NUMBER or
+KParseType::UNI_NUMBER) this bit is also set in
+ParseResult::ContFlags.
+
+ NOTE: absence of this bit in
+nContCharFlags changes the default behaviour that in
+prior releases accepted numbers with group separators but lead
+to unexpected results when parsing formula expressions where the
+user entered a (wrong) separator that happened to be the group
+separator instead of an intended decimal separator. Usually
+inline numbers in a formula expression do not contain group
+separators.
+
+@since LibreOffice 6.2
+ */
+const long GROUP_SEPARATOR_IN_NUMBER = 0x0800;
+
/** If this bit is set in nContCharFlags parameters and a
string enclosed in double quotes is parsed and two consecutive
double quotes are encountered, the string is ended. If this bit
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 8b6ecdb27f85..8dc665642278 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -210,7 +210,7 @@ DECLARE_RTFEXPORT_TEST(testMathEqarray, "math-eqarray.rtf")
{
OUString aActual = getFormula(getRun(getParagraph(1), 1));
OUString const aExpected(
-"y = left lbrace stack { 0, x < 0 # 1, x = 0 # {x} ^ {2} , x > 0 }
right none");
+"y
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/data/functions/statistical/fods/large.fods | 16 ++-
sc/qa/unit/data/functions/statistical/fods/small.fods | 17 ++-
sc/source/core/inc/interpre.hxx |5
sc/source/core/tool/interpr3.cxx | 93 +-
sc/source/core/tool/interpr5.cxx | 33 --
5 files changed, 141 insertions(+), 23 deletions(-)
New commits:
commit e4c2d0bb57ab8ea8f5c400d103d01376b8140f22
Author: Takeshi Abe
AuthorDate: Tue Nov 27 11:28:18 2018 +0900
Commit: Eike Rathke
CommitDate: Fri Nov 30 22:14:17 2018 +0100
i#32345 Support a matrix of rank argument for LARGE()/SMALL()
This is a followup of e22ab5e6f6b0ea49231ca454a567133996306116.
Change-Id: I7052e113173204f7cfcd40622f52c5d4e14b3aa9
Reviewed-on: https://gerrit.libreoffice.org/64139
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/qa/unit/data/functions/statistical/fods/large.fods
b/sc/qa/unit/data/functions/statistical/fods/large.fods
index 6e701e71671f..d72e3bde9a20 100644
--- a/sc/qa/unit/data/functions/statistical/fods/large.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/large.fods
@@ -4794,10 +4794,18 @@
-
-
-
-
+
+ -2
+
+
+ -2
+
+
+ TRUE
+
+
+ =MDETERM(LARGE(I30:I39,{1,2;3,4}))
+
2
diff --git a/sc/qa/unit/data/functions/statistical/fods/small.fods
b/sc/qa/unit/data/functions/statistical/fods/small.fods
index 94a6ae6344ef..549be5c7e187 100644
--- a/sc/qa/unit/data/functions/statistical/fods/small.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/small.fods
@@ -4186,10 +4186,19 @@
-
-
-
-
+
+
+ -13
+
+
+ -13
+
+
+ TRUE
+
+
+ =MDETERM(SMALL(F1:F11,{1,2;3,4}))
+
90012
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 7608098d53bb..b6c68dcdb264 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -175,6 +175,8 @@ public:
ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty = false);
+ScMatrixRef GetNewMat(SCSIZE nC, SCSIZE nR, const std::vector&
rValues);
+
enum VolatileType {
VOLATILE,
VOLATILE_MACRO,
@@ -225,6 +227,8 @@ private:
VolatileType meVolatileType;
+void MakeMatNew(ScMatrixRef& rMat, SCSIZE nC, SCSIZE nR);
+
/// Merge global and document specific settings.
void MergeCalcConfig();
@@ -934,6 +938,7 @@ private:
void ScMedian();
double GetMedian( ::std::vector & rArray );
double GetPercentileExclusive( ::std::vector & rArray, double
fPercentile );
+std::vector GetTopNumberArray( SCSIZE& rCol, SCSIZE& rRow );
void GetNumberSequenceArray( sal_uInt8 nParamCount, ::std::vector&
rArray, bool bConvertTextInArray );
void GetSortArray( sal_uInt8 nParamCount, ::std::vector&
rSortArray, ::std::vector* pIndexOrder, bool bConvertTextInArray, bool
bAllowEmptyArray );
static void QuickSort(::std::vector& rSortArray,
::std::vector* pIndexOrder);
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index ac980b7257da..f91d0037ddb5 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3639,14 +3639,15 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
if ( !MustHaveParamCount( GetByte(), 2 ) )
return;
-std::vector aArray;
-GetNumberSequenceArray(1, aArray, false);
+SCSIZE nCol = 0, nRow = 0;
+auto aArray = GetTopNumberArray(nCol, nRow);
auto aArraySize = aArray.size();
if (aArraySize == 0 || nGlobalError != FormulaError::NONE)
{
PushNoValue();
return;
}
+assert(aArraySize == nCol * nRow);
for (double fArg : aArray)
{
double f = ::rtl::math::approxFloor(fArg);
@@ -3701,8 +3702,7 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
aArray.clear();
for (SCSIZE n : aRankArray)
aArray.push_back(aSortArray[bSmall ? n-1 : nSize-n]);
-ScMatrixRef pResult = GetNewMat(1, aArraySize, true);
-pResult->PutDoubleVector(aArray, 0, 0);
+ScMatrixRef pResult = GetNewMat(nCol, nRow, aArray);
PushMatrix(pResult);
}
}
@@ -3841,6 +3841,91 @@ void ScInterpreter::ScTrimMean()
}
}
+std::vector ScInterpreter::GetTopNumberArray( SCSIZE& rCol, SCSIZE&
rRow )
+{
+std::vector aArray;
+switch (GetStackType())
+{
+case svDouble:
+aArray.push_back(PopDouble());
+rCol = rRow = 1;
+break;
+case svSingleRef:
+{
+ScAddress aAdr;
+PopSingleRef(aAdr);
+ScRefCellValue aCell(*pDok, aAdr);
+if (aCell.hasNumeric())
+{
+aArray.push_back(GetCellValue(aAdr, aCell));
+
[Libreoffice-bugs] [Bug 95424] Export PDF with password protection for copying content doesn't protect copy of content
https://bugs.documentfoundation.org/show_bug.cgi?id=95424 --- Comment #20 from Pavlos K. Ponos --- (In reply to Buovjaga from comment #19) > (In reply to PICCORO Lenz McKAY from comment #18) > > Hey, that's a lie! i property set the PDF permission using OpenOffice 2.X > > and okular detect those permissions! but using Libreoffice does not work! > > > > in fact only bug happenend if we used all the libreoffice 3+ releases, with > > 2.X releases work perfectly! > > Please attach a PDF you exported from OpenOffice 2.x so we can see it > working with Okular with our own eyes. Hello everybody, 3 years and still there is no solution on that?? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - oox/source
oox/source/drawingml/chart/seriesconverter.cxx | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 5c380a7fe3b3399002aabdc980842ce46a50d012
Author: Markus Mohrhard
AuthorDate: Fri Nov 30 00:45:57 2018 +0100
Commit: Caolán McNamara
CommitDate: Fri Nov 30 21:42:11 2018 +0100
tdf#121282, tdf#121279, set text properties also on complex data labels
Change-Id: I2304b6050b786b6e4a9a8a968d7a4846d9da8be8
Reviewed-on: https://gerrit.libreoffice.org/64306
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit 6a04b9298ae993881d20fc4b5aa91516d4df6695)
Reviewed-on: https://gerrit.libreoffice.org/64309
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index 0c98cd1bd48e..79dd8143dd81 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -124,6 +124,14 @@ Reference< XLabeledDataSequence >
lclCreateLabeledDataSequence(
return xLabeledSeq;
}
+void convertTextProperty(PropertySet& rPropSet, ObjectFormatter& rFormatter,
+DataLabelModelBase::TextBodyRef xTextProps)
+{
+rFormatter.convertTextFormatting( rPropSet, xTextProps,
OBJECTTYPE_DATALABEL );
+ObjectFormatter::convertTextRotation( rPropSet, xTextProps, false );
+ObjectFormatter::convertTextWrap( rPropSet, xTextProps );
+}
+
void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter&
rFormatter,
const DataLabelModelBase& rDataLabel, const
TypeGroupConverter& rTypeGroup,
bool bDataSeriesLabel, bool bMSO2007Doc, const
PropertySet* pSeriesPropSet )
@@ -171,10 +179,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet,
ObjectFormatter& rFormatt
rFormatter.convertNumberFormat( rPropSet, rDataLabel.maNumberFormat,
false, bShowPercent );
// data label text formatting (frame formatting not supported by
Chart2)
-rFormatter.convertTextFormatting( rPropSet, rDataLabel.mxTextProp,
OBJECTTYPE_DATALABEL );
-ObjectFormatter::convertTextRotation( rPropSet, rDataLabel.mxTextProp,
false );
-ObjectFormatter::convertTextWrap( rPropSet, rDataLabel.mxTextProp );
-
+convertTextProperty(rPropSet, rFormatter, rDataLabel.mxTextProp);
// data label separator (do not overwrite series separator, if no
explicit point separator is present)
if( bDataSeriesLabel || rDataLabel.moaSeparator.has() )
@@ -338,6 +343,7 @@ void DataLabelConverter::convertFromModel( const Reference<
XDataSeries >& rxDat
}
aPropSet.setProperty( PROP_CustomLabelFields, makeAny( aSequence )
);
+convertTextProperty(aPropSet, getFormatter(),
mrModel.mxText->mxTextBody);
}
}
catch( Exception& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 111936] CHARTS: Bad display on data label in percent stacked chart
https://bugs.documentfoundation.org/show_bug.cgi?id=111936 Buovjaga changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #10 from Buovjaga --- (In reply to Markus Mohrhard from comment #9) > Please retest after the fix for Bug 105236 has been merged. At least in my > tests it seems to be fixed. > > If this is not yet fixed I might need more detailed steps how to reproduce > the bug. Thanks, both cases from Dimitri produce the expected result now! The other report had a somewhat different topic, so I will not close as dupe. Arch Linux 64-bit Version: 6.3.0.0.alpha0+ Build ID: 9059457a1a8385cb80b5dd2c797cee77af4222a9 CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: gtk3_kde5; Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US Calc: threaded Built on 30 November 2018 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[API CHANGE] css::i18n::XCharacterClassification::parseAnyToken() and parsePredefinedToken() new css::i18n::KParseTokens::GROUP_SEPARATOR_IN_NUMBER
Hi, To solve https://bugs.documentfoundation.org/show_bug.cgi?id=42518 where in a Writer table formula a group separator entered instead of the intended decimal separator lead to wrong calculations instead of error, the css::i18n::KParseTokens constants have a new bit added, GROUP_SEPARATOR_IN_NUMBER. This changes the runtime behaviour of calls to css::i18n::XCharacterClassification::parseAnyToken() and parsePredefinedToken() that do not have the bit set, citing from the description documentation in offapi/com/sun/star/i18n/KParseTokens.idl: If this bit is set in nContCharFlags parameters, the locale's group separator characters in numbers are accepted and ignored/skipped. Else a group separator in a number ends the current token. A leading group separator is never accepted. If an accepted group separator was encountered in a number (ParseResult::TokenType is KParseType::ASC_NUMBER or KParseType::UNI_NUMBER) this bit is also set in ParseResult::ContFlags. NOTE: absence of this bit in nContCharFlags changes the default behaviour that in prior releases accepted numbers with group separators but lead to unexpected results when parsing formula expressions where the user entered a (wrong) separator that happened to be the group separator instead of an intended decimal separator. Usually inline numbers in a formula expression do not contain group separators. The default for this flag instead of a negated default (continue to parse away group separators if not set) was chosen because of that formula expression context mentioned in the description, which this parser is usually used for. Happy parsing Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 94223] Selection box for text box not shown
https://bugs.documentfoundation.org/show_bug.cgi?id=94223 --- Comment #18 from Buovjaga --- (In reply to jenny from comment #17) > Bug not reproducible in version > > Version: 6.3.0.0.alpha0+ (x64) > Build ID: 0f25a3c36f27fd51453b9a9115f236b83c143684 > CPU threads: 8; OS: Windows 10.0; UI render: GL; VCL: win; > TinderBox: Win-x86_64@42, Branch:master, Time: 2018-11-27_20:06:55 > Locale: zh-TW (zh_TW); UI-Language: en-US > Calc: threaded This is false. It is still reproducible/confirmable. Arch Linux 64-bit Version: 6.3.0.0.alpha0+ Build ID: 9059457a1a8385cb80b5dd2c797cee77af4222a9 CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: gtk3_kde5; Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US Calc: threaded Built on 30 November 2018 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121825] Add date-related formulas
https://bugs.documentfoundation.org/show_bug.cgi?id=121825 Xavier Van Wijmeersch changed: What|Removed |Added Resolution|--- |WORKSFORME Status|UNCONFIRMED |RESOLVED --- Comment #1 from Xavier Van Wijmeersch --- In writer you can use insert field, there you can select a fixed date or you can look in the 'More Fields' dialog There you can choose a fixed date or 'daily' date (idem as today() in calc) No need for a formula If your not agree with the WFM solution then you can reopen as unconfirmed Best regards -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121823] white area in prinout
https://bugs.documentfoundation.org/show_bug.cgi?id=121823 --- Comment #3 from Xavier Van Wijmeersch --- cannot reproduce with Version: 6.2.0.0.beta1+ Build ID: 4e9258e033d17b9f05df36026ca573aa6b229823 CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: kde4; Locale: nl-BE (en_US.UTF-8); UI-Language: en-US Calc: threaded Version: 6.3.0.0.alpha0+ Build ID: b15b1a2a90fa4c239ff8a6a33e73ff50ea422abf CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: kde4; TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time: 2018-11-28_06:21:05 Locale: nl-BE (en_US.UTF-8); UI-Language: en-US Calc: threaded but can reproduce with Version: 5.2.7.2 Build ID: 2b7f1e640c46ceb28adf43ee075a6e8b8439ed10 CPU Threads: 8; OS Version: Linux 4.19; UI Render: default; VCL: kde4; Locale: nl-BE (en_US.UTF-8); Calc: group Version: 6.0.6.2 Build ID: 0c292870b25a325b5ed35f6b45599d2ea4458e77 CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: kde4; Locale: nl-BE (en_US.UTF-8); Calc: group Version: 6.1.4.0.0+ Build ID: b3af23568f9b9b444ae09f2a1ab4a61d212b422a CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: kde4; TinderBox: Linux-rpm_deb-x86_64@70-TDF, Branch:libreoffice-6-1, Time: 2018-11-23_09:38:29 Locale: nl-BE (en_US.UTF-8); Calc: group threaded -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121833] New: Low raster quality when using "compress" on SVG inside Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=121833 Bug ID: 121833 Summary: Low raster quality when using "compress" on SVG inside Writer Product: LibreOffice Version: 5.0 all versions Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: graphics stack Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tobias.wendo...@tu-dortmund.de Description: When using "compress" (see steps below) to convert a SVG to raster, all settings for resolutions get ignored. Seems like it's hardcoded to 96 ppi. This might be related to #121831 Steps to Reproduce: 1. Download a reference SVG: https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/ 2. Insert it into a Write document 3. Right click on the SVG 4. Select a high resolution, like 300 ppi Actual Results: Unsharp raster image. Expected Results: It's expected to have the SVG rasterized at the dimension and resolutions set. Reproducible: Always User Profile Reset: Yes OpenGL enabled: Yes Additional Info: The problem occurs on all versions, which can read and display SVG files. Ghostscript, imagemagick and pstoedit have been installed and are reachable via path variable. This might be related to #121831 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121832] New: editing PPT in Impress changes title field labels so titles are not shown in outline views
https://bugs.documentfoundation.org/show_bug.cgi?id=121832 Bug ID: 121832 Summary: editing PPT in Impress changes title field labels so titles are not shown in outline views Product: LibreOffice Version: 6.1.3.2 release Hardware: x86-64 (AMD64) OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: joseph.pr...@okstate.edu Created attachment 147181 --> https://bugs.documentfoundation.org/attachment.cgi?id=147181=edit sample files Version: 6.1.3.2 Build ID: 1:6.1.3-1 on Debian testing Microsoft Powerpoint 2016 MSO (16.0.4266.1001) 64bit in VM VM : Oracle virtualbox, Version 5.2.14(qT5.11.2) 2018 Take a powerpoint document (e.g. *.ppt or *.pptx) that has several slides, each of which shows a title. Open in Impress. Edit In Impress the text in the file in any minor way, and save the file still as *.ppt . When the file is reopened within Windows Mspowerpoint, the Title objects will have been renamed, and the Outline view no longer shows any Titles, although there is still a text box object containing the text of the title on the slides. They still exist and are seen in the slide view, but any global actions on "Titles" such as formatting those objects or including them in the Outline view does not show them. If I reopen this modified file in Impress, is does not show titles in the Outline view either. Screen shots are available. I have been told that opening PPT files on some tablets or phones does something similar, but I cannot verify that. This a major nuisance and major hurdle to collaborations with file exchanges. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81497] PRINTING: to PDF with Adobe Distiller or GS based PDF printer, EPS images not rendered to PS vector for PDF, instead print uses the preview of EPS image
https://bugs.documentfoundation.org/show_bug.cgi?id=81497 --- Comment #32 from Tobias --- I can confirm this for all v5 and v6 alpha. The last version, which was able to export a EPS stream correctly to a PS interpreter (via printing) was v4.2.4.2. This patch seems to create the issue: https://gerrit.libreoffice.org/plugins/gitiles/core/+/3bedb85460b028500ff450eeeb80acf8278df39e -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121297] LO Impress: Some fields are overlapping each other in Presentation Minimizer Wizard
https://bugs.documentfoundation.org/show_bug.cgi?id=121297 --- Comment #5 from Durgapriyanka --- I can not reproduce the bug in Version: 6.0.6.2 Build ID: 0c292870b25a325b5ed35f6b45599d2ea4458e77 CPU threads: 2; OS: Windows 6.1; UI render: default; Locale: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121831] New: Low raster quality when saving SVG as PNG to DOC(X)
https://bugs.documentfoundation.org/show_bug.cgi?id=121831 Bug ID: 121831 Summary: Low raster quality when saving SVG as PNG to DOC(X) Product: LibreOffice Version: 5.0 all versions Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: graphics stack Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tobias.wendo...@tu-dortmund.de Description: When saving a Writer document containing a SVG to DOCX, it get rasterized to PNG due to the current limits of this format. The convertion to PNG is done using 96 ppi only and doesn't care about the SVGs dimensions (f.e. when it got resized in LibreOffice. So, when loading a SVG with a dimension of 30 mm × 30 mm, it gets rendered to PNG with 96 ppi and a size of 30 mm × 30 mm. When scaling the SVG to 120 mm × 120 mm, it also gets rendered to 30 mm × 30 mm, but scaled to 120 mm afterwards. In "Expert Options", you can select "PixelExportResolution", but it is ignored. Steps to Reproduce: 1. Download a reference SVG: https://dev.w3.org/SVG/tools/svgweb/samples/svg-files/ 2. Insert it into a Write document 3. Save it to DOCX 4. Open in Microsoft Office or unpack ZIP and find the media directory Actual Results: Unsharp raster image, since the dimensions and pixel resolution is too low / fixed at a default value, which might be too low in many cases. Expected Results: At least it's expected to render the SVG at the target dimensions, but it's highly recommended to set a proper resolution for high quality export/printing/viewing to DOCX. Reproducible: Always User Profile Reset: Yes OpenGL enabled: Yes Additional Info: The problem occurs on all versions, which can read and display SVG files. Ghostscript, imagemagick and pstoedit have been installed and are reachable via path variable. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121793] Animated gif causes big CPU load
https://bugs.documentfoundation.org/show_bug.cgi?id=121793
Buovjaga changed:
What|Removed |Added
OS|Windows (All) |All
Keywords||perf
Summary|Performance problems|Animated gif causes big CPU
|editing Impress file under |load
|windows |
Version|6.1.3.2 release |Inherited From OOo
--- Comment #4 from Buovjaga ---
(In reply to Telesto from comment #3)
> Also found
> LibreOffice 3.5.7.2
> Build ID: 3215f89-f603614-ab984f2-7348103-1225a5b
True, so not a regression as claimed ("in the past months"). Same load under
5.4, 5.0, 4.3, 3.3...
Also on Linux
The report in See also *is* a regression, however, and appeared in 5.2.
Arch Linux 64-bit
Version: 6.3.0.0.alpha0+
Build ID: 9059457a1a8385cb80b5dd2c797cee77af4222a9
CPU threads: 8; OS: Linux 4.19; UI render: default; VCL: gtk3_kde5;
Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US
Calc: threaded
Built on 30 November 2018
--
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 120250] FILESAVE, when i save a big file windows crash
https://bugs.documentfoundation.org/show_bug.cgi?id=120250 --- Comment #13 from Buovjaga --- vlb: try getting a backtrace https://wiki.documentfoundation.org/How_to_get_a_backtrace_with_WinDbg -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 98183] Export PDF via command line: formula in text tables result in ** Expression is faulty **
https://bugs.documentfoundation.org/show_bug.cgi?id=98183 --- Comment #7 from Buovjaga --- (In reply to H.C Hsu from comment #6) > Bug not reproducible in version 6.3.0.0. > In this version can print the result for the formel. > > Version: 6.3.0.0.alpha0+ (x64) > Build ID: 0f25a3c36f27fd51453b9a9115f236b83c143684 > CPU threads: 8; OS: Windows 10.0; UI render: GL; VCL: win; > TinderBox: Win-x86_64@42, Branch:master, Time: 2018-11-27_20:06:55 > Locale: zh-TW (zh_TW); UI-Language: en-US > Calc: threaded I doubt this result as I can still repro with Version: 6.2.0.0.beta1 (x64) Build ID: d1b41307be3f8c19fe6f1938cf056e7ff1eb1d18 CPU threads: 4; OS: Windows 10.0; UI render: default; VCL: win; Locale: fi-FI (fi_FI); UI-Language: en-US Calc: threaded And it is not very old yet (a bit over a week) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121086] The first page in print preview shifts to the left when exporting to PDF (visual glitch)
https://bugs.documentfoundation.org/show_bug.cgi?id=121086 --- Comment #3 from Durgapriyanka --- I cannot reproduce the bug in Version: 6.0.6.2 Build ID: 0c292870b25a325b5ed35f6b45599d2ea4458e77 CPU threads: 2; OS: Windows 6.1; UI render: default; Locale: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - filter/source include/sfx2 include/svx officecfg/registry sc/Library_sc.mk sc/sdi sc/source sc/uiconfig sfx2/source svx/sdi
filter/source/config/fragments/filters/chart8.xcu|2 include/sfx2/objsh.hxx |2 include/svx/svxids.hrc |1 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 - sc/Library_sc.mk |1 sc/sdi/tabvwsh.sdi |1 sc/source/filter/chart/chart_imp.cxx | 32 -- sc/source/ui/docshell/docsh.cxx | 39 --- sc/source/ui/drawfunc/fuins2.cxx | 37 --- sc/source/ui/inc/docsh.hxx |2 sc/source/ui/inc/fuinsert.hxx|7 - sc/source/ui/view/tabvwshb.cxx | 19 --- sc/uiconfig/scalc/menubar/menubar.xml|1 sfx2/source/doc/guisaveas.cxx| 21 sfx2/source/doc/objstor.cxx | 49 +- svx/sdi/svx.sdi | 19 --- 16 files changed, 10 insertions(+), 231 deletions(-) New commits: commit 4632afbd9ecdf85f3980b41fa9d58b6099aa2d81 Author: Markus Mohrhard AuthorDate: Thu Nov 29 20:34:56 2018 +0100 Commit: Markus Mohrhard CommitDate: Fri Nov 30 20:03:13 2018 +0100 tdf#93005, tdf#100611, remove the incomplete ODC export feature Change-Id: I96a3882cd412ea5d993971df7e20b1fd8da73642 Reviewed-on: https://gerrit.libreoffice.org/64283 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit d543e8dfd3d8ae718e29304a155e1cf70d08325d) Reviewed-on: https://gerrit.libreoffice.org/64311 diff --git a/filter/source/config/fragments/filters/chart8.xcu b/filter/source/config/fragments/filters/chart8.xcu index 3c33792476fe..6bcfbd88dc18 100644 --- a/filter/source/config/fragments/filters/chart8.xcu +++ b/filter/source/config/fragments/filters/chart8.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT OWN DEFAULT PREFERRED ENCRYPTION +IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER PREFERRED ENCRYPTION com.sun.star.comp.chart2.XMLFilter XML diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index af6c050c1dc8..0f2c09aeef82 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -604,7 +604,7 @@ public: */ voidSetupStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, -sal_Int32 nVersion, bool bTemplate, bool bChart = false ) const; +sal_Int32 nVersion, bool bTemplate ) const; css::uno::Reference< css::embed::XStorage > const & GetStorage(); diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index acd2df632a1a..5ccb79dcf527 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -267,7 +267,6 @@ class SfxStringItem; #define SID_OBJECT_ALIGN_UP ( SID_SVX_START + 134 ) #define SID_OBJECT_ALIGN_MIDDLE ( SID_SVX_START + 135 ) #define SID_OBJECT_ALIGN_DOWN ( SID_SVX_START + 136 ) -#define SID_INSERT_DIAGRAM_FROM_FILE( SID_SVX_START + 139 ) #define SID_INSERT_DIAGRAM ( SID_SVX_START + 140 ) #define SID_INSERT_TABLE( SID_SVX_START + 141 ) #define SID_ATTRIBUTES_AREA ( SID_SVX_START + 142 ) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 69856aa6362e..e13acb9d192f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2549,14 +2549,6 @@ 1 - - - Chart from File... - - - 1 - - Bullets diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index fe0e4368379b..82bd3ba17691 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -349,7 +349,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/filter/xml/xmltabi \ sc/source/filter/xml/xmltransformationi \ sc/source/filter/xml/xmlwrap \ -sc/source/filter/chart/chart_imp \ sc/source/filter/importfilterdata \ sc/source/ui/Accessibility/AccessibilityHints \ sc/source/ui/Accessibility/AccessibleCell \ diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index 7f33a247a394..4f9b451b05e2 100644 --- a/sc/sdi/tabvwsh.sdi +++
[Libreoffice-commits] core.git: i18npool/source offapi/com sw/qa
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 13 +
offapi/com/sun/star/i18n/KParseTokens.idl | 22
++
sw/qa/extras/rtfexport/rtfexport.cxx |2
3 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit 776f7e7463de3e97f3056712ee567f49a314829d
Author: Eike Rathke
AuthorDate: Fri Nov 30 14:20:49 2018 +0100
Commit: Eike Rathke
CommitDate: Fri Nov 30 20:01:20 2018 +0100
[API CHANGE] Resolves: tdf#42518 new KParseTokens::GROUP_SEPARATOR_IN_NUMBER
Default unset bit now does not accept/skip group separators in
numbers.
See .idl description comment for why this is incompatible and how.
This actually uncovered a "bug" (or at least unexpected) in the
Math parser that parsed "0," as one entity instead of "0" followed
by ",". As obtaining the text form appends a blank after each
entity the sw/qa/extras/rtfexport/rtfexport.cxx testMathEqarray()
testcase had to be adapted.
Change-Id: I2b605742ab3d8a9bb81ad6880faf050535dc80fa
Reviewed-on: https://gerrit.libreoffice.org/64270
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 8cca988607fd..3c040a5a0085 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -441,8 +441,15 @@ void cclass_Unicode::initParserTable( const Locale&
rLocale, sal_Int32 startChar
cDecimalSepAlt = aItem.decimalSeparatorAlternative.toChar();
}
-if ( cGroupSep < nDefCnt )
-pTable[cGroupSep] |= ParserFlags::VALUE;
+if (nContTypes & KParseTokens::GROUP_SEPARATOR_IN_NUMBER)
+{
+if ( cGroupSep < nDefCnt )
+pTable[cGroupSep] |= ParserFlags::VALUE;
+}
+else
+{
+cGroupSep = 0;
+}
if ( cDecimalSep < nDefCnt )
pTable[cDecimalSep] |= ParserFlags::CHAR_VALUE | ParserFlags::VALUE;
if ( cDecimalSepAlt && cDecimalSepAlt < nDefCnt )
@@ -814,6 +821,8 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
}
if ( nMask & ParserFlags::VALUE )
{
+if (current == cGroupSep)
+nParseTokensType |=
KParseTokens::GROUP_SEPARATOR_IN_NUMBER;
if ((current == cDecimalSep || (bDecSepAltUsed =
(cDecimalSepAlt && current == cDecimalSepAlt))) &&
++nDecSeps > 1)
{
diff --git a/offapi/com/sun/star/i18n/KParseTokens.idl
b/offapi/com/sun/star/i18n/KParseTokens.idl
index ce5d355f0430..bc0f92c42c83 100644
--- a/offapi/com/sun/star/i18n/KParseTokens.idl
+++ b/offapi/com/sun/star/i18n/KParseTokens.idl
@@ -95,6 +95,28 @@ published constants KParseTokens
/// Unicode (above 127) other number
const long UNI_OTHER_NUMBER = 0x0008;
+/** If this bit is set in nContCharFlags parameters, the
+locale's group separator characters in numbers are accepted and
+ignored/skipped. Else a group separator in a number ends the
+current token. A leading group separator is never accepted. If
+an accepted group separator was encountered in a number
+(ParseResult::TokenType is KParseType::ASC_NUMBER or
+KParseType::UNI_NUMBER) this bit is also set in
+ParseResult::ContFlags.
+
+ NOTE: absence of this bit in
+nContCharFlags changes the default behaviour that in
+prior releases accepted numbers with group separators but lead
+to unexpected results when parsing formula expressions where the
+user entered a (wrong) separator that happened to be the group
+separator instead of an intended decimal separator. Usually
+inline numbers in a formula expression do not contain group
+separators.
+
+@since LibreOffice 6.2
+ */
+const long GROUP_SEPARATOR_IN_NUMBER = 0x0800;
+
/** If this bit is set in nContCharFlags parameters and a
string enclosed in double quotes is parsed and two consecutive
double quotes are encountered, the string is ended. If this bit
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 8b6ecdb27f85..8dc665642278 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -210,7 +210,7 @@ DECLARE_RTFEXPORT_TEST(testMathEqarray, "math-eqarray.rtf")
{
OUString aActual = getFormula(getRun(getParagraph(1), 1));
OUString const aExpected(
-"y = left lbrace stack { 0, x < 0 # 1, x = 0 # {x} ^ {2} , x > 0 }
right none");
+"y = left lbrace stack { 0 , x < 0 # 1 , x = 0 # {x} ^ {2} , x > 0 }
right none");
CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
[Libreoffice-bugs] [Bug 121829] Linked section to protected (password or gpg encrypted) document does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=121829 bugzi...@venere.me changed: What|Removed |Added Summary|Linked section to protected |Linked section to protected |(password or gpg encrypted) |(password or gpg encrypted) |file does not work |document does not work -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121829] Linked section to protected (password or gpg encrypted) file does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=121829 --- Comment #1 from bugzi...@venere.me --- Additional Info: Build ID: 86daf60bf00efa86ad547e59e09d6bb77c699acb CPU threads: 4; OS: Windows 6.1; UI render: default; Calc: CL -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121829] New: Linked section to protected (password or gpg encrypted) file does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=121829 Bug ID: 121829 Summary: Linked section to protected (password or gpg encrypted) file does not work Product: LibreOffice Version: 6.3.0.0.alpha0+ Master Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: bugzi...@venere.me Description: Creating a linked section to a document works when the document is not protected with password nor GPG encryption. It will not work if the linked document is either password protected or encrypted with GPG. It doesn't show the contents Steps to Reproduce: 1. Create an ODT file with the contents and save it with a password or GPG encryption. 2. Create a new ODT file and insert a section linked to the first protected file. Actual Results: The contents of linked file does not show within the section. Expected Results: It should ask for a password or encryption key and then load the protected contents. Reproducible: Always User Profile Reset: No Additional Info: -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121699] Lots of menu buttons and icons are greyed out and Calc file window cannot be closed
https://bugs.documentfoundation.org/show_bug.cgi?id=121699 Oliver Brinzing changed: What|Removed |Added CC||xiscofa...@libreoffice.org --- Comment #5 from Oliver Brinzing --- @Xisco: could you please have a look? imho this is a serious issue. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121699] Lots of menu buttons and icons are greyed out and Calc file window cannot be closed
https://bugs.documentfoundation.org/show_bug.cgi?id=121699 Oliver Brinzing changed: What|Removed |Added Version|6.3.0.0.alpha0+ Master |6.1.2.1 release -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 120942] Calc crashes when copying multiple rows, if Ditto app is running
https://bugs.documentfoundation.org/show_bug.cgi?id=120942 Chad Cloman changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |DUPLICATE --- Comment #4 from Chad Cloman --- I reproduced this on 6.0.6.2, then installed 6.1.3.2 and the error did not occur. Marking it as resolved and a duplicate of 118416. Thank you for investigating. *** This bug has been marked as a duplicate of bug 118416 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121060] LibreOffice gets unresponsive (does not respond) under certain circumstances
https://bugs.documentfoundation.org/show_bug.cgi?id=121060 Durgapriyanka changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Durgapriyanka --- Thank you for reporting the bug.I can confirm that the bug is present in Version: 6.0.6.2 Build ID: 0c292870b25a325b5ed35f6b45599d2ea4458e77 CPU threads: 2; OS: Windows 6.1; UI render: default; Locale: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121770] Table records in Base not visible until highlighted/selected
https://bugs.documentfoundation.org/show_bug.cgi?id=121770 Bill changed: What|Removed |Added Resolution|NOTABUG |WORKSFORME --- Comment #7 from Bill --- It is white font on white background. Strange that this happened only in this Table. Thanks -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121828] New: Moving / resizing animated GIF cause a crash
https://bugs.documentfoundation.org/show_bug.cgi?id=121828 Bug ID: 121828 Summary: Moving / resizing animated GIF cause a crash Product: LibreOffice Version: 6.1.2.1 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: maris.nart...@gmail.com This bug was filed from the crash reporting server and is br-480ffdc0-360b-4113-a7fa-ab0d8c2541d1. = The crash is always reproducible with presentation from the Bug 98500 To make it crash, in "normal" mode just fiddle around (move, resize) with animated GIFs from this attachment: https://bugs.documentfoundation.org/attachment.cgi?id=123386 Usually within one minute LO crashes. It might be necessary to move/resize GIFs in more than one slide to trigger the crash. I'm using Nouveau video driver (if it matters) x11-drivers/xf86-video-nouveau-1.0.15-r1 According to my comments on bug 98500 https://bugs.documentfoundation.org/show_bug.cgi?id=98500#c25 6.1.0.0.alpha0+ version was crashing only at the end of work but not during it. Thus it is a regression introduced after 6.1.0.0alpha0+. IMHO this bug should be linked to the Bug 116109 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #167 from Commit Notification --- Jens Carl committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/6408dbf268fc8cc72fa741197e38b07619f0e96a%5E%21 tdf#45904 Move XEnumerationAccess Java test to C++ It will be available in 6.3.0. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/CppunitTest_sc_cellsobj.mk sc/Module_sc.mk sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv |1
sc/CppunitTest_sc_cellsobj.mk | 43 +
sc/Module_sc.mk|1
sc/qa/extras/sccellsobj.cxx| 101 +
4 files changed, 145 insertions(+), 1 deletion(-)
New commits:
commit 6408dbf268fc8cc72fa741197e38b07619f0e96a
Author: Jens Carl
AuthorDate: Fri Nov 30 07:11:51 2018 +
Commit: Jens Carl
CommitDate: Fri Nov 30 18:15:08 2018 +0100
tdf#45904 Move XEnumerationAccess Java test to C++
Move XEnumerationAccess Java tests to C++ for ScCellsObj.
Change-Id: I3ec78142db7cfa924bf5663ca44cca80b6a0e556
Reviewed-on: https://gerrit.libreoffice.org/64315
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv
index d6ede74a7d3f..c8c8a23d9be7 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellsObj.csv
@@ -1,3 +1,2 @@
"ScCellsObj";"com::sun::star::container::XElementAccess";"getElementType()"
"ScCellsObj";"com::sun::star::container::XElementAccess";"hasElements()"
-"ScCellsObj";"com::sun::star::container::XEnumerationAccess";"createEnumeration()"
diff --git a/sc/CppunitTest_sc_cellsobj.mk b/sc/CppunitTest_sc_cellsobj.mk
new file mode 100644
index ..07dfd37992da
--- /dev/null
+++ b/sc/CppunitTest_sc_cellsobj.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sc_cellsobj))
+
+$(eval $(call gb_CppunitTest_use_external,sc_cellsobj,boost_headers))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sc_cellsobj, \
+sc/qa/extras/sccellsobj \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sc_cellsobj, \
+ cppu \
+ sal \
+ subsequenttest \
+ test \
+ unotest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_cellsobj,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,sc_cellsobj))
+
+$(eval $(call gb_CppunitTest_use_ure,sc_cellsobj))
+$(eval $(call gb_CppunitTest_use_vcl,sc_cellsobj))
+
+$(eval $(call gb_CppunitTest_use_components,sc_cellsobj,\
+$(sc_unoapi_common_components) \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sc_cellsobj))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 1dfe489869f6..530b5a791fec 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -110,6 +110,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_cellcursorobj \
CppunitTest_sc_cellformatsenumeration \
CppunitTest_sc_cellobj \
+ CppunitTest_sc_cellsobj \
CppunitTest_sc_cellrangeobj \
CppunitTest_sc_cellrangesobj \
CppunitTest_sc_cellsenumeration \
diff --git a/sc/qa/extras/sccellsobj.cxx b/sc/qa/extras/sccellsobj.cxx
new file mode 100644
index ..93c9c9f8d259
--- /dev/null
+++ b/sc/qa/extras/sccellsobj.cxx
@@ -0,0 +1,101 @@
+/* -*- 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/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+using namespace css;
+using namespace css::uno;
+
+namespace sc_apitest
+{
+class ScCells : public CalcUnoApiTest, public apitest::XEnumerationAccess
+{
+public:
+ScCells();
+
+virtual uno::Reference init() override;
+virtual void setUp() override;
+virtual void tearDown() override;
+
+CPPUNIT_TEST_SUITE(ScCells);
+
+// XEnumerationAccess
+CPPUNIT_TEST(testCreateEnumeration);
+
+CPPUNIT_TEST_SUITE_END();
+
+private:
+uno::Reference m_xComponent;
+};
+
+ScCells::ScCells()
+: CalcUnoApiTest("/sc/qa/extras/testdocuments")
+{
+}
+
+uno::Reference ScCells::init()
+{
+uno::Reference xDoc(m_xComponent,
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
+
+uno::Reference xSheets(xDoc->getSheets(),
uno::UNO_QUERY_THROW);
+uno::Reference xIA(xSheets, uno::UNO_QUERY_THROW);
+uno::Reference xCellRange(xIA->getByIndex(0),
[Libreoffice-commits] core.git: test/source
test/source/container/xenumerationaccess.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit c95f919756b5b45cbea1d37a9cb232c7f20a5f1d
Author: Jens Carl
AuthorDate: Fri Nov 30 07:07:07 2018 +
Commit: Jens Carl
CommitDate: Fri Nov 30 18:14:36 2018 +0100
Give CPPUNIT_ASSERT_MESSAGE a more meaningful message
Change-Id: Ia83a4403243a2b2ab98c2b0e6a28213ce6fe1269
Reviewed-on: https://gerrit.libreoffice.org/64314
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git a/test/source/container/xenumerationaccess.cxx
b/test/source/container/xenumerationaccess.cxx
index 2de4999f3525..316a25e361d9 100644
--- a/test/source/container/xenumerationaccess.cxx
+++ b/test/source/container/xenumerationaccess.cxx
@@ -24,9 +24,8 @@ void XEnumerationAccess::testCreateEnumeration()
{
uno::Reference xEnumerationAccess(init(),
UNO_QUERY_THROW);
-CPPUNIT_ASSERT_MESSAGE("Successfully able to Create Enumeration",
- xEnumerationAccess->createEnumeration());
-}
+CPPUNIT_ASSERT_MESSAGE("Unable to create enumeration",
xEnumerationAccess->createEnumeration());
}
+} // namespace apitest
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
Michael Meeks wrote: > * Hackfests & Events (Thorsten) >+ next year hackfests coming up: >+ FOSDEM in February - 2 days before the conference expected. > Apologies, there's an off-by-one error: tentative FOSDEM schedule is as follows: Wednesday, January 30 * Hackfest at betacowork Thursday, January 31 * Hackfest at betacowork * 1300-1800 board + ED meeting at betacowork Friday, February 1 * all day board + ED + MC + staff at betacowork Cheers, -- Thorsten signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 121719] Gradient shows separator borders in slideshow mode
https://bugs.documentfoundation.org/show_bug.cgi?id=121719 --- Comment #8 from jl.lesi...@free.fr --- (In reply to Alex Thurgood from comment #4) > With the enclosed test file, I don't see a problem with the gradient per se. > As per the properties of the object, the colour gradient is linear and > angled at 50°, with linear transparency. > > What I do see, and perhaps this is the real object of the bug report is > awful lines drawn at 50° to the horizontal separating each change of colour > when in display mode. These lines are not visible when editing the slide. > > Tested against > > Version: 6.1.2.1 > Build ID: 65905a128db06ba48db947242809d14d3f9a93fe > Threads CPU : 4; OS : Mac OS X 10.14.1; UI Render : par défaut; > Locale : fr-FR (fr_FR.UTF-8); Calc: group threaded > > > @jl.lesieur : is this what you mean by "don't display it properly" ? > > Setting NEEDINFO pending requested information. Exactly ! The bug report concern these awfull line drawn in display mode. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4a' - 2 commits - sw/source
sw/source/core/edit/autofmt.cxx | 11 ++-
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 19 ++-
sw/source/filter/xml/swxml.cxx | 15 +--
sw/source/filter/xml/wrtxml.cxx | 22 --
sw/source/uibase/uiview/view2.cxx | 15 ---
sw/source/uibase/uiview/viewstat.cxx|7 +--
6 files changed, 22 insertions(+), 67 deletions(-)
New commits:
commit 6be6ab406ca0338f562b0ee872a3ada51e70ee42
Author: Michael Stahl
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 30 18:00:19 2018 +0100
HACK: ODF import: always hide redlines
Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 138dc19981c8..5b10130d6e8f 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -889,8 +889,10 @@ ErrCode XMLReader::Read( SwDoc , const OUString&
rBaseURL, SwPaM , con
// restore redline mode from import info property set
RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
if ( *o3tl::doAccess(aAny) )
nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
aAny = xInfoSet->getPropertyValue( sRecordChanges );
if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
nRedlineFlags |= RedlineFlags::On;
commit ef505113d382183f17264b48e100236ac4b0318a
Author: Michael Stahl
AuthorDate: Fri Nov 30 17:54:41 2018 +0100
Commit: Michael Stahl
CommitDate: Fri Nov 30 17:54:41 2018 +0100
sw_redlinehide: make layout based Show/Hide mode the default
remove ExperimentalMode checks
Change-Id: Ie098eda0840bbd3231696cae43cc572ad61379fc
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 7089ce157de3..048706bbce41 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2267,21 +2267,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell,
SvxSwAutoFormatFlags const &
m_nEndNdIdx = m_aEndNdIdx.GetIndex(),
m_pDoc->GetDocShell() );
-uno::Reference const xContext(
-comphelper::getProcessComponentContext());
-bool const
isExp(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext));
RedlineFlags eRedlMode =
m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(), eOldMode = eRedlMode;
if( m_aFlags.bWithRedlining )
{
m_pDoc->SetAutoFormatRedline( true );
-eRedlMode = isExp
-? RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask)
-: RedlineFlags::On | RedlineFlags::ShowInsert;
+eRedlMode = RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask);
}
else
- eRedlMode = isExp
- ? RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask)
- : RedlineFlags::ShowInsert | RedlineFlags::Ignore;
+ eRedlMode = RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask);
m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( eRedlMode );
// save undo state (might be turned off)
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index ce3573b7b946..f956bbd85953 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -343,19 +343,12 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
aAny <<= bShowChanges;
if ( bHandleShowChanges )
{
-if (!utl::ConfigManager::IsFuzzing() &&
officecfg::Office::Common::Misc::ExperimentalMode::get(comphelper::getProcessComponentContext()))
-{
-aAny <<= true;
-xModelPropertySet->setPropertyValue( g_sShowChanges, aAny );
-// TODO maybe we need some property for the view-setting?
-SwDoc *const pDoc(SwImport::GetDocFromXMLImport(m_rImport));
-assert(pDoc);
-
pDoc->GetDocumentRedlineManager().SetHideRedlines(!bShowChanges);
-}
-else
-{
-xModelPropertySet->setPropertyValue( g_sShowChanges, aAny );
-}
+aAny <<= true;
+xModelPropertySet->setPropertyValue( g_sShowChanges, aAny );
+// TODO maybe we need some property for the view-setting?
+SwDoc *const pDoc(SwImport::GetDocFromXMLImport(m_rImport));
+assert(pDoc);
+pDoc->GetDocumentRedlineManager().SetHideRedlines(!bShowChanges);
}
else
xImportInfoPropertySet->setPropertyValue( g_sShowChanges, aAny );
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index f36ffb47a147..138dc19981c8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++
[Libreoffice-bugs] [Bug 121789] Automatic spell checking is not working
https://bugs.documentfoundation.org/show_bug.cgi?id=121789 --- Comment #4 from Timur --- Do you use and have languages installed and marked? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121787] Automatic spell checking is not working
https://bugs.documentfoundation.org/show_bug.cgi?id=121787 Timur changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Timur --- *** This bug has been marked as a duplicate of bug 121789 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121789] Automatic spell checking is not working
https://bugs.documentfoundation.org/show_bug.cgi?id=121789 --- Comment #3 from Timur --- *** Bug 121787 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103309] [META] Print dialog bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103309 Bug 103309 depends on bug 67905, which changed state. Bug 67905 Summary: Enhancement: Add ability to turn off preview in print dialog https://bugs.documentfoundation.org/show_bug.cgi?id=67905 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67905] Enhancement: Add ability to turn off preview in print dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=67905 Daniel Silva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #9 from Daniel Silva --- Dear Xisco, This bug was also solved in my feature branch and we havefinally merged it master. Sorry for any inconvenience I may have caused. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121827] Validity - the dropdown menu is visible in another sheets
https://bugs.documentfoundation.org/show_bug.cgi?id=121827 --- Comment #1 from kabilo --- Created attachment 147180 --> https://bugs.documentfoundation.org/attachment.cgi?id=147180=edit the drop-down menu -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112294] "Place in margins" Print Comment Section active and cannot be changed if document with comments printed and then comments removed
https://bugs.documentfoundation.org/show_bug.cgi?id=112294 Daniel Silva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #14 from Daniel Silva --- Dear Xisco, This bug was already solved in my feature branch, but it seems we took a very long time to merge it to master. I am sorry for any inconvenience I may have caused. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103309] [META] Print dialog bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103309 Bug 103309 depends on bug 112294, which changed state. Bug 112294 Summary: "Place in margins" Print Comment Section active and cannot be changed if document with comments printed and then comments removed https://bugs.documentfoundation.org/show_bug.cgi?id=112294 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121827] New: Validity - the dropdown menu is visible in another sheets
https://bugs.documentfoundation.org/show_bug.cgi?id=121827 Bug ID: 121827 Summary: Validity - the dropdown menu is visible in another sheets Product: LibreOffice Version: 6.1.3.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: minute.visit...@gmail.com Description: When the A3 (Validity) cell is active and you switch to another sheet, the popup button is visible and functional even in this worksheet before you select another active cell Steps to Reproduce: 1. Make a Validity on the cell range in another sheet 2. Set the cell as active 3. Switch to sheet with data Actual Results: dropdown menu is visible and it is working Expected Results: the drop-down menu should not work Reproducible: Always User Profile Reset: No Additional Info: tested on 6.0, 6.1, 6.2 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121774] FORMATTING -- ConditionalFormat.ColorScale does not survive file-reload
https://bugs.documentfoundation.org/show_bug.cgi?id=121774 xeverive changed: What|Removed |Added Version|unspecified |5.3 all versions --- Comment #1 from xeverive --- Reproducible: Always -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101948] Search fails to find specified indentation in imported Word document
https://bugs.documentfoundation.org/show_bug.cgi?id=101948 --- Comment #6 from David F Smith --- This bug is still present, with exactly the same symptoms as in the original report. Version: 6.0.5.2 (x64) Build ID: 54c8cbb85f300ac59db32fe8a675ff7683cd5a16 CPU threads: 4; OS: Windows 10.0; UI render: default; Locale: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121502] LO Calc, Multiple copying of cell which contains link to another cell doesn't work correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=121502 --- Comment #7 from Andrey --- Found the trick! KDE klipboard -> Options -> "Synchronize contents of the clipboards and the selection". When unchecked (default) it's all ok, else - the subj is. When I copy with that option it selects cell value and the selection overwrites link with first copied value. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121826] New: Insert document dialog does nothing
https://bugs.documentfoundation.org/show_bug.cgi?id=121826 Bug ID: 121826 Summary: Insert document dialog does nothing Product: LibreOffice Online Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: minor Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: cont...@rudloff.pro Hello, In LOO 5.3-60, when using Insert > Link..., there are tabs (Document and New Document) to link to a local document. Of course, these don't work when using Online (the browse button does nothing) and it might confuse some users. I suppose these tabs could be removed from the Online version. Regards, -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 2 commits - ios/README Makefile.in
Makefile.in |3 --- ios/README |2 +- 2 files changed, 1 insertion(+), 4 deletions(-) New commits: commit dcd4add8e0e918fea26e00613b8d9ed762144d5a Author: Tor Lillqvist AuthorDate: Fri Nov 30 18:20:23 2018 +0200 Commit: Tor Lillqvist CommitDate: Fri Nov 30 18:20:23 2018 +0200 Mention this file is outdated Change-Id: Iacd5323ee1db9be294556f3d7344eab00b27095b diff --git a/ios/README b/ios/README index a5433cc99a36..7f01d5d600d8 100644 --- a/ios/README +++ b/ios/README @@ -1,4 +1,4 @@ -iOS app and LibreOfficeKit. +Somewhat obsolete README for the LibreOfficeLight iOS app and LibreOfficeKit. -- LibreOfficeLight a swift based UI, very much work in progress commit 0047ca93e80e3cd7303eafff02a7936e853e7ab8 Author: Tor Lillqvist AuthorDate: Fri Nov 30 18:19:09 2018 +0200 Commit: Tor Lillqvist CommitDate: Fri Nov 30 18:19:18 2018 +0200 No ios/generated folder is created any longer The generated files for iOS are now in workdir/CustomTarget/ios. Change-Id: Idee3902eaabf21aa7dacb971ad81f4e2c7df3b5b diff --git a/Makefile.in b/Makefile.in index 2de08601c127..55ebf44dd8c4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -178,9 +178,6 @@ clean-host: rm -fr $(TESTINSTALLDIR) rm -fr $(INSTDIR) rm -fr $(WORKDIR) -ifeq ($(OS),iOS) - rm -fr $(SRCDIR)/ios/generated -endif clean-build: ifneq ($(CROSS_COMPILING),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
