[Libreoffice-bugs] [Bug 120847] Under Print - the 'Properties' are Gray'ed Out in Writer & Calc for Brother printer
https://bugs.documentfoundation.org/show_bug.cgi?id=120847 raal changed: What|Removed |Added Resolution|FIXED |NOTOURBUG -- 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: Building Error ./autogen.sh
Hello Hakan, I think you skipped installing build dependencies of libreoffice. And you should remove sharp symbol related line from /etc/apt/source.list. Please reread here: https://wiki.documentfoundation.org/Development/BuildingOnLinux Best, Gülşah On Sat, Jan 19, 2019, 00:36 Eike Rathke Hi hakan, > > On Friday, 2019-01-18 04:41:56 -0700, hakan wrote: > > > I receive this error. how can I solve this. > > > > configure: error: Package requirements (gstreamer-0.10 > > gstreamer-plugins-base-0.10 gstreamer-pbutils-0.10 ) were not met: > > > > No package 'gstreamer-0.10' found > > No package 'gstreamer-plugins-base-0.10' found > > No package 'gstreamer-pbutils-0.10' found > > Either do not configure with the --enable-gstreamer-0-10 switch, or make > sure that your system provides the necessary gstreamer*-0.10-dev* (or > whatever they're actually named) packages. > > Eike > > -- > GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 > 2D3A > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svtools sfx2/source svtools/source
include/svtools/DocumentToGraphicRenderer.hxx | 16 -
sfx2/source/doc/objserv.cxx | 36 +++-
svtools/source/filter/DocumentToGraphicRenderer.cxx | 58 ++--
3 files changed, 99 insertions(+), 11 deletions(-)
New commits:
commit 189f4d3b3ee5807e1140b6c417a3b2687dfdd2a3
Author: Muhammet Kara
AuthorDate: Fri Jan 18 14:07:56 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Jan 19 08:21:09 2019 +0100
Redaction: Adjust offset for multiple Calc pages
* Add an enum and some methods to DocumentToGraphicRenderer
to differentiate between the doc/module types:
isWriter(), isCalc(), isImpress()
* Put some checks for module/doc type
* The result seems ok for a Calc document of multiple sheets
with hundreds of pages
Change-Id: Idf3e1966d4239df30a48a947a95c9085c25ee1bb
Reviewed-on: https://gerrit.libreoffice.org/66605
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/include/svtools/DocumentToGraphicRenderer.hxx
b/include/svtools/DocumentToGraphicRenderer.hxx
index 4ce5cb4d41fa..49a3ab0b347e 100644
--- a/include/svtools/DocumentToGraphicRenderer.hxx
+++ b/include/svtools/DocumentToGraphicRenderer.hxx
@@ -46,12 +46,19 @@ class SVT_DLLPUBLIC DocumentToGraphicRenderer
{
const css::uno::Reference& mxDocument;
+enum DocType {
+WRITER,
+CALC,
+IMPRESS,
+UNKNOWN
+};
+
css::uno::Reference mxModel;
css::uno::ReferencemxController;
css::uno::Reference mxRenderable;
css::uno::Reference mxToolkit;
css::uno::Any maSelection;
-boolmbIsWriter;
+DocType meDocType;
std::vector maChapterNames;
bool hasSelection() const;
@@ -77,7 +84,8 @@ public:
Size getDocumentSizeInPixels( sal_Int32 nCurrentPage );
-Size getDocumentSizeIn100mm(sal_Int32 nCurrentPage, Point*
pDocumentPosition = nullptr);
+Size getDocumentSizeIn100mm(sal_Int32 nCurrentPage, Point*
pDocumentPosition = nullptr,
+Point* pCalcPagePosition = nullptr, Size
*pCalcPageSize = nullptr);
Graphic renderToGraphic( sal_Int32 nCurrentPage, Size aDocumentSizePixel,
Size aTargetSizePixel, Color aPageColor, bool
bExtOutDevData);
@@ -92,6 +100,10 @@ public:
css::uno::Reference< css::drawing::XShapes > & rxShapes,
css::uno::Reference< css::drawing::XShape > & rxShape,
const css::uno::Reference< css::frame::XController > &
rxController );
+
+bool isWriter() const;
+bool isCalc() const;
+bool isImpress() const;
};
#endif
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index ff6755257000..defa5ea0e483 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -549,7 +549,16 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
uno::Reference< lang::XComponent > xSourceDoc( xModel );
-DocumentToGraphicRenderer aRenderer(xSourceDoc,
/*bSelectionOnly=*/false);
+DocumentToGraphicRenderer aRenderer(xSourceDoc, false);
+
+bool bIsWriter = aRenderer.isWriter();
+bool bIsCalc = aRenderer.isCalc();
+
+if (!bIsWriter && !bIsCalc)
+{
+SAL_WARN( "sfx.doc", "Redaction is supported only for Writer
and Calc! (for now...)");
+return;
+}
sal_Int32 nPages = aRenderer.getPageCount();
@@ -559,7 +568,9 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
{
::Size aDocumentSizePixel =
aRenderer.getDocumentSizeInPixels(nPage);
::Point aLogicPos;
-::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage,
);
+::Point aCalcPageLogicPos;
+::Size aCalcPageContentSize;
+::Size aLogic = aRenderer.getDocumentSizeIn100mm(nPage,
, , );
// FIXME: This is a temporary hack. Need to figure out a
proper way to derive this scale factor.
::Size aTargetSize(aDocumentSizePixel.Width() * 1.23,
aDocumentSizePixel.Height() * 1.23);
@@ -572,9 +583,21 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest )
MapMode aMapMode;
aMapMode.SetMapUnit(MapUnit::Map100thMM);
// FIXME: This is a temporary hack. Need to figure out a
proper way to derive these magic numbers.
-aMapMode.SetOrigin(::Point(-(aLogicPos.getX() - 512) * 1.53,
-((aLogicPos.getY() - 501)* 1.53 + (nPage-1)*740 )));
+if (bIsWriter)
+aMapMode.SetOrigin(::Point(-(aLogicPos.getX() - 512) *
1.53, -((aLogicPos.getY() - 501)* 1.53 + (nPage-1)*740 )));
+else if (bIsCalc)
+
[Libreoffice-bugs] [Bug 122803] Gallery import: File picker window title not localizable
https://bugs.documentfoundation.org/show_bug.cgi?id=122803 Dian Li changed: What|Removed |Added Status|UNCONFIRMED |NEW OS|Windows (All) |All Ever confirmed|0 |1 -- 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 122804] Bitmap import: File picker window title not localizable
https://bugs.documentfoundation.org/show_bug.cgi?id=122804 Dian Li changed: What|Removed |Added Ever confirmed|0 |1 OS|Windows (All) |All Status|UNCONFIRMED |NEW -- 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 115024] FILEOPEN DOC: Small lag while opening
https://bugs.documentfoundation.org/show_bug.cgi?id=115024 --- Comment #2 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113049] Menus open in wrong positions on multi-monitor config
https://bugs.documentfoundation.org/show_bug.cgi?id=113049 --- Comment #17 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101895] Paragraph dialog units shown as "ch" and "lines" when "Enable char unit" is enabled by default
https://bugs.documentfoundation.org/show_bug.cgi?id=101895 --- Comment #16 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101931] FILEOPEN: Drawings/shapes in DOCX (MS Office 2007) are not shown correctly (WPS)
https://bugs.documentfoundation.org/show_bug.cgi?id=101931 --- Comment #8 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108450] Shrinking of grow/shrink custom animation effect does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=108450 --- Comment #20 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 100778] "Start with caps" autocorrect doesn't work if word contains apostrophe and "Single quotes" option is on
https://bugs.documentfoundation.org/show_bug.cgi?id=100778 --- Comment #7 from QA Administrators --- ** Please read this message in its entirety before responding ** To make sure we're focusing on the bugs that affect our users today, LibreOffice QA is asking bug reporters and confirmers to retest open, confirmed bugs which have not been touched for over a year. There have been thousands of bug fixes and commits since anyone checked on this bug report. During that time, it's possible that the bug has been fixed, or the details of the problem have changed. We'd really appreciate your help in getting confirmation that the bug is still present. If you have time, please do the following: Test to see if the bug is still present with the latest version of LibreOffice from https://www.libreoffice.org/download/ If the bug is present, please leave a comment that includes the information from Help - About LibreOffice. If the bug is NOT present, please set the bug's Status field to RESOLVED-WORKSFORME and leave a comment that includes the information from Help - About LibreOffice. Please DO NOT Update the version field Reply via email (please reply directly on the bug tracker) Set the bug's Status field to RESOLVED - FIXED (this status has a particular meaning that is not appropriate in this case) If you want to do more to help you can test to see if your issue is a REGRESSION. To do so: 1. Download and install oldest version of LibreOffice (usually 3.3 unless your bug pertains to a feature added after 3.3) from http://downloadarchive.documentfoundation.org/libreoffice/old/ 2. Test your bug 3. Leave a comment with your results. 4a. If the bug was present with 3.3 - set version to 'inherited from OOo'; 4b. If the bug was not present in 3.3 - add 'regression' to keyword Feel free to come ask questions or to say hello in our QA chat: https://kiwiirc.com/nextclient/irc.freenode.net/#libreoffice-qa Thank you for helping us make LibreOffice even better for everyone! Warm Regards, QA Team MassPing-UntouchedBug -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119569] Open Sub-Form causes PostgreSQL error
https://bugs.documentfoundation.org/show_bug.cgi?id=119569
--- Comment #29 from ansari.a...@gmail.com ---
(In reply to Buovjaga from comment #28)
> (In reply to Julien Nabet from comment #27)
> > (In reply to ansari.afcs from comment #26)
> > > Forgive for asking this. But Please build a standalone sdbc-postgresql
> > > driver with this patch.
> > > ...
> >
> > Rather try the filepicker on recent LO version with different rendering if
> > necessary. If there's a problem, feel free to submit a bugtracker if there's
> > none corresponding to your problem.
> > Also, I don't know if it's possible to build a standalone sdbc-postgresql
> > but you may also retrieve the code and give it a try.
I wish I could but am not a programmer. My journey with openoffice, basic,
macro programming started many years back with free CD of StarOffice 5.2 and
the need to change the dbase4 management system we were using then. I managed
to cook up something which works for us. I lurked and read through the forum
pages and learned from many people. Many many people contrirbuted in my
learning. And wait many years for this PG-log syntax error to be fixed. Since a
solution is working, I asked for the possibility of a new extension, the last
sdbc-extension available in sdbc-openoffice.org is many years old. Well forgive
me, I know this is not OpenOffice bugzilla. Should I make a request directed to
'Lionel'
>
> Adding ansari to CC. The filepicker is dependent on the operating system.
> Indeed, try with 6.2 and create a report, if necessary. Include all the
> relevant information.
>
> On Windows 10, the preview ("Show the preview pane") in filepicker is
> certainly resizeable.
I was not referring to windows 10 file preview as I need to start the file
preview with specific path selected from the basic macro. Application users are
not expected to browse. The 'SetDefaultDirectory' method does not work with
"com.sun.star.ui.dialogs.SystemFilePicker" or
"com.sun.star.ui.dialogs.FilePicker".
I did test with LO 6.2.0.2, same behaviour as 6.1.4. Filepicker started with
basic macro using "com.sun.star.ui.dialogs.OfficeFilePicker", shows 3 panes and
is re-sizeable. Can change sizes for 'Myplaces and or file list panes but the
preview area remain the same.
This behaviour is different in OO/AOO which shows only 2 panes, file list and
preview and can be enlarged together making it functional for me.
Thank you
Best Regards
Ansari
--
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 34689] UI scroll problem: Cell with dimensions exceeding screen dimensions impossible to work with
https://bugs.documentfoundation.org/show_bug.cgi?id=34689 --- Comment #22 from Kyle Marek --- (In reply to Libomark from comment #21) > An obvious workaround is to zoom out on the sheet. If that reduces > legibility too far, then use assorted text function to split the text into > different cells nearby, or reformat the cells using wrap etc. as appropriate. Modifying the layout of the document is not always an option. My most recent occurrence of this issue was updating finding status on a STIG viewer spreadsheet export (which needed to be re-imported into the tool). -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/qt5
vcl/qt5/Qt5Widget.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit ba0e870fe7c9004280e2d3669e89876e1491cc1c
Author: Jan-Marek Glogowski
AuthorDate: Fri Jan 4 15:40:06 2019 +0100
Commit: Michael Weghorn
CommitDate: Sat Jan 19 01:17:26 2019 +0100
tdf#122459 Qt5 IM underline pre-edit
This simply always underlines the pre-edit text, so it'S easier to
see what text block is currently IM edited.
Change-Id: I45145e4faa872c44eb6583ac6f335dd40fe3e53e
Reviewed-on: https://gerrit.libreoffice.org/65856
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit f2ee532640fa200ada55ac51fbe47bad260aec7e)
Reviewed-on: https://gerrit.libreoffice.org/65858
Reviewed-by: Michael Weghorn
(cherry picked from commit 7ca6bd053869a84d18bcce2b3f08a27a6ad785d9)
Reviewed-on: https://gerrit.libreoffice.org/66612
Tested-by: Michael Weghorn
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 462f19675905..4eaac1629b53 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -41,6 +41,7 @@
#include
#include
+#include
void Qt5Widget::paintEvent(QPaintEvent* pEvent)
{
@@ -449,6 +450,10 @@ void Qt5Widget::inputMethodEvent(QInputMethodEvent* pEvent)
{
aInputEvent.maText = toOUString(pEvent->preeditString());
aInputEvent.mnCursorPos = 0;
+sal_Int32 nLength = aInputEvent.maText.getLength();
+std::vector aTextAttrs(nLength,
ExtTextInputAttr::Underline);
+if (nLength)
+aInputEvent.mpTextAttr = [0];
m_pFrame->CallCallback(SalEvent::ExtTextInput, );
pEvent->accept();
}
___
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' - vcl/qt5 vcl/unx
vcl/qt5/Qt5Frame.cxx |6 --
vcl/unx/kde4/KDESalFrame.cxx |6 --
2 files changed, 12 deletions(-)
New commits:
commit 17fd7790f84d9bbdddc0ebcde20ed143cdc27a64
Author: Jan-Marek Glogowski
AuthorDate: Wed Dec 12 12:57:10 2018 +0100
Commit: Michael Weghorn
CommitDate: Sat Jan 19 01:16:45 2019 +0100
Qt5+kde4 don't override generic VCL style settings
In commit 3911bf8364da ("tdf#98253 Qt5 rely on VCL for
SetDeactiveColor") the named was dropped from the Qt5 styling.
This results in SetDeactiveColor now being controlled by LO,
but SetActiveColor by the Qt theming.
But IMHO both need to be managed together in some way, as the
deactive color is normally some variant of active with a lower
opacity.
Also no other backends except Windows and headless even
overide the four general colors Set(De|A)ctive(Text)?Color and
Windows is setting them from the window decorations (CAPTION)?!
So let's get rid of all these settings for Qt5 and kde4.
Change-Id: Id9497dc067e4718d25d24c5795589b6c028a8817
Reviewed-on: https://gerrit.libreoffice.org/65028
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 89c888b48eca24e25ffe8895542cf7ac9b731187)
Reviewed-on: https://gerrit.libreoffice.org/65857
Reviewed-by: Michael Weghorn
(cherry picked from commit 2b6ba5e47671358cbe44ba68000e13db22bd36db)
Reviewed-on: https://gerrit.libreoffice.org/66611
Tested-by: Michael Weghorn
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 955412073501..6441d7d244ea 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -847,12 +847,6 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
style.SetToolbarIconSize(ToolbarIconSize::Large);
-style.SetActiveColor(toColor(pal.color(QPalette::Active,
QPalette::Window)));
-// rely on VCL for style.SetDeactiveColor
-
-style.SetActiveTextColor(toColor(pal.color(QPalette::Active,
QPalette::WindowText)));
-style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive,
QPalette::WindowText)));
-
Color aFore = toColor(pal.color(QPalette::Active, QPalette::WindowText));
Color aBack = toColor(pal.color(QPalette::Active, QPalette::Window));
Color aText = toColor(pal.color(QPalette::Active, QPalette::Text));
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 7dde568a23b1..09a0e7866503 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -169,12 +169,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetToolbarIconSize( ToolbarIconSize::Large );
-style.SetActiveColor(toColor(pal.color(QPalette::Active,
QPalette::Window)));
-style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive,
QPalette::Window)));
-
-style.SetActiveTextColor(toColor(pal.color(QPalette::Active,
QPalette::WindowText)));
-style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive,
QPalette::WindowText)));
-
// Font
vcl::Font aFont = toFont( QApplication::font(),
rSettings.GetUILanguageTag().getLocale() );
style.BatchSetFonts( aFont, aFont );
___
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' - vcl/qt5
vcl/qt5/Qt5Frame.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5468ba95e24c0c513646797379241f1063032dff Author: Sumit Chauhan AuthorDate: Tue Dec 4 18:47:10 2018 +0530 Commit: Michael Weghorn CommitDate: Sat Jan 19 01:15:55 2019 +0100 tdf#98253 Qt5 rely on VCL for SetDeactiveColor Keep the DeactiveColor from generic vcl style without overriding it with the Qt5 style. Change-Id: I10ffdc79e1b6878d27ae13c6394ad50d7470f073 Reviewed-on: https://gerrit.libreoffice.org/64522 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski (cherry picked from commit 3911bf8364dae4c855ad37237c114f9007f70657) Reviewed-on: https://gerrit.libreoffice.org/65560 Reviewed-by: Michael Weghorn (cherry picked from commit 66d3a5b78b7a7665a75047c87ac180eeb03b476f) Reviewed-on: https://gerrit.libreoffice.org/66610 Tested-by: Michael Weghorn diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx index e42621e95c1b..955412073501 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/Qt5Frame.cxx @@ -848,7 +848,7 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings) style.SetToolbarIconSize(ToolbarIconSize::Large); style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window))); -style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive, QPalette::Window))); +// rely on VCL for style.SetDeactiveColor style.SetActiveTextColor(toColor(pal.color(QPalette::Active, QPalette::WindowText))); style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText))); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/sdxmlimp.cxx |1 +
xmloff/source/draw/sdxmlimp_impl.hxx |3 ++-
xmloff/source/draw/ximpbody.cxx |5 +
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 16fffbe869785dffeda9ae0d9f7c18a6559a2093
Author: Regina Henschel
AuthorDate: Thu Jan 17 14:09:22 2019 +0100
Commit: Regina Henschel
CommitDate: Sat Jan 19 00:41:16 2019 +0100
tdf#101218 Import layer-set from page
This patch is a interim solution for document exchange between
Karbon and LibreOffice, till layer-set for page and for
master-page is implemented some day.
Change-Id: I2f12eeeb9c742f65999fd4c0d95c418273ae008f
Reviewed-on: https://gerrit.libreoffice.org/66518
Tested-by: Jenkins
Reviewed-by: Regina Henschel
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 9a68a31634fd..6ba506ef6832 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -578,6 +578,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap()
{ XML_NAMESPACE_PRESENTATION, XML_NOTES,
XML_TOK_DRAWPAGE_NOTES },
{ XML_NAMESPACE_ANIMATION, XML_PAR,
XML_TOK_DRAWPAGE_PAR},
{ XML_NAMESPACE_ANIMATION, XML_SEQ,
XML_TOK_DRAWPAGE_SEQ},
+{ XML_NAMESPACE_DRAW, XML_LAYER_SET,
XML_TOK_DRAWPAGE_LAYER_SET },
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx
b/xmloff/source/draw/sdxmlimp_impl.hxx
index 40010440c597..e61f8866ff2f 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -110,7 +110,8 @@ enum SdXMLDrawPageElemTokenMap
{
XML_TOK_DRAWPAGE_NOTES,
XML_TOK_DRAWPAGE_PAR,
-XML_TOK_DRAWPAGE_SEQ
+XML_TOK_DRAWPAGE_SEQ,
+XML_TOK_DRAWPAGE_LAYER_SET
};
enum SdXMLPresentationPlaceholderAttrTokenMap
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 0b682b4a4494..de7a9cac23d1 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -35,6 +35,7 @@
#include
#include
#include "ximpshow.hxx"
+#include "layerimp.hxx"
#include
#include
#include
@@ -258,6 +259,10 @@ SvXMLImportContextRef
SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPref
}
break;
}
+case XML_TOK_DRAWPAGE_LAYER_SET:
+{
+xContext = new SdXMLLayerSetContext( GetSdImport(), nPrefix,
rLocalName, xAttrList );
+}
}
// call parent when no own context was created
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 122709] In LibreOffice Writer (6.1.2 to 6.1.4, German) under Windows 10: Displayed window does not fit to mouse coordinates
https://bugs.documentfoundation.org/show_bug.cgi?id=122709 Xisco Faulí changed: What|Removed |Added Ever confirmed|0 |1 CC||xiscofa...@libreoffice.org Status|UNCONFIRMED |NEEDINFO --- Comment #5 from Xisco Faulí --- Does it work if you disable OpenGl ? -> https://wiki.documentfoundation.org/OpenGL I have set the bug's status to 'NEEDINFO'. Please change it back to 'UNCONFIRMED' if the issue is still present -- 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 120847] Under Print - the 'Properties' are Gray'ed Out in Writer & Calc for Brother printer
https://bugs.documentfoundation.org/show_bug.cgi?id=120847 eustace@gmail.com changed: What|Removed |Added Resolution|--- |FIXED Status|NEEDINFO|RESOLVED --- Comment #8 from eustace@gmail.com --- Please close. Brother International is pro ported to be a leader in Customer Service for the past 5+ years. I for one dispute their claim. The have the worst customer service I have ever come across. Never will I but another of their products. The errors that I had described were clearly Brother driver errors. Their cleanup tools and installation (7 times) never worked. Please thank everyone for their assistance and CLOSE this ticket. -- 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 121781] Status of time zone data storage in date cells; timezone conversion
https://bugs.documentfoundation.org/show_bug.cgi?id=121781 --- Comment #8 from Adolfo Jayme --- Note that the old wiki-based help pages are obsolete and won’t be updated further. The new page (where the above patch is going to be reflected) is https://help.libreoffice.org/6.3/en-US/text/scalc/01/04060102.html -- 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 119949] Filter broken by blank line
https://bugs.documentfoundation.org/show_bug.cgi?id=119949 einsachtz...@online.de changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW -- 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 119949] Filter broken by blank line
https://bugs.documentfoundation.org/show_bug.cgi?id=119949 --- Comment #7 from einsachtz...@online.de --- Reproducible in: Version: 6.1.4.2 Build-ID: 10(Build:2) CPU-Threads: 4; BS: Linux 4.12; UI-Render: Standard; VCL: gtk3_kde5; Gebietsschema: de-DE (de_DE.UTF-8); Calc: group threaded It is possible to avoid described behavior by marking all involved columns before activating autofilter. Using this as a workaround reveals that data seems to be filtered correctly. BUT in case autofilter is deactivated (by menu or symbol) while values are filtered some rows keep hidden from time to time and must be made visible manually (another 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-commits] core.git: xmloff/source
xmloff/source/draw/animationimport.cxx | 42 +
1 file changed, 7 insertions(+), 35 deletions(-)
New commits:
commit f7923deee042a39d5328987e579b1ac60c6c4186
Author: Matteo Casalin
AuthorDate: Sun Dec 30 15:35:33 2018 +0100
Commit: Matteo Casalin
CommitDate: Fri Jan 18 23:30:59 2019 +0100
Use getTokenCount instead of custom code
Change-Id: Ie6f097984950d306453f0735eb299cfa65d4d74e
Reviewed-on: https://gerrit.libreoffice.org/66225
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/xmloff/source/draw/animationimport.cxx
b/xmloff/source/draw/animationimport.cxx
index ccf3dfb39325..814871c22f05 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -48,6 +48,7 @@
#include
#include
#include
+#include
#include
@@ -320,24 +321,6 @@ static bool isTime( const OUString& rValue )
return (nLength == 0) || ((*pStr == 's' || *pStr == 'S') && (nLength ==
1));
}
-static sal_Int32 count_codes( const OUString& rString, sal_Unicode nCode )
-{
-sal_Int32 nCount = 0;
-sal_Int32 fromIndex = 0;
-
-while(true)
-{
-fromIndex = rString.indexOf( nCode, fromIndex );
-if( fromIndex == -1 )
-break;
-
-fromIndex++;
-nCount++;
-}
-
-return nCount;
-}
-
Any AnimationsImportHelperImpl::convertTarget( const OUString& rValue )
{
try
@@ -466,11 +449,9 @@ Sequence< Any >
AnimationsImportHelperImpl::convertValueSequence( XMLTokenEnum e
{
Sequence< Any > aValues;
-// do we have any value at all?
-if( !rValue.isEmpty() )
+const sal_Int32 nElements { comphelper::string::getTokenCount(rValue, ';')
};
+if ( nElements>0 )
{
-sal_Int32 nElements = count_codes( rValue, ';') + 1; // a non empty
string has at least one value
-
// prepare the sequence
aValues.realloc( nElements );
@@ -487,12 +468,9 @@ Any AnimationsImportHelperImpl::convertTiming( const
OUString& rValue )
{
Any aAny;
-// do we have any value at all?
-if( !rValue.isEmpty() )
+const sal_Int32 nElements { comphelper::string::getTokenCount(rValue, ';')
};
+if ( nElements>0 )
{
-// count the values
-sal_Int32 nElements = count_codes( rValue, ';' ) + 1; // a non empty
string has at least one value
-
if( nElements == 1 )
{
if( IsXMLToken( rValue, XML_MEDIA ) )
@@ -564,10 +542,7 @@ Any AnimationsImportHelperImpl::convertTiming( const
OUString& rValue )
Sequence< double > AnimationsImportHelperImpl::convertKeyTimes( const
OUString& rValue )
{
-sal_Int32 nElements = 0;
-
-if( !rValue.isEmpty() )
-nElements = count_codes( rValue, ';' ) + 1; // a non empty string has
at least one value
+const sal_Int32 nElements { comphelper::string::getTokenCount(rValue, ';')
};
Sequence< double > aKeyTimes( nElements );
@@ -583,10 +558,7 @@ Sequence< double >
AnimationsImportHelperImpl::convertKeyTimes( const OUString&
Sequence< TimeFilterPair > AnimationsImportHelperImpl::convertTimeFilter(
const OUString& rValue )
{
-sal_Int32 nElements = 0;
-
-if( !rValue.isEmpty() )
-nElements = count_codes( rValue, ';' ) + 1; // a non empty string has
at least one value
+const sal_Int32 nElements { comphelper::string::getTokenCount(rValue, ';')
};
Sequence< TimeFilterPair > aTimeFilter( nElements );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/print/genprnpsp.cxx | 48
1 file changed, 16 insertions(+), 32 deletions(-)
New commits:
commit 284e998aae8f65857a6ef8df965e03910fc4bef0
Author: Matteo Casalin
AuthorDate: Sat Jan 12 17:29:06 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Jan 18 23:12:52 2019 +0100
No need to loop twice on the same tokens
Change-Id: If1ef69d537c67bf0e6f9f5236ce97b1264e82c51
Reviewed-on: https://gerrit.libreoffice.org/66236
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/vcl/unx/generic/print/genprnpsp.cxx
b/vcl/unx/generic/print/genprnpsp.cxx
index 151db7574729..baeaadc3541a 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -63,12 +63,8 @@
using namespace psp;
using namespace com::sun::star;
-/*
- * static helpers
- */
-static OUString getPdfDir( const PrinterInfo& rInfo )
+static bool getPdfDir( const PrinterInfo& rInfo, OUString )
{
-OUString aDir;
sal_Int32 nIndex = 0;
while( nIndex != -1 )
{
@@ -76,13 +72,13 @@ static OUString getPdfDir( const PrinterInfo& rInfo )
if( aToken.startsWith( "pdf=" ) )
{
sal_Int32 nPos = 0;
-aDir = aToken.getToken( 1, '=', nPos );
-if( aDir.isEmpty() && getenv( "HOME" ) )
-aDir = OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ),
osl_getThreadTextEncoding() );
-break;
+rDir = aToken.getToken( 1, '=', nPos );
+if( rDir.isEmpty() && getenv( "HOME" ) )
+rDir = OUString( getenv( "HOME" ), strlen( getenv( "HOME" ) ),
osl_getThreadTextEncoding() );
+return true;
}
}
-return aDir;
+return false;
}
namespace
@@ -418,16 +414,9 @@ void SalGenericInstance::GetPrinterQueueInfo(
ImplPrnQueueList* pList )
pInfo->maLocation = rInfo.m_aLocation;
pInfo->maComment= rInfo.m_aComment;
-sal_Int32 nIndex = 0;
-while( nIndex != -1 )
-{
-OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
-if( aToken.match( "pdf=" ) )
-{
-pInfo->maLocation = getPdfDir( rInfo );
-break;
-}
-}
+OUString sPdfDir;
+if (getPdfDir(rInfo, sPdfDir))
+pInfo->maLocation = sPdfDir;
pList->Add( std::move(pInfo) );
}
@@ -855,21 +844,16 @@ bool PspSalPrinter::StartJob(
int nMode = 0;
// check whether this printer is configured as fax
-sal_Int32 nIndex = 0;
const PrinterInfo& rInfo( PrinterInfoManager::get().getPrinterInfo(
m_aJobData.m_aPrinterName ) );
-while( nIndex != -1 )
+OUString sPdfDir;
+if (getPdfDir(rInfo, sPdfDir))
{
-OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) );
-if( aToken.startsWith( "pdf=" ) )
-{
-m_bPdf = true;
-m_aTmpFile = getTmpName();
-nMode = S_IRUSR | S_IWUSR;
+m_bPdf = true;
+m_aTmpFile = getTmpName();
+nMode = S_IRUSR | S_IWUSR;
-if( m_aFileName.isEmpty() )
-m_aFileName = getPdfDir( rInfo ) + "/" + rJobName + ".pdf";
-break;
-}
+if( m_aFileName.isEmpty() )
+m_aFileName = sPdfDir + "/" + rJobName + ".pdf";
}
m_aPrinterGfx.Init( m_aJobData );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Commit 66203
Hi Komal, On Friday, 2019-01-18 08:31:53 +0530, Komal Bharadiya wrote: > I have been working on my first commit. But I am not able to rework on my > patch. > I get this on my terminal-- > > To ssh://logerrit:29418/core > ! [remote rejected] HEAD -> refs/publish/master/66203 (you are > not allowed to upload merges) > error: failed to push some refs to 'ssh://komalbharadiya@logerrit > :29418/core' > * > Please help, how do I resolve *CANNOT MERGE* issue? It could had helped if you described exactly how you manoeuvred yourself into that situation, i.e. which sequence of commands lead to a merge commit that can't be pushed. Anyway.. First put aside (just in case your existing conflict resolution could be reused or would come handy when resolving the merge conflict again) and throw away your current commit(s); assuming that you are on your local master do git log Your conflict resolution probably is the second commit and the HEAD commit is the merge commit. If so, then git format-patch -1 HEAD~1 which writes some 0001-your-commit-summary.patch file. Then git reset --hard HEAD~2 which throws away the topmost 2 commits. If your commit history is different then please adjust the commands. Then git pull -r to pull and rebase master to current state (probably you omitted the -r to some pull in some stage earlier which lead to the merge) Then cherry-pick the gerrit change with git fetch https://git.libreoffice.org/core refs/changes/03/66203/2 && git cherry-pick FETCH_HEAD This should lead to an error message about merge conflicts. Resolve the merge conflicts. When done git cherry-pick --continue If the change is commited and builds you can push to gerrit. If the earlier assumption that you are on your local master does not hold but you are on a local branch instead (which is advisable), then proceed the same but instead of git pull -r issue the commands git fetch git rebase origin/master Hope that helps. Eike -- 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 105225] Color palette cannot be chosen in various places
https://bugs.documentfoundation.org/show_bug.cgi?id=105225 --- Comment #83 from Mike Kaganski --- So the only place in the codebase where SvxBackgroundTabPage is still added seems to be cui/source/tabpages/bbdlg.cxx? -- 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: vcl/unx
vcl/unx/generic/printer/jobdata.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8511bc6b9bf5dcaf0ce6ecee65be54552bc73bd5
Author: Matteo Casalin
AuthorDate: Thu Jan 3 17:11:11 2019 +0100
Commit: Matteo Casalin
CommitDate: Fri Jan 18 23:10:04 2019 +0100
Use indexed getToken, avoid unnecessary OUString copy
Change-Id: I2ce2d16c24f7fd90c7ba16175ea99f7e1cb46fc9
Reviewed-on: https://gerrit.libreoffice.org/66233
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/vcl/unx/generic/printer/jobdata.cxx
b/vcl/unx/generic/printer/jobdata.cxx
index 76de4fef3e14..8f2b0018ca07 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -237,11 +237,11 @@ bool JobData::constructFromStreamBuffer( const void*
pData, sal_uInt32 bytes, Jo
else if (aLine.startsWith(margindajustmentEquals))
{
bMargin = true;
-OString
aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals)));
-rJobData.m_nLeftMarginAdjust = aValues.getToken(0, ',').toInt32();
-rJobData.m_nRightMarginAdjust = aValues.getToken(1, ',').toInt32();
-rJobData.m_nTopMarginAdjust = aValues.getToken(2, ',').toInt32();
-rJobData.m_nBottomMarginAdjust = aValues.getToken(3,
',').toInt32();
+sal_Int32 nIdx {RTL_CONSTASCII_LENGTH(margindajustmentEquals)};
+rJobData.m_nLeftMarginAdjust = aLine.getToken(0, ',',
nIdx).toInt32();
+rJobData.m_nRightMarginAdjust = aLine.getToken(0, ',',
nIdx).toInt32();
+rJobData.m_nTopMarginAdjust = aLine.getToken(0, ',',
nIdx).toInt32();
+rJobData.m_nBottomMarginAdjust = aLine.getToken(0, ',',
nIdx).toInt32();
}
else if (aLine.startsWith(colordepthEquals))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit bbb004094381ec595267fa93449facd2f608b9f7
Author: Matteo Casalin
AuthorDate: Sun Dec 30 15:44:35 2018 +0100
Commit: Matteo Casalin
CommitDate: Fri Jan 18 23:03:02 2019 +0100
Avoid getToken index for single call, minor simplification
Change-Id: If9ec36565cf42d11a0e1715f4aac28c365843a56
Reviewed-on: https://gerrit.libreoffice.org/66226
Tested-by: Jenkins
Reviewed-by: Matteo Casalin
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index cb607630f502..9dceca28faed 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -997,9 +997,8 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
if( xLabel.is() )
{
aRange =
xLabel->getSourceRangeRepresentation();
-sal_Int32 nSearchIndex = 0;
-OUString aSecondToken =
aRange.getToken( 1, ' ', nSearchIndex );
-if( ::std::find(
rTable.aHiddenColumns.begin(), rTable.aHiddenColumns.end(),
aSecondToken.toInt32() ) == rTable.aHiddenColumns.end() )
+const sal_Int32 nId
{aRange.getToken(1, ' ').toInt32()};
+if( ::std::find(
rTable.aHiddenColumns.begin(), rTable.aHiddenColumns.end(), nId ) ==
rTable.aHiddenColumns.end() )
bHasUnhiddenColumns = true;
}
}
@@ -1039,8 +1038,7 @@ void
SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary(
if( xLabel.is() )
{
aRange =
xLabel->getSourceRangeRepresentation();
-sal_Int32 nSearchIndex = 0;
-OUString aSecondToken = aRange.getToken(
1, ' ', nSearchIndex );
+OUString aSecondToken = aRange.getToken(1,
' ');
if( !aSecondToken.isEmpty() )
aUsageMap[aSecondToken.toInt32()] =
true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 101650] Frame, used to make a table float, has wrapping Page Wrap; should be Wrap Off, now a character is placed beside the table, in stead if below it.
https://bugs.documentfoundation.org/show_bug.cgi?id=101650 Cor Nouws changed: What|Removed |Added Summary|[FILEOPEN,DOCX] Badly |Frame, used to make a table |positioned symbol |float, has wrapping Page ||Wrap; should be Wrap Off, ||now a character is placed ||beside the table, in stead ||if below it. --- Comment #16 from Cor Nouws --- (In reply to Tamás Zolnai from comment #8) > Hi, > > I checked this problem. That's true it comes up with my commit > (f4ae06c6b558628457f3abdade1f2a705bf8b886), but not this commit is the > problem. > If you check the table positions you will see. > 1) Open the document in MS Word and go to Table Properties -> Positioning. > You can see table is positioned with 2,27" vertically, relative to page. > 2) Open the document in Writer and open Frame dialog. In Writer a floating > table is a simple table inside a frame. The floating table position is > defined by the frame. So try to select the frame containing the table. In > Frame dialog select Type tab which shows the positioning. The problem is the wrapping of the frame aroudn the table - changing summary accordingly -- 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 101650] [FILEOPEN, DOCX] Badly positioned symbol
https://bugs.documentfoundation.org/show_bug.cgi?id=101650 --- Comment #15 from Cor Nouws --- still the same in Version: 6.3.0.0.alpha0+ Build ID: b8e450a54936560cdac00ab4c70ef80c20cfaf99 CPU threads: 4; OS: Linux 4.15; UI render: default; VCL: gtk3; TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time: 2019-01-18_06:04:42 Locale: nl-NL (nl_NL.UTF-8); UI-Language: en-US Calc: 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 105225] Color palette cannot be chosen in various places
https://bugs.documentfoundation.org/show_bug.cgi?id=105225 --- Comment #82 from Commit Notification --- Jim Raykowski committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/7eedbd6380d30de82427c159b05b9545bb57336d%5E%21 tdf#105225 New background tab page for Search for formatting dialog 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: cui/source svx/source
cui/source/dialogs/srchxtra.cxx |2 +-
svx/source/dialog/srchdlg.cxx |4
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 7eedbd6380d30de82427c159b05b9545bb57336d
Author: Jim Raykowski
AuthorDate: Fri Jan 18 00:44:55 2019 -0900
Commit: Mike Kaganski
CommitDate: Fri Jan 18 22:50:36 2019 +0100
tdf#105225 New background tab page for Search for formatting dialog
Change-Id: I3642ea9e474c06943ea8bfb88e4209749db1fd83
Reviewed-on: https://gerrit.libreoffice.org/66578
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index a63691256f19..ecd2b1697d35 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -44,7 +44,7 @@ SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window*
pParent, const SfxIte
AddTabPage("labelTP_PARA_ALIGN", SvxParaAlignTabPage::Create, nullptr);
AddTabPage("labelTP_PARA_EXT", SvxExtParagraphTabPage::Create, nullptr);
AddTabPage("labelTP_PARA_ASIAN", SvxAsianTabPage::Create, nullptr );
-AddTabPage("background", SvxBackgroundTabPage::Create, nullptr);
+AddTabPage("background", SvxBkgTabPage::Create, nullptr);
// remove asian tabpages if necessary
SvtCJKOptions aCJKOptions;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index d005a1f5869a..4ab0bdf3147e 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -73,6 +73,8 @@
#include
#include
+#include
+
using namespace com::sun::star::i18n;
using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility;
@@ -2007,6 +2009,8 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, Button*,
void)
sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
aSet.MergeRange(nBrushWhich, nBrushWhich);
+aSet.MergeRange(XATTR_FILL_FIRST, XATTR_FILL_LAST);
+
OUString aTxt;
aSet.InvalidateAllItems();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 122747] FILESAVE: DOCX: RTL text is left aligned after RT
https://bugs.documentfoundation.org/show_bug.cgi?id=122747 Eyal Rozenberg changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #2 from Eyal Rozenberg --- (In reply to Xisco Faulí from comment #0) > Steps to reproduce: > 1. Open attachment 90382 [details] from bug 72424 -> all hebrew text is > aligned to the right > 2. Save it as DOCX. > 3. Open the new document > -> All hebrew text is aligned to the right First, in the document, some Hebrew text is justified. But regardless of that - the behavior you describe is just fine: Text aligned to the right stays aligned to the right. What's the problem? If you mean "aligned to the left" - can't reproduce with Version: 6.2.0.2 Build ID: 2ce5217b30a543f7666022df50f0562f82be0cff CPU threads: 4; OS: Linux 4.9; UI render: default; VCL: gtk3; Locale: he-IL (en_IL); UI-Language: en-US Calc: threaded so perhaps you want to changed the minimum version? -- 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 91769] Move up and down buttons work for paragraphs, but only available on toolbar Bullets and Numbering
https://bugs.documentfoundation.org/show_bug.cgi?id=91769 Cor Nouws changed: What|Removed |Added Keywords|needsDevEval|easyHack CC||tietze.he...@gmail.com Summary|Bullet/Number move up and |Move up and down buttons |down buttons accessible |work for paragraphs, but |when not in a list |only available on toolbar ||Bullets and Numbering --- Comment #9 from Cor Nouws --- (In reply to Roman Kuznetsov from comment #8) > but i'm not sure it's a bug Indeed - just related to availability in toolbar(s) Should be an easy hack. @heiko? -- 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 91769] Move up and down buttons work for paragraphs without list too, but only available on toolbar Bullets and Numbering
https://bugs.documentfoundation.org/show_bug.cgi?id=91769 Cor Nouws changed: What|Removed |Added Summary|Move up and down buttons|Move up and down buttons |work for paragraphs, but|work for paragraphs without |only available on toolbar |list too, but only |Bullets and Numbering |available on toolbar ||Bullets and Numbering -- 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: Building Error ./autogen.sh
Hi hakan, On Friday, 2019-01-18 04:41:56 -0700, hakan wrote: > I receive this error. how can I solve this. > > configure: error: Package requirements (gstreamer-0.10 > gstreamer-plugins-base-0.10 gstreamer-pbutils-0.10 ) were not met: > > No package 'gstreamer-0.10' found > No package 'gstreamer-plugins-base-0.10' found > No package 'gstreamer-pbutils-0.10' found Either do not configure with the --enable-gstreamer-0-10 switch, or make sure that your system provides the necessary gstreamer*-0.10-dev* (or whatever they're actually named) packages. Eike -- 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-commits] core.git: vcl/inc
vcl/inc/font/OpenTypeFeatureStrings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 58aa6a55e5bc795a94ac732cf16a4a270db7fe21
Author: Adolfo Jayme Barrientos
AuthorDate: Fri Jan 18 15:32:33 2019 -0600
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Jan 18 15:32:33 2019 -0600
Remove werdly duplicated string
It’s a label for a combo box in the Font Features dialog,
so give it appropriate text and a colon.
Change-Id: I2403b77283eef118d2e7701dfdcbe190fe504f36
diff --git a/vcl/inc/font/OpenTypeFeatureStrings.hrc
b/vcl/inc/font/OpenTypeFeatureStrings.hrc
index 88a90f2c7d5a..d1debceedeab 100644
--- a/vcl/inc/font/OpenTypeFeatureStrings.hrc
+++ b/vcl/inc/font/OpenTypeFeatureStrings.hrc
@@ -40,7 +40,7 @@
#define STR_FONT_FEATURE_ID_DPNG NC_("STR_FONT_FEATURE_ID_DPNG",
"Diphthongs (Obsolete)")
#define STR_FONT_FEATURE_ID_EXPT NC_("STR_FONT_FEATURE_ID_EXPT",
"Expert Forms")
#define STR_FONT_FEATURE_ID_FALT NC_("STR_FONT_FEATURE_ID_FALT",
"Final Glyph on Line Alternates")
-#define STR_FONT_FEATURE_ID_FRAC NC_("STR_FONT_FEATURE_ID_FRAC",
"DIagonal Fractions")
+#define STR_FONT_FEATURE_ID_FRAC NC_("STR_FONT_FEATURE_ID_FRAC",
"Fraction style:")
#define STR_FONT_FEATURE_ID_FRAC_PARAM_1
NC_("STR_FONT_FEATURE_ID_FRAC_PARAM_1", "Diagonal Fractions")
#define STR_FONT_FEATURE_ID_FRAC_PARAM_2
NC_("STR_FONT_FEATURE_ID_FRAC_PARAM_2", "Nut Fractions")
#define STR_FONT_FEATURE_ID_FWID NC_("STR_FONT_FEATURE_ID_FWID",
"Full Widths")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 122479] UI: dialog Modify Style: no tool tips (with extended Help activated) for buttons Reset and Standard
https://bugs.documentfoundation.org/show_bug.cgi?id=122479 Cor Nouws changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #3 from Cor Nouws --- Hi Xisco, (In reply to Xisco Faulí from comment #2) > Do I need to have help installed to show these extended tips ? I guess so - I do not expect the texts are retrieved from the www. -- 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 122787] Editing: Missing Entry „Table of Figures“ in Table of Contents (TOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=122787
--- Comment #18 from Dieter Praas ---
(In reply to Jens Radloff from comment #17)
> There is no style called "Figure Index 1" or "Figure Index Heading" in the
> Styles list (by right-clicking the TOC, then "Styles").
>
> It does not work. Note that I am using Linux Debian 9.6 ("Stretch").
Put cursor in Figure Index Heading
In german UI: "Abbildungsindex als Überschriften"
in English UI: "Figure Index Heading"
I can find both styles in edit index.
--
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 122812] New: Base Firebird: Time Format hh:mm:ss PM Broken
https://bugs.documentfoundation.org/show_bug.cgi?id=122812 Bug ID: 122812 Summary: Base Firebird: Time Format hh:mm:ss PM Broken Product: LibreOffice Version: 6.1.3.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Base Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: p_mirow...@bentaxna.com Description: After migration to Firebird, forms no longer showed AM/PM format and show hh:mm. Steps to Reproduce: 1.Open form 2.Date field is defined as hh:mm:ss PM 3.Changed format to 24 hour clock format hh:mm:ss 4.Date field display 24 hour clock format correctly. Actual Results: No hh:mm:ss PM format Expected Results: hh:mm:ss PM format 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 122811] New: Base Firebird: Query broken when "Save", but not with "Save As"
https://bugs.documentfoundation.org/show_bug.cgi?id=122811 Bug ID: 122811 Summary: Base Firebird: Query broken when "Save", but not with "Save As" Product: LibreOffice Version: 6.1.3.2 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Base Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: p_mirow...@bentaxna.com Description: Opening the "2 Amps to Volts-High by Series" By main "Queries", right click and choose "Edit" In view, changed 134 to '134' Message: WarningThe entered criterion cannot be compared with this field. Remove 134 from Series and hit enter. results in all records Add 134 to Series and hit enter. results in just 134 Series records. Query Design Double left click on query name "2 Amps to Volts-High by Series" Message: The data content could not be loaded. Error code: 1 firebird_sdbc error: *Dynamic SQL Error *SQL error code = -104 *Invalid usage of boolean expression caused by 'isc_dsql_prepare' By main "Queries", right click and choose "Edit in SQL view..." Remove AND "Amps"."Series" = '134' results in all records Add AND "Amps"."Series" = '134' results in just 134 Series records. Remove Add AND "Amps"."Series" = '134' and add Add AND "Amps"."Series" = 134 results in just 134 Series records. Saved the query in multiple states When ever I save the Query and double left click from main Query window on "2 Amps to Volts-High by Series" Results in error message: firebird_sdbc error: *Dynamic SQL Error *SQL error code = -104 *Invalid usage of boolean expression caused by 'isc_dsql_prepare' In effect, in either edit mode it works correctly. The saved query always fails. However, when query is "Save As" it works correctly with newly named query. Steps to Reproduce: There seems to be something wrong in the saved query, which isn't shown while editing the query. For other users: 1. I have tested to execute the query. 2. Execution fails. 3. I opened the query in design-view. 4. I executed the query. 5. Execution works. ... This is the problem, what nobody could understand ... 6. I changed something in the query (removed "Equipment"."Series" = 134 ) and saved the query. 7. Closed the design-view. 8. Execution fails. ... Then I opened the query, added the removed part again, saved ... All the same. ...But when I open the query and save the query with a new name the query will be saved with this new name and could be executed. So I created, for example "12 Amps to Volts-High by Series" and it works. Actual Results: ...But when I open the query and save the query with a new name the query will be saved with this new name and could be executed. So I created, for example "12 Amps to Volts-High by Series" and it works. Expected Results: Query "Saved" should work. Reproducible: Always User Profile Reset: No Additional Info: This was issue was originally raised on us...@global.libreoffice.org The information supplied is based on questions and answers there. -- 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 122787] Editing: Missing Entry „Table of Figures“ in Table of Contents (TOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=122787
--- Comment #17 from Jens Radloff ---
(In reply to Dieter Praas from comment #16)
> (In reply to Jens Radloff from comment #15)
> > Yes, fabulous. How did you do that?
>
> 1. Cursor in TOC => Edit index
> 2. nable Create from additional styles
Done. Which I did in my test before, by the way.
> 3. Assign styles
Done. I tried "Figure Index 1" and "Figure Index Heading".
> 4. Assign the style of the Table of Figure Heading to the first level of TOC
There is no style called "Figure Index 1" or "Figure Index Heading" in the
Styles list (by right-clicking the TOC, then "Styles").
It does not work. Note that I am using Linux Debian 9.6 ("Stretch").
--
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 122787] Editing: Missing Entry „Table of Figures“ in Table of Contents (TOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=122787 --- Comment #16 from Dieter Praas --- (In reply to Jens Radloff from comment #15) > Yes, fabulous. How did you do that? 1. Cursor in TOC => Edit index 2. nable Create from additional styles 3. Assign styles 4. Assign the style of the Table of Figure Heading to the first level of TOC -- 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 122787] Editing: Missing Entry „Table of Figures“ in Table of Contents (TOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=122787 --- Comment #15 from Jens Radloff --- (In reply to Dieter Praas from comment #14) > Created attachment 148430 [details] > Expected result? > > Jens, is this the desired result? Yes, fabulous. How did you do that? Regards, Jens -- 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 121851] Calc loses time zone information for datetime cells
https://bugs.documentfoundation.org/show_bug.cgi?id=121851 --- Comment #7 from Dan Dascalescu --- I'm a developer, albeit not a Java one, so maybe I'm wrong. Why would it be so complicated to store timestamps in UTC? I've already shown in my previous comment that date fields already have a 'Z' tacked onto them. Is that used? If not, how could it be used? Can Calc convert timestamps from the local timezone into UTC on save, and form UTC into the local timezone on load? Both these conversions should be provided by the OS or the runtime, so there should be no reason to mess with timezones in Calc code. https://stackoverflow.com/questions/19431234/converting-between-java-time-localdatetime-and-java-util-date -- 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 122787] Editing: Missing Entry „Table of Figures“ in Table of Contents (TOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=122787 --- Comment #14 from Dieter Praas --- Created attachment 148430 --> https://bugs.documentfoundation.org/attachment.cgi?id=148430=edit Expected result? Jens, is this the desired result? -- 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 | 40 +---
sd/qa/unit/import-tests-smartart.cxx|4 ++
2 files changed, 30 insertions(+), 14 deletions(-)
New commits:
commit 1791e08e9f27453ac5563ef400c715e30c791133
Author: Miklos Vajna
AuthorDate: Fri Jan 18 15:48:57 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Jan 18 20:43:00 2019 +0100
oox smartart, org chart: fix shape type of connectors
PowerPoint renders these as bent connectors, not as arrow shapes.
Also add a bit of vertical spacing between the nodes, otherwise the
connectors have no way to be visible. Their position is still incorrect,
though.
Change-Id: I995930c0bbc1bdb1014face2490be392571548a2
Reviewed-on: https://gerrit.libreoffice.org/66627
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 4495ae8a570d..f7da2cc03515 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -79,21 +79,32 @@ sal_Int32 getConnectorType(const
oox::drawingml::LayoutNode* pNode)
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)
+switch (pAlgAtom->getType())
{
-case oox::XML_fromL:
-nType = oox::XML_rightArrow;
+case oox::XML_lin:
+{
+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;
+}
break;
-case oox::XML_fromR:
-nType = oox::XML_leftArrow;
+}
+case oox::XML_hierChild:
+{
+// TODO should be able
+// to customize this.
+nType = oox::XML_bentConnector3;
break;
+}
}
}
@@ -618,6 +629,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
break;
sal_Int32 nCount = rShape->getChildren().size();
+double fSpace = 0.3;
if (mnType == XML_hierChild)
{
@@ -652,7 +664,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
awt::Size aChildSize = rShape->getSize();
if (nDir == XML_fromT)
{
-aChildSize.Height /= nCount;
+aChildSize.Height /= (nCount + nCount * fSpace);
}
else
aChildSize.Width /= nCount;
@@ -672,7 +684,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
continue;
if (nDir == XML_fromT)
-aChildPos.Y += aChildSize.Height;
+aChildPos.Y += aChildSize.Height + aChildSize.Height *
fSpace;
else
aChildPos.X += aChildSize.Width;
}
diff --git a/sd/qa/unit/import-tests-smartart.cxx
b/sd/qa/unit/import-tests-smartart.cxx
index 34b9ea439544..ee25c47fbd8e 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -796,6 +796,10 @@ void SdImportTestSmartArt::testOrgChart()
// manager2 has no assistants / employees.
CPPUNIT_ASSERT_GREATER(aManagerSize.Width, aEmployeeSize.Width +
aEmployee2Size.Width);
+// Without the accompanying fix in place, this test would have failed: an
+// employee was exactly the third of the total height, without any spacing.
+CPPUNIT_ASSERT_LESS(xGroup->getSize().Height / 3, aEmployeeSize.Height);
+
xDocShRef->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 104816] Inserting a user field will lose the condition of section
https://bugs.documentfoundation.org/show_bug.cgi?id=104816 Justin L changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #12 from Justin L --- A temporary work-around is to ensure that the section is not at the end of the document. You can insert a space after the section with an alt-enter. -- 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 107738] [META] Section bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=107738 Bug 107738 depends on bug 104816, which changed state. Bug 104816 Summary: Inserting a user field will lose the condition of section https://bugs.documentfoundation.org/show_bug.cgi?id=104816 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-commits] core.git: Branch 'distro/collabora/cp-6.0' - oox/source
oox/source/export/chartexport.cxx | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 5aeeff325b98374bfbd08e9e69de4ed8ce2340cc
Author: Gülşah Köse
AuthorDate: Thu Jan 17 09:57:41 2019 +0300
Commit: Andras Timar
CommitDate: Fri Jan 18 20:35:14 2019 +0100
tdf#122031 Export number format of chart label to OOXML
The patch fixes missing numFmt. numFmt element has been added as child
under the dLbl element.
Change-Id: Ic81ac58c2ea087cd7599351034eb4298ee613843
Signed-off-by: Gülşah Köse
Reviewed-on: https://gerrit.libreoffice.org/66493
Reviewed-by: Andras Timar
Tested-by: Jenkins
(cherry picked from commit 102f42fa6398fa7e6bf8e9bcfa4c28c22473cd26)
Reviewed-on: https://gerrit.libreoffice.org/66631
Tested-by: Andras Timar
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index a6bd3b4c0618..2f4b55fcd2d8 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3091,7 +3091,7 @@ void ChartExport::exportDataLabels(
if (GetProperty(xPropSet, "LinkNumberFormatToSource"))
mAny >>= bLinkedNumFmt;
-if (GetProperty(xPropSet, "NumberFormat"))
+if (GetProperty(xPropSet, "NumberFormat") || GetProperty(xPropSet,
"PercentageNumberFormat"))
{
sal_Int32 nKey = 0;
mAny >>= nKey;
@@ -3157,15 +3157,31 @@ void ChartExport::exportDataLabels(
const sal_Int32* p = aAttrLabelIndices.getConstArray();
const sal_Int32* pEnd = p + aAttrLabelIndices.getLength();
+
+
for (; p != pEnd; ++p)
{
sal_Int32 nIdx = *p;
uno::Reference xLabelPropSet =
xSeries->getDataPointByIndex(nIdx);
+
if (!xLabelPropSet.is())
continue;
-// Individual label property that overwrites the baseline.
pFS->startElement(FSNS(XML_c, XML_dLbl), FSEND);
+
+if (GetProperty(xLabelPropSet, "NumberFormat") ||
GetProperty(xLabelPropSet, "PercentageNumberFormat"))
+{
+sal_Int32 nKey = 0;
+mAny >>= nKey;
+
+OUString aNumberFormatString = getNumberFormatCode(nKey);
+OString sNumberFormatString =
OUStringToOString(aNumberFormatString, RTL_TEXTENCODING_UTF8);
+
+pFS->singleElement(FSNS(XML_c, XML_numFmt), XML_formatCode,
sNumberFormatString.getStr(),
+ XML_sourceLinked, bLinkedNumFmt ? "1" : "0",
FSEND);
+}
+
+// Individual label property that overwrites the baseline.
pFS->singleElement(FSNS(XML_c, XML_idx), XML_val, I32S(nIdx), FSEND);
exportTextProps( xPropSet );
writeLabelProperties(pFS, this, xLabelPropSet, aParam);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 122738] Draw, labels and block object tool
https://bugs.documentfoundation.org/show_bug.cgi?id=122738 --- Comment #4 from Maurizio --- Created attachment 148429 --> https://bugs.documentfoundation.org/attachment.cgi?id=148429=edit File example Just try to open the file to see the problem. The labels should be smaller, modify them, save and close. Once open the file again, the labels will be bigger. Best m -- 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 34689] UI scroll problem: Cell with dimensions exceeding screen dimensions impossible to work with
https://bugs.documentfoundation.org/show_bug.cgi?id=34689 --- Comment #21 from Libomark --- An obvious workaround is to zoom out on the sheet. If that reduces legibility too far, then use assorted text function to split the text into different cells nearby, or reformat the cells using wrap etc. as appropriate. -- 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
oox/source/export/chartexport.cxx | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 102f42fa6398fa7e6bf8e9bcfa4c28c22473cd26
Author: Gülşah Köse
AuthorDate: Thu Jan 17 09:57:41 2019 +0300
Commit: Gülşah Köse
CommitDate: Fri Jan 18 20:20:56 2019 +0100
tdf#122031 Export number format of chart label to OOXML
The patch fixes missing numFmt. numFmt element has been added as child
under the dLbl element.
Change-Id: Ic81ac58c2ea087cd7599351034eb4298ee613843
Signed-off-by: Gülşah Köse
Reviewed-on: https://gerrit.libreoffice.org/66493
Reviewed-by: Andras Timar
Tested-by: Jenkins
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 00b631688b14..28c5771eab44 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3155,7 +3155,7 @@ void ChartExport::exportDataLabels(
if (GetProperty(xPropSet, "LinkNumberFormatToSource"))
mAny >>= bLinkedNumFmt;
-if (GetProperty(xPropSet, "NumberFormat"))
+if (GetProperty(xPropSet, "NumberFormat") || GetProperty(xPropSet,
"PercentageNumberFormat"))
{
sal_Int32 nKey = 0;
mAny >>= nKey;
@@ -3221,15 +3221,31 @@ void ChartExport::exportDataLabels(
const sal_Int32* p = aAttrLabelIndices.getConstArray();
const sal_Int32* pEnd = p + aAttrLabelIndices.getLength();
+
+
for (; p != pEnd; ++p)
{
sal_Int32 nIdx = *p;
uno::Reference xLabelPropSet =
xSeries->getDataPointByIndex(nIdx);
+
if (!xLabelPropSet.is())
continue;
-// Individual label property that overwrites the baseline.
pFS->startElement(FSNS(XML_c, XML_dLbl), FSEND);
+
+if (GetProperty(xLabelPropSet, "NumberFormat") ||
GetProperty(xLabelPropSet, "PercentageNumberFormat"))
+{
+sal_Int32 nKey = 0;
+mAny >>= nKey;
+
+OUString aNumberFormatString = getNumberFormatCode(nKey);
+OString sNumberFormatString =
OUStringToOString(aNumberFormatString, RTL_TEXTENCODING_UTF8);
+
+pFS->singleElement(FSNS(XML_c, XML_numFmt), XML_formatCode,
sNumberFormatString.getStr(),
+ XML_sourceLinked, bLinkedNumFmt ? "1" : "0",
FSEND);
+}
+
+// Individual label property that overwrites the baseline.
pFS->singleElement(FSNS(XML_c, XML_idx), XML_val, I32S(nIdx), FSEND);
exportTextProps( xPropSet );
writeLabelProperties(pFS, this, xLabelPropSet, aParam);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 75057] [META] OOXML Chart object issues
https://bugs.documentfoundation.org/show_bug.cgi?id=75057 Bug 75057 depends on bug 122031, which changed state. Bug 122031 Summary: FILESAVE Percentage format in pie chart not saved in XLSX format https://bugs.documentfoundation.org/show_bug.cgi?id=122031 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121851] Calc loses time zone information for datetime cells
https://bugs.documentfoundation.org/show_bug.cgi?id=121851 --- Comment #6 from Libomark --- I suspect this would turn into a nightmare to maintain, because time zones and daylight savings time date changes are subject to constant change on political whim. Expecting these events all to be detected, and finding a way to implement the updates automatically would be no trivial task. I think the onus has to remain with the spreadsheet designer to record the time zone in a separate cell, or to find a way to use GMT (or a designated local time) as a standard where event sequence is important. Where contracts are concerned, these will specify the time zone to be used if it is critical e.g. "by 17:00 hours London time". Where collaborative editing is involved, the edits will presumably be timestamped by the hosting server. -- 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 'aoo/trunk' - odk/source sal/osl
odk/source/unoapploader/unx/unoapploader.c |6 +++---
sal/osl/unx/nlsupport.c| 22 ++
sal/osl/unx/process_impl.cxx |2 +-
3 files changed, 26 insertions(+), 4 deletions(-)
New commits:
commit 4e555abf06c9f2571700bbc10c19d7f2076de63b
Author: Jim Jagielski
AuthorDate: Fri Jan 18 18:50:36 2019 +
Commit: Jim Jagielski
CommitDate: Fri Jan 18 18:50:36 2019 +
more PATH weirdness on macOS
diff --git a/odk/source/unoapploader/unx/unoapploader.c
b/odk/source/unoapploader/unx/unoapploader.c
index f825885403e4..1fb1540134f3 100644
--- a/odk/source/unoapploader/unx/unoapploader.c
+++ b/odk/source/unoapploader/unx/unoapploader.c
@@ -206,10 +206,10 @@ int main( int argc, char *argv[] )
strcat( envstr, value );
}
putenv( envstr );
-#ifdef MACOSX
+#ifdef MACOSX
/* https://bz.apache.org/ooo/show_bug.cgi?id=127965 */
value = getenv( "PATH" );
-size = strlen( "PATH" ) + strlen( "=/usr/local/bin" );
+size = strlen( "PATH" ) + strlen( "=/usr/local/bin" ) + 1;
if ( value != NULL )
size += strlen( PATHSEPARATOR ) + strlen( value );
envstr = (char*) malloc( size );
@@ -220,7 +220,7 @@ int main( int argc, char *argv[] )
}
strcat( envstr, "/usr/local/bin" ); /* We are adding at the end */
putenv( envstr );
-#endif
+#endif
}
else
{
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c
index 0172ac77e3bc..0f3dd7f17747 100644
--- a/sal/osl/unx/nlsupport.c
+++ b/sal/osl/unx/nlsupport.c
@@ -832,6 +832,8 @@ int macosx_getLocale(char *locale, sal_uInt32 bufferLen);
void _imp_getProcessLocale( rtl_Locale ** ppLocale )
{
static char *locale = NULL;
+char *npath, *opath;
+int slen;
/* basic thread safeness */
//pthread_mutex_lock( );
@@ -870,6 +872,26 @@ void _imp_getProcessLocale( rtl_Locale ** ppLocale )
setenv("LC_CTYPE", locale, 1 );
setenv("LANG", locale, 1 );
+/*
+ * This is a hack. We know that we are setting some envvars here
+ * and due to https://bz.apache.org/ooo/show_bug.cgi?id=127965
+ * we need to update PATH on macOS. Doing it here ensures
+ * that it's done but it's not the right location to be doing
+ * this.
+ */
+opath = getenv ( "PATH" );
+slen = strlen( "/usr/local/bin" ) + 1;
+if ( opath != NULL )
+slen += strlen( ":" ) + strlen( opath );
+npath = malloc( slen );
+if ( opath != NULL ) {
+strcat( npath, opath );
+strcat( npath, ":" );
+}
+strcat( npath, "/usr/local/bin" ); /* We are adding at the end */
+setenv("PATH", npath, 1 );
+free(npath);
+
#ifdef DEBUG
fprintf( stderr, "nlsupport.c: _imp_getProcessLocale() returning %s as
current locale.\n", locale );
#endif
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 30712be02a69..4564491c9070 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -385,7 +385,7 @@ oslProcessError SAL_CALL osl_clearEnvironment(rtl_uString*
pustrEnvVar)
rtl_TextEncoding encoding = osl_getThreadTextEncoding();
rtl_String* pstr_env_var = 0;
-OSL_PRECOND(pustrEnvVar, "osl_setEnvironment(): Invalid parameter");
+OSL_PRECOND(pustrEnvVar, "osl_clearEnvironment(): Invalid parameter");
rtl_uString2String(
_env_var,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 103427] [META] Styles and Formatting sidebar deck and floating window
https://bugs.documentfoundation.org/show_bug.cgi?id=103427 Bug 103427 depends on bug 122743, which changed state. Bug 122743 Summary: Parent style change not immediately seen for children in Sidebar preview https://bugs.documentfoundation.org/show_bug.cgi?id=122743 What|Removed |Added Status|RESOLVED|NEW Resolution|DUPLICATE |--- -- 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 122743] Parent style change not immediately seen for children in Sidebar preview
https://bugs.documentfoundation.org/show_bug.cgi?id=122743 Buovjaga changed: What|Removed |Added Status|RESOLVED|NEW Resolution|DUPLICATE |--- --- Comment #3 from Buovjaga --- Sadly I still repro. Also tried with safe mode just in case. Arch Linux 64-bit Version: 6.3.0.0.alpha0+ Build ID: ae34f471030869dfc0da1784597cae6f9131f8c5 CPU threads: 8; OS: Linux 4.20; UI render: default; VCL: gtk3; Locale: fi-FI (fi_FI.UTF-8); UI-Language: en-US Calc: threaded Built on 18 January 2019 -- 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 104816] Inserting a user field will lose the condition of section
https://bugs.documentfoundation.org/show_bug.cgi?id=104816 Commit Notification changed: What|Removed |Added Whiteboard||target:6.3.0 -- 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 104816] Inserting a user field will lose the condition of section
https://bugs.documentfoundation.org/show_bug.cgi?id=104816 --- Comment #11 from Commit Notification --- Justin Luth committed a patch related to this issue. It has been pushed to "master": https://git.libreoffice.org/core/+/85bd9d81e1dafdef5b868637ebb34f22282befab%5E%21 tdf#104816 sw: if non-section content, let all sections hide. 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: sw/qa sw/source
sw/qa/python/var_fields.py |5 --
sw/source/core/doc/DocumentFieldsManager.cxx | 47 ---
2 files changed, 30 insertions(+), 22 deletions(-)
New commits:
commit 85bd9d81e1dafdef5b868637ebb34f22282befab
Author: Justin Luth
AuthorDate: Thu Jan 10 16:42:45 2019 +0300
Commit: Thorsten Behrens
CommitDate: Fri Jan 18 19:44:07 2019 +0100
tdf#104816 sw: if non-section content, let all sections hide.
If all of the document is contained inside of sections, then at
least one section must be visible or writer crashes. The 2012
fix seemed to assume that all content would be in a section,
and thus required at least one section be visible.
Instead, check for non-section content at the start and end of the
document, and for gaps between sections, and count those
as "virtual", visible sections, which would allow all real sections
to be marked as hidden.
The example document HiddenSection.odt in tdf#55814 is a really
nice test document. With this patch, that test now works
even if you remove the last non-section paragraph.
Even nicer is finding that a (very unclear) "did you fix me?"
unit test entry gives a unit test for patch.
Change-Id: I6cac5e6df8dff7fbb78828ae2521a1b02e305a27
Reviewed-on: https://gerrit.libreoffice.org/66128
Reviewed-by: Justin Luth
Tested-by: Jenkins
Tested-by: Serge Krot (CIB)
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/python/var_fields.py b/sw/qa/python/var_fields.py
index e7c7fbb9adff..e793aaa5f7ec 100644
--- a/sw/qa/python/var_fields.py
+++ b/sw/qa/python/var_fields.py
@@ -132,10 +132,7 @@ class TestVarFields(unittest.TestCase):
read_content = xSection.getPropertyValue("Condition")
# 21. check
-# expected:
-# self.assertEqual("foo EQ 1", readContent)
-# reality:
-self.assertEqual("0", read_content)
+self.assertEqual("foo EQ 1", read_content)
if __name__ == '__main__':
unittest.main()
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx
b/sw/source/core/doc/DocumentFieldsManager.cxx
index 53bc3e2344ce..e122e6936ecd 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -993,19 +993,36 @@ void DocumentFieldsManager::UpdateExpFieldsImpl(
bool bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(),
nLang, aCalc );
#endif
-// Make sure we don't hide all sections, which would lead to a crash.
First, count how many of them do we have.
+// Make sure we don't hide all content, which would lead to a crash.
First, count how many visible sections we have.
int nShownSections = 0;
+sal_uLong nContentStart =
m_rDoc.GetNodes().GetEndOfContent().StartOfSectionIndex() + 1;
+sal_uLong nContentEnd = m_rDoc.GetNodes().GetEndOfContent().GetIndex();
+SwSectionFormats& rSectFormats = m_rDoc.GetSections();
+for( SwSectionFormats::size_type n = 0; nGetSection();
+SwSectionFormat& rSectFormat = *rSectFormats[ n ];
+SwSectionNode* pSectionNode = rSectFormat.GetSectionNode();
+SwSection* pSect = rSectFormat.GetSection();
-// count only visible sections
-if ( pSect && !pSect->CalcHiddenFlag())
-nShownSections++;
+// Usually some of the content is not in a section: count that as a
virtual section, so that all real sections can be hidden.
+// Only look for section gaps at the lowest level, ignoring
sub-sections.
+if ( pSectionNode && !rSectFormat.GetParent() )
+{
+SwNodeIndex aNextIdx( *pSectionNode->EndOfSectionNode(), 1 );
+if ( n == 0 && pSectionNode->GetIndex() != nContentStart )
+nShownSections++; //document does not start with a section
+if ( n == rSectFormats.size() - 1 )
+{
+if ( aNextIdx.GetIndex() != nContentEnd )
+nShownSections++; //document does not end in a section
+}
+else if ( !aNextIdx.GetNode().IsSectionNode() )
+nShownSections++; //section is not immediately followed by
another section
}
+
+// count only visible sections
+if ( pSect && !pSect->CalcHiddenFlag())
+nShownSections++;
}
IDocumentRedlineAccess const& rIDRA(m_rDoc.getIDocumentRedlineAccess());
@@ -1027,15 +1044,9 @@ void DocumentFieldsManager::UpdateExpFieldsImpl(
// This section will be hidden, but it wasn't before
if (nShownSections == 1)
{
-// Is the last node part of a section?
-SwPaM aPam(m_rDoc.GetNodes());
-aPam.Move(fnMoveForward, GoInDoc);
-if
(aPam.Start()->nNode.GetNode().StartOfSectionNode()->IsSectionNode())
-{
-
[Libreoffice-bugs] [Bug 122810] New: UI: Main editor unfocused when cursor in search field of the floating search dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=122810 Bug ID: 122810 Summary: UI: Main editor unfocused when cursor in search field of the floating search dialog Product: LibreOffice Version: 4.4.7.2 release Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: tele...@surfxs.nl Description: UI: Main editor unfocused when cursor in search field of the floating search dialog. Not sure if this is to be expected or not.. However most floating windows/widgets leave the focus on the main window Steps to Reproduce: 1. Open Writer 2. Press CTRL+F 3. Undo the search toolbar & place the cursor inside the search box -> Focus gone from main window (gray) 4. Dock the search bar & do the same.. fine 5. Make a font color widget floating.. select a color -> Main editor has focus Actual Results: Main window loses focus Expected Results: The main should be marked 'active'. Reproducible: Always User Profile Reset: No Additional Info: Version: 6.3.0.0.alpha0+ Build ID: 6740443311268b7d918bf4f43134d64fb78a0109 CPU threads: 4; OS: Windows 6.3; UI render: GL; VCL: win; TinderBox: Win-x86@42, Branch:master, Time: 2019-01-15_23:37:04 Locale: nl-NL (nl_NL); UI-Language: en-US Calc: CL -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 121103] ANOVA uses wrong formula when on new sheet
https://bugs.documentfoundation.org/show_bug.cgi?id=121103 Libomark changed: What|Removed |Added Keywords||easyHack -- 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: vcl/qt5
vcl/qt5/Qt5Clipboard.cxx | 111 +--
1 file changed, 70 insertions(+), 41 deletions(-)
New commits:
commit 7e01a02b12a9ea3a39b5a627f3b26d94bc1ad921
Author: Aleksei Nikiforov
AuthorDate: Thu Jan 17 15:31:51 2019 +0300
Commit: Thorsten Behrens
CommitDate: Fri Jan 18 19:21:04 2019 +0100
tdf#120836 KDE5: allow adding multiple mime types to clipboard
Also correct processing "text/html" and "image/png" mime types
to fix slow select in Calc:
if both "text/html" and "image/png" mime types were present,
"image/png" data was requested, but it was processed as if it was
"text/html" data.
Change-Id: Ie192fff06cd9de28f466547dac32343620fe2730
Reviewed-on: https://gerrit.libreoffice.org/66576
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx
index 6ed8b1086e4a..a9134506896f 100644
--- a/vcl/qt5/Qt5Clipboard.cxx
+++ b/vcl/qt5/Qt5Clipboard.cxx
@@ -184,63 +184,92 @@ void VclQt5Clipboard::setContents(
bool bHasHtml = false, bHasImage = false;
lcl_peekFormats(aFormats, bHasHtml, bHasImage);
-css::datatransfer::DataFlavor aFlavor;
-QClipboard* clipboard = QApplication::clipboard();
+std::unique_ptr pMimeData(new QMimeData);
-if (bHasImage)
-{
-//FIXME: other image formats?
-aFlavor.MimeType = "image/png";
-aFlavor.DataType = cppu::UnoType::get();
-}
-else if (bHasHtml)
+// Add html data if present
+if (bHasHtml)
{
+css::datatransfer::DataFlavor aFlavor;
aFlavor.MimeType = "text/html";
-aFlavor.DataType = cppu::UnoType::get();
-}
-else
-{
-aFlavor.MimeType = "text/plain;charset=utf-16";
-aFlavor.DataType = cppu::UnoType::get();
-}
+aFlavor.DataType = cppu::UnoType>::get();
-Any aValue;
-try
-{
-aValue = xTrans->getTransferData(aFlavor);
-}
-catch (...)
-{
-}
-
-if (aValue.getValueTypeClass() == TypeClass_STRING)
-{
-OUString aString;
-aValue >>= aString;
-clipboard->setText(toQString(aString));
-}
-else if (aValue.getValueType() ==
cppu::UnoType>::get())
-{
-Sequence aData;
-aValue >>= aData;
+Any aValue;
+try
+{
+aValue = xTrans->getTransferData(aFlavor);
+}
+catch (...)
+{
+}
-if (bHasHtml)
+if (aValue.getValueType() ==
cppu::UnoType>::get())
{
+Sequence aData;
+aValue >>= aData;
+
OUString aHtmlAsString(reinterpret_cast(aData.getConstArray()),
aData.getLength(),
RTL_TEXTENCODING_UTF8);
-QMimeData* mimeData = new QMimeData;
-mimeData->setHtml(toQString(aHtmlAsString));
-clipboard->setMimeData(mimeData);
+pMimeData->setHtml(toQString(aHtmlAsString));
}
-else if (bHasImage)
+}
+
+// Add image data if present
+if (bHasImage)
+{
+css::datatransfer::DataFlavor aFlavor;
+//FIXME: other image formats?
+aFlavor.MimeType = "image/png";
+aFlavor.DataType = cppu::UnoType>::get();
+
+Any aValue;
+try
{
+aValue = xTrans->getTransferData(aFlavor);
+}
+catch (...)
+{
+}
+
+if (aValue.getValueType() ==
cppu::UnoType>::get())
+{
+Sequence aData;
+aValue >>= aData;
+
QImage image;
image.loadFromData(reinterpret_cast(aData.getConstArray()),
aData.getLength());
-clipboard->setImage(image);
+
+pMimeData->setImageData(image);
+}
+}
+
+// Add text data
+// TODO: consider checking if text of suitable type is present
+{
+css::datatransfer::DataFlavor aFlavor;
+aFlavor.MimeType = "text/plain;charset=utf-16";
+aFlavor.DataType = cppu::UnoType::get();
+
+Any aValue;
+try
+{
+aValue = xTrans->getTransferData(aFlavor);
+}
+catch (...)
+{
+}
+
+if (aValue.getValueTypeClass() == TypeClass_STRING)
+{
+OUString aString;
+aValue >>= aString;
+pMimeData->setText(toQString(aString));
}
}
+
+QClipboard* clipboard = QApplication::clipboard();
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 24
++
sw/source/core/crsr/pam.cxx | 12 -
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 46c6c414a6df79575517f5df67510d6f4e3d0128
Author: Serge Krot
AuthorDate: Mon Dec 17 17:07:23 2018 +0100
Commit: Thorsten Behrens
CommitDate: Fri Jan 18 19:11:40 2019 +0100
tdf#122201 sw: DOCX: allow editing of unprotected areas in protected doc
Change-Id: I5fb590745b733e2bfb934d946276857b65caf680
Reviewed-on: https://gerrit.libreoffice.org/65278
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/65501
(cherry picked from commit 63ec2e8d07dff652a68c9dc96859c4c61f26b9df)
Reviewed-on: https://gerrit.libreoffice.org/65502
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt
b/sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt
new file mode 100644
index ..217c8c38a409
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 54bb46946354..4b443c7ff67c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -52,6 +52,8 @@
#include
#include
+#include
+#include
class Test : public SwModelTestBase
{
@@ -996,6 +998,28 @@ DECLARE_OOXMLEXPORT_TEST(tdf66398_permissions,
"tdf66398_permissions.docx")
CPPUNIT_ASSERT(xBookmarksByName->hasByName("permission-for-group:267014232:everyone"));
}
+DECLARE_OOXMLEXPORT_TEST(tdf122201_editUnprotectedText,
"tdf122201_editUnprotectedText.odt")
+{
+// get the document
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+CPPUNIT_ASSERT(pDoc);
+
+// get two different nodes
+SwNodeIndex aDocEnd(pDoc->GetNodes().GetEndOfContent());
+SwNodeIndex aDocStart(*aDocEnd.GetNode().StartOfSectionNode(), 3);
+
+// check protected area
+SwPaM aPaMPortected(aDocStart);
+CPPUNIT_ASSERT(aPaMPortected.HasReadonlySel(false));
+
+// check unprotected area
+SwPaM aPaMUnprotected(aDocEnd);
+CPPUNIT_ASSERT(!aPaMUnprotected.HasReadonlySel(false));
+}
+
DECLARE_OOXMLEXPORT_TEST(testSectionHeader, "sectionprot.odt")
{
if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 4e762bfcf218..3eaf288f7b30 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -597,6 +597,16 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
{
bRet = true;
}
+else
+{
+const SwSectionNode* pParentSectionNd = pNd->FindSectionNode();
+if ( pParentSectionNd != nullptr
+ && ( pParentSectionNd->GetSection().IsProtectFlag()
+ || ( bFormView &&
!pParentSectionNd->GetSection().IsEditInReadonlyFlag()) ) )
+{
+bRet = true;
+}
+}
}
if ( !bRet
@@ -701,7 +711,7 @@ bool SwPaM::HasReadonlySel( bool bFormView ) const
// touches fields, or fully encloses it), then don't disable
editing
bRet = !( ( !pA || bAtStartA ) && ( !pB || bAtStartB ) );
}
-if( !bRet && pDoc->GetDocumentSettingManager().get(
DocumentSettingId::PROTECT_FORM ) )
+if( !bRet && pDoc->GetDocumentSettingManager().get(
DocumentSettingId::PROTECT_FORM ) && (pA || pB) )
{
// Form protection case
bRet = ( pA == nullptr ) || ( pB == nullptr ) || bAtStartA ||
bAtStartB;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 122807] LO 6.1.4.2: Spreadsheet: Graph of Column + Line not displaying line
https://bugs.documentfoundation.org/show_bug.cgi?id=122807 Oliver Brinzing changed: What|Removed |Added CC||oliver.brinz...@gmx.de --- Comment #2 from Oliver Brinzing --- Created attachment 148428 --> https://bugs.documentfoundation.org/attachment.cgi?id=148428=edit chart sample document (In reply to Hylton Conacher from comment #0) if i try to edit the chart from your attached document i get a warning: "This chart currently contains an internal data table. Do you want to proceed, deleting the internal data table, and set a new data range?" not sure, what happend, so i am adding a new sample document: - first insert a line chart - select the data series - insert mean value line - change chart type to column https://help.libreoffice.org/Chart/Trend_Lines does this solve your problem? -- 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 122807] LO 6.1.4.2: Spreadsheet: Graph of Column + Line not displaying line
https://bugs.documentfoundation.org/show_bug.cgi?id=122807 Oliver Brinzing changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEEDINFO -- 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 122787] Editing: Missing Entry „Table of Figures“ in Table of Contents (TOC)
https://bugs.documentfoundation.org/show_bug.cgi?id=122787 --- Comment #13 from Jens Radloff --- (In reply to Timur from comment #12) > Jens, I included URL for help. Thanks, Timur. > If help is not sufficient, that's Documentation bug than. I tried around for a while (about 10 minutes or so) with these Additional style configurations in my TOC, but I don't get it working: My TOC does not show a line like "Figure Index ". If one really gets this functionality working, then it is too complicated, I am sorry to tell. > If ToF and others can be included in ToC, that's not "normal" bug as > confirmed. > Maybe enhancement to have them included by default. New users to LibreOffice Writer, who normally are not experienced, probably would think "LibreOffice does not work, let me use another text processing programme instead". Regards, Jens -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 19 commits - desktop/unx download.lst external/lcms2 external/libxml2 external/poppler external/python3 include/o3tl sdext/source
desktop/unx/source/pagein.c |1 download.lst | 12 external/lcms2/0001-Added-an-extra-check-to-MLU-bounds.patch.1 | 25 external/lcms2/0017-Upgrade-Visual-studio-2017-15.8.patch.1 | 172 + external/lcms2/ExternalPackage_lcms2.mk |2 external/lcms2/ExternalProject_lcms2.mk |1 external/lcms2/UnpackedTarball_lcms2.mk |6 external/lcms2/lcms2-2.4-windows.patch | 32 external/lcms2/lcms2-config-guess.patch.0 | 1566 -- external/lcms2/lcms2-vc2013-project.patch | 490 --- external/lcms2/lcms2.patch | 20 external/lcms2/ubsan.patch.0 | 22 external/libxml2/0001-Fix-buffer-size-checks-in-xmlSnprintfElementContent.patch.1 | 116 external/libxml2/0001-Fix-handling-of-parameter-entity-references.patch.1 | 287 - external/libxml2/0001-Fix-type-confusion-in-xmlValidateOneNamespace.patch.1 | 43 external/libxml2/0001-Increase-buffer-space-for-port-in-HTTP-redirect-supp.patch.1 | 31 external/libxml2/0001-Prevent-unwanted-external-entity-reference.patch.1 | 35 external/libxml2/ExternalPackage_xml2.mk |2 external/libxml2/ExternalProject_xml2.mk |3 external/libxml2/UnpackedTarball_xml2.mk |6 external/libxml2/libxml2-android.patch | 14 external/libxml2/libxml2-global-symbols.patch |4 external/libxml2/libxml2-icu.patch.0 | 15 external/libxml2/libxml2-vc10.patch |2 external/libxml2/ubsan.patch.0 | 84 external/poppler/StaticLibrary_poppler.mk |6 external/poppler/UnpackedTarball_poppler.mk | 11 external/poppler/poppler-c++11.patch.1 | 31 external/poppler/poppler-config.patch.1 | 12 external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 | 59 external/python3/UnpackedTarball_python3.mk |1 include/o3tl/make_unique.hxx | 19 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 38 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 49 sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx |6 sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx |4 solenv/gcc-wrappers/wrapper.cxx | 20 37 files changed, 403 insertions(+), 2844 deletions(-) New commits: commit a3d7c43630c0078fb9238887077d397f06ba4c08 Author: Michael Stahl AuthorDate: Mon Jan 14 17:33:37 2019 +0100 Commit: Michael Stahl CommitDate: Fri Jan 18 18:44:30 2019 +0100 python3: add patch bpo-17239: Disable external entities in SAX parser Change-Id: I44e969d8d3a8fe6b6426d61a1cbe83154c8518dd Reviewed-on: https://gerrit.libreoffice.org/66329 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit a57dd8eba9c0799dd42eb547a37622bce8fdb0b3) Reviewed-on: https://gerrit.libreoffice.org/66370 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 66b3860fd1772284dc12d0d2d2c76ac59b16883e) diff --git a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 new file mode 100644 index ..489e5d0e89ee --- /dev/null +++ b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 @@ -0,0 +1,59 @@ +From 582d188e6e3487180891f1fc457a80dec8be26a8 Mon Sep 17 00:00:00 2001 +From: Christian Heimes +Date: Mon, 24 Sep 2018 14:38:31 +0200 +Subject: [PATCH] [3.6] bpo-17239: Disable external entities in SAX parser + (GH-9217) (GH-9512) + +The SAX parser no longer processes general external entities by default +to increase security. Before, the parser created network connections +to fetch remote files or
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |4
1 file changed, 4 insertions(+)
New commits:
commit 7da863145d76aa57c36d14730c84f82bbdf72138
Author: Szymon Kłos
AuthorDate: Tue Dec 18 17:22:28 2018 +0100
Commit: Jan Holesovsky
CommitDate: Fri Jan 18 18:47:26 2019 +0100
Don't show modification indicator in read-only mode
Change-Id: Ib9f8803c0524040d6debf4adbdd4de7fa47fa32c
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 53f19b561..23eaffe23 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -855,6 +855,10 @@ L.Control.Menubar = L.Control.extend({
continue;
}
+ if (this._map._permission === 'readonly' && menu[i].id
=== 'last-mod') {
+ continue;
+ }
+
if (menu[i].type === 'action') {
if ((menu[i].id === 'rev-history' &&
!revHistoryEnabled) ||
(menu[i].id === 'closedocument' &&
!closebutton)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |4
1 file changed, 4 insertions(+)
New commits:
commit 3e47e6ffae48cbc3a66c94556820e4de5f31aa90
Author: Szymon Kłos
AuthorDate: Tue Dec 18 17:22:28 2018 +0100
Commit: Jan Holesovsky
CommitDate: Fri Jan 18 18:46:58 2019 +0100
Don't show modification indicator in read-only mode
Change-Id: Ib9f8803c0524040d6debf4adbdd4de7fa47fa32c
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 53f19b561..23eaffe23 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -855,6 +855,10 @@ L.Control.Menubar = L.Control.extend({
continue;
}
+ if (this._map._permission === 'readonly' && menu[i].id
=== 'last-mod') {
+ continue;
+ }
+
if (menu[i].type === 'action') {
if ((menu[i].id === 'rev-history' &&
!revHistoryEnabled) ||
(menu[i].id === 'closedocument' &&
!closebutton)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 122484] UI: dialog Paragraph/Character, tab Font, box Family: search does not trigger autocomplete for font name
https://bugs.documentfoundation.org/show_bug.cgi?id=122484 --- Comment #7 from Cor Nouws --- dear dev / Caolan, I'm not sure if bug 122693, marked as dupe, is the same. So while at this one, you may want to look at that one too, for convenience :) -- 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 122693] UI: Font list search/autoselect function is case sensitive
https://bugs.documentfoundation.org/show_bug.cgi?id=122693 --- Comment #5 from Cor Nouws --- (In reply to Xisco Faulí from comment #4) > I believe this is the same as bug 122484 ? Let's wait until bug 122484 is > fixed to retry... I doubt. In 122484 something is selected. In this bug not at all.. > *** This bug has been marked as a duplicate of bug 122484 *** will add a not there. -- 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 103427] [META] Styles and Formatting sidebar deck and floating window
https://bugs.documentfoundation.org/show_bug.cgi?id=103427 Bug 103427 depends on bug 122743, which changed state. Bug 122743 Summary: Parent style change not immediately seen for children in Sidebar preview https://bugs.documentfoundation.org/show_bug.cgi?id=122743 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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 122743] Parent style change not immediately seen for children in Sidebar preview
https://bugs.documentfoundation.org/show_bug.cgi?id=122743 Cor Nouws changed: What|Removed |Added Resolution|--- |DUPLICATE Status|NEW |RESOLVED --- Comment #2 from Cor Nouws --- I see bug 122458 it's resolved and in Version: 6.3.0.0.alpha0+ Build ID: b8e450a54936560cdac00ab4c70ef80c20cfaf99 CPU threads: 4; OS: Linux 4.15; UI render: default; VCL: gtk3; TinderBox: Linux-rpm_deb-x86_64@86-TDF, Branch:master, Time: 2019-01-18_06:04:42 Locale: nl-NL (nl_NL.UTF-8); UI-Language: en-US Calc: threaded this very bug is indeed fixed. So let me set this very bug as duplicate. *** This bug has been marked as a duplicate of bug 122458 *** -- 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 122802] Check-box is missing from opening menus of For Paragraph, For All Text.
https://bugs.documentfoundation.org/show_bug.cgi?id=122802 Oliver Brinzing changed: What|Removed |Added CC||oliver.brinz...@gmx.de --- Comment #4 from Oliver Brinzing --- Created attachment 148427 --> https://bugs.documentfoundation.org/attachment.cgi?id=148427=edit screenshot aoo 4.1.5 reproducible with aoo 4.1.5 -- 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 122802] Check-box is missing from opening menus of For Paragraph, For All Text.
https://bugs.documentfoundation.org/show_bug.cgi?id=122802 Oliver Brinzing changed: What|Removed |Added Version|4.4.7.2 release |Inherited From OOo -- 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 122809] Save is not the default any more on macOS when trying to leave the app
https://bugs.documentfoundation.org/show_bug.cgi?id=122809 William Gathoye changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from William Gathoye --- Link to the report made on the French instance of ask: https://ask.libreoffice.org/fr/question/178529/x/?answer=179896#post-id-179896 -- 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 122809] New: Save is not the default any more on macOS when trying to leave the app
https://bugs.documentfoundation.org/show_bug.cgi?id=122809 Bug ID: 122809 Summary: Save is not the default any more on macOS when trying to leave the app Product: LibreOffice Version: 6.1.4.2 release Hardware: All OS: Mac OS X (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: will...@gathoye.be Description: When the app asks us whether we want to save the document, don't save the document or cancel the operation when trying to leave the app, there is a regression with the branch 6.1.4. Save is not the default button on macOS any more. Tested on Windows 10 and GNU/Linux with KDE Plasma 5 and the button was Save like it was before with 6.0.x. Steps to Reproduce: 1. Open a document type some text 2. Try to leave LibreOffice without saving the app 3. The popup dialog ask us whether we want to Save the document, Do not save or Cancel the operation Actual Results: Cancel is the default Expected Results: Like with 6.0.7, Save is the default. Reproducible: Always User Profile Reset: No Additional Info: The user reports he is loosing quite a bunch of time when editing multiple documents. It seems like muscle memory is the cause since because of this REGRESSION, he doesn't press Tab before pressing Enter to save the document. As Cancel is selected by default, LibreOffice doesn't quit. -- 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/datamodelcontext.cxx |2
oox/source/drawingml/diagram/diagram.hxx|3 -
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 41 +++-
sd/qa/unit/import-tests-smartart.cxx|9 +---
4 files changed, 46 insertions(+), 9 deletions(-)
New commits:
commit ae34f471030869dfc0da1784597cae6f9131f8c5
Author: Miklos Vajna
AuthorDate: Fri Jan 18 11:10:28 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Jan 18 18:14:16 2019 +0100
oox smartart, org chart: implement support for hierBranch conditions
The relevant part of the layout is the element that has a with two branches:
The connectors were missing as we took the first branch
(ConditionAtom::getDecision() returned true if the arg was hierBranch),
even hierBranch on the parent layout node was set to "init".
With this, the correct number of connectors are created, previously all
employee connectors were missing. Their size / position is still
incorrect, though.
Change-Id: I74a705b13f82a065fc0b9b9d306bfb0dcaf0f7f4
Reviewed-on: https://gerrit.libreoffice.org/66579
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx
b/oox/source/drawingml/diagram/datamodelcontext.cxx
index 326b4f933ed6..b98d0ee87ccf 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -111,7 +111,7 @@ public:
mrPoint.mnDirection = rAttribs.getToken( XML_val, XML_norm );
break;
case DGM_TOKEN( hierBranch ):
-mrPoint.mnHierarchyBranch = rAttribs.getToken( XML_val,
XML_std );
+mrPoint.moHierarchyBranch = rAttribs.getToken( XML_val );
break;
case DGM_TOKEN( orgChart ):
mrPoint.mbOrgChartEnabled = rAttribs.getBool( XML_val, false );
diff --git a/oox/source/drawingml/diagram/diagram.hxx
b/oox/source/drawingml/diagram/diagram.hxx
index 1a981a858c29..242ff09fa152 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -73,7 +73,6 @@ struct Point
mnMaxChildren(-1),
mnPreferredChildren(-1),
mnDirection(XML_norm),
-mnHierarchyBranch(XML_std),
mnResizeHandles(XML_rel),
mnCustomAngle(-1),
mnPercentageNeighbourWidth(-1),
@@ -118,7 +117,7 @@ struct Point
sal_Int32 mnMaxChildren;
sal_Int32 mnPreferredChildren;
sal_Int32 mnDirection;
-sal_Int32 mnHierarchyBranch;
+OptValue moHierarchyBranch;
sal_Int32 mnResizeHandles;
sal_Int32 mnCustomAngle;
sal_Int32 mnPercentageNeighbourWidth;
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index fc5b1c059410..4495ae8a570d 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -346,8 +346,32 @@ bool ConditionAtom::getDecision() const
case XML_var:
{
const dgm::Point* pPoint = getPresNode();
-if (pPoint && maCond.mnArg == XML_dir)
+if (!pPoint)
+break;
+
+if (maCond.mnArg == XML_dir)
return compareResult(maCond.mnOp, pPoint->mnDirection,
maCond.mnVal);
+else if (maCond.mnArg == XML_hierBranch)
+{
+sal_Int32 nHierarchyBranch =
pPoint->moHierarchyBranch.get(XML_std);
+if (!pPoint->moHierarchyBranch.has())
+{
+// If is missing in the current presentation
+// point, ask the parent.
+OUString aParent = navigate(mrLayoutNode, XML_presParOf,
pPoint->msModelId,
+/*bSourceToDestination*/ false);
+DiagramData::PointNameMap& rPointNameMap
+= mrLayoutNode.getDiagram().getData()->getPointNameMap();
+auto it = rPointNameMap.find(aParent);
+if (it != rPointNameMap.end())
+{
+const dgm::Point* pParent = it->second;
+if (pParent->moHierarchyBranch.has())
+nHierarchyBranch = pParent->moHierarchyBranch.get();
+}
+}
+return compareResult(maCond.mnOp, nHierarchyBranch, maCond.mnVal);
+}
break;
}
@@ -595,6 +619,15 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
sal_Int32 nCount = rShape->getChildren().size();
+if (mnType == XML_hierChild)
+{
+// Connectors should not influence the size of non-connect
+// shapes.
+nCount = std::count_if(
+rShape->getChildren().begin(), rShape->getChildren().end(),
+[](const
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - beanshell/prj
beanshell/prj/d.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c50e8fdeb9933ea35f093cd94e0a1f5ed27615c Author: Jim Jagielski AuthorDate: Fri Jan 18 15:41:17 2019 + Commit: Jim Jagielski CommitDate: Fri Jan 18 15:41:17 2019 + correct path and filename version for beanshell diff --git a/beanshell/prj/d.lst b/beanshell/prj/d.lst index 21dbf3a4a64b..c24a06320295 100644 --- a/beanshell/prj/d.lst +++ b/beanshell/prj/d.lst @@ -1 +1 @@ -..\%__SRC%\misc\build\BeanShell-2.0b5\dist\bsh-2.0b5.jar %_DEST%\bin%_EXT%\bsh.jar +..\%__SRC%\misc\build\BeanShell-2.0b6\dist\bsh-2.0b6.jar %_DEST%\bin%_EXT%\bsh.jar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit e3cc5506d695b602fbd3c6ee816e36e6a76d9d96 Author: heiko tietze AuthorDate: Fri Jan 18 09:03:57 2019 +0100 Commit: Heiko Tietze CommitDate: Fri Jan 18 17:56:49 2019 +0100 Resolves tdf#122118 - Toolbar dropdown button triangles are too large Toolbar expander triangles are now scaled depending on the parent size Change-Id: I4974c0976c1591fc09594bf4aeca020a72ebf11a Reviewed-on: https://gerrit.libreoffice.org/66565 Tested-by: Jenkins Reviewed-by: Heiko Tietze Tested-by: Heiko Tietze diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 4d203c6b9186..90bd2622ef87 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2493,8 +2493,10 @@ static void ImplDrawDropdownArrow(vcl::RenderContext& rRenderContext, const tool tools::Polygon aPoly(4); -long width = 7 * fScaleFactor; -long height = 4 * fScaleFactor; +long width = round(rDropDownRect.getHeight()/5.5) * fScaleFactor; // scale triangle depending on theme/toolbar height with 7 for gtk, 5 for gen +long height = round(rDropDownRect.getHeight()/9.5) * fScaleFactor; // 4 for gtk, 3 for gen +if (width < 4) width = 4; +if (height < 3) height = 3; long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2; long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 122792] Writer repeatedly rewrites screen during document load
https://bugs.documentfoundation.org/show_bug.cgi?id=122792 --- Comment #4 from Christian Lehmann --- If it is the first page, the rewriting reduces to a flickering of the page, since there is no page break to be redone. If instead the cursor is on p. 300 or so, you will see Writer displaying six different page breaks. -- 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 122807] LO 6.1.4.2: Spreadsheet: Graph of Column + Line not displaying line
https://bugs.documentfoundation.org/show_bug.cgi?id=122807 --- Comment #1 from Hylton Conacher --- Created attachment 148426 --> https://bugs.documentfoundation.org/attachment.cgi?id=148426=edit Showing that graph line doesn't 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 122792] Writer repeatedly rewrites screen during document load
https://bugs.documentfoundation.org/show_bug.cgi?id=122792 --- Comment #3 from Durgapriyanka --- Thank you for reporting the bug. I can reproduce the bug. It takes approximately 90 seconds to load the full document. The cursor doesn't move anywhere, but a section of page on which the cursor is present(1st page) flickers about 5-6 times once the file is loaded. Version: 6.3.0.0.alpha0+ Build ID: 3c964980da07892a02d5ac721d80558c459532d0 CPU threads: 2; OS: Windows 6.1; UI render: default; VCL: win; TinderBox: Win-x86@42, Branch:master, Time: 2018-12-12_02:07:45 Locale: en-US (en_US); UI-Language: en-US Calc: 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 103378] [META] PDF export bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103378 Bug 103378 depends on bug 122657, which changed state. Bug 122657 Summary: Converting .odt file to PDF contains fonts that are not in the .odf file https://bugs.documentfoundation.org/show_bug.cgi?id=122657 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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 118541] Undesired font embedded in pdf form created with Libre Office Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=118541 cmflatsc...@yahoo.com changed: What|Removed |Added CC||cmflatsc...@yahoo.com --- Comment #17 from cmflatsc...@yahoo.com --- *** Bug 122657 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 122808] CRASH while closing LibreOffice with Search for formatting dialog open ( gen/gtk )
https://bugs.documentfoundation.org/show_bug.cgi?id=122808 Xisco Faulí changed: What|Removed |Added CC||caol...@redhat.com, ||xiscofa...@libreoffice.org Ever confirmed|0 |1 Keywords||bibisected, bisected, ||regression Status|UNCONFIRMED |NEW --- Comment #1 from Xisco Faulí --- Regression introduced by: https://cgit.freedesktop.org/libreoffice/core/commit/?id=4d83c24cdd433d5c63800290e2da6317ae12111c author Caolán McNamara 2018-11-02 18:21:20 + committer Caolán McNamara 2018-11-04 17:33:06 +0100 commit 4d83c24cdd433d5c63800290e2da6317ae12111c (patch) treebfd4c863f0f79d40ac1671812fef1976ca4a9c85 parent 628e96ce1fce194b30a5c2912feb8b7ec0328db0 (diff) reweld SwWordCountFloatDlg Bisected with: bibisect-linux64-6.2 Adding Cc: to Caolán McNamara -- 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 122657] Converting .odt file to PDF contains fonts that are not in the .odf file
https://bugs.documentfoundation.org/show_bug.cgi?id=122657 cmflatsc...@yahoo.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #12 from cmflatsc...@yahoo.com --- Thank you, Dieter. Hope this issue can be resolved soon. --Christian *** This bug has been marked as a duplicate of bug 118541 *** -- 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 122808] New: CRASH while closing LibreOffice with Search for formatting dialog open ( gen/gtk )
https://bugs.documentfoundation.org/show_bug.cgi?id=122808 Bug ID: 122808 Summary: CRASH while closing LibreOffice with Search for formatting dialog open ( gen/gtk ) Product: LibreOffice Version: 6.2.0.0.alpha1+ Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: xiscofa...@libreoffice.org Steps to reproduce: 1. Open Writer 2. Search & Replace 3. Click on Format 4. Close LibreOffice -> Crash Reproduced in Version: 6.3.0.0.alpha0+ Build ID: cc7712ba4c70c035cbf080c5cf2f2eb6f9fe3eb1 CPU threads: 4; OS: Linux 4.15; UI render: default; VCL: gtk; Locale: ca-ES (ca_ES.UTF-8); UI-Language: en-US Calc: 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-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - oovbaapi/ooo sw/source
oovbaapi/ooo/vba/word/XWordBasic.idl |2 +
sw/source/ui/vba/vbaapplication.cxx | 52 +++
sw/source/ui/vba/vbadocuments.cxx|1
3 files changed, 55 insertions(+)
New commits:
commit 78579b56ccb51ca0f011614f0549b2c9f9452eb7
Author: Tor Lillqvist
AuthorDate: Fri Jan 18 18:39:31 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Jan 18 18:39:55 2019 +0200
Add a (dummy) WordBasic.FileSave()
Change-Id: I021d63c9d57f1e0435bcc5f97abc57bc39fece01
diff --git a/oovbaapi/ooo/vba/word/XWordBasic.idl
b/oovbaapi/ooo/vba/word/XWordBasic.idl
index 3d9454b812b7..320787361ca9 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -17,6 +17,7 @@ interface XWordBasic
[attribute] long MailMergeMainDocumentType;
void FileOpen( [in] string Name, [in] any ConfirmConversions, [in] any
ReadOnly, [in] any AddToMru, [in] any PasswordDoc, [in] any PasswordDot, [in]
any Revert, [in] any WritePasswordDoc, [in] any WritePasswordDot );
+void FileSave();
void ToolsOptionsView( [in] any Whatever1, [in] any Whatever2, [in] any
Whatever3, [in] any Whatever4, [in] any Whatever5, [in] any Whatever6, [in] any
Whatever7, [in] any Whatever8, [in] any Whatever9, [in] any Whatever10, [in]
any Whatever11, [in] any Whatever12, [in] any Whatever13, [in] any Whatever14,
[in] any Whatever15, [in] any Whatever16, [in] any Whatever17, [in] any
Whatever18, [in] any Whatever19, [in] any Whatever20 );
string WindowName();
boolean ExistingBookmark( [in] string Name );
diff --git a/sw/source/ui/vba/vbaapplication.cxx
b/sw/source/ui/vba/vbaapplication.cxx
index 29ff8e394038..2fd7d4943136 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -75,6 +75,7 @@ public:
virtual void SAL_CALL setMailMergeMainDocumentType( sal_Int32
_mailmergemaindocumenttype ) override;
virtual void SAL_CALL FileOpen( const OUString& Name, const uno::Any&
ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToMru, const
uno::Any& PasswordDoc, const uno::Any& PasswordDot, const uno::Any& Revert,
const uno::Any& WritePasswordDoc, const uno::Any& WritePasswordDot ) override;
+virtual void SAL_CALL FileSave() override;
virtual void SAL_CALL ToolsOptionsView( const css::uno::Any& Whatever1,
const css::uno::Any& Whatever2,
const css::uno::Any& Whatever3,
@@ -532,6 +533,12 @@ SwWordBasic::FileOpen( const OUString& Name, const
uno::Any& ConfirmConversions,
}
void SAL_CALL
+SwWordBasic::FileSave()
+{
+// FIXME save it
+}
+
+void SAL_CALL
SwWordBasic::ToolsOptionsView( const css::uno::Any& /*Whatever1*/,
const css::uno::Any& /*Whatever2*/,
const css::uno::Any& /*Whatever3*/,
commit bac428070379c1da45851760a92971a6eaece408
Author: Tor Lillqvist
AuthorDate: Fri Jan 18 18:38:59 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Jan 18 18:38:59 2019 +0200
Add TODO FIXME
Change-Id: I1492c604ac39ce72fe2cfe8804ac15e8c41b9a46
diff --git a/sw/source/ui/vba/vbadocuments.cxx
b/sw/source/ui/vba/vbadocuments.cxx
index aef486ba4718..b32b80beeac5 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -110,6 +110,7 @@ SwVbaDocuments::Add( const uno::Any& Template, const
uno::Any& /*NewTemplate*/,
}
// #TODO# #FIXME# can any of the unused params below be used?
+// #TODO# #FIXME# surely we should actually close the document here
void SAL_CALL
SwVbaDocuments::Close( const uno::Any& /*SaveChanges*/, const uno::Any&
/*OriginalFormat*/, const uno::Any& /*RouteDocument*/ )
{
commit ac43be5afca3691f85f455035628df009f2d9694
Author: Tor Lillqvist
AuthorDate: Fri Jan 18 16:59:51 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Jan 18 17:09:16 2019 +0200
Add a dummy WordBasic.ToolsOptionsView
Does nothing. Needed for customer application to proceed. Once we are
further along in getting it to work, we can investigate what the
parameters passed to this ToolsOptionsView method actually are. (This
WordBasic thing is something that has been deprecated since last
century, I suspect, so no wonder it is hard to find authoritative
documentation on it.)
Change-Id: I62a6d6d9abb9364afca110570fa341a2375a77a6
diff --git a/oovbaapi/ooo/vba/word/XWordBasic.idl
b/oovbaapi/ooo/vba/word/XWordBasic.idl
index 769d8aad3faf..3d9454b812b7 100644
--- a/oovbaapi/ooo/vba/word/XWordBasic.idl
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -17,6 +17,7 @@ interface XWordBasic
[attribute] long MailMergeMainDocumentType;
void FileOpen( [in] string Name, [in] any ConfirmConversions, [in] any
ReadOnly, [in] any AddToMru, [in] any PasswordDoc, [in] any PasswordDot, [in]
any Revert, [in] any WritePasswordDoc, [in] any WritePasswordDot );
+
[Libreoffice-bugs] [Bug 122259] LO: Some icons have different height for icon style = Elementary (SVG)
https://bugs.documentfoundation.org/show_bug.cgi?id=122259 Adolfo Jayme changed: What|Removed |Added Component|LibreOffice |UI -- 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 122244] Installer DMG window on MacOS has a misplaced "bin" folder icon
https://bugs.documentfoundation.org/show_bug.cgi?id=122244 Adolfo Jayme changed: What|Removed |Added Summary|Installer DMG window on |Installer DMG window on |MacOS corrupted by "bin"|MacOS has a misplaced "bin" |folder icon |folder 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 122807] New: LO 6.1.4.2: Spreadsheet: Graph of Column + Line not displaying line
https://bugs.documentfoundation.org/show_bug.cgi?id=122807 Bug ID: 122807 Summary: LO 6.1.4.2: Spreadsheet: Graph of Column + Line not displaying line Product: LibreOffice Version: 6.1.4.2 release Hardware: Other OS: Mac OS X (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: hyl...@conacher.co.za Description: On 20190118 I downloaded an update to my LibreOffice and successfully installed. I opened a file I had been working on in an older version which had the same issue as discribed in the subject. I visited the corresponding sheet and saw that the graph was not displaying a line as requested in the Chart Type fields of column and 1 line. I rechecked the references to the data cells and all is correct. I changed the order of the units in Data Ranges to see if another colour would show, but with no luck. I also tried running my mouse cursor up from the X axis to see if it managed to identify a line that was either transparebt or too thin to differentiate between the Major Grid. No labels showed up, despite the entry appearing in the Key. Steps to Reproduce: 1.Create 6 column data table with 1st column and 1st row as labels ie a1 blank, b1=2016,c1=2017,d1=2018,e1=2019,f1=Annual average. 2. a2=Annual total,b2=100,c2=50,d2=100,e2=75,f2=average(b2:e2) 3.graph data with the entry for f1:f2 being the last entry in the data ranges 4. Change chart type to column and line with a single line Actual Results: Expected result is a 4 column graph showing the totals in (2) abd the fifth column being a line across all the columns showing the average of all 4 columns. Expected Results: No 'Average' line was shown Reproducible: Always User Profile Reset: No Additional Info: Shown an average line across all four columns Version: 6.1.4.2 Build ID: 9d0f32d1f0b509096fd65e0d4bec26ddd1938fd3 CPU threads: 4; OS: Mac OS X 10.14.2; UI render: default; Locale: en-GB (en_ZA.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 122218] After Update to 6.1.4 on macOS fonts are blurred on retina display
https://bugs.documentfoundation.org/show_bug.cgi?id=122218 Adolfo Jayme changed: What|Removed |Added Component|LibreOffice |UI -- 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 120847] Under Print - the 'Properties' are Gray'ed Out in Writer & Calc for Brother printer
https://bugs.documentfoundation.org/show_bug.cgi?id=120847 Timur changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #7 from Timur --- Please see Bug 93132 -- 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 122790] Table background color isn't shown when opening table background tab
https://bugs.documentfoundation.org/show_bug.cgi?id=122790 Adolfo Jayme changed: What|Removed |Added Summary|Table background color |Table background color |isn't show when opening |isn't shown when opening |table background tab|table background tab -- 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 107317] On Add Text Box to shape, undo label shows 'Insert $1'
https://bugs.documentfoundation.org/show_bug.cgi?id=107317 Timur changed: What|Removed |Added Keywords||implementationError Severity|normal |trivial Summary|Undo label shows 'Insert|On Add Text Box to shape, |$1' |undo label shows 'Insert ||$1' Priority|medium |low --- Comment #5 from Timur --- Repro 6.3+. -- 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: svx/source sw/source
svx/source/dialog/srchdlg.cxx| 19 +--
sw/source/uibase/uiview/viewsrch.cxx | 24 +---
2 files changed, 10 insertions(+), 33 deletions(-)
New commits:
commit dba14e6a75b56b75c32cb7f07a56cfc7f13112e5
Author: Mike Kaganski
AuthorDate: Fri Jan 18 16:23:18 2019 +0300
Commit: Mike Kaganski
CommitDate: Fri Jan 18 17:17:13 2019 +0100
Ensure itemset ranges are sorted
What used to create sorted range automatically in FID_SEARCH_SEARCHSET
handler in SwView::ExecSearch, over time turned into unsorted. this
prevents using MergeRange on the sets created from the range list; see
https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/24448/consoleFull
> svl/source/items/itemset.cxx:641:
> void SfxItemSet::MergeRange(sal_uInt16, sal_uInt16):
> Assertion `!pRange[2] || (pRange[2] > pRange[1] && pRange[2] - pRange[1]
> 1)' failed.
So let's just use MergeRange in the SwView::ExecSearch itself, which
would ensure early detection if the initial list gets unsorted.
Change-Id: Id0232190f850e3feb463adfcb3153eafbaad7d9b
Reviewed-on: https://gerrit.libreoffice.org/66607
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 91f62a0eebae..d005a1f5869a 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -1999,23 +1999,14 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl,
Button*, void)
if ( !pSh || !pImpl->pRanges )
return;
-std::vector aWhRanges;
-
-const sal_uInt16* pPtr = pImpl->pRanges.get();
-while (*pPtr)
-{
-aWhRanges.push_back(*pPtr++);
-}
+SfxItemPool& rPool = pSh->GetPool();
+SfxItemSet aSet(rPool, pImpl->pRanges.get());
-aWhRanges.push_back(SID_ATTR_PARA_MODEL);
-aWhRanges.push_back(SID_ATTR_PARA_MODEL);
+aSet.MergeRange(SID_ATTR_PARA_MODEL, SID_ATTR_PARA_MODEL);
sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
-aWhRanges.push_back(nBrushWhich);
-aWhRanges.push_back(nBrushWhich);
-aWhRanges.push_back(0);
-SfxItemPool& rPool = pSh->GetPool();
-SfxItemSet aSet(rPool, aWhRanges.data());
+aSet.MergeRange(nBrushWhich, nBrushWhich);
+
OUString aTxt;
aSet.InvalidateAllItems();
diff --git a/sw/source/uibase/uiview/viewsrch.cxx
b/sw/source/uibase/uiview/viewsrch.cxx
index a127c1a12241..94eb878621ef 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -442,7 +442,6 @@ void SwView::ExecSearch(SfxRequest& rReq)
/*10 */ RES_CHRATR_ROTATE, RES_CHRATR_ROTATE,
/*12 */ RES_CHRATR_SCALEW, RES_CHRATR_RELIEF,
/*14 */ RES_CHRATR_OVERLINE,RES_CHRATR_OVERLINE,
-// insert position for CJK/CTL attributes!
/*16 */ RES_PARATR_LINESPACING, RES_PARATR_HYPHENZONE,
/*18 */ RES_PARATR_REGISTER,RES_PARATR_REGISTER,
/*20 */ RES_PARATR_VERTALIGN, RES_PARATR_VERTALIGN,
@@ -451,33 +450,20 @@ void SwView::ExecSearch(SfxRequest& rReq)
/*26 */ 0
};
-static const sal_uInt16 aCJKAttr[] =
-{
-RES_CHRATR_CJK_FONT,RES_CHRATR_CJK_WEIGHT,
-RES_CHRATR_EMPHASIS_MARK, RES_CHRATR_TWO_LINES,
-RES_PARATR_SCRIPTSPACE, RES_PARATR_FORBIDDEN_RULES
-};
-static const sal_uInt16 aCTLAttr[] =
-{
-RES_CHRATR_CTL_FONT,RES_CHRATR_CTL_WEIGHT
-};
+SfxItemSet aSet(m_pWrtShell->GetAttrPool(), aNormalAttr);
-std::vector aArr;
-aArr.insert( aArr.begin(), aNormalAttr,
-aNormalAttr + SAL_N_ELEMENTS( aNormalAttr ));
if( SW_MOD()->GetCTLOptions().IsCTLFontEnabled() )
{
-aArr.insert( aArr.begin() + 16, aCTLAttr,
-aCTLAttr + SAL_N_ELEMENTS( aCTLAttr ));
+aSet.MergeRange(RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_WEIGHT);
}
SvtCJKOptions aCJKOpt;
if( aCJKOpt.IsAnyEnabled() )
{
-aArr.insert( aArr.begin() + 16, aCJKAttr,
-aCJKAttr + SAL_N_ELEMENTS( aCJKAttr ));
+aSet.MergeRange(RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_WEIGHT);
+aSet.MergeRange(RES_CHRATR_EMPHASIS_MARK,
RES_CHRATR_TWO_LINES);
+aSet.MergeRange(RES_PARATR_SCRIPTSPACE,
RES_PARATR_FORBIDDEN_RULES);
}
-SfxItemSet aSet( m_pWrtShell->GetAttrPool(), [0] );
sal_uInt16 nWhich = SID_SEARCH_SEARCHSET;
if ( FID_SEARCH_REPLACESET == nSlot )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92880] CopyFromRecordset function not working since 4.x
https://bugs.documentfoundation.org/show_bug.cgi?id=92880 Buovjaga changed: What|Removed |Added Ever confirmed|0 |1 Status|UNCONFIRMED |NEW --- Comment #12 from Buovjaga --- (In reply to raal from comment #6) > Created attachment 135662 [details] > test file > > I get mentioned error in LO 6 after macro run. Version 3.3 without error. Is > the test file sufficient? I also get the error Version: 6.3.0.0.alpha0+ (x64) Build ID: 62ce65fe042543e7aeaf83bf66f8c2357ff902c6 CPU threads: 4; OS: Windows 10.0; UI render: default; VCL: win; TinderBox: Win-x86_64@42, Branch:master, Time: 2019-01-17_02:33:10 Locale: fi-FI (fi_FI); UI-Language: en-US Calc: 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
