[Libreoffice-bugs] [Bug 112264] LibreOffice freezes on attempting to open the dialog editor in the Basic IDE.
https://bugs.documentfoundation.org/show_bug.cgi?id=112264 Jean-Baptiste Faurechanged: What|Removed |Added Keywords||regression Status|UNCONFIRMED |NEW CC||jbfa...@libreoffice.org Ever confirmed|0 |1 --- Comment #1 from Jean-Baptiste Faure --- Good catch, thank you for the bug report. I reproduce with LO 5.4.1 from Ubuntu PPA, LO 5.4.2.0.0+ and master both built at home under Ubuntu 16.04. The problem is related to the gtk3 backend, it works as expected if I use GTK2 backend instead of gtk3. Of course it worked before, so regression. Setting status to NEW Best regards. JBF -- 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 112011] Copying and pasting a word within same document always adds leading space
https://bugs.documentfoundation.org/show_bug.cgi?id=112011 --- Comment #15 from blendergeek--- I believe this is a bug and I will try to explain. I will use underscores as stand-ins for spaces so that we can visualize it. We have the following paragraph: Lorem_ipsum_dolor_sit_ Note that there is a trailing "space" at the end of the line. I position the cursor at the end of the line and paste "amet" (copied without spaces). The paragraph now reads: Lorem_ipsum_dolor_sit__amet Notice the TWO "spaces" between "sit" and "amet". I would expect to only find one space there especially given that if I had pasted "amet" with the cursor just before "sit" the paragraph would read Lorem_ipsum_dolor_ametsit Note the ONE "space" between dolor and amet despite the cursor being AFTER the space. This is different from the behavior at the end of the line and is thus counterintuitive and I therefore would consider it a 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 107079] LOCALHELP: Index: colors; defining and saving needs update to new color tab
https://bugs.documentfoundation.org/show_bug.cgi?id=107079 Adolfo Jaymechanged: What|Removed |Added CC||hellena.bai...@reem.one --- Comment #1 from Adolfo Jayme --- *** Bug 112277 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 112277] Custome palette editors completely removed from application
https://bugs.documentfoundation.org/show_bug.cgi?id=112277 Adolfo Jaymechanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Adolfo Jayme --- Thanks for reporting the issue! That help page is indeed out of date. See bug 107079. *** This bug has been marked as a duplicate of bug 107079 *** -- 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 108638] FORMATTING Text size is not scaled correctly according to the zoom factor
https://bugs.documentfoundation.org/show_bug.cgi?id=108638 V Stuart Footechanged: What|Removed |Added CC||vstuart.fo...@utsa.edu --- Comment #9 from V Stuart Foote --- (In reply to stefan_lange...@t-online.de from comment #8) > I think I can confirm this. I haven't found an installation file for LO > 3.5.0, only for Version 3.6.7.2 (Build ID: e183d5b). But I think that makes > no difference. > http://downloadarchive.documentfoundation.org/libreoffice/old/ Of course, please check with current master where calculating the internal leading for fonts has been corrected on builds after > 20170906 [1] With Version: 6.0.0.0.alpha0+ Build ID: f2c29539d52095ea7b914b20ef7f564469d2aa96 CPU threads: 8; OS: Windows 6.19; UI render: GL; TinderBox: Win-x86@39, Branch:master, Time: 2017-09-07_01:40:27 Locale: en-US (en_US); Calc: CL As I zoom in and out of test document--attached comment 0--the cell holds its format fairly well, including being cut off/non-optimal height. And when the row height is set optimized. =-ref-= [1] http://cgit.freedesktop.org/libreoffice/core/commit/?id=0c8b749e602b6743857a9bc4efb24b6183690311 -- 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 112267] Localization of unicode names
https://bugs.documentfoundation.org/show_bug.cgi?id=112267 --- Comment #5 from Adolfo Jayme--- > I suggest to reuse official or similar translations of Unicode characters There is no such thing. The Unicode Standard is English-only. It used to be released in French as well, but that was in the past. This is why you should be able to search for characters by their code point hexadecimal number. -- 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 90556] About dialog: Include build date for daily builds
https://bugs.documentfoundation.org/show_bug.cgi?id=90556 Adolfo Jaymechanged: What|Removed |Added Status|NEW |RESOLVED Blocks|103202 | Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |cl...@documentfoundation.or |desktop.org |g Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103202 [Bug 103202] [META] About dialog bugs and enhancements -- 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 103202] [META] About dialog bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103202 Adolfo Jaymechanged: What|Removed |Added Depends on|90556 | Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=90556 [Bug 90556] About dialog: Include build date for daily builds -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - drawinglayer/source
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 96886d7e09fc52d7a2099bf5296d74829a97febc Author: Caolán McNamaraDate: Thu Sep 7 21:02:13 2017 +0100 gerrit cherry-pick mismerge left Pop in wrong block Change-Id: I5928dc6778124006e08754f1dad51ffe1f3f7b63 Reviewed-on: https://gerrit.libreoffice.org/42084 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index 88616b2517b7..ee1f8dcf13d2 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -1728,6 +1728,7 @@ namespace drawinglayer impEndSvtGraphicFill(pSvtGraphicFill); } +mpOutputDevice->Pop(); break; } case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D : @@ -1747,7 +1748,6 @@ namespace drawinglayer RenderMetafilePrimitive2D(aMetafile); } -mpOutputDevice->Pop(); break; } case PRIMITIVE2D_ID_MASKPRIMITIVE2D : ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 107296] Moving cursor leaves artifacts behind if paragraph has two directionalities
https://bugs.documentfoundation.org/show_bug.cgi?id=107296 --- Comment #8 from Luigi--- Hi all good news, My problem appears to be fixed with 5.4. I managed to download it and when I did what I know still fails with 3.6 and it works fine. The end of the file looks OK and back scrolling now works and the display looks fine. Thanks for fixing the 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 106739] Autocalc not working randomly
https://bugs.documentfoundation.org/show_bug.cgi?id=106739 --- Comment #3 from Luigi--- Hi All Good news, I have managed to download and install 5.4. My Autocalc issue appears to be fixed. I just did a test and my cells autocalc updated correctly. Also now my 5.3.6.1 version also is working. I don't know why, maybe a library module has been fixed which is used by both versions. I am happy it is working now for my problem. If it was a real bug and it got fixed then thanks. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107629] Ctrl+Leftshift/ Rightshift shortcut keys function but are not listed in keyboard shortcuts
https://bugs.documentfoundation.org/show_bug.cgi?id=107629 --- Comment #4 from Phant--- This is not a duplicate, though. 103158 is about inconsistent behavior about keydown vs keyup on this keyboard shortcut. 107629 is about whether this particular keyboard shortcut should be impossible to remap. I don't see any compelling reason why it ought to be impossible to change by the user. Certainly being a "standard shortcut" is not a criteria for that, as it is entirely possible to remap ctrl+C and ctrl+V in libreoffice, which are far more "standard" and commonly used shortcuts (for instance, they're respected in notepad, but control+leftshift and control+rightshift are not). What makes control+shift deserve immunity from remapping? I can understand if it would be difficult (and thus, lower priority), but the control+shift combination can already be enabled and disabled in-program. The way to enable or to disable the hotkey is by going through "Tools->Options->Language Settings->Languages->Default Languages for Documents, then unchecking a box labelled Complex Text Layout (CTL). It's *really* bad UI, because there's no indication whatsoever in the program itself that this hotkey exists, or is toggled through that series of actions. At the bare minimum the key combination should be consistently documented together with the other ones on the list of hotkeys, not buried in https://help.libreoffice.org/Common/Languages_Using_Complex_Text_Layout . -- 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 112282] New: Crash in: ntdll.dll
https://bugs.documentfoundation.org/show_bug.cgi?id=112282 Bug ID: 112282 Summary: Crash in: ntdll.dll Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: p...@donnapaul.net This bug was filed from the crash reporting server and is br-cc4f9d91-0fb0-4372-9cbd-933b40a8269e. === Basic macro caused this error. I believe there is simply an un-balanced if/endif. That is, a missing endif. -- 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 97648] Horizontal line is not imported
https://bugs.documentfoundation.org/show_bug.cgi?id=97648 --- Comment #4 from Justin L--- proposed partial solution: https://gerrit.libreoffice.org/42088 I'm not assigning myself to this bug because ultimately it needs to support the "100%" nWidth=0 case - which is the most common one. However, although the variables seem to be present to handle maWidthPercent, the back-end code doesn't seem to use it at all for the horizontal line shape. Also needed is something to handle o:hralign. Again, the variables seem to exist for it, but the back-end code doesn't actually affect the o:hr shape. +OUString hralign = rAttribs.getString( O_TOKEN( hralign ), "left" ); +mrTypeModel.maPositionHorizontal = hralign; I'm a bit afraid of hacking on this low level vml library code, since I will be changing a lot more than just horizontal lines... -- 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 57587] Rehearsed timings are stored nowhere
https://bugs.documentfoundation.org/show_bug.cgi?id=57587 --- Comment #6 from Octavio Alvarez--- I have tried again on 5.4 and now it works for me too. Maybe this is now fixed. Version: 5.4.0.2 Build ID: 1:5.4.0~rc2-1 CPU threads: 4; OS: Linux 4.2; UI render: default; VCL: gtk3; Locale: en-US (en_US.utf8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107296] Moving cursor leaves artifacts behind if paragraph has two directionalities
https://bugs.documentfoundation.org/show_bug.cgi?id=107296 Luigichanged: What|Removed |Added Version|5.2.6.2 release |5.3.6.1 release Whiteboard||Display leaves part of ||screen behind OS|All |Linux (All) --- Comment #7 from Luigi --- Definitely in the current version (but unsure when it appeared) when I reach the end of any document and then try and scroll backwards the screen display part of the old screen and fails to overwrite with the new data so that it very quickly is unreadable. This can also happen as I scroll down through the document. It certainly always happens when I reach the end. My footer appears several times at the bottom of my last page as an example. My only fix is close and reopen. No data appears damaged but it is unusable until I restart. As I said I don't know when this started but I am sure it must be quite recent. I am trying to get to 5.4 version so I can see if it is still there. libreoffice.x86_64 1:5.3.6.1-3.fc26 I am not sure if this is related to the bug reports but this is the closest item I could find to my 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 106739] Autocalc not working randomly
https://bugs.documentfoundation.org/show_bug.cgi?id=106739 Luigichanged: What|Removed |Added Version|5.3.1.2 release |5.3.6.1 release --- Comment #2 from Luigi --- I have just noticed exactly this problem. In my big sheet the autocalculate is not working. Cut that page out and put it in a new sheet and it work. I have 8 sheets but none are very big in that failing one. I am quite sure it worked when I was creating up the original Spread sheet but I would not have had as many sheets on it then. I am 64bit Version: 5.3.6.1 Build ID: 5.3.6.1-3.fc26 Since as indicated in the original post unless you "KNOW" the value should have changed you would not know it is wrong. Also you have to F9 on each and every cell you need updated which can be a real problem. I will try and update to 5.4 to see if it is fixed but my auto dnf is saying I am up to date at the moment. -- 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 111785] PPTX: Hatch fill background color is not exported to PPTX
https://bugs.documentfoundation.org/show_bug.cgi?id=111785 --- Comment #8 from Tamás Zolnai--- PPTX specification: https://msdn.microsoft.com/en-us/library/office/documentformat.openxml.drawing.patternfill.aspx -- 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 111897] Crash in: mergedlo.dll
https://bugs.documentfoundation.org/show_bug.cgi?id=111897 --- Comment #4 from Xisco Faulí--- (In reply to Libomark from comment #2) > File size is too large for me to upload. Try to create an example as > follows:- > > In an new sheet place =rand() into columns A-F for all rows. In G2 put > formula =if(b2>c2,d2,e2) > > Copy cell G2 over the rest of column G. > > Crash occurs with "bad allocation" message. Could you please use another service like dropbox or google drive? -- 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 111884] PPTX with animation on grouped shapes opens with repair in PowerPoint after roundtrip
https://bugs.documentfoundation.org/show_bug.cgi?id=111884 Xisco Faulíchanged: What|Removed |Added Status|RESOLVED|VERIFIED --- Comment #8 from Xisco Faulí --- Verified in Version: 6.0.0.0.alpha0+ Build ID: 383aab7ed63bf30931c1cf89138707d2228b5dce CPU threads: 4; OS: Linux 4.10; UI render: default; VCL: gtk3; Locale: ca-ES (ca_ES.UTF-8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107166] Text is invisible, both in UI and in editor on update to 5.3.2, older AMD and Intel GPUs
https://bugs.documentfoundation.org/show_bug.cgi?id=107166 --- Comment #197 from Tomaz Vajngerl--- Will G. Ugh... that's interesting -- 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 107166] Text is invisible, both in UI and in editor on update to 5.3.2, older AMD and Intel GPUs
https://bugs.documentfoundation.org/show_bug.cgi?id=107166 --- Comment #196 from Tomaz Vajngerl--- Terje Yeah, that would be better as this bug is a combination of something that was fixed and a the rest of partially related issues. Starting clean would be good. -- 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 53241] The extension is .man instead of .msi in the downloadable files for Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=53241 Aron Budeachanged: What|Removed |Added Status|REOPENED|RESOLVED CC||ba...@caesar.elte.hu Resolution|--- |MOVED --- Comment #15 from Aron Budea --- Moved to redmine: https://redmine.documentfoundation.org/issues/2358 -- 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 112266] The libreoffice installation file for Windows x64 is damaged.
https://bugs.documentfoundation.org/show_bug.cgi?id=112266 Aron Budeachanged: What|Removed |Added CC||ba...@caesar.elte.hu --- Comment #2 from Aron Budea --- Junichi, can you please check and share the exact link to the file you downloaded? (so we know which mirror it is) -- 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 111884] PPTX with animation on grouped shapes opens with repair in PowerPoint after roundtrip
https://bugs.documentfoundation.org/show_bug.cgi?id=111884 Jan Holesovskychanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #7 from Jan Holesovsky --- Should be closed now I hope :-) -- 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 104787] [META] FILESAVE: PPTX: Corrupted file in MSO PP after RT
https://bugs.documentfoundation.org/show_bug.cgi?id=104787 Bug 104787 depends on bug 111884, which changed state. Bug 111884 Summary: PPTX with animation on grouped shapes opens with repair in PowerPoint after roundtrip https://bugs.documentfoundation.org/show_bug.cgi?id=111884 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108638] FORMATTING Text size is not scaled correctly according to the zoom factor
https://bugs.documentfoundation.org/show_bug.cgi?id=108638 --- Comment #8 from stefan_lange...@t-online.de--- Hi Norbert, I think I can confirm this. I haven't found an installation file for LO 3.5.0, only for Version 3.6.7.2 (Build ID: e183d5b). But I think that makes no difference. With this build I have opened my spreadsheet "Test_Text_Width_V2.ods" and I have found the behavior described in this Bug (108638). I have also reproduced the behavior described in Bug 104570. -- 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 107166] Text is invisible, both in UI and in editor on update to 5.3.2, older AMD and Intel GPUs
https://bugs.documentfoundation.org/show_bug.cgi?id=107166 --- Comment #195 from Terje Bråten--- This bug has status "RESOLVED FIXED", while we are many that still have this issue on our computer. Should we open a new bug, since you do not want to reopen this one? T. -- 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: svtools/source
svtools/source/svrtf/svparser.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit fc670f637d4271246691904fd649358ce2e7be59 Author: Michael StahlDate: Thu Sep 7 23:01:26 2017 +0200 svtools: HTML import: don't put lone surrogates in OUString The bytes "ed b3 b5" in fdo67610-1.doc (which, as the name indicates, is an HTML file) are converted to the lone UTF-16 surrogate "dcf5", which is inserted into SwTextNode and causes asserts later on. The actual encoding of the HTML document is probably GBK (at least VIM doesn't display any missing characters with that), but because it doesn't contain any indication of its encoding it's apparently imported as UTF-8; the ImplConvertUtf8ToUnicode() thinking a surrogate code point is valid even if the JSON-compatible mode RTL_TEXTENCODING_JAVA_UTF8 is not specified is a bit of a surprise. Change-Id: Idd788d9d461fed150171dd907439166f3075a834 diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 541aa5276c2d..cef258f04dd2 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -423,7 +423,8 @@ sal_uInt32 SvParser::GetNextChar() while( 0 == nChars && !bErr ); } -if ( ! rtl::isUnicodeCodePoint( c ) ) +// Note: ImplConvertUtf8ToUnicode() may produce a surrogate! +if (!rtl::isUnicodeCodePoint(c) || rtl::isHighSurrogate(c) || rtl::isLowSurrogate(c)) c = '?' ; if( bErr ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 112011] Copying and pasting a word within same document always adds leading space
https://bugs.documentfoundation.org/show_bug.cgi?id=112011 --- Comment #14 from Michael Bauer--- On 5.4.1.2 now but yes, it seems to be the case that this only happens at the end of the paragraph. I also tried inserting into the middle of a sentence in the middle of 4 or more spaces and it does not seem to add an additional one there. Well spotted blendergeek, I hadn't seen that pattern :) -- 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: svtools/source
svtools/source/contnr/treelistbox.cxx | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) New commits: commit 554a79d793ee9546f71802643b79001749c3c695 Author: Eike RathkeDate: Thu Sep 7 22:49:27 2017 +0200 SvTreeListBox: turn some DBG_ASSERT() into assert() Change-Id: I14cd42d816cfd6fcc7f0fc3f32ece09e10d3137f diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index fb6c31630a75..d0a7e2003738 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -820,7 +820,7 @@ SvViewDataItem* SvTreeListBox::GetViewDataItem(SvTreeListEntry const * pEntry, S const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEntry, const SvLBoxItem* pItem) const { const SvViewDataEntry* pEntryData = SvListView::GetViewData(pEntry); -DBG_ASSERT(pEntryData,"Entry not in View"); +assert(pEntryData && "Entry not in View"); sal_uInt16 nItemPos = pEntry->GetPos(pItem); return >GetItem(nItemPos); } @@ -1099,7 +1099,7 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox* pSourceView ) { -DBG_ASSERT( pSourceView, "SvTreeListBox::ExecuteDrop(): no source view" ); +assert(pSourceView); pSourceView->EnableSelectionAsDropTarget(); ImplShowTargetEmphasis( pTargetEntry, false ); @@ -1330,7 +1330,7 @@ OUString SvTreeListBox::GetEntryLongDescription( SvTreeListEntry* ) const OUString SvTreeListBox::SearchEntryTextWithHeadTitle( SvTreeListEntry* pEntry ) { -DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" ); +assert(pEntry); OUString sRet; sal_uInt16 nCount = pEntry->ItemCount(); @@ -1633,25 +1633,25 @@ void SvTreeListBox::InitEntry(SvTreeListEntry* pEntry, OUString SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const { -DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): no entry" ); +assert(pEntry); SvLBoxString* pItem = static_cast (pEntry->GetFirstItem(SvLBoxItemType::String)); -DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): item not found" ); +assert(pItem); return pItem->GetText(); } const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) { -DBG_ASSERT(pEntry,"Entry?"); +assert(pEntry); const SvLBoxContextBmp* pItem = static_cast(pEntry->GetFirstItem(SvLBoxItemType::ContextBmp)); -DBG_ASSERT(pItem,"GetContextBmp:Item not found"); +assert(pItem); return pItem->GetBitmap2( ); } const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry ) { -DBG_ASSERT(pEntry,"Entry?"); +assert(pEntry); const SvLBoxContextBmp* pItem = static_cast(pEntry->GetFirstItem(SvLBoxItemType::ContextBmp)); -DBG_ASSERT(pItem,"GetContextBmp:Item not found"); +assert(pItem); return pItem->GetBitmap1( ); } @@ -1727,7 +1727,7 @@ SvTreeListEntry* SvTreeListBox::InsertEntry( const OUString& rText, void SvTreeListBox::SetEntryText(SvTreeListEntry* pEntry, const OUString& rStr) { SvLBoxString* pItem = static_cast (pEntry->GetFirstItem(SvLBoxItemType::String)); -DBG_ASSERT(pItem,"SetText:Item not found"); +assert(pItem); pItem->SetText(rStr); pItem->InitViewData( this, pEntry ); GetModel()->InvalidateEntry( pEntry ); @@ -1737,7 +1737,7 @@ void SvTreeListBox::SetExpandedEntryBmp( SvTreeListEntry* pEntry, const Image& a { SvLBoxContextBmp* pItem = static_cast (pEntry->GetFirstItem(SvLBoxItemType::ContextBmp)); -DBG_ASSERT(pItem,"SetExpBmp:Item not found"); +assert(pItem); pItem->SetBitmap2( aBmp ); GetModel()->InvalidateEntry( pEntry ); @@ -1755,7 +1755,7 @@ void SvTreeListBox::SetCollapsedEntryBmp(SvTreeListEntry* pEntry,const Image& aB { SvLBoxContextBmp* pItem = static_cast (pEntry->GetFirstItem(SvLBoxItemType::ContextBmp)); -DBG_ASSERT(pItem,"SetExpBmp:Item not found"); +assert(pItem); pItem->SetBitmap1( aBmp ); GetModel()->InvalidateEntry( pEntry ); @@ -2497,7 +2497,7 @@ void SvTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* pEntry ) void SvTreeListBox::EditItemText(SvTreeListEntry* pEntry, SvLBoxString* pItem, const Selection& rSelection) { -DBG_ASSERT(pEntry&,"EditItemText: Bad params"); +assert(pEntry && pItem); if( IsSelected( pEntry )) { pImpl->ShowCursor( false ); @@ -3087,7 +3087,7 @@ tools::Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLin sal_IntPtr SvTreeListBox::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab) { -DBG_ASSERT(pTab,"No Tab"); +assert(pTab); sal_IntPtr nPos = pTab->GetPos(); if( pTab->IsDynamic() ) { @@ -3375,7 +3375,7 @@ void SvTreeListBox::Command(const CommandEvent& rCEvt) void
[Libreoffice-bugs] [Bug 108638] FORMATTING Text size is not scaled correctly according to the zoom factor
https://bugs.documentfoundation.org/show_bug.cgi?id=108638 --- Comment #7 from OfficeUser--- Correction: is reported on 3.5.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 108638] FORMATTING Text size is not scaled correctly according to the zoom factor
https://bugs.documentfoundation.org/show_bug.cgi?id=108638 --- Comment #6 from OfficeUser--- According to my own experience and duplicate bug 104570 I think this one is NOT a 5.3 regression. I think it is an older bug. Duplicate bug 104570 is reported on 5.3.0 build. @Stefan L. Can you confirm this? -- 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 106111] Display, PDF, print and print preview broken for all spreadsheets with line breaks ( 5.3 regression) (steps in comment 40)
https://bugs.documentfoundation.org/show_bug.cgi?id=106111 --- Comment #63 from OfficeUser--- Additional info: I have removed the duplicate status from the zooming related bugs because they are not covered by this patch and because I think they are not related to Khaled's patch. The zooming bug is now covered in bug 108638 separately again. -- 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 106111] Display, PDF, print and print preview broken for all spreadsheets with line breaks ( 5.3 regression) (steps in comment 40)
https://bugs.documentfoundation.org/show_bug.cgi?id=106111 OfficeUserchanged: What|Removed |Added Summary|Display, PDF, print and |Display, PDF, print and |print preview broken for|print preview broken for |all spreadsheets with line |all spreadsheets with line |breaks, wrong scaling |breaks (5.3 regression) |depending on zoom level |(steps in comment 40) |(5.3 regression) (steps in | |comment 40) | -- 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 104570] Multi-line text does not scale properly with zoom level, lines are cut off or invisible
https://bugs.documentfoundation.org/show_bug.cgi?id=104570 --- Comment #5 from OfficeUser--- *** This bug has been marked as a duplicate of bug 108638 *** -- 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 108638] FORMATTING Text size is not scaled correctly according to the zoom factor
https://bugs.documentfoundation.org/show_bug.cgi?id=108638 OfficeUserchanged: What|Removed |Added CC||y+documentfoundation.org@ma ||rc-jano.de --- Comment #5 from OfficeUser --- *** Bug 104570 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 108638] FORMATTING Text size is not scaled correctly according to the zoom factor
https://bugs.documentfoundation.org/show_bug.cgi?id=108638 OfficeUserchanged: What|Removed |Added CC||thomas.le...@gmail.com --- Comment #4 from OfficeUser --- *** Bug 106393 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 106393] VIEWING: Text doesn't fit in cells when zooming
https://bugs.documentfoundation.org/show_bug.cgi?id=106393 --- Comment #13 from OfficeUser--- *** This bug has been marked as a duplicate of bug 108638 *** -- 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 108638] FORMATTING Text size is not scaled correctly according to the zoom factor
https://bugs.documentfoundation.org/show_bug.cgi?id=108638 OfficeUserchanged: What|Removed |Added Status|RESOLVED|NEW Resolution|DUPLICATE |--- Ever confirmed|0 |1 --- Comment #3 from OfficeUser --- Bug still present in: Version: 5.4.0.3 Build-ID: 1:5.4.0~rc3-0ubuntu0.14.04.1~lo2 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sc/qa sc/source
sc/qa/unit/data/xlsm/tdf111974.xlsm |binary sc/qa/unit/subsequent_filters-test.cxx| 10 ++ sc/source/filter/oox/workbookfragment.cxx |2 +- 3 files changed, 11 insertions(+), 1 deletion(-) New commits: commit 500b5727fd5902b7d14c6e707c2ad3d2b227bb1a Author: Dennis FrancisDate: Thu Aug 31 14:22:15 2017 +0530 tdf#111974: Ensure sufficient space for all sheets in FormulaBuffer... and not just for the number of sheet fragments. This is important because we changed the internal storage of FormulaBuffer from based on std::map to std::vector in d17a83fa549f828f29e6939b16ba8b568a75f95e Added simple unit test that loads the bugdoc in subsequent_filters-test.cxx Reviewed-on: https://gerrit.libreoffice.org/41792 Tested-by: Jenkins Reviewed-by: Dennis Francis (cherry picked from commit 20169423d492b58ab93fb0e8e9d2918c0baebc92) Reviewed-on: https://gerrit.libreoffice.org/41841 Tested-by: Jenkins Reviewed-by: Eike Rathke Conflicts: sc/qa/unit/subsequent_filters-test.cxx Backported. Change-Id: I7320dd537266e540d585d3fccfbb8665bba457c7 Reviewed-on: https://gerrit.libreoffice.org/42057 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/sc/qa/unit/data/xlsm/tdf111974.xlsm b/sc/qa/unit/data/xlsm/tdf111974.xlsm new file mode 100644 index ..bb6ac6d0a2d3 Binary files /dev/null and b/sc/qa/unit/data/xlsm/tdf111974.xlsm differ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 8873513f7212..0672c3a23f99 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -240,6 +240,7 @@ public: void testTdf100458(); void testTdf100709XLSX(); void testTdf97598XLSX(); +void testTdf111974XLSM(); CPPUNIT_TEST_SUITE(ScFiltersTest); CPPUNIT_TEST(testBooleanFormatXLSX); @@ -357,6 +358,7 @@ public: CPPUNIT_TEST(testTdf100458); CPPUNIT_TEST(testTdf100709XLSX); CPPUNIT_TEST(testTdf97598XLSX); +CPPUNIT_TEST(testTdf111974XLSM); CPPUNIT_TEST_SUITE_END(); @@ -3761,6 +3763,14 @@ void ScFiltersTest::testColumnStyle2XLSX() xDocSh->DoClose(); } +void ScFiltersTest::testTdf111974XLSM() +{ +// Would crash without the fix on loading +ScDocShellRef xDocSh = loadDoc("tdf111974.", FORMAT_XLSM); +CPPUNIT_ASSERT_MESSAGE("Failed to open doc", xDocSh.Is()); +xDocSh->DoClose(); +} + void ScFiltersTest::testBnc762542() { ScDocShellRef xDocSh = loadDoc("bnc762542.", FORMAT_XLSX); diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 53ae02fc26b9..37e196aae1d5 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -452,7 +452,7 @@ void WorkbookFragment::finalizeImport() } // setup structure sizes for the number of sheets -getFormulaBuffer().SetSheetCount( aSheetFragments.size() ); +getFormulaBuffer().SetSheetCount( nWorksheetCount ); // create all database ranges and defined names, in that order getTables().finalizeImport(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/2.1.2-13'
Tag '2.1.2-13' created by Andras Timarat 2017-09-07 20:11 + 2.1.2-13 Changes since 2.1.2-12-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - debian/changelog loolwsd.spec.in
debian/changelog |6 ++ loolwsd.spec.in |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit beeebc23555de2ff70b935b6a1e1d2e948f816ca Author: Andras TimarDate: Thu Sep 7 22:11:17 2017 +0200 Bump version for packages 2.1.2-13 Change-Id: Idc632c51bb8a820fc333b594d799ca565139a809 diff --git a/debian/changelog b/debian/changelog index 7e7b04dd..7838c628 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +loolwsd (2.1.2-13) unstable; urgency=medium + + * see the git log: http://col.la/coolcd + + -- Andras Timar Thu, 07 Sep 2017 21:40:00 +0200 + loolwsd (2.1.2-12) unstable; urgency=medium * see the git log: http://col.la/coolcd diff --git a/loolwsd.spec.in b/loolwsd.spec.in index cabe7b31..a9ca698f 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix} Name: loolwsd %endif Version:@PACKAGE_VERSION@ -Release:12%{?dist} +Release:13%{?dist} Vendor: Collabora Summary:LibreOffice On-Line WebSocket Daemon License:MPL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 112280] PPTX with spin animation gets corrupted upon roundtrip
https://bugs.documentfoundation.org/show_bug.cgi?id=112280 --- Comment #3 from Commit Notification--- Jan Holesovsky committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=d921d4fd24b6416e00069678886f9692ffb4a008 tdf#112280: Unit test. It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://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-bugs] [Bug 112280] PPTX with spin animation gets corrupted upon roundtrip
https://bugs.documentfoundation.org/show_bug.cgi?id=112280 --- Comment #2 from Commit Notification--- Jan Holesovsky committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=f5fa86303f25dd271d9bbfa9fc25c1e21430910f tdf#112280: Export spin animation in PPTX. It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://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-bugs] [Bug 112280] PPTX with spin animation gets corrupted upon roundtrip
https://bugs.documentfoundation.org/show_bug.cgi?id=112280 Commit Notificationchanged: What|Removed |Added Whiteboard||target:6.0.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-commits] core.git: 2 commits - sd/qa sd/source
sd/qa/unit/data/pptx/tdf112280.pptx |binary sd/qa/unit/export-tests-ooxml2.cxx | 15 + sd/source/filter/eppt/pptx-epptooxml.cxx | 84 +++ 3 files changed, 89 insertions(+), 10 deletions(-) New commits: commit d921d4fd24b6416e00069678886f9692ffb4a008 Author: Jan HolesovskyDate: Thu Sep 7 19:42:45 2017 +0200 tdf#112280: Unit test. Change-Id: I70d7f388c1573ed34bb3d93b480fe1ccaa97076f Reviewed-on: https://gerrit.libreoffice.org/42075 Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/sd/qa/unit/data/pptx/tdf112280.pptx b/sd/qa/unit/data/pptx/tdf112280.pptx new file mode 100644 index ..39c2aa4cb1b8 Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf112280.pptx differ diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index ce7c117e27c0..999d0744b562 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -105,6 +105,7 @@ public: void testTdf100387(); void testRotateFlip(); void testTdf106867(); +void testTdf112280(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest2); @@ -137,6 +138,7 @@ public: CPPUNIT_TEST(testTdf100387); CPPUNIT_TEST(testRotateFlip); CPPUNIT_TEST(testTdf106867); +CPPUNIT_TEST(testTdf112280); CPPUNIT_TEST_SUITE_END(); @@ -1024,6 +1026,19 @@ void SdOOXMLExportTest2::testTdf106867() "spid", "42"); } +void SdOOXMLExportTest2::testTdf112280() +{ +::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112280.pptx"), PPTX); +utl::TempFile tempFile; +xDocShRef = saveAndReload(xDocShRef.get(), PPTX, ); +xDocShRef->DoClose(); + +// check the animRot value +xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); +assertXPath(pXmlDocContent, "/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animRot", +"by", "2160"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); commit f5fa86303f25dd271d9bbfa9fc25c1e21430910f Author: Jan Holesovsky Date: Thu Sep 7 19:26:07 2017 +0200 tdf#112280: Export spin animation in PPTX. Change-Id: I9f13bbc2bd3a3de582491ea5b2ad16535589420a Reviewed-on: https://gerrit.libreoffice.org/42074 Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index b00aa125b129..2129b7f6bcaa 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -928,6 +930,16 @@ void PowerPointExport::WriteAnimationAttributeName(const FSHelperPtr& pFS, const pFS->writeEscaped("ppt_y"); pFS->endElementNS(XML_p, XML_attrName); } +else if (rAttributeName == "Rotate") +{ +pFS->startElementNS(XML_p, XML_attrName, FSEND); +pFS->writeEscaped("r"); +pFS->endElementNS(XML_p, XML_attrName); +} +else +{ +SAL_INFO("sd.eppt", "unhandled animation attribute name: " << rAttributeName); +} pFS->endElementNS(XML_p, XML_attrNameLst); } @@ -1012,27 +1024,62 @@ void PowerPointExport::WriteAnimationNodeAnimate(const FSHelperPtr& pFS, const R } } -OUString aPath; if (nXmlNodeType == XML_animMotion) { -Reference rMotion(rXNode, UNO_QUERY); -if (rMotion.is()) -rMotion->getPath() >>= aPath; -} +OUString aPath; +Reference xMotion(rXNode, UNO_QUERY); +if (xMotion.is()) +xMotion->getPath() >>= aPath; -if (aPath.isEmpty()) +pFS->startElementNS(XML_p, nXmlNodeType, +XML_path, OUStringToOString(aPath, RTL_TEXTENCODING_UTF8), +FSEND); +} +else if (nXmlNodeType == XML_animRot) { +// when const char* is nullptr, the attribute is completely omitted in the output +const char* pBy = nullptr; +const char* pFrom = nullptr; +const char* pTo = nullptr; +OString aBy, aFrom, aTo; + +Reference xTransform(rXNode, UNO_QUERY); +if (xTransform.is()) +{ +double value; +if (xTransform->getBy() >>= value) +{ +aBy = OString::number(static_cast(value * PER_DEGREE)); +pBy = aBy.getStr(); +} + +if (xTransform->getFrom() >>= value) +{ +aFrom =
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js|8 +++- loleaflet/src/control/Control.Menubar.js |5 - 2 files changed, 11 insertions(+), 2 deletions(-) New commits: commit dcdaa19458166ff1989935bc5aebb3dd401875f1 Author: Marco CecchettiDate: Thu Sep 7 20:44:44 2017 +0200 Disable slideshow feature when DisableExport property is set. Change-Id: I424da9abf2bba737c2985c6dcbb2ab9dbee4770c Reviewed-on: https://gerrit.libreoffice.org/42081 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index fbb9322a..b48487b8 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -941,6 +941,9 @@ map.on('wopiprops', function(e) { w2ui['toolbar-up'].hide('save'); w2ui['toolbar-up'].hide('savebreak'); } + if (e.HideExportOption) { + w2ui['presentation-toolbar'].hide('presentation', 'presentationbreak'); + } if (e.DisableCopy) { $('input#formulaInput').bind('copy', function(evt) { evt.preventDefault(); @@ -1020,7 +1023,10 @@ map.on('doclayerinit', function () { break; case 'presentation': var presentationToolbar = w2ui['presentation-toolbar']; - presentationToolbar.show('presentation', 'presentationbreak', 'insertpage', 'duplicatepage', 'deletepage'); + presentationToolbar.show('insertpage', 'duplicatepage', 'deletepage'); + if (!map['wopi'].HideExportOption) { + presentationToolbar.show('presentation', 'presentationbreak'); + } toolbarUp.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); toolbarUpMore.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); statusbar.insert('left', [ diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index fdd63bcd..70616749 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -222,7 +222,7 @@ L.Control.Menubar = L.Control.extend({ {name: _('New slide'), id: 'insertpage', type: 'action'}, {name: _('Duplicate slide'), id: 'duplicatepage', type: 'action'}, {name: _('Delete slide'), id: 'deletepage', type: 'action'}, - {type: 'separator'}, + {type: 'separator', id: 'fullscreen-presentation-separator'}, {name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}] }, {name: _('Help'), id: 'help', type: 'menu', menu: [ @@ -719,6 +719,9 @@ L.Control.Menubar = L.Control.extend({ if (menu[i].id === 'save' && this._map['wopi'].HideSaveOption) continue; + if (menu[i].id && menu[i].id.startsWith('fullscreen-presentation') && this._map['wopi'].HideExportOption) + continue; + // Keep track of all 'downloadas-' options and register them as // export formats with docLayer which can then be publicly accessed unlike // this Menubar control for which there doesn't seem to be any easy way ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js|8 +++- loleaflet/src/control/Control.Menubar.js |5 - 2 files changed, 11 insertions(+), 2 deletions(-) New commits: commit 5112f33d097a3c30787aad861deaf6eb6f0d7280 Author: Marco CecchettiDate: Thu Sep 7 20:44:44 2017 +0200 Disable slideshow feature when DisableExport property is set. Change-Id: I424da9abf2bba737c2985c6dcbb2ab9dbee4770c Reviewed-on: https://gerrit.libreoffice.org/42081 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index d69fe1b3..6810034a 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -981,6 +981,9 @@ map.on('wopiprops', function(e) { if (e.HideSaveOption) { w2ui['toolbar-up'].hide('save'); } + if (e.HideExportOption) { + w2ui['presentation-toolbar'].hide('presentation', 'presentationbreak'); + } if (e.DisableCopy) { $('input#formulaInput').bind('copy', function(evt) { evt.preventDefault(); @@ -1060,7 +1063,10 @@ map.on('doclayerinit', function () { break; case 'presentation': var presentationToolbar = w2ui['presentation-toolbar']; - presentationToolbar.show('presentation', 'presentationbreak', 'insertpage', 'duplicatepage', 'deletepage'); + presentationToolbar.show('insertpage', 'duplicatepage', 'deletepage'); + if (!map['wopi'].HideExportOption) { + presentationToolbar.show('presentation', 'presentationbreak'); + } toolbarUp.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); toolbarUpMore.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); statusbar.insert('left', [ diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 17bc8a64..808b58fa 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -229,7 +229,7 @@ L.Control.Menubar = L.Control.extend({ {name: _('New slide'), id: 'insertpage', type: 'action'}, {name: _('Duplicate slide'), id: 'duplicatepage', type: 'action'}, {name: _('Delete slide'), id: 'deletepage', type: 'action'}, - {type: 'separator'}, + {type: 'separator', id: 'fullscreen-presentation-separator'}, {name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}] }, {name: _('Help'), id: 'help', type: 'menu', menu: [ @@ -738,6 +738,9 @@ L.Control.Menubar = L.Control.extend({ if (menu[i].id === 'save' && this._map['wopi'].HideSaveOption) continue; + if (menu[i].id && menu[i].id.startsWith('fullscreen-presentation') && this._map['wopi'].HideExportOption) + continue; + // Keep track of all 'downloadas-' options and register them as // export formats with docLayer which can then be publicly accessed unlike // this Menubar control for which there doesn't seem to be any easy way ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/cctrl/checklistmenu.cxx | 41 +-- sc/source/ui/inc/checklistmenu.hxx |2 - 2 files changed, 31 insertions(+), 12 deletions(-) New commits: commit bece4b6715cfec8eaaa6ee97bade92521d1e2d18 Author: Eike RathkeDate: Thu Sep 7 22:00:59 2017 +0200 Resolves: tdf#112258 correctly pick items from AutoFilter selection Combining only one child with one parent to lookup is not sufficient if we have year,month,day chains. The entire chain is needed. Regression from commit 2a39dc74724d3648ff76aa900edfebe0dd19b296 Date: Thu Jun 1 18:27:13 2017 +0200 tdf#108259 Fix nested checkbox handling in autofilter popup and commit 511fb8e80d298d42f5c45e7410bf64f2a25b441e Date: Wed May 31 10:59:42 2017 +0200 tdf#108259 Enable autofilter with many different values which combined landed in 5.4 as commit 0163957ef808cffa332c2ddd3267409c5ae1494a Date: Wed May 31 10:59:42 2017 +0200 tdf#108259 Enable autofilter with many different values This on the other hand makes the change of these doubtful, as for each leaf item the concatenation and the lookup has to be done. Something to be investigated. Change-Id: I07fd6367bb8da2adab94a43c45fe88391179f496 diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 15c52b83f1cc..e4f04da83504 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1637,14 +1637,18 @@ void ScCheckListBox::Init() SetNodeDefaultImages(); } -void ScCheckListBox::GetRecursiveChecked(SvTreeListEntry* pEntry, std::unordered_set & vOut, SvTreeListEntry* pParent) +void ScCheckListBox::GetRecursiveChecked( SvTreeListEntry* pEntry, std::unordered_set & vOut, +OUString& rLabel ) { if (GetCheckButtonState(pEntry) == SvButtonState::Checked) { -// we have to hash both parent and child together -OUString aName = GetEntryText(pEntry); -if (pParent) aName += GetEntryText(pParent); -vOut.insert(aName); +// We have to hash parents and children together. +// Per convention for easy access in getResult() +// "child;parent;grandparent" while descending. +if (rLabel.isEmpty()) +rLabel = GetEntryText(pEntry); +else +rLabel = GetEntryText(pEntry) + ";" + rLabel; } if (pEntry->HasChildren()) @@ -1652,10 +1656,14 @@ void ScCheckListBox::GetRecursiveChecked(SvTreeListEntry* pEntry, std::unordered const SvTreeListEntries& rChildren = pEntry->GetChildEntries(); for (auto& rChild : rChildren) { -GetRecursiveChecked(rChild.get(), vOut, pEntry); +OUString aLabel = rLabel; +GetRecursiveChecked( rChild.get(), vOut, aLabel); +if (!aLabel.isEmpty()) +vOut.insert( aLabel); } +// Let the caller not add the parent alone. +rLabel.clear(); } - } std::unordered_set ScCheckListBox::GetAllChecked() @@ -1665,7 +1673,10 @@ std::unordered_set ScCheckListBox::GetAllChecked() SvTreeListEntry* pEntry = GetEntry(nRootPos); while (pEntry) { -GetRecursiveChecked(pEntry, vResults, nullptr); +OUString aLabel; +GetRecursiveChecked( pEntry, vResults, aLabel); +if (!aLabel.isEmpty()) +vResults.insert( aLabel); pEntry = GetEntry(++nRootPos); } @@ -1951,9 +1962,17 @@ void ScCheckListMenuWindow::getResult(ResultType& rResult) if (aLabel.isEmpty()) aLabel = ScGlobal::GetRscString(STR_EMPTYDATA); -bool bState = vCheckeds.find(maMembers[i].mpParent ? - aLabel.copy(0).concat(maChecks->GetEntryText(maMembers[i].mpParent)) : -aLabel) != vCheckeds.end(); +/* TODO: performance-wise this looks suspicious, concatenating to + * do the lookup for each leaf item seems wasteful. */ +// Checked labels are in the form "child;parent;grandparent". +for (SvTreeListEntry* pParent = maMembers[i].mpParent; +pParent && pParent->GetFirstItem( SvLBoxItemType::String); +pParent = pParent->GetParent()) +{ +aLabel += ";" + maChecks->GetEntryText( pParent); +} +bool bState = vCheckeds.find(aLabel) != vCheckeds.end(); + ResultEntry aResultEntry; aResultEntry.bValid = bState; if ( maMembers[i].mbDate ) diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 51771ec6a429..5e7a158e7c70 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++
[Libreoffice-bugs] [Bug 90556] About dialog: Include build date for daily builds
https://bugs.documentfoundation.org/show_bug.cgi?id=90556 Commit Notificationchanged: What|Removed |Added Whiteboard||target:6.0.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 90556] About dialog: Include build date for daily builds
https://bugs.documentfoundation.org/show_bug.cgi?id=90556 --- Comment #5 from Commit Notification--- Christian Lohmaier committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=7b946b386d18172cad2bea4c05c825eb8021131d tdf#90556 android: make buildID in about a clickable link to git log It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://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: android/source
android/source/res/values/strings.xml|2 +- android/source/src/java/org/libreoffice/AboutDialogFragment.java | 10 ++ 2 files changed, 7 insertions(+), 5 deletions(-) New commits: commit 7b946b386d18172cad2bea4c05c825eb8021131d Author: Christian LohmaierDate: Tue Sep 5 22:28:03 2017 +0200 tdf#90556 android: make buildID in about a clickable link to git log that will allow them to deduce the age of the build Change-Id: Ic1baffbf1ecc6a743a1edd91d24c86670dc640a3 Reviewed-on: https://gerrit.libreoffice.org/41962 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml index c8c84f9702ba..e84c496db3c5 100644 --- a/android/source/res/values/strings.xml +++ b/android/source/res/values/strings.xml @@ -5,7 +5,7 @@ LibreOffice Viewer Settings LibreOffice Viewer \'Beta\' -Version: $VERSION\nBuild ID: $BUILDID +Version: %1$s\nBuild ID: %2$s LibreOffice Viewer is a document viewer based on LibreOffice. http://www.libreoffice.org This release was supplied by $VENDOR. diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java index 1f4e7438d2ce..c5875ecf0ee3 100644 --- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java +++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java @@ -20,6 +20,8 @@ import android.net.Uri; import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.DialogFragment; +import android.text.Html; +import android.text.method.LinkMovementMethod; import android.view.View; import android.widget.TextView; @@ -52,12 +54,12 @@ public class AboutDialogFragment extends DialogFragment { String[] tokens = versionName.split("/"); if (tokens.length == 3) { -String version = versionView.getText().toString(); +String version = String.format(versionView.getText().toString().replace("\n", ""), +tokens[0], "https://hub.libreoffice.org/git-core/; + tokens[1] + "\">" + tokens[1] + ""); +versionView.setText(Html.fromHtml(version)); + versionView.setMovementMethod(LinkMovementMethod.getInstance()); String vendor = vendorView.getText().toString(); -version = version.replace("$VERSION", tokens[0]); -version = version.replace("$BUILDID", tokens[1]); vendor = vendor.replace("$VENDOR", tokens[2]); -versionView.setText(version); vendorView.setText(vendor); } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/Bootstrap android/.gitignore android/README android/source
android/.gitignore |2 -- android/Bootstrap/Makefile.shared |2 -- android/README | 37 - android/source/AndroidManifest.xml |1 - android/source/Makefile|2 +- android/source/build.gradle| 36 ++-- 6 files changed, 19 insertions(+), 61 deletions(-) New commits: commit 2e8e0b213a3cbac802515cd9255286b26d3bba60 Author: Christian LohmaierDate: Tue Sep 5 17:40:56 2017 +0200 android: drop workarounds for ndk-gdb support (can still run manually) packing gdbserver into apk conflicts with extractNativeLibs="false", as the gradle pugin compresses it (which could be disabled using aaptOptions), but furthermore it doesn't page-align it, breaking installation. So instead let the user manually push the gdbserver tool to device and remove the hardcoded values that were only there to please the ndk-gdb scripts. Using lldb from within Android Studio is more comfortable anyway :-) Change-Id: I31c3af4847a479c56b3fcd6b5bed114e004bf0d2 Reviewed-on: https://gerrit.libreoffice.org/41950 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/android/.gitignore b/android/.gitignore index c93775722a5e..19c3690b3ab7 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -7,9 +7,7 @@ /source/captures/ /source/jni/Application.mk /source/jniLibs/ -/source/jniLibs_debug/ /source/liboSettings.gradle -/source/libs/*/gdb.setup /source/local.properties /source/native-code.cxx /source/obj/ diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index e06e36cdac54..332192918e9c 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -99,8 +99,6 @@ liboSettings.gradle: $(BUILDDIR)/config_build.mk $(BUILDDIR)/config_host.mk && echo "liboVersionMajor= '$(LIBO_VERSION_MAJOR)'" \ && echo "liboVersionMinor= '$(LIBO_VERSION_MINOR)'" \ && echo "liboGitFullCommit = '$(shell cd $(SRCDIR) && git log -1 --format=%H)'" \ - && echo "liboNdkGdbserver= '$(ANDROID_NDK_GDBSERVER)'" \ - && echo "liboAndroidAppAbi = '$(ANDROID_APP_ABI)'" \ && echo "}" \ && echo "android.defaultConfig {" \ && echo "applicationId '$(ANDROID_PACKAGE_NAME)'" \ diff --git a/android/README b/android/README index 118e5ff6113f..ce7c3be7a603 100644 --- a/android/README +++ b/android/README @@ -210,25 +210,19 @@ swap). * Using ndk-gdb -When you have all this, install the .apk to the device, and: - -cd android/source -/ndk-gdb --adb=/platform-tools/adb [--start] - -In case you used --with-android-package-name, add --package=your.package.name -to the invocation - -If you get the error - -ERROR: Could not find gdb.setup under ./libs/ - -(and an empty "Compatible device ABI:" when run with --verbose), you need to fix -the quoting in the ndk-gdb script: - -@@ -574 +574 @@ --adb_var_shell BCFILES run-as $PACKAGE_NAME /system/bin/sh -c "ls lib/*.bc" -+adb_var_shell BCFILES run-as $PACKAGE_NAME /system/bin/sh -c \"ls lib/*.bc\" - +Direct support for using ndk-gdb has been removed from the build system. It is +recommended that you give the lldb debugger a try that has the benefit of being +nicely integrated into Android Studio (see below for instructions). +If you nevertheless want to continue using ndk-gdb, use the following steps +that are described in more detail here: https://stackoverflow.com/a/10539883 + +- add android:debuggable="true" to AndroidManifest.xml +- push gdbserver to device, launch and attach to application +- forward debugging port from host to device +- launch matching gdb on host and run following setup commands: +- set solib-search-path obj/local/ +- file obj/local//liblo-native-code.so +- target remote : Pretty printers aren't loaded automatically due to the single shared object, but you can still load them manually. E.g. to have a pretty-printer for @@ -239,8 +233,9 @@ rtl::OString, you need: * Using Android Studio (and thus lldb) -Note that both might not yield the same results - so if lldb doesn't show you -useful info, try with the ndk-gdb method and the other way round. +Note that lldb might not yield the same results as ndk-gdb. If you suspect a +problem with lldb, you can try to manually use ndk-gdb as described above. +Using lldb from within Android Studio is more comfortable though and works like this: - open android/source/build.gradle in Android Studio via File|New â Import Project - make sure you select the right build variant (strippedUIDebug is what you want) diff --git a/android/source/AndroidManifest.xml
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd' - 2 commits - loleaflet/dist loleaflet/src
loleaflet/dist/toolbar/toolbar.js| 18 -- loleaflet/src/control/Control.Menubar.js |5 - loleaflet/src/layer/tile/TileLayer.js|4 +++- 3 files changed, 23 insertions(+), 4 deletions(-) New commits: commit b187fbd8df42d7d5c05dda33b58fafc039518189 Author: Marco CecchettiDate: Thu Sep 7 20:44:44 2017 +0200 Disable slideshow feature when DisableExport property is set. Change-Id: I424da9abf2bba737c2985c6dcbb2ab9dbee4770c diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index b49a88f6..d872908c 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -938,6 +938,9 @@ map.on('wopiprops', function(e) { w2ui['toolbar-up'].hide('save'); w2ui['toolbar-up'].hide('savebreak'); } + if (e.HideExportOption) { + w2ui['presentation-toolbar'].hide('presentation', 'presentationbreak'); + } if (e.DisableCopy) { $('input#formulaInput').bind('copy', function(evt) { evt.preventDefault(); @@ -1017,7 +1020,10 @@ map.on('doclayerinit', function () { break; case 'presentation': var presentationToolbar = w2ui['presentation-toolbar']; - presentationToolbar.show('presentation', 'presentationbreak', 'insertpage', 'duplicatepage', 'deletepage'); + presentationToolbar.show('insertpage', 'duplicatepage', 'deletepage'); + if (!map['wopi'].HideExportOption) { + presentationToolbar.show('presentation', 'presentationbreak'); + } toolbarUp.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); toolbarUpMore.remove('insertannotation', 'wraptextseparator', 'wraptext', 'togglemergecells', 'break-toggle', 'numberformatcurrency', 'numberformatpercent', 'numberformatdecimal', 'numberformatdate', 'numberformatincdecimals', 'numberformatdecdecimals', 'break-number', 'sortascending', 'sortdescending'); statusbar.insert('left', [ diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 0bf811d3..63d29c62 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -222,7 +222,7 @@ L.Control.Menubar = L.Control.extend({ {name: _('New slide'), id: 'insertpage', type: 'action'}, {name: _('Duplicate slide'), id: 'duplicatepage', type: 'action'}, {name: _('Delete slide'), id: 'deletepage', type: 'action'}, - {type: 'separator'}, + {type: 'separator', id: 'fullscreen-presentation-separator'}, {name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}] }, {name: _('Help'), id: 'help', type: 'menu', menu: [ @@ -711,6 +711,9 @@ L.Control.Menubar = L.Control.extend({ if (menu[i].id === 'save' && this._map['wopi'].HideSaveOption) continue; + if (menu[i].id && menu[i].id.startsWith('fullscreen-presentation') && this._map['wopi'].HideExportOption) + continue; + // Keep track of all 'downloadas-' options and register them as // export formats with docLayer which can then be publicly accessed unlike // this Menubar control for which there doesn't seem to be any easy way commit 6c5443f4a7005d1b826f29acf63d29989f2461c2 Author: Pranav Kant Date: Wed Jun 21 12:12:25 2017 +0530 Disable Copy from calc cells and formula bar ... of course only when DisableCopy is mentioned. (cherry picked from commit 6e46c760ce6928e5c2120499a44d79529e263e07) (cherry picked from commit 202b9974d74469355203f9e38400c7b6a6a50a7d) Change-Id: I843b7cab2e3fe2dd691396e4702281a6bc953947 diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index e227c074..b49a88f6 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -938,6 +938,14 @@ map.on('wopiprops', function(e) { w2ui['toolbar-up'].hide('save'); w2ui['toolbar-up'].hide('savebreak'); } + if (e.DisableCopy) { + $('input#formulaInput').bind('copy', function(evt) { + evt.preventDefault(); + }); +
[Libreoffice-bugs] [Bug 112254] CuiAboutConfigTabPage::InsertEntry leaks memory
https://bugs.documentfoundation.org/show_bug.cgi?id=112254 Julien Nabetchanged: What|Removed |Added CC|serval2...@yahoo.fr | --- Comment #5 from Julien Nabet --- (In reply to Noel Grandin from comment #4) > probably the easiest fix is to define a custom subclass of SvTreeListEntry > that delete's the UserData in it's destructor. > something like > class MyListEntry : public SvTreeListEntry{ > public: > ~MyListEntry() { delete static_cast(GetUserData()); } > } > unless the ownership of UserData is more complicated. Sorry Noel, I don't know C++ enough to understand this mechanism. It seems I can't do anything here, so let's uncc. -- 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: external/nss
external/nss/ExternalProject_nss.mk | 29 ++ external/nss/UnpackedTarball_nss.mk |2 external/nss/nss-android.patch | 161 external/nss/nss-android.patch.1| 49 ++ 4 files changed, 60 insertions(+), 181 deletions(-) New commits: commit 9a920bf9c96468c29505eab15f80d45e5f296597 Author: Christian LohmaierDate: Thu Sep 7 18:10:36 2017 +0200 fix nss build for android x86 and remove duplicated configure call remove hardcoded arm flags for android, and instead of patching the sources, rather specify the desired values on commandline to override nss' makefile defaults where possible. Also since the build stage runs nspr configure by itself in a dedicated outdir, the separate configure step was removed (for all systems). Change-Id: I586c605615cc2d45b757497395a98c53dd1beb1d Reviewed-on: https://gerrit.libreoffice.org/42070 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 0a0e89006352..8f16c697dc1f 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -9,25 +9,14 @@ $(eval $(call gb_ExternalProject_ExternalProject,nss)) +# nss build calls configure for nspr itself - if for some reason the configure step should be split out, +# make sure to create config.status (aka run configure) in dir specified with OBJDIR_NAME (nspr/out) $(eval $(call gb_ExternalProject_register_targets,nss,\ - configure \ build \ )) -$(call gb_ExternalProject_get_state_target,nss,configure): - $(call gb_ExternalProject_run,configure,\ - $(if $(filter MSC,$(COM)),INCLUDE="$(COMPATH)/include" LIB="$(ILIB)") \ - $(if $(CROSS_COMPILING),\ - NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ - nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter ANDROID,$(OS)),--build=$(BUILD_PLATFORM) --host="arm-linux-androidebi" --with-android-ndk=$(ANDROID_NDK_HOME) --with-android-toolchain=$(ANDROID_CLANG_TOOLCHAIN) --with-android-platform=$(ANDROID_PLATFORM_DIRECTORY)) \ - $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \ - $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \ - ,,nss_configure.log) - ifeq ($(OS),WNT) -$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) +$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \ @@ -39,7 +28,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject ,nss) else # OS!=WNT -$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) +# make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so nss can append it's own defaults +# OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so they will overrule nss makefile values +$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ $(if $(filter IOS,$(OS)),\ @@ -52,14 +43,14 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(CROSS_COMPILING),\ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ $(if $(filter IOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ - NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ + NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ $(MAKE) -j1 AR="$(AR)" \ RANLIB="$(RANLIB)" \ NMEDIT="$(NM)edit" \ - CCC="$(CXX)" \ - $(if $(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ - $(if $(filter
[Libreoffice-bugs] [Bug 106111] Display, PDF, print and print preview broken for all spreadsheets with line breaks, wrong scaling depending on zoom level (5.3 regression) ( steps in comment 40)
https://bugs.documentfoundation.org/show_bug.cgi?id=106111 --- Comment #62 from OfficeUser--- Can confirm that this bug is fixed in: Version: 6.0.0.0.alpha0+ Build-ID: 115bed941d7b7ed1b95d6424bfb98456c1d87546 Good work! Thanks! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108891] Increase inter-line spacing for multiline text
https://bugs.documentfoundation.org/show_bug.cgi?id=108891 --- Comment #13 from OfficeUser--- Good work! Thanks! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 108891] Increase inter-line spacing for multiline text
https://bugs.documentfoundation.org/show_bug.cgi?id=108891 --- Comment #13 from OfficeUser--- Good work! Thanks! -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 100622] Menu shortcuts don't work with right ALT key
https://bugs.documentfoundation.org/show_bug.cgi?id=100622 Aron Budeachanged: What|Removed |Added Blocks|98259 |107244 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=98259 [Bug 98259] [META] Keyboard shortcuts and accelerators bugs and enhancements https://bugs.documentfoundation.org/show_bug.cgi?id=107244 [Bug 107244] [META] Ctrl+Alt (aka AltGR) keyboard shortcut issues -- 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 107244] [META] Ctrl+Alt (aka AltGR) keyboard shortcut issues
https://bugs.documentfoundation.org/show_bug.cgi?id=107244 Aron Budeachanged: What|Removed |Added Depends on||100622 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=100622 [Bug 100622] Menu shortcuts don't work with right ALT key -- 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 98259] [META] Keyboard shortcuts and accelerators bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=98259 Aron Budeachanged: What|Removed |Added Depends on|100622 | Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=100622 [Bug 100622] Menu shortcuts don't work with right ALT key -- 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 90406] Hanging punctuation after math objects or bibliography entries
https://bugs.documentfoundation.org/show_bug.cgi?id=90406 --- Comment #22 from Buovjaga--- (In reply to Yury from comment #21) > Created attachment 136107 [details] > sample doc (modified) triggering the issue in 6.0.0.0 > > In the paragraph in question, the characters' spacing up to and including > the offending comma is set to -0,3 pt. Yep, you are right. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112254] CuiAboutConfigTabPage::InsertEntry leaks memory
https://bugs.documentfoundation.org/show_bug.cgi?id=112254 --- Comment #4 from Noel Grandin--- probably the easiest fix is to define a custom subclass of SvTreeListEntry that delete's the UserData in it's destructor. something like class MyListEntry : public SvTreeListEntry{ public: ~MyListEntry() { delete static_cast(GetUserData()); } } unless the ownership of UserData is more complicated. -- 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: dbaccess/qa sw/qa unotest/source
dbaccess/qa/python/fdo84315.py |2 sw/qa/python/check_cross_references.py |2 sw/qa/python/check_fields.py |2 sw/qa/python/check_flies.py |2 sw/qa/python/text_portion_enumeration_test.py|6 +- unotest/source/python/org/libreoffice/unotest.py | 63 ++- 6 files changed, 25 insertions(+), 52 deletions(-) New commits: commit 01b0d6da7ffdbd0eeea601020329c82fa1b37c11 Author: Michael StahlDate: Thu Sep 7 21:26:02 2017 +0200 unotest.py: refactor confusing mess of openDoc functions Change-Id: I148332c639510c55dea2d09bc7aa695708fbf34c diff --git a/dbaccess/qa/python/fdo84315.py b/dbaccess/qa/python/fdo84315.py index 03acc0a92e2f..f58b16f51309 100644 --- a/dbaccess/qa/python/fdo84315.py +++ b/dbaccess/qa/python/fdo84315.py @@ -20,7 +20,7 @@ class Fdo84315(unittest.TestCase): cls._uno = UnoInProcess() cls._uno.setUp() workdir = os.environ[ "WORKDIR_FOR_BUILD" ] -cls._xDoc = cls._uno.openDoc(workdir + "/CppunitTest/fdo84315.odb") +cls._xDoc = cls._uno.openDocFromAbsolutePath(workdir + "/CppunitTest/fdo84315.odb") @classmethod def tearDownClass(cls): diff --git a/sw/qa/python/check_cross_references.py b/sw/qa/python/check_cross_references.py index 2246118bed31..9eaabf0b0105 100644 --- a/sw/qa/python/check_cross_references.py +++ b/sw/qa/python/check_cross_references.py @@ -38,7 +38,7 @@ class CheckCrossReferences(unittest.TestCase): def setUpClass(cls): cls._uno = UnoInProcess() cls._uno.setUp() -cls.document = cls._uno.openWriterTemplateDoc("CheckCrossReferences.odt") +cls.document = cls._uno.openDocFromTDOC("CheckCrossReferences.odt") cls.xParaEnum = None cls.xPortionEnum = None cls.xFieldsRefresh = None diff --git a/sw/qa/python/check_fields.py b/sw/qa/python/check_fields.py index ff02ec0eb9d5..2fdbdf93cc2c 100644 --- a/sw/qa/python/check_fields.py +++ b/sw/qa/python/check_fields.py @@ -17,7 +17,7 @@ class CheckFields(unittest.TestCase): def setUpClass(cls): cls._uno = UnoInProcess() cls._uno.setUp() -cls._xDoc = cls._uno.openWriterTemplateDoc("fdo39694.ott") +cls._xDoc = cls._uno.openTemplateFromTDOC("fdo39694.ott") cls._xEmptyDoc = cls._uno.openEmptyWriterDoc() @classmethod diff --git a/sw/qa/python/check_flies.py b/sw/qa/python/check_flies.py index 55c04fec0783..d9407731e609 100644 --- a/sw/qa/python/check_flies.py +++ b/sw/qa/python/check_flies.py @@ -26,7 +26,7 @@ class CheckFlies(unittest.TestCase): def setUpClass(cls): cls._uno = UnoInProcess() cls._uno.setUp() -cls.document = cls._uno.openWriterTemplateDoc("CheckFlies.odt") +cls.document = cls._uno.openDocFromTDOC("CheckFlies.odt") @classmethod def tearDownClass(cls): diff --git a/sw/qa/python/text_portion_enumeration_test.py b/sw/qa/python/text_portion_enumeration_test.py index b767368d850b..d6774629f96a 100644 --- a/sw/qa/python/text_portion_enumeration_test.py +++ b/sw/qa/python/text_portion_enumeration_test.py @@ -3250,7 +3250,7 @@ class TextPortionEnumerationTest(unittest.TestCase): def doload(self, file): xComp = None print("Loading test document...") -xComp = self.__class__._uno.openDoc(file) +xComp = self.__class__._uno.openDocFromAbsolutePath(file) self.assertIsNotNone(xComp, "cannot load: {}".format(file)) print("...done") return xComp @@ -3266,7 +3266,7 @@ class TextPortionEnumerationTest(unittest.TestCase): xComp = None filename = "TESTMETA.odt" try: -xComp = self.__class__._uno.openBaseDoc(filename) +xComp = self.__class__._uno.openDocFromTDOC(filename) if xComp: self.checkloadmeta(xComp) with TemporaryDirectory() as tempdir: @@ -3338,7 +3338,7 @@ class TextPortionEnumerationTest(unittest.TestCase): xComp = None filename = "TESTXMLID.odt" try: -xComp = self.__class__._uno.openBaseDoc(filename) +xComp = self.__class__._uno.openDocFromTDOC(filename) if xComp: self.checkloadxmlid(xComp) with TemporaryDirectory() as tempdir: diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 0bb5212c9d4a..a6a927ca881c 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -195,72 +195,45 @@ class UnoInProcess: if not(havePonies): pyuno.private_initTestEnvironment() havePonies = True + def openEmptyWriterDoc(self): -assert(self.xContext) -smgr = self.getContext().ServiceManager -desktop =
[Libreoffice-bugs] [Bug 90406] Hanging punctuation after math objects or bibliography entries
https://bugs.documentfoundation.org/show_bug.cgi?id=90406 --- Comment #21 from Yury--- Created attachment 136107 --> https://bugs.documentfoundation.org/attachment.cgi?id=136107=edit sample doc (modified) triggering the issue in 6.0.0.0 In the paragraph in question, the characters' spacing up to and including the offending comma is set to -0,3 pt. -- 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 90406] Hanging punctuation after math objects or bibliography entries
https://bugs.documentfoundation.org/show_bug.cgi?id=90406 --- Comment #20 from Yury--- Created attachment 136106 --> https://bugs.documentfoundation.org/attachment.cgi?id=136106=edit sample in 6.0.0 The previous sample rendered fine (is the default kerning more loose btw?), but the problem is there, triggered by selecting the glyphs in the paragraph up to and including the offending comma, and setting the 'spacing' to -0,3 points. Saved and reopened. -- 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 108634] Portable Windows version for a single pre-release of minor releases
https://bugs.documentfoundation.org/show_bug.cgi?id=108634 --- Comment #3 from OfficeUser--- I am voting for this one too! -- 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 111987] Menu items (main and right-click) disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=111987 --- Comment #6 from roumanet--- Confirmed for the whole 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 112262] context menu isn't usable (not show as planned)
https://bugs.documentfoundation.org/show_bug.cgi?id=112262 roumanetchanged: What|Removed |Added Status|RESOLVED|CLOSED --- Comment #4 from roumanet --- yes, it's exactly the same as https://bugs.documentfoundation.org/show_bug.cgi?id=111987 closed this ticket please -- 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: writerperfect/qa writerperfect/source
writerperfect/qa/unit/EPUBExportTest.cxx |4 ++- writerperfect/qa/unit/data/writer/epubexport/line-break.fodt | 14 ++- writerperfect/source/writer/exp/txtparai.cxx | 13 +++--- writerperfect/source/writer/exp/txtparai.hxx |3 ++ 4 files changed, 28 insertions(+), 6 deletions(-) New commits: commit 01cc6e5107c706760939c2331ca57247bd02cb77 Author: Miklos VajnaDate: Thu Sep 7 17:29:18 2017 +0200 EPUB export: handle span-level line break By pulling out common part of the paragraph/span context factory. Change-Id: If5fda87ce9f60e7e10d7f9406c30740bc8707143 Reviewed-on: https://gerrit.libreoffice.org/42064 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx index 3bce1b5a9ba5..0d869737fc8e 100644 --- a/writerperfect/qa/unit/EPUBExportTest.cxx +++ b/writerperfect/qa/unit/EPUBExportTest.cxx @@ -325,7 +325,9 @@ void EPUBExportTest::testLineBreak() mpXmlDoc = parseExport("OEBPS/sections/section0001.xhtml"); // This was 0, line break was not handled. -assertXPath(mpXmlDoc, "//xhtml:p/xhtml:br", 1); +assertXPath(mpXmlDoc, "//xhtml:p[1]/xhtml:br", 1); +// This was 0, line break inside span was not handled. +assertXPath(mpXmlDoc, "//xhtml:p[2]/xhtml:br", 1); } CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest); diff --git a/writerperfect/qa/unit/data/writer/epubexport/line-break.fodt b/writerperfect/qa/unit/data/writer/epubexport/line-break.fodt index c380f6df0063..1a6fca72b08a 100644 --- a/writerperfect/qa/unit/data/writer/epubexport/line-break.fodt +++ b/writerperfect/qa/unit/data/writer/epubexport/line-break.fodt @@ -1,8 +1,20 @@ - +http://openoffice.org/2009/office; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> + + + + + + + + + + + ab + aabb diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx index c476904277e2..b085537cf106 100644 --- a/writerperfect/source/writer/exp/txtparai.cxx +++ b/writerperfect/source/writer/exp/txtparai.cxx @@ -103,7 +103,7 @@ XMLImportContext *XMLSpanContext::CreateChildContext(const OUString , cons return new XMLTextFrameContext(mrImport); if (rName == "text:span") return new XMLSpanContext(mrImport, _aPropertyList); -return nullptr; +return writerperfect::exp::CreateChildContext(mrImport, rName); } void XMLSpanContext::startElement(const OUString &/*rName*/, const css::uno::Reference ) @@ -207,9 +207,7 @@ XMLImportContext *XMLParaContext::CreateChildContext(const OUString , cons return new XMLSpanContext(mrImport, nullptr); if (rName == "text:a") return new XMLHyperlinkContext(mrImport); -if (rName == "text:line-break") -return new XMLLineBreakContext(mrImport); -return nullptr; +return writerperfect::exp::CreateChildContext(mrImport, rName); } void XMLParaContext::startElement(const OUString &/*rName*/, const css::uno::Reference ) @@ -253,6 +251,13 @@ void XMLParaContext::characters(const OUString ) mrImport.GetGenerator().closeSpan(); } +XMLImportContext *CreateChildContext(XMLImport , const OUString ) +{ +if (rName == "text:line-break") +return new XMLLineBreakContext(rImport); +return nullptr; +} + } // namespace exp } // namespace writerperfect diff --git a/writerperfect/source/writer/exp/txtparai.hxx b/writerperfect/source/writer/exp/txtparai.hxx index 61c3fc5bfc73..52543ffeadde 100644 --- a/writerperfect/source/writer/exp/txtparai.hxx +++ b/writerperfect/source/writer/exp/txtparai.hxx @@ -33,6 +33,9 @@ private: OUString m_aStyleName; }; +/// Shared child context factory for paragraph and span contexts. +XMLImportContext *CreateChildContext(XMLImport , const OUString ); + } // namespace exp } // namespace writerperfect ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/firebird
external/firebird/firebird-vs2017.patch.1 |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 5ffe8f05590e43eb8a668bb6da1f2e2ce0a7f713 Author: Szymon KÅosDate: Thu Sep 7 15:39:49 2017 +0200 Fix firebird build with MSVC update 15.3 Change-Id: I236f182fd99e19e4ea171ad1bae6c03f1a258c7e Reviewed-on: https://gerrit.libreoffice.org/42060 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1 index ba747b3470f4..b1d6b1b6b49e 100644 --- a/external/firebird/firebird-vs2017.patch.1 +++ b/external/firebird/firebird-vs2017.patch.1 @@ -1,12 +1,14 @@ diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os/win32/mod_loader.cpp --- firebird.orig/src/common/os/win32/mod_loader.cpp 2017-02-15 22:11:48.939042400 +0100 +++ firebird/src/common/os/win32/mod_loader.cpp2017-02-15 22:12:30.062262700 +0100 -@@ -103,6 +103,8 @@ +@@ -103,6 +103,10 @@ "msvcr120.dll", #elif _MSC_VER == 1900 "vcruntime140.dll", +#elif _MSC_VER == 1910 + "vcruntime140.dll", ++#elif _MSC_VER == 1911 ++ "vcruntime140.dll", #else #error Specify CRT DLL name here ! #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 42982] improve UNO API error reporting
https://bugs.documentfoundation.org/show_bug.cgi?id=42982 --- Comment #37 from Commit Notification--- Samuel Mehrbrodt committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=4b56d76e83fe062e39f5c00fa405f2a14a13b7ca tdf#42982 Improve exceptions in text document api It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://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: Changes to 'refs/tags/cd-5.3-23'
Tag 'cd-5.3-23' created by Andras Timarat 2017-09-07 18:51 + cd-5.3-23 Changes since cd-5.3-21-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/tags/cd-5.3-23' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 42982] improve UNO API error reporting
https://bugs.documentfoundation.org/show_bug.cgi?id=42982 Commit Notificationchanged: What|Removed |Added Whiteboard|target:5.4.0|target:5.4.0 target:6.0.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-commits] core.git: sw/source
sw/source/uibase/uno/unotxdoc.cxx | 113 +++--- 1 file changed, 58 insertions(+), 55 deletions(-) New commits: commit 4b56d76e83fe062e39f5c00fa405f2a14a13b7ca Author: Samuel MehrbrodtDate: Thu Sep 7 16:10:28 2017 +0200 tdf#42982 Improve exceptions in text document api * Throw DisposedException instead of RuntimeException when the document has been destroyed * Add messages to RuntimeExceptions Change-Id: I5cc370ed835a0f620596754ac6339d2ef543f6c4 Reviewed-on: https://gerrit.libreoffice.org/42062 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index e4ce4a985098..865d00e5b6ce 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -508,7 +508,7 @@ Reference< XText > SwXTextDocument::getText() { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); if(!xBodyText.is()) { pBodyText = new SwXBodyText(pDocShell->GetDoc()); @@ -521,7 +521,7 @@ void SwXTextDocument::reformat() { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); } void SwXTextDocument::lockControllers() @@ -533,7 +533,7 @@ void SwXTextDocument::lockControllers() aActionArr.push_front(pContext); } else -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); } void SwXTextDocument::unlockControllers() @@ -546,7 +546,7 @@ void SwXTextDocument::unlockControllers() delete pContext; } else -throw RuntimeException(); +throw RuntimeException("Nothing to unlock"); } sal_Bool SwXTextDocument::hasControllersLocked() @@ -644,7 +644,7 @@ Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties() } } else -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); return mxXLineNumberingProperties; } @@ -652,7 +652,7 @@ Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules() { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); if(!mxXChapterNumbering.is()) { mxXChapterNumbering = new SwXChapterNumbering(*pDocShell); @@ -664,7 +664,7 @@ Reference< XIndexAccess > SwXTextDocument::getNumberingRules() { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); if(!mxXNumberingRules.is() ) { mxXNumberingRules = new SwXNumberingRulesCollection( pDocShell->GetDoc() ); @@ -676,7 +676,7 @@ Reference< XIndexAccess > SwXTextDocument::getFootnotes() { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); if(!mxXFootnotes.is()) { mxXFootnotes = new SwXFootnotes(false, pDocShell->GetDoc()); @@ -689,7 +689,7 @@ Reference< XPropertySet > SAL_CALL { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); if(!mxXFootnoteSettings.is()) { mxXFootnoteSettings = new SwXFootnoteProperties(pDocShell->GetDoc()); @@ -701,7 +701,7 @@ Reference< XIndexAccess > SwXTextDocument::getEndnotes() { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); if(!mxXEndnotes.is()) { mxXEndnotes = new SwXFootnotes(true, pDocShell->GetDoc()); @@ -713,7 +713,7 @@ Reference< XPropertySet > SwXTextDocument::getEndnoteSettings() { SolarMutexGuard aGuard; if(!IsValid()) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); if(!mxXEndnoteSettings.is()) { mxXEndnoteSettings = new SwXEndnoteProperties(pDocShell->GetDoc()); @@ -746,7 +746,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > SolarMutexGuard aGuard; Reference< XUnoTunnel > xDescTunnel(xDesc, UNO_QUERY_THROW); if(!IsValid() || !xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId())) -throw RuntimeException(); +throw DisposedException("", static_cast< XTextDocument* >(this)); Reference< XTextCursor > xCursor; auto pUnoCursor(CreateCursorForSearch(xCursor)); @@ -949,7 +949,7 @@ Reference< XIndexAccess > Reference< XTextCursor > xCursor; auto
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - external/libwpd
external/libwpd/UnpackedTarball_libwpd.mk |1 external/libwpd/libwpd-tdf112269.patch.1 | 42 ++ 2 files changed, 43 insertions(+) New commits: commit 05da1c67e49a2d758799db735a826c4d292fea44 Author: Caolán McNamaraDate: Thu Sep 7 13:37:30 2017 +0100 Resolves: tdf#112269 libwpd fix Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1 Reviewed-on: https://gerrit.libreoffice.org/42056 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 7fb7c3b2181d..495824d804b5 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0)) $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ external/libwpd/libwpd-vs2013.patch.1 \ $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ + external/libwpd/libwpd-tdf112269.patch.1 \ )) ifneq ($(OS),MACOSX) diff --git a/external/libwpd/libwpd-tdf112269.patch.1 b/external/libwpd/libwpd-tdf112269.patch.1 new file mode 100644 index ..bc79ab0eaccd --- /dev/null +++ b/external/libwpd/libwpd-tdf112269.patch.1 @@ -0,0 +1,42 @@ +--- libwpd/src/lib/WP5StylesListener.cpp libwpd/src/lib/WP5StylesListener.cpp +@@ -85,8 +85,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { +--- libwpd/src/lib/WP42StylesListener.cpp libwpd/src/lib/WP42StylesListener.cpp +@@ -84,8 +84,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { +--- libwpd/src/lib/WP1StylesListener.cpp libwpd/src/lib/WP1StylesListener.cpp +@@ -83,8 +83,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - external/libwpd
external/libwpd/UnpackedTarball_libwpd.mk |1 external/libwpd/libwpd-tdf112269.patch.1 | 42 ++ 2 files changed, 43 insertions(+) New commits: commit c0d54f7080a22074cac7eeb78893116c36114871 Author: Caolán McNamaraDate: Thu Sep 7 13:37:30 2017 +0100 Resolves: tdf#112269 libwpd fix Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1 Reviewed-on: https://gerrit.libreoffice.org/42055 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 7fb7c3b2181d..495824d804b5 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwpd,0)) $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ external/libwpd/libwpd-vs2013.patch.1 \ $(if $(SYSTEM_REVENGE),,external/libwpd/rpath.patch) \ + external/libwpd/libwpd-tdf112269.patch.1 \ )) ifneq ($(OS),MACOSX) diff --git a/external/libwpd/libwpd-tdf112269.patch.1 b/external/libwpd/libwpd-tdf112269.patch.1 new file mode 100644 index ..bc79ab0eaccd --- /dev/null +++ b/external/libwpd/libwpd-tdf112269.patch.1 @@ -0,0 +1,42 @@ +--- libwpd/src/lib/WP5StylesListener.cpp libwpd/src/lib/WP5StylesListener.cpp +@@ -85,8 +85,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { +--- libwpd/src/lib/WP42StylesListener.cpp libwpd/src/lib/WP42StylesListener.cpp +@@ -84,8 +84,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { +--- libwpd/src/lib/WP1StylesListener.cpp libwpd/src/lib/WP1StylesListener.cpp +@@ -83,8 +83,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 111987] Menu items (main and right-click) disappear
https://bugs.documentfoundation.org/show_bug.cgi?id=111987 Maxim Monastirskychanged: What|Removed |Added CC||go...@free.fr --- Comment #5 from Maxim Monastirsky --- *** Bug 112262 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 112262] context menu isn't usable (not show as planned)
https://bugs.documentfoundation.org/show_bug.cgi?id=112262 Maxim Monastirskychanged: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Maxim Monastirsky --- *** This bug has been marked as a duplicate of bug 111987 *** -- 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/cd-5.3' - sd/qa sd/source
sd/qa/unit/data/pptx/tdf112280.pptx |binary sd/qa/unit/export-tests-ooxml2.cxx | 15 + sd/source/filter/eppt/pptx-epptooxml.cxx | 84 +++ 3 files changed, 89 insertions(+), 10 deletions(-) New commits: commit 379990b93958d6c49d716f097d94f5b8894e811e Author: Jan HolesovskyDate: Thu Sep 7 19:26:07 2017 +0200 tdf#112280: Export spin animation in PPTX. Contains also: tdf#112280: Unit test. Change-Id: I9f13bbc2bd3a3de582491ea5b2ad16535589420a Reviewed-on: https://gerrit.libreoffice.org/42077 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/sd/qa/unit/data/pptx/tdf112280.pptx b/sd/qa/unit/data/pptx/tdf112280.pptx new file mode 100644 index ..39c2aa4cb1b8 Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf112280.pptx differ diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 5586564a33e5..531f97b153c9 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -106,6 +106,7 @@ public: void testTdf105739(); void testTdf111518(); void testTdf106867(); +void testTdf112280(); CPPUNIT_TEST_SUITE(SdOOXMLExportTest2); @@ -135,6 +136,7 @@ public: CPPUNIT_TEST(testTdf105739); CPPUNIT_TEST(testTdf111518); CPPUNIT_TEST(testTdf106867); +CPPUNIT_TEST(testTdf112280); CPPUNIT_TEST_SUITE_END(); @@ -840,6 +842,19 @@ void SdOOXMLExportTest2::testTdf106867() "spid", "42"); } +void SdOOXMLExportTest2::testTdf112280() +{ +::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf112280.pptx"), PPTX); +utl::TempFile tempFile; +xDocShRef = saveAndReload(xDocShRef.get(), PPTX, ); +xDocShRef->DoClose(); + +// check the animRot value +xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml"); +assertXPath(pXmlDocContent, "/p:sld/p:timing/p:tnLst/p:par/p:cTn/p:childTnLst/p:seq/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:par/p:cTn/p:childTnLst/p:animRot", +"by", "2160"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx index 4c18981fe169..e04b6f950f75 100644 --- a/sd/source/filter/eppt/pptx-epptooxml.cxx +++ b/sd/source/filter/eppt/pptx-epptooxml.cxx @@ -41,12 +41,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -908,6 +910,16 @@ void PowerPointExport::WriteAnimationAttributeName( const FSHelperPtr& pFS, cons pFS->writeEscaped("ppt_y"); pFS->endElementNS(XML_p, XML_attrName); } +else if (rAttributeName == "Rotate") +{ +pFS->startElementNS(XML_p, XML_attrName, FSEND); +pFS->writeEscaped("r"); +pFS->endElementNS(XML_p, XML_attrName); +} +else +{ +SAL_INFO("sd.eppt", "unhandled animation attribute name: " << rAttributeName); +} pFS->endElementNS( XML_p, XML_attrNameLst ); } @@ -969,27 +981,62 @@ void PowerPointExport::WriteAnimationNodeAnimate( const FSHelperPtr& pFS, const } } -OUString aPath; if (nXmlNodeType == XML_animMotion) { -Reference rMotion(rXNode, UNO_QUERY); -if (rMotion.is()) -rMotion->getPath() >>= aPath; -} +OUString aPath; +Reference xMotion(rXNode, UNO_QUERY); +if (xMotion.is()) +xMotion->getPath() >>= aPath; -if (aPath.isEmpty()) +pFS->startElementNS(XML_p, nXmlNodeType, +XML_path, OUStringToOString(aPath, RTL_TEXTENCODING_UTF8), +FSEND); +} +else if (nXmlNodeType == XML_animRot) { +// when const char* is nullptr, the attribute is completely omitted in the output +const char* pBy = nullptr; +const char* pFrom = nullptr; +const char* pTo = nullptr; +OString aBy, aFrom, aTo; + +Reference xTransform(rXNode, UNO_QUERY); +if (xTransform.is()) +{ +double value; +if (xTransform->getBy() >>= value) +{ +aBy = OString::number(static_cast(value * PER_DEGREE)); +pBy = aBy.getStr(); +} + +if (xTransform->getFrom() >>= value) +{ +aFrom = OString::number(static_cast(value * PER_DEGREE)); +pFrom = aFrom.getStr(); +} + +if (xTransform->getTo() >>= value) +{ +aTo = OString::number(static_cast(value * PER_DEGREE)); +pTo = aTo.getStr(); +} +} + pFS->startElementNS(XML_p,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - oox/source
oox/source/ppt/timenodelistcontext.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 649b14eb85205f6cfa31e01138e3bc6ce393f9a0 Author: Regina HenschelDate: Tue Feb 14 20:18:51 2017 +0100 tdf#99617 convert powerpoint angle to degree 1 powerpoint angle unit = 1/6 degree Roundtrip test not yet possible because of tdf#106002. Change-Id: I5854c4f9f013f1a2db7e9536fc9cf5198c7a02ed Reviewed-on: https://gerrit.libreoffice.org/34279 Tested-by: Jenkins Reviewed-by: Michael Stahl Reviewed-on: https://gerrit.libreoffice.org/42076 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index e795b6e8b129..287e67ebf066 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -711,18 +711,18 @@ namespace oox { namespace ppt { // sd/source/filter/ppt/pptinanimations.cxx if(attribs.hasAttribute( XML_by ) ) { -sal_Int32 nBy = attribs.getInteger( XML_by, 0 ); -pNode->setBy( makeAny( (double) nBy ) ); +double fBy = attribs.getDouble( XML_by, 0.0 ) / PER_DEGREE; //1 PowerPoint-angle-unit = 1/6 degree +pNode->setBy( makeAny( fBy ) ); } if(attribs.hasAttribute( XML_from ) ) { -sal_Int32 nFrom = attribs.getInteger( XML_from, 0 ); -pNode->setFrom( makeAny( (double) nFrom ) ); +double fFrom = attribs.getDouble( XML_from, 0.0 ) / PER_DEGREE; +pNode->setFrom( makeAny( fFrom ) ); } if(attribs.hasAttribute( XML_to ) ) { -sal_Int32 nTo = attribs.getInteger( XML_to, 0 ); -pNode->setTo( makeAny( (double) nTo ) ); +double fTo = attribs.getDouble( XML_to, 0.0 ) / PER_DEGREE; +pNode->setTo( makeAny( fTo ) ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - oox/source
oox/source/ppt/timenodelistcontext.cxx | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit af282a9c7fe78a088fcd883012e31d5b962f4afe Author: Regina HenschelDate: Tue Feb 14 20:18:51 2017 +0100 tdf#99617 convert powerpoint angle to degree 1 powerpoint angle unit = 1/6 degree Roundtrip test not yet possible because of tdf#106002. Change-Id: I5854c4f9f013f1a2db7e9536fc9cf5198c7a02ed Reviewed-on: https://gerrit.libreoffice.org/34279 Tested-by: Jenkins Reviewed-by: Michael Stahl Reviewed-on: https://gerrit.libreoffice.org/42078 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index e795b6e8b129..287e67ebf066 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -711,18 +711,18 @@ namespace oox { namespace ppt { // sd/source/filter/ppt/pptinanimations.cxx if(attribs.hasAttribute( XML_by ) ) { -sal_Int32 nBy = attribs.getInteger( XML_by, 0 ); -pNode->setBy( makeAny( (double) nBy ) ); +double fBy = attribs.getDouble( XML_by, 0.0 ) / PER_DEGREE; //1 PowerPoint-angle-unit = 1/6 degree +pNode->setBy( makeAny( fBy ) ); } if(attribs.hasAttribute( XML_from ) ) { -sal_Int32 nFrom = attribs.getInteger( XML_from, 0 ); -pNode->setFrom( makeAny( (double) nFrom ) ); +double fFrom = attribs.getDouble( XML_from, 0.0 ) / PER_DEGREE; +pNode->setFrom( makeAny( fFrom ) ); } if(attribs.hasAttribute( XML_to ) ) { -sal_Int32 nTo = attribs.getInteger( XML_to, 0 ); -pNode->setTo( makeAny( (double) nTo ) ); +double fTo = attribs.getDouble( XML_to, 0.0 ) / PER_DEGREE; +pNode->setTo( makeAny( fTo ) ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 112280] PPTX with spin animation gets corrupted upon roundtrip
https://bugs.documentfoundation.org/show_bug.cgi?id=112280 Jan Holesovskychanged: What|Removed |Added CC||rb.hensc...@t-online.de --- Comment #1 from Jan Holesovsky --- *** Bug 106002 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 106002] Spin animation lost if export to pptx
https://bugs.documentfoundation.org/show_bug.cgi?id=106002 Jan Holesovskychanged: What|Removed |Added Status|NEW |RESOLVED CC||ba...@caesar.elte.hu Resolution|--- |DUPLICATE --- Comment #4 from Jan Holesovsky --- Actually I think I've got a fix for this, but in bug 112280: https://gerrit.libreoffice.org/#/c/42074/ https://gerrit.libreoffice.org/#/c/42075/ Let me mark as duplicate; feel free to re-open if it's not the case. *** This bug has been marked as a duplicate of bug 112280 *** -- 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 104787] [META] FILESAVE: PPTX: Corrupted file in MSO PP after RT
https://bugs.documentfoundation.org/show_bug.cgi?id=104787 Bug 104787 depends on bug 106002, which changed state. Bug 106002 Summary: Spin animation lost if export to pptx https://bugs.documentfoundation.org/show_bug.cgi?id=106002 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 112281] Resize of (PNG) image does not work correctly after rotate
https://bugs.documentfoundation.org/show_bug.cgi?id=112281 --- Comment #2 from Jan Vlug--- Note that when you first resize the image so that it will fit after the rotation, and only after this resize rotate, the problem seems not to occur. -- 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 103183] Pasting text from OneNote fails
https://bugs.documentfoundation.org/show_bug.cgi?id=103183 --- Comment #20 from V Stuart Foote--- Created attachment 136105 --> https://bugs.documentfoundation.org/attachment.cgi?id=136105=edit NirSoft InsideClipboard of OneNote 2016 clipboard -- 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 103183] Pasting text from OneNote fails
https://bugs.documentfoundation.org/show_bug.cgi?id=103183 --- Comment #19 from V Stuart Foote--- Created attachment 136104 --> https://bugs.documentfoundation.org/attachment.cgi?id=136104=edit OneNote 2010 vs OneNote 2016 clipboards sidebyside MS Office OneNote clipboard behavior has changed, comparing OneNote 2010 to OneNote 2016 shows changes to clipboard output by the program--notably support for CF_TEXT and CF_UNICODETEXT Otherwise, loading attachment 136098 into InsideClipboard v1.15 and the Paste and Paste Special pick up the unformatted text in LO 5.4.1 and current master. And, a copy/paste or copy/paste special directly from OneNote 2016 works as expected. -- 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 112227] Paste unformatted text option disappears
https://bugs.documentfoundation.org/show_bug.cgi?id=112227 --- Comment #2 from Raúl Márquez Garza--- Yes, it does. None of the above appear, however I'm using LO 5.3.4.2 Anyway, the very same bug has been present since previous releases, maybe 3.5s included. Thanks. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112273] Add API method to reload a form with same parameter
https://bugs.documentfoundation.org/show_bug.cgi?id=112273 --- Comment #2 from Peter Toye--- I agree that this is one way to do it - you were kind enough to send me some code when I raised this issue in the forum. But even easier (for the programmer) would be the API function. If no-one else wants it, that's fine. At least one other forum member suggested that I should raise the issue as an RFE. So I did (albeit 7 months later). -- 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 112281] Resize of (PNG) image does not work correctly after rotate
https://bugs.documentfoundation.org/show_bug.cgi?id=112281 --- Comment #1 from Jan Vlug--- Created attachment 136103 --> https://bugs.documentfoundation.org/attachment.cgi?id=136103=edit Correctly working original LibreOffice document -- 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 112281] New: Resize of (PNG) image does not work correctly after rotate
https://bugs.documentfoundation.org/show_bug.cgi?id=112281 Bug ID: 112281 Summary: Resize of (PNG) image does not work correctly after rotate Product: LibreOffice Version: 5.4.0.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: jan.pub...@famvlug.nl Created attachment 136102 --> https://bugs.documentfoundation.org/attachment.cgi?id=136102=edit Rotate the image 90 degrees to see the issue Note that this only seems to happen in an .odt document that was created by conversion from a Microsoft Office document. I inserted a scanned A4 sized PNG image in Writer. Next I rotated it 90 degrees (from portrait to landscape). This results in a partial visible not scaled image. Scaling by using the green handles at the corner of the image does not work well. I attached an example document showing the issue: Rotate the image 90 degrees and see the strange behaviour. I will also a correctly working original LibreOffice document to compare with. -- 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 112272] Provide a graphical way of generating delete and update queries
https://bugs.documentfoundation.org/show_bug.cgi?id=112272 Peter Toyechanged: What|Removed |Added Summary|Allow delete and update |Provide a graphical way of |queries |generating delete and ||update queries --- Comment #4 from Peter Toye --- Robert, I disagree. Your clips from the bug 31398 are both for SQL that's been typed in. I'm asking for a graphical way of generating the query. I've changed the title to make it clearer. -- 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 103183] Pasting text from OneNote fails
https://bugs.documentfoundation.org/show_bug.cgi?id=103183 --- Comment #18 from Buovjaga--- (In reply to V Stuart Foote from comment #17) > Our current default handling of pasting the PNG image from clipboard could > probably be changed to instead paste unformatted text--but other than that > WFM. Hmm, yes, it is a question of if we will ignore OneNote 2010 as later versions 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 111946] Validity freezing OS
https://bugs.documentfoundation.org/show_bug.cgi?id=111946 Buovjagachanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||todven...@suomi24.fi Ever confirmed|0 |1 --- Comment #2 from Buovjaga --- Can you attach an example file? Which Linux distro are you using? Set to NEEDINFO. Change back to UNCONFIRMED after you have provided the document. -- 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 103183] Pasting text from OneNote fails
https://bugs.documentfoundation.org/show_bug.cgi?id=103183 --- Comment #17 from V Stuart Foote--- Could not confirm with current builds. On Windows 10 Ent 64-bit en-US with OneNote 2016 MSO (16.0.4549.1000) 64-bit and Version: 6.0.0.0.alpha0+ Build ID: dccd1633a111ba124f9868a4a51579c95200d745 CPU threads: 8; OS: Windows 6.19; UI render: GL; TinderBox: Win-x86@39, Branch:master, Time: 2017-09-06_06:44:26 Locale: en-US (en_US); Calc: CL and with Version: 5.4.1.1 (x64) Build ID: a5be49f0c45fe24a575c7f41559aa8fc79a781a2 CPU threads: 8; OS: Windows 6.19; UI render: GL; Locale: en-US (en_US); Calc: group Same result as Thomas L. notes in comment 14, the Ctrl+c/Ctrl+v copy paste of text pastes from system clipboard a PNG image of text with a border. But all Paste Special options otherwise provide sensible results, including pasting unformatted text. So, OneNote 2016 is placing the data (in multiple CF formats--confirmed with NirSoft's InsideClipboard) to clipboard, and LibreOffice _is_ reading them. Our current default handling of pasting the PNG image from clipboard could probably be changed to instead paste unformatted text--but other than that WFM. -- 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 112279] EDITING: Incorrectly displayed error when adding named cells
https://bugs.documentfoundation.org/show_bug.cgi?id=112279 Eike Rathkechanged: What|Removed |Added Priority|medium |lowest OS|Windows (All) |All Severity|normal |trivial --- Comment #1 from Eike Rathke --- How much prose do you want in one line? The name can not be a number, not something that could be a cell reference in any of the possible reference styles, and it can't start with a digit, which here is the case. -- 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