[Libreoffice-bugs] [Bug 97846] Slow behaviour when opening or editing a file
https://bugs.documentfoundation.org/show_bug.cgi?id=97846 --- Comment #6 from andras.d...@arcor.de --- Here you are: DriverVersion: 9.18.13.4192 DriverDate: 10-13-2015 DeviceID: PCI\VEN_10DE_10C3_13013842_A2 AdapterVendorID: 0x10de AdapterDeviceID: 0x10c3 AdapterSubsysID: 0x13013842 DeviceKey: System\CurrentControlSet\Control\Video\{E82FEF4C-629C-4FED-8340-D596536894CC}\ DeviceString: NVIDIA GeForce 8400GS -- 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 97829] Pos1 key in text field not jumping to the start of the line
https://bugs.documentfoundation.org/show_bug.cgi?id=97829 --- Comment #2 from andras.d...@arcor.de --- Just open a new presentation and just using the first empty layout which has a headline and a text field. Start typing a text in the text field with to get two or three lines of text and try to jump to the start of a line by pressing the 'POS1' key or try to jump to the end of the line with the 'END'-key. CTRG+POS1 and CTRG+END to jump to the start end end of a paragraph do work as expected. It works that way on my computer in 5.0.4 . -- 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 73049] FILEOPEN Huge memory use on opening specific complex ods spreadsheets with array functions
https://bugs.documentfoundation.org/show_bug.cgi?id=73049 --- Comment #39 from Markus Mohrhard--- (In reply to andis.lazdins from comment #38) > (In reply to Markus Mohrhard from comment #37) > > > From all the comments it seems that 5.1 is at least much better than older > > versions. Maybe not perfect but still better. > > I would not say "much better", but there are some improvements. I just tried > to work with 8 MB calc while without any formulas, which takes about 30 sec > to open for OpenOffice.org. In 5.2 it took about 5 min. and it is not really > possible to work with the file. You are mixing many different problems into this bug report. I'm loosing the overview what you are complaining about. The original report was about huge memory usage with array formulas and the last comment is about something completely different. If you still want something fixed please open new bug reports for each issue. In its current form this report has become unfixable as it mixes too many unrelated problems. @QA team: IMHO we can close this issue. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 97992] Start Center left panel is blank
https://bugs.documentfoundation.org/show_bug.cgi?id=97992 tommy27changed: What|Removed |Added Component|LibreOffice |UI Summary|LO 5.1.0.3 didn't work |Start Center left panel is |right |blank --- Comment #5 from tommy27 --- please post a screenshot and tell your exact O/S edited summary notes and component -- 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 95060] Combining Diacritics will not stack when exported to PDF.
https://bugs.documentfoundation.org/show_bug.cgi?id=95060 --- Comment #8 from Chris Sherlock--- I'l try to bibisect on the 4.4 series. Unfortunately there are problems with an international cable to Australia causing severe slowdowns with me getting the bibisect-44max.tar.xz -- 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 98017] New: PRINTING: Multiple Notes Per Page Bug
https://bugs.documentfoundation.org/show_bug.cgi?id=98017 Bug ID: 98017 Summary: PRINTING: Multiple Notes Per Page Bug Product: LibreOffice Version: 5.0.5.1 rc Hardware: All OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: david.baxend...@gmail.com When printing multiple notes per page, the header and footer on the note is printed for each note. Previously, when I printed multiple notes per page the header and footer were printed on the page only and not for each individual note. I don't know which version this changed as I only noticed it in 5.0 series. Also the version that "works" allowed one to print three notes per page which is no longer an option for the 5 series. I'm not concerned with the number of notes per page, just that the current format seems rather "unprofessional" I can provide an example of the old and the current multiple note page output on request but I do wish this to go into the public domain. -- 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 67744] FORMATTING: Adobe Courier Std font is always bold on Mac OS X
https://bugs.documentfoundation.org/show_bug.cgi?id=67744 --- Comment #12 from Chris Sherlock--- Any chance that a test document could be uploaded? -- 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 45168] Add Option to crop (reduce size of) Images in PDF Export
https://bugs.documentfoundation.org/show_bug.cgi?id=45168 --- Comment #15 from Dipankar Niranjan--- (In reply to Samuel Mehrbrodt (CIB) from comment #11) > Please ask if you need code pointers - you can also join IRC and ask there! Hi, Any code pointers on where to look and how to get the changes from updateGraphicsState() to reflect in the storing of the image..? Like which classes/variables would I have to look at to get the size(of the image) data stored by updateGraphicsState()? Where do I need to look to reduce the size of the image on cropping..? Also code pointers to where I should insert UI toggles for this would be helpful too. I've asked on the IRC and was told to ask here.. -- 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 94470] ugly downscaled thumbnail images in start center
https://bugs.documentfoundation.org/show_bug.cgi?id=94470 --- Comment #4 from Chris Sherlock--- Andras, I've tested this on LO 5-2 master, on Ubuntu Linux but not seeing the same issue you are. I realise this was marked as a regression in the 4.4.x series, but can you confirm if this is occuring in LO 5.0 or 5.1? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 94470] ugly downscaled thumbnail images in start center
https://bugs.documentfoundation.org/show_bug.cgi?id=94470 Chris Sherlockchanged: What|Removed |Added CC||chris.sherloc...@gmail.com --- Comment #3 from Chris Sherlock --- Created attachment 122813 --> https://bugs.documentfoundation.org/attachment.cgi?id=122813=edit Start Centre - master 5-2 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 98013] Microsoft Office files were not converted to PDF properly
https://bugs.documentfoundation.org/show_bug.cgi?id=98013 Adolfo Jaymechanged: What|Removed |Added Component|LibreOffice |Writer -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 94737] Poor subpixel rendering on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=94737 --- Comment #29 from Chris Sherlock--- S. - any chance you could bibisect this? Unfortunately the tar file is massive, but it would help to pinpoint where things started going wrong. https://wiki.documentfoundation.org/QA/Bibisect/Linux -- 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 94737] Poor subpixel rendering on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=94737 --- Comment #28 from Chris Sherlock--- Beluga, S. - I'm running this in a VM that doesn't have GL acceleration and I'm not seeing the problem you are evidentally seeing. I've tried with GTK, GTK3 and KDE, fonts look fine. Unfortunately I don't have access to a Linux system that can use accelerated OpenGL graphics. Perhaps someone else could bibisect this one? -- 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 94737] Poor subpixel rendering on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=94737 --- Comment #27 from S.--- Thanks a lot Chris for looking into 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 94737] Poor subpixel rendering on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=94737 --- Comment #26 from Chris Sherlock--- Created attachment 122812 --> https://bugs.documentfoundation.org/attachment.cgi?id=122812=edit screenshot 110% zoom on master - Ubuntu Linux -- 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 94737] Poor subpixel rendering on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=94737 --- Comment #25 from Chris Sherlock--- Created attachment 122811 --> https://bugs.documentfoundation.org/attachment.cgi?id=122811=edit screenshot 85% zoom on master - Ubuntu Linux -- 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 94737] Poor subpixel rendering on Linux
https://bugs.documentfoundation.org/show_bug.cgi?id=94737 --- Comment #24 from Chris Sherlock--- Sorry this is taking so long, I'm having some bibisect problems. -- 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
Final review to resolve bug 85761
Hi all, I've got a final back ported fix for the 5-0 series of LO. Would someone be able to review it and submit? https://gerrit.libreoffice.org/#/c/22454/ It has been reviewed and pushed to master and to 5-1 thanks to Tomasz's diligent help :-) so it would be nice to get this into 5-0 Thanks all, Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Problem Building Libreoffice on Linux
Is it worthwhile asking the RHEL guys to consider creating a Harfbuzz package? From a comment in that bug I believe the only reason we now statically link Harfbuzz is because RHEL doesn't have a package. Previously we also did it was because of ABI stability issues, but these are apparently no longer a problem. Chris > On 19 Feb 2016, at 11:10 PM, Michael Stahlwrote: > >> On 19.02.2016 10:10, Khaled Hosny wrote: >>> On Thu, Feb 18, 2016 at 02:36:48PM +0100, Michael Stahl wrote: On 18.02.2016 14:17, Khaled Hosny wrote: I don’t think it is just the unit test that is failing, running the application will most likely crash as well. Building with system HarfBuzz should fix the issue, until a better fix is found. >>> >>> commit 549130ab5d9616f7eb5504db31546b386737ccb2 on master should >>> hopefully fix the problem of VCL exporting conflicting hb_* symbols. >>> >>> Pranav please tell us if it still crashes. >> >> This fixed the crash for me, it would be nice to backport this to other >> active branches since it seems to affect anyone with a recent enough >> system HarfBuzz. > > okay, great; meanwhile it landed in libreoffice-5-1 as commit > c2f19cda2b0c0ecea69e57bb0ae9a364e939b729, and in libreoffice-5-0 as > commit 395995f03dd640aee28767f6d920901d91dd3bee > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LibreOffice_5.1.0.3
It is definitely valuable feedback :-) Are you actively working on it and need some code pointers? If that's the case, then this list is definitely the one to ask on, so others can help just let us know what you've tried so we can make sure we don't go over old ground. Otherwise, if there isn't already a bug logged it sounds like this is a prime candidate so it can be tracked and someone (or multiple people!) can work on it. Regardless, thank you for taking the time to note this. Even if it is just a heads up to let us know about an issue, I think it's good for us to acknowledge that you've taken the time and effort to look into this, and I know I for one appreciate it. Thanks, Steven :-) Chris > On 19 Feb 2016, at 4:40 AM, Steven Howewrote: > > Actively developing ... I thought that would be the correct place to point > out the issue, to the developers? You know, so they could rework the problem, > make the software better ... developer sort of thing? > > The feature is there. It works poorly. I was pointing that out to the > developers. > My bad. > > Sorry for the misdirection. Thanks for the pointer. > > Steven > > > >> On Thu, Feb 18, 2016 at 4:16 AM, Bjoern Michaelsen >> wrote: >> Hi, >> >> On Wed, Feb 17, 2016 at 10:22:58PM -0800, Steven Howe wrote: >> > Some issue with 'remote' file mode. >> >> great that you are using LibreOffice! Unfortunately, this is the wrong list >> for >> user support. Please consider: >> >> us...@global.libreoffice.org or >> https://ask.libreoffice.org/en/questions/ >> >> instead. This list is for actively developing LibreOffice itself only. >> >> Thanks, >> >> Bjoern > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 65848] PRINTING: CALC doesn't set scaling factor set by PHPExcel class
https://bugs.documentfoundation.org/show_bug.cgi?id=65848 Joel Maderochanged: What|Removed |Added Status|REOPENED|UNCONFIRMED Ever confirmed|1 |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 98009] Wrong calculation in calc when dragging formula
https://bugs.documentfoundation.org/show_bug.cgi?id=98009 m.a.riosvchanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||miguelangelrv@libreoffice.o ||rg Ever confirmed|0 |1 --- Comment #3 from m.a.riosv --- Please could you attach a sample file where to reproduce the issue. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 98008] missing menu entry (2)
https://bugs.documentfoundation.org/show_bug.cgi?id=98008 m.a.riosvchanged: What|Removed |Added CC||miguelangelrv@libreoffice.o ||rg --- Comment #1 from m.a.riosv --- For me is there. Win10x64 Version: 5.1.1.1 (x64) Build ID: c43cb650e9c145b181321ea547d38296db70f36e CPU Threads: 4; OS Version: Windows 6.19; UI Render: GL; Locale: es-ES (es_ES) -- 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 90848] Include a font baseline in symbol preview in Special Character dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=90848 Adolfo Jaymechanged: What|Removed |Added Priority|medium |low CC||f...@libreoffice.org Component|LibreOffice |UI Version|4.5.0.0.alpha0+ Master |Inherited From OOo -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67776] FILEOPEN: Some SmartArt shapes have wrong direction (.xlsx)
https://bugs.documentfoundation.org/show_bug.cgi?id=67776 --- Comment #5 from Luke--- Sushil, Does reverting 1abc0695d770eebd21256a86aeee14a5384d84c7 fix this? Or does your patch fix both this and Bug 83672? If so, can mark as bisected. -- 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 67776] FILEOPEN: Some SmartArt shapes have wrong direction (.xlsx)
https://bugs.documentfoundation.org/show_bug.cgi?id=67776 Lukechanged: What|Removed |Added Keywords||bibisectRequest, regression -- 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 65848] PRINTING: CALC doesn't set scaling factor set by PHPExcel class
https://bugs.documentfoundation.org/show_bug.cgi?id=65848 --- Comment #8 from David Berky--- Created attachment 122810 --> https://bugs.documentfoundation.org/attachment.cgi?id=122810=edit test-three (7).xlsx show in comparison image -- 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 65848] PRINTING: CALC doesn't set scaling factor set by PHPExcel class
https://bugs.documentfoundation.org/show_bug.cgi?id=65848 --- Comment #7 from David Berky--- Created attachment 122809 --> https://bugs.documentfoundation.org/attachment.cgi?id=122809=edit File in Excel shows 90%, in Calc shows 100% -- 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 65848] PRINTING: CALC doesn't set scaling factor set by PHPExcel class
https://bugs.documentfoundation.org/show_bug.cgi?id=65848 David Berkychanged: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID |--- --- Comment #6 from David Berky --- It's not just files created with PHPExcel, it also appears to be happening with files created in Excel itself. The "Scaling Factor" value set by either Excel (Office 365) or PHPExcel (v1.8.1) is not respected in Calc (v5.0.4.2) - see attached images and test file. -- 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: sc/source
sc/source/core/tool/interpr1.cxx |8 +++- sc/source/ui/app/scmod.cxx |1 + 2 files changed, 4 insertions(+), 5 deletions(-) New commits: commit 1684e347cd16ce91ecf27d94691b185a0110cc34 Author: Eike RathkeDate: Sat Feb 20 01:20:12 2016 +0100 add missing IsFormulaWildcardsEnabled() calls, tdf#72196 Change-Id: Ia684cfe93c6a0e71a0fbbe22974501bf610e9190 diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index a91..26b7f10 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -8512,9 +8512,8 @@ bool ScInterpreter::MayBeRegExp( const OUString& rStr, const ScDocument* pDoc, b bool ScInterpreter::MayBeWildcard( const OUString& rStr, const ScDocument* pDoc ) { -/* TODO: doc options will need a new enum (or a second bool that takes - * precedence over regex?) */ -(void)pDoc; +if ( pDoc && !pDoc->GetDocOptions().IsFormulaWildcardsEnabled() ) +return false; // Wildcards without '~' escape, if there are no wildcards then an escaped // character does not make sense. @@ -8537,8 +8536,7 @@ utl::SearchParam::SearchType ScInterpreter::DetectSearchType( const OUString& rS { if (pDoc) { -bool bWildcardEnabled = false; /* TODO: obtain doc option */ -if (bWildcardEnabled) +if (pDoc->GetDocOptions().IsFormulaWildcardsEnabled()) return MayBeWildcard( rStr, nullptr) ? utl::SearchParam::SRCH_WILDCARD : utl::SearchParam::SRCH_NORMAL; if (pDoc->GetDocOptions().IsFormulaRegexEnabled()) return MayBeRegExp( rStr, nullptr) ? utl::SearchParam::SRCH_REGEXP : utl::SearchParam::SRCH_NORMAL; diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 0ac4315..4d7e2d5 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1115,6 +1115,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) || rOldOpt.IsMatchWholeCell() != rNewOpt.IsMatchWholeCell() || rOldOpt.GetYear2000() != rNewOpt.GetYear2000() || rOldOpt.IsFormulaRegexEnabled() != rNewOpt.IsFormulaRegexEnabled() + || rOldOpt.IsFormulaWildcardsEnabled() != rNewOpt.IsFormulaWildcardsEnabled() ); pDoc->SetDocOptions( rNewOpt ); pDocSh->SetDocumentModified(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/download_external_dependencies.pl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9825e795eca5a633a169e8e8511b9215be102762 Author: Damjan JovanovicDate: Fri Feb 19 22:58:06 2016 + Log the HTTP status when a download in ./bootstrap fails. Patch by: me diff --git a/solenv/bin/download_external_dependencies.pl b/solenv/bin/download_external_dependencies.pl index 5cc5a25..9db822b 100755 --- a/solenv/bin/download_external_dependencies.pl +++ b/solenv/bin/download_external_dependencies.pl @@ -551,7 +551,7 @@ sub DownloadFile ($$$) } else { -print "download from $URL failed\n"; +print "download from $URL failed (" . $response->status_line . ")\n"; } close($out); ___ 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/filter/xml/XMLCalculationSettingsContext.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 59a175b692fd26200bf2dfbe411a969eef3e00f5 Author: Eike RathkeDate: Fri Feb 19 13:20:09 2016 +0100 read ODF table:use-wildcards, tdf#72196 Change-Id: I37dc8d6c75378fabda88930f6cc3f0508587207c diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 4110b5e..b99b58e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -89,9 +89,15 @@ ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& r } else if (IsXMLToken(aLocalName, XML_USE_REGULAR_EXPRESSIONS)) { -if (IsXMLToken(sValue, XML_FALSE)) +// Overwrite only the default (regex true) value, not wildcard. +if (eSearchType == utl::SearchParam::SRCH_REGEXP && IsXMLToken(sValue, XML_FALSE)) eSearchType = utl::SearchParam::SRCH_NORMAL; } +else if (IsXMLToken(aLocalName, XML_USE_WILDCARDS)) +{ +if (IsXMLToken(sValue, XML_TRUE)) +eSearchType = utl::SearchParam::SRCH_WILDCARD; +} } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - include/unotools offapi/com officecfg/registry sc/inc sc/source
include/unotools/textsearch.hxx | 30 ++ offapi/com/sun/star/sheet/SpreadsheetDocumentSettings.idl | 16 +++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +++ sc/inc/docoptio.hxx |6 ++ sc/inc/optuno.hxx |1 sc/inc/unonames.hxx |2 sc/source/core/tool/docoptio.cxx | 13 +- sc/source/filter/xml/XMLCalculationSettingsContext.cxx|6 +- sc/source/filter/xml/xmlexprt.cxx | 10 +++- sc/source/ui/unoobj/docuno.cxx|2 sc/source/ui/unoobj/optuno.cxx|7 +++ 11 files changed, 96 insertions(+), 5 deletions(-) New commits: commit ef02de2698d90fd874bddf3146165cbe85487bc5 Author: Eike RathkeDate: Sat Feb 20 00:36:03 2016 +0100 write ODF table:use-wildcards to calculation settings, tdf#72196 Change-Id: I36d23c891b9ba85f0b0352d2314f092d7e9113eb diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 508f8c2..bcff585 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3749,6 +3749,9 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference getPropertyValue(SC_UNO_LOOKUPLABELS) )); bool bMatchWholeCell (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_MATCHWHOLE) )); bool bUseRegularExpressions (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_REGEXENABLED) )); +bool bUseWildcards (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_WILDCARDSENABLED) )); +if (bUseWildcards && bUseRegularExpressions) +bUseRegularExpressions = false; // mutually exclusive, wildcards take precedence bool bIsIterationEnabled (::cppu::any2bool( xPropertySet->getPropertyValue(SC_UNO_ITERENABLED) )); sal_uInt16 nYear2000 (pDoc ? pDoc->GetDocOptions().GetYear2000() : 0); sal_Int32 nIterationCount(100); @@ -3758,8 +3761,9 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference getPropertyValue( SC_UNO_NULLDATE ) >>= aNullDate; if (bCalcAsShown || bIgnoreCase || !bLookUpLabels || !bMatchWholeCell || !bUseRegularExpressions || -bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || -aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) +bUseWildcards || +bIsIterationEnabled || nIterationCount != 100 || !::rtl::math::approxEqual(fIterationEpsilon, 0.001) || +aNullDate.Day != 30 || aNullDate.Month != 12 || aNullDate.Year != 1899 || nYear2000 != 1930) { if (bIgnoreCase) AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_FALSE); @@ -3771,6 +3775,8 @@ void ScXMLExport::WriteCalculationSettings(const uno::Reference Date: Sat Feb 20 00:33:01 2016 +0100 import Wildcards at ScXMLCalculationSettingsContext, tdf#72196 Change-Id: Ic0031052a488581ad8627375993c275bc635ed8a diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 836d530..4110b5e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -131,8 +131,10 @@ void ScXMLCalculationSettingsContext::EndElement() xPropertySet->setPropertyValue( SC_UNO_IGNORECASE, uno::makeAny(bIgnoreCase) ); xPropertySet->setPropertyValue( SC_UNO_LOOKUPLABELS, uno::makeAny(bLookUpLabels) ); xPropertySet->setPropertyValue( SC_UNO_MATCHWHOLE, uno::makeAny(bMatchWholeCell) ); -xPropertySet->setPropertyValue( SC_UNO_REGEXENABLED, -uno::makeAny(eSearchType == utl::SearchParam::SRCH_REGEXP) ); +bool bWildcards, bRegex; +utl::SearchParam::ConvertToBool( eSearchType, bWildcards, bRegex); +xPropertySet->setPropertyValue( SC_UNO_REGEXENABLED, uno::makeAny(bRegex) ); +xPropertySet->setPropertyValue( SC_UNO_WILDCARDSENABLED, uno::makeAny(bWildcards) ); xPropertySet->setPropertyValue( SC_UNO_ITERENABLED, uno::makeAny(bIsIterationEnabled) ); xPropertySet->setPropertyValue( SC_UNO_ITERCOUNT, uno::makeAny(nIterationCount) ); xPropertySet->setPropertyValue( SC_UNO_ITEREPSILON, uno::makeAny(fIterationEpsilon) ); commit 9f0fa7e5316509d73e3384a3b23b61a8a2d27f7c Author: Eike Rathke Date: Sat Feb 20 00:23:31 2016 +0100 add Wildcards UNO API implementation, tdf#72196 Change-Id: I3dbca9661b55596484ac77f92243fd463fa01ec9 diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index d2d2bce..b75fb3c 100644 ---
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - cui/uiconfig
cui/uiconfig/ui/distributionpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3422b8804c2459fdd7f870ee300f2a81f3365d6c Author: Yousuf PhilipsDate: Fri Feb 19 02:26:25 2016 +0400 Fix incorrect icon reference in Distribution dialog Change-Id: I2b296f06800b5ae29a61cdae7b00961a6b502b66 Reviewed-on: https://gerrit.libreoffice.org/22492 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit aa7ceb44cf018d092ce09bb1572d7ce4876be513) Signed-off-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/distributionpage.ui b/cui/uiconfig/ui/distributionpage.ui index 9d29749..c278b2f 100644 --- a/cui/uiconfig/ui/distributionpage.ui +++ b/cui/uiconfig/ui/distributionpage.ui @@ -144,7 +144,7 @@ False center center -svx/res/dsth_cen.png +svx/res/dsth_dst.png 3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 59699] RTF: INCLUDEPICTURE image not shown
https://bugs.documentfoundation.org/show_bug.cgi?id=59699 Miklos Vajnachanged: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |vmik...@collabora.co.uk |desktop.org | -- 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 93925] Regression: Comments lost in PDF Export of documents with comments inside margin
https://bugs.documentfoundation.org/show_bug.cgi?id=93925 --- Comment #10 from Michael Stahl--- (In reply to raal from comment #9) > It can be anyone from these commits oops, sorry, you are right, i didn't read properly and assumed it was one of these -max repos when it clearly was not. -- 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 90904] FILESAVE: OOXML export is missing document statistics
https://bugs.documentfoundation.org/show_bug.cgi?id=90904 Michael Stahlchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |alexey.chemic...@gmail.com |desktop.org | --- Comment #11 from Michael Stahl --- oops, missed that bugzilla mail... "AppVersion" would sound obvious but iirc i tried to add that once and found that it really is "Microsoft Office version" - if the version number isn't formatted exactly like MSO version numbers are then MSO will complain that the document is invalid. (also i'm surprised that the "HLinks" anachronism still exists) one would think that Impress would have a SlideCount statistic but apparently it doesn't. so i think we're done here for now, nothing easily implemented left, thanks Alexey. -- 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] online.git: loolwsd/test
loolwsd/test/httpwstest.cpp | 101 +++- 1 file changed, 54 insertions(+), 47 deletions(-) New commits: commit d05f42df08a429e18e7b1d8ff0c74b46612a9825 Author: Pranav KantDate: Sat Feb 20 03:52:22 2016 +0530 loolwsd: Rework document password unit test Our unit test structure changed with 7037f07a3861d0835fc6f2648e91d48f99ded4a6 . Restructure this one too. Change-Id: I1a14dd0ab0d631fd447edf620b6c24fe3730c843 diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index 351031d..8e52976 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -222,59 +222,66 @@ void HTTPWSTest::testRenderingOptions() void HTTPWSTest::testPasswordProtectedDocument() { -// Load a password protected document -const std::string documentPath = TDOC "/password-protected.ods"; -const std::string documentURL = "file://" + Poco::Path(documentPath).makeAbsolute().toString(); -// Send a load request without password first -sendTextFrame(_socket, "load url=" + documentURL); - -int flags; -int n; -int counter = 0; -do -{ -char buffer[READ_BUFFER_SIZE]; -n = _socket.receiveFrame(buffer, sizeof(buffer), flags); -if (n > 0) +try { + +Poco::Net::WebSocket socket(_session, _request, _response); + +// Load a password protected document +const std::string documentPath = TDOC "/password-protected.ods"; +const std::string documentURL = "file://" + Poco::Path(documentPath).makeAbsolute().toString(); +// Send a load request without password first +sendTextFrame(socket, "load url=" + documentURL); + +int flags; +int n; +int counter = 0; +do { -std::string line = LOOLProtocol::getFirstLine(buffer, n); -StringTokenizer tokens(line, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM); -std::string errorCommand; -std::string errorKind; -if (counter == 0 && -tokens[0] == "error:" && -LOOLProtocol::getTokenString(tokens[1], "cmd", errorCommand) && -LOOLProtocol::getTokenString(tokens[2], "kind", errorKind) ) +char buffer[READ_BUFFER_SIZE]; +n = socket.receiveFrame(buffer, sizeof(buffer), flags); +if (n > 0) { -CPPUNIT_ASSERT_EQUAL(std::string("load"), errorCommand); -// TODO: Do a test for document requiring password to edit -CPPUNIT_ASSERT_EQUAL(std::string("passwordrequired:to-view"), errorKind); +std::string line = LOOLProtocol::getFirstLine(buffer, n); +StringTokenizer tokens(line, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM); +std::string errorCommand; +std::string errorKind; +if (counter == 0 && +tokens[0] == "error:" && +LOOLProtocol::getTokenString(tokens[1], "cmd", errorCommand) && +LOOLProtocol::getTokenString(tokens[2], "kind", errorKind) ) +{ +CPPUNIT_ASSERT_EQUAL(std::string("load"), errorCommand); +// TODO: Do a test for document requiring password to edit + CPPUNIT_ASSERT_EQUAL(std::string("passwordrequired:to-view"), errorKind); -// Send another load request with incorrect password -sendTextFrame(_socket, "load url=" + documentURL + " password=2"); -counter++; -} -else if (counter == 1 && -tokens[0] == "error:" && -LOOLProtocol::getTokenString(tokens[1], "cmd", errorCommand) && -LOOLProtocol::getTokenString(tokens[2], "kind", errorKind) ) -{ -CPPUNIT_ASSERT_EQUAL(std::string("load"), errorCommand); -CPPUNIT_ASSERT_EQUAL(std::string("wrongpassword"), errorKind); +// Send another load request with incorrect password +sendTextFrame(socket, "load url=" + documentURL + " password=2"); +counter++; +} +else if (counter == 1 && + tokens[0] == "error:" && + LOOLProtocol::getTokenString(tokens[1], "cmd", errorCommand) && + LOOLProtocol::getTokenString(tokens[2], "kind", errorKind) ) +{ +CPPUNIT_ASSERT_EQUAL(std::string("load"), errorCommand); +CPPUNIT_ASSERT_EQUAL(std::string("wrongpassword"), errorKind); -// Send another load request with correct password -sendTextFrame(_socket, "load url=" + documentURL + " password=1"); -counter++; -} -
[Libreoffice-bugs] [Bug 96785] Crash when copying object from wpd
https://bugs.documentfoundation.org/show_bug.cgi?id=96785 Michael Stahlchanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #5 from Michael Stahl --- *** This bug has been marked as a duplicate of bug 97108 *** -- 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 93386] Crashes when closing a Database with macro editor open
https://bugs.documentfoundation.org/show_bug.cgi?id=93386 raalchanged: What|Removed |Added Keywords||bibisected, bisected CC||ke...@collabora.com, ||r...@post.cz OS|Mac OS X (All) |All --- Comment #20 from raal --- This seems to have begun at the below commit. Adding Cc: to Jan Holesovsky ; Could you possibly take a look at this one? Thanks bibisect 4.4max: here are only 'skip'ped commits left to test. The first bad commit could be any of: c0323ebfa2d90555a0cef35d7340d65c16b7c44e 182d90b6bc60a33c6692f0295261b68b068ed93a We cannot bisect more! git log -1 c0323ebfa2d90555a0cef35d7340d65c16b7c44e commit c0323ebfa2d90555a0cef35d7340d65c16b7c44e Author: Matthew Francis Date: Sat Mar 14 22:11:52 2015 +0800 source-hash-f246ac13bd1a12e11eba03cbe3c62ea77293e02e (Bibisect: This commit covers source commit(s) 6403f2b59b4c83e0899012e5ca0ddd705784350c^1..f246ac13bd1a12e11eba03cbe3c62ea77293e02e which failed to build) commit f246ac13bd1a12e11eba03cbe3c62ea77293e02e Author: Jan Holesovsky AuthorDate: Tue Jun 24 13:09:14 2014 +0200 Commit: Jan Holesovsky CommitDate: Wed Jun 25 20:03:19 2014 +0200 pagedesc: It's better when MakePageDesc returns a pointer. This removes many uses of GetPageDesc(sal_uInt16). Change-Id: I9660e30d7fccd4336422ba03b19087321a7ae973 git log -1 182d90b6bc60a33c6692f0295261b68b068ed93a commit 182d90b6bc60a33c6692f0295261b68b068ed93a Author: Matthew Francis Date: Sat Mar 14 22:12:01 2015 +0800 source-hash-c1be76ec98cb465e07df961843134147100beaa9 commit c1be76ec98cb465e07df961843134147100beaa9 Author: Jan Holesovsky AuthorDate: Tue Jun 24 17:32:28 2014 +0200 Commit: Jan Holesovsky CommitDate: Wed Jun 25 20:03:19 2014 +0200 pagedesc: Consolidate FindPageDescByName() and FindPageDesc(). Change-Id: I18d570509cd3f3b65a19a12a9df0b1d5db901d04 git bisect log # bad: [cf6ea17155fabb2a120ba07c150735591ac861d7] source-hash-3f94c9e9ddfd807b449f3bb9b232cf2041fa12d2 # good: [fc71ac001f16209654d15ef8c1c4018aa55769f5] source-hash-c15927f20d4727c3b8de68497b6949e72f9e6e9e git bisect start 'latest' 'oldest' # bad: [8cf60cc706948588e2f33a6d98b7c55d454e362a] source-hash-f340f0454627939f1830826fb5cc53a90e6c62a4 git bisect bad 8cf60cc706948588e2f33a6d98b7c55d454e362a # bad: [d9885f526fc7a09cc8f9f8ee643af1b966be24bb] source-hash-d1465c64c6f64ad8dd25e40cdc69649b24b305ea git bisect bad d9885f526fc7a09cc8f9f8ee643af1b966be24bb # good: [e3eab511ffbcd2e1e2c67e7a4fec162bb0b26b7a] source-hash-dc9cc46f3223aff3f85d3ce9696178a5f4d3d087 git bisect good e3eab511ffbcd2e1e2c67e7a4fec162bb0b26b7a # good: [1477f347fb61b5b07de64312247b49371812f5b4] source-hash-4598bbe41d0906a34ceb1126c7fce2108642cd8e git bisect good 1477f347fb61b5b07de64312247b49371812f5b4 # good: [fdbfc593506d9f38152b80f14c9e7afdbef0b40a] source-hash-6024ddbfac8e62db50dd5352d610c87d279627de git bisect good fdbfc593506d9f38152b80f14c9e7afdbef0b40a # bad: [b1d1e3e3ac1515cf33be95eba837476142fb6ca8] source-hash-f55ddffd7e81cc8f3314047a6aa62991e2d293b1 git bisect bad b1d1e3e3ac1515cf33be95eba837476142fb6ca8 # bad: [e5308eaa46281027dc932b4a6550e7b1f0ba0622] source-hash-822d0e9db610ce3cbee2cf8d3154ee41218ea562 git bisect bad e5308eaa46281027dc932b4a6550e7b1f0ba0622 # bad: [75c46439114b95c3914ce2b771b1c660443856d0] source-hash-d89d8169716a748c098108eaada789206bb722c3 git bisect bad 75c46439114b95c3914ce2b771b1c660443856d0 # bad: [2313f29360bed2da1747d5c454b8a845e9d254f9] source-hash-bb6d9b0123dcde32fe260f6d1c3e567d1ddfcb35 git bisect bad 2313f29360bed2da1747d5c454b8a845e9d254f9 # good: [55e7160feaf0ab14035ecf800d233bb9a1a81f87] source-hash-1ba95042121983d0bf865e3dd449f8362d119c7c git bisect good 55e7160feaf0ab14035ecf800d233bb9a1a81f87 # good: [85a301306130f4aae393ff40a0356e8af65f44a0] source-hash-076e4afc61b216e34959bd4e3701f1fa19972d5c git bisect good 85a301306130f4aae393ff40a0356e8af65f44a0 # bad: [182d90b6bc60a33c6692f0295261b68b068ed93a] source-hash-c1be76ec98cb465e07df961843134147100beaa9 git bisect bad 182d90b6bc60a33c6692f0295261b68b068ed93a # bad: [182d90b6bc60a33c6692f0295261b68b068ed93a] source-hash-c1be76ec98cb465e07df961843134147100beaa9 git bisect bad 182d90b6bc60a33c6692f0295261b68b068ed93a # bad: [182d90b6bc60a33c6692f0295261b68b068ed93a] source-hash-c1be76ec98cb465e07df961843134147100beaa9 git bisect bad 182d90b6bc60a33c6692f0295261b68b068ed93a # bad: [182d90b6bc60a33c6692f0295261b68b068ed93a] source-hash-c1be76ec98cb465e07df961843134147100beaa9 git bisect bad 182d90b6bc60a33c6692f0295261b68b068ed93a #
[Libreoffice-bugs] [Bug 97989] LO Calc very poor performance when saving to ODS or CSV on large spreadsheet
https://bugs.documentfoundation.org/show_bug.cgi?id=97989 MMchanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #6 from MM --- Tested with v5.0.5.2 & v5.1.1.1 under ubuntu 14.04 x64 and 5.1.1.1 under windows 10 x64. Saving to ODS will take from about 20 - 40 secs, but not 6-7 mins. And about 10-15 secs to csv... You might wanna try resetting your user profile and report back. https://wiki.documentfoundation.org/UserProfile#Resolving_corruption_in_the_user_profile -- 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] online.git: loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp loolwsd/LOOLKit.cpp loolwsd/LOOLSession.hpp
loolwsd/ChildProcessSession.cpp | 48 --- loolwsd/ChildProcessSession.hpp |4 - loolwsd/LOOLKit.cpp | 100 ++-- loolwsd/LOOLSession.hpp |8 --- 4 files changed, 100 insertions(+), 60 deletions(-) New commits: commit b71ebb8dfcead80197a482c2e8619dd3e3d768f3 Author: Pranav KantDate: Mon Feb 8 01:23:45 2016 +0530 loolwsd: Ask for password for multiple views also This is possible by moving all the password handling logic to Document container class. When a user opens a password protected document the first time, it saves all possible data such as password, password type etc. Upon opening the same document again, password is matched with the cached password saved in the document container class before allowing the new view access to this document. Change-Id: Id1f2b6e06de806564bf865e83fed51b01c9a0fbc Reviewed-on: https://gerrit.libreoffice.org/22208 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp index a2e737f..5bfd320 100644 --- a/loolwsd/ChildProcessSession.cpp +++ b/loolwsd/ChildProcessSession.cpp @@ -309,7 +309,7 @@ ChildProcessSession::ChildProcessSession(const std::string& id, LibreOfficeKit* loKit, LibreOfficeKitDocument * loKitDocument, const std::string& jailId, - std::function onLoad, + std::function onLoad, std::function onUnload) : LOOLSession(id, Kind::ToMaster, ws), _loKit(loKit), @@ -415,21 +415,6 @@ bool ChildProcessSession::_handleInput(const char *buffer, int length) } _isDocLoaded = loadDocument(buffer, length, tokens); -if (!_isDocLoaded && _isDocPasswordProtected) -{ -if (!_isDocPasswordProvided) -{ -std::string passwordFrame = "passwordrequired:"; -if (_docPasswordType == PasswordType::ToView) -passwordFrame += "to-view"; -else if (_docPasswordType == PasswordType::ToModify) -passwordFrame += "to-modify"; -sendTextFrame("error: cmd=load kind=" + passwordFrame); -} -else -sendTextFrame("error: cmd=load kind=wrongpassword"); -} - return _isDocLoaded; } else if (!_isDocLoaded) @@ -584,7 +569,7 @@ bool ChildProcessSession::loadDocument(const char * /*buffer*/, int /*length*/, assert(!_docURL.empty()); assert(!_jailedFilePath.empty()); -_loKitDocument = _onLoad(getId(), _jailedFilePath); +_loKitDocument = _onLoad(getId(), _jailedFilePath, _docPassword, _isDocPasswordProvided); if (!_loKitDocument) return false; @@ -611,11 +596,6 @@ bool ChildProcessSession::loadDocument(const char * /*buffer*/, int /*length*/, _loKitDocument->pClass->setPart(_loKitDocument, part); } -// 'statusindicatorfinish:' is used to let clients, and parent process know of successfull document load -// Usually, 'statusindicatorfinish:' is already sent when the load document operation finishes, -// but in case of multiple sessions accessing the same document, it won't be sent. -sendTextFrame("statusindicatorfinish:"); - // Respond by the document status, which has no arguments. if (!getStatus(nullptr, 0)) return false; @@ -1330,30 +1310,6 @@ bool ChildProcessSession::setPage(const char* /*buffer*/, int /*length*/, String return true; } -void ChildProcessSession::setDocumentPassword(const int nPasswordType) -{ - -if (_isDocPasswordProtected && _isDocPasswordProvided) -{ -// it means this is the second attempt with the wrong password; abort load operation -_loKit->pClass->setDocumentPassword(_loKit, _jailedFilePath.c_str(), nullptr); -return; -} - -// One thing for sure, this is a password protected document -_isDocPasswordProtected = true; - -if (nPasswordType == LOK_CALLBACK_DOCUMENT_PASSWORD) -_docPasswordType = PasswordType::ToView; -else if (nPasswordType == LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY) -_docPasswordType = PasswordType::ToModify; - -if (_isDocPasswordProvided) -_loKit->pClass->setDocumentPassword(_loKit, _jailedFilePath.c_str(), _docPassword.c_str()); -else -_loKit->pClass->setDocumentPassword(_loKit, _jailedFilePath.c_str(), nullptr); -} - void
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp | 67 +++- 1 file changed, 30 insertions(+), 37 deletions(-) New commits: commit 631ae0f11fb863a2ba9bbcc279c83905af8bba96 Author: Pranav KantDate: Sun Feb 7 22:08:48 2016 +0530 loolwsd: Get the first *live* connection Sometimes there are situations when `connection` map is filled with dead sessions. We don't want to deal with those dead ones. Change-Id: I00dda77c39b5adbba69421eace0be0159e02505c Reviewed-on: https://gerrit.libreoffice.org/22207 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index 3694d42..703e30b 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -496,48 +496,41 @@ private: static void KitCallback(int nType, const char* pPayload, void* pData) { Document* self = reinterpret_cast (pData); +Log::trace() << "Callback " + << KitCallbackTypeToString(nType) + << " [" << pPayload << "]." << Log::end; + if (self) { std::unique_lock lock(self->_mutex); - -// Ideally, there would be only one connection at this point of time -const auto& it = self->_connections.begin(); - -if (!it->second->isRunning()) -Log::error() << "Error: Connection died unexpectedly" << Log::end; - -auto session = it->second->getSession(); -auto sessionLock = session->getLock(); - -Log::trace() << "Callback [" << session->getViewId() << "] " - << KitCallbackTypeToString(nType) - << " [" << pPayload << "]." << Log::end; - -if (session->isDisconnected()) -{ -Log::trace("Skipping callback on disconnected session " + session->getName()); -return; -} -else if (session->isInactive()) +for (auto& it: self->_connections) { -Log::trace("Skipping callback on inactive session " + session->getName()); -return; -} +if (it.second->isRunning()) +{ +auto session = it.second->getSession(); +auto sessionLock = session->getLock(); -switch (nType) -{ -case LOK_CALLBACK_STATUS_INDICATOR_START: -session->sendTextFrame("statusindicatorstart:"); -break; -case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE: -session->sendTextFrame("statusindicatorsetvalue: " + std::string(pPayload)); -break; -case LOK_CALLBACK_STATUS_INDICATOR_FINISH: -session->sendTextFrame("statusindicatorfinish:"); -break; -case LOK_CALLBACK_DOCUMENT_PASSWORD: -case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: -session->setDocumentPassword(nType); +switch (nType) +{ +case LOK_CALLBACK_STATUS_INDICATOR_START: +session->sendTextFrame("statusindicatorstart:"); +break; +case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE: +session->sendTextFrame("statusindicatorsetvalue: " + std::string(pPayload)); +break; +case LOK_CALLBACK_STATUS_INDICATOR_FINISH: +session->sendTextFrame("statusindicatorfinish:"); +break; +case LOK_CALLBACK_DOCUMENT_PASSWORD: +case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: +session->setDocumentPassword(nType); +break; +} +} + +// Ideally, there would be only one *live* connection at this point of time +// So, just get the first running one and break out. +// TODO: Find a better way to find the correct connection. break; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/LOOLKit.cpp
loolwsd/ChildProcessSession.cpp | 21 --- loolwsd/LOOLKit.cpp | 73 ++-- 2 files changed, 72 insertions(+), 22 deletions(-) New commits: commit 10db02c208a79dc1dcaac0b96de15831a9800082 Author: Pranav KantDate: Sun Feb 7 21:35:00 2016 +0530 loolwsd: Move document related callback logic to Document class There are 5 LOK callbacks currently that are triggered on LOKit, and not on LOKitDocument. These include status indicators, and document password callbacks during document load. Lets move all the callbacks called during document load in the Document container itself, and keep the callbacks called after document load in the Child session. Change-Id: I8e43c2baaa12023b34822954dd494780ee6dd7ca Reviewed-on: https://gerrit.libreoffice.org/22206 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp index 5fd53ee..a2e737f 100644 --- a/loolwsd/ChildProcessSession.cpp +++ b/loolwsd/ChildProcessSession.cpp @@ -104,12 +104,6 @@ public: return std::string("LOK_CALLBACK_HYPERLINK_CLICKED"); case LOK_CALLBACK_STATE_CHANGED: return std::string("LOK_CALLBACK_STATE_CHANGED"); -case LOK_CALLBACK_STATUS_INDICATOR_START: -return std::string("LOK_CALLBACK_STATUS_INDICATOR_START"); -case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE: -return std::string("LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE"); -case LOK_CALLBACK_STATUS_INDICATOR_FINISH: -return std::string("LOK_CALLBACK_STATUS_INDICATOR_FINISH"); case LOK_CALLBACK_SEARCH_NOT_FOUND: return std::string("LOK_CALLBACK_SEARCH_NOT_FOUND"); case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED: @@ -144,7 +138,7 @@ public: return; } -switch (static_cast(nType)) +switch (nType) { case LOK_CALLBACK_INVALIDATE_TILES: { @@ -223,15 +217,6 @@ public: case LOK_CALLBACK_STATE_CHANGED: _session.sendTextFrame("statechanged: " + rPayload); break; -case LOK_CALLBACK_STATUS_INDICATOR_START: -_session.sendTextFrame("statusindicatorstart:"); -break; -case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE: -_session.sendTextFrame("statusindicatorsetvalue: " + rPayload); -break; -case LOK_CALLBACK_STATUS_INDICATOR_FINISH: -_session.sendTextFrame("statusindicatorfinish:"); -break; case LOK_CALLBACK_SEARCH_NOT_FOUND: _session.sendTextFrame("searchnotfound: " + rPayload); break; @@ -248,10 +233,6 @@ public: case LOK_CALLBACK_UNO_COMMAND_RESULT: _session.sendTextFrame("unocommandresult: " + rPayload); break; -case LOK_CALLBACK_DOCUMENT_PASSWORD: -case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: -_session.setDocumentPassword(nType); -break; case LOK_CALLBACK_ERROR: { Poco::JSON::Parser parser; diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index 00847da..3694d42 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -473,6 +473,76 @@ public: private: +static std::string KitCallbackTypeToString (const int nType) +{ +switch (nType) +{ +case LOK_CALLBACK_STATUS_INDICATOR_START: +return std::string("LOK_CALLBACK_STATUS_INDICATOR_START"); +case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE: +return std::string("LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE"); +case LOK_CALLBACK_STATUS_INDICATOR_FINISH: +return std::string("LOK_CALLBACK_STATUS_INDICATOR_FINISH"); +case LOK_CALLBACK_DOCUMENT_PASSWORD: +return std::string("LOK_CALLBACK_DOCUMENT_PASSWORD"); +case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: +return std::string("LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY"); +} + +return std::to_string(nType); +} + + +static void KitCallback(int nType, const char* pPayload, void* pData) +{ +Document* self = reinterpret_cast (pData); +if (self) +{ +std::unique_lock lock(self->_mutex); + +// Ideally, there would be only one connection at this point of time +const auto& it = self->_connections.begin(); + +if (!it->second->isRunning()) +Log::error() << "Error: Connection died unexpectedly" << Log::end; + +auto session = it->second->getSession(); +auto sessionLock = session->getLock(); + +Log::trace() << "Callback [" << session->getViewId() << "] " + << KitCallbackTypeToString(nType) +
[Libreoffice-commits] online.git: loolwsd/LOOLKit.cpp
loolwsd/LOOLKit.cpp | 29 - 1 file changed, 16 insertions(+), 13 deletions(-) New commits: commit 7ecde2342246274d4f5564fd13511856e7533921 Author: Pranav KantDate: Sun Feb 7 14:38:03 2016 +0530 loolwsd: Remove superfluous registration of callback Our DocumentCallback is smart enough which checks all the running connections, and send the callback notification to all of them. Registering the callback only during the first loadDocument call should be enough. Change-Id: I82bcb9525814dae14def3bfb6c088337d0d0ea3c Reviewed-on: https://gerrit.libreoffice.org/22202 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp index 9c55ff3..00847da 100644 --- a/loolwsd/LOOLKit.cpp +++ b/loolwsd/LOOLKit.cpp @@ -516,10 +516,12 @@ private: if (_loKitDocument == nullptr) { +// This is the first time we are loading the document Log::info("Loading new document from URI: [" + uri + "] for session [" + sessionId + "]."); if ( LIBREOFFICEKIT_HAS(_loKit, registerCallback)) { +// TODO: Separate the global callback from document callback _loKit->pClass->registerCallback(_loKit, DocumentCallback, this); _loKit->pClass->setOptionalFeatures(_loKit, LOK_FEATURE_DOCUMENT_PASSWORD | LOK_FEATURE_DOCUMENT_PASSWORD_TO_MODIFY); @@ -527,6 +529,7 @@ private: // documentLoad will trigger callback, which needs to take the lock. lock.unlock(); + if ((_loKitDocument = _loKit->pClass->documentLoad(_loKit, uri.c_str())) == nullptr) { Log::error("Failed to load: " + uri + ", error: " + _loKit->pClass->getError(_loKit)); @@ -535,22 +538,22 @@ private: // Retake the lock. lock.lock(); -} -if (_multiView) -{ -Log::info("Loading view to document from URI: [" + uri + "] for session [" + sessionId + "]."); -const auto viewId = _loKitDocument->pClass->createView(_loKitDocument); +if (_multiView) +{ +Log::info("Loading view to document from URI: [" + uri + "] for session [" + sessionId + "]."); +const auto viewId = _loKitDocument->pClass->createView(_loKitDocument); -_loKitDocument->pClass->registerCallback(_loKitDocument, ViewCallback, reinterpret_cast (intSessionId)); +_loKitDocument->pClass->registerCallback(_loKitDocument, ViewCallback, reinterpret_cast (intSessionId)); -Log::info() << "Document [" << _url << "] view [" -<< viewId << "] loaded, leaving " -<< (_clientViews + 1) << " views." << Log::end; -} -else -{ -_loKitDocument->pClass->registerCallback(_loKitDocument, DocumentCallback, this); +Log::info() << "Document [" << _url << "] view [" +<< viewId << "] loaded, leaving " +<< (_clientViews + 1) << " views." << Log::end; +} +else +{ +_loKitDocument->pClass->registerCallback(_loKitDocument, DocumentCallback, this); +} } ++_clientViews; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/MasterProcessSession.cpp
loolwsd/MasterProcessSession.cpp |6 ++ 1 file changed, 6 insertions(+) New commits: commit a2549e3df708426052dcb4e29773aa95fcc85258 Author: Pranav KantDate: Thu Feb 18 00:14:25 2016 +0530 loolwsd: Disconnect the child if there is no client Don't let them hanging around, otherwise we would keep sending messages to a dead peer (ToClient) indefinitely. Change-Id: I9d4bb6edee351bd31f1faa30deaa4f37c3c7d031 Reviewed-on: https://gerrit.libreoffice.org/22465 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/MasterProcessSession.cpp b/loolwsd/MasterProcessSession.cpp index d9b4f33..19d780a 100644 --- a/loolwsd/MasterProcessSession.cpp +++ b/loolwsd/MasterProcessSession.cpp @@ -125,6 +125,12 @@ bool MasterProcessSession::_handleInput(const char *buffer, int length) if (_kind == Kind::ToPrisoner) { +if (!peer) +{ +LOOLSession::disconnect(); +return false; +} + if (tokens[0] == "error:") { std::string errorCommand; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/test
loolwsd/test/data/password-protected.ods |binary loolwsd/test/httpwstest.cpp | 61 +++ 2 files changed, 61 insertions(+) New commits: commit b902d80ec7354923f3680aea83b774114be387c4 Author: Pranav KantDate: Thu Feb 18 02:45:28 2016 +0530 loolwsd: Add a unit test for password protected documents Change-Id: Ia675d2750e11cb466b2e80b8f36f2ef04e0a7a09 Reviewed-on: https://gerrit.libreoffice.org/22466 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/test/data/password-protected.ods b/loolwsd/test/data/password-protected.ods new file mode 100644 index 000..d803d8e Binary files /dev/null and b/loolwsd/test/data/password-protected.ods differ diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp index e17702d..351031d 100644 --- a/loolwsd/test/httpwstest.cpp +++ b/loolwsd/test/httpwstest.cpp @@ -22,6 +22,8 @@ #include #include +using Poco::StringTokenizer; + /// Tests the HTTP WebSocket API of loolwsd. The server has to be started manually before running this test. class HTTPWSTest : public CPPUNIT_NS::TestFixture { @@ -34,11 +36,13 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture CPPUNIT_TEST(testPaste); CPPUNIT_TEST(testLargePaste); CPPUNIT_TEST(testRenderingOptions); +CPPUNIT_TEST(testPasswordProtectedDocument); CPPUNIT_TEST_SUITE_END(); void testPaste(); void testLargePaste(); void testRenderingOptions(); +void testPasswordProtectedDocument(); static void sendTextFrame(Poco::Net::WebSocket& socket, const std::string& string); @@ -216,6 +220,63 @@ void HTTPWSTest::testRenderingOptions() } } +void HTTPWSTest::testPasswordProtectedDocument() +{ +// Load a password protected document +const std::string documentPath = TDOC "/password-protected.ods"; +const std::string documentURL = "file://" + Poco::Path(documentPath).makeAbsolute().toString(); +// Send a load request without password first +sendTextFrame(_socket, "load url=" + documentURL); + +int flags; +int n; +int counter = 0; +do +{ +char buffer[READ_BUFFER_SIZE]; +n = _socket.receiveFrame(buffer, sizeof(buffer), flags); +if (n > 0) +{ +std::string line = LOOLProtocol::getFirstLine(buffer, n); +StringTokenizer tokens(line, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM); +std::string errorCommand; +std::string errorKind; +if (counter == 0 && +tokens[0] == "error:" && +LOOLProtocol::getTokenString(tokens[1], "cmd", errorCommand) && +LOOLProtocol::getTokenString(tokens[2], "kind", errorKind) ) +{ +CPPUNIT_ASSERT_EQUAL(std::string("load"), errorCommand); +// TODO: Do a test for document requiring password to edit +CPPUNIT_ASSERT_EQUAL(std::string("passwordrequired:to-view"), errorKind); + +// Send another load request with incorrect password +sendTextFrame(_socket, "load url=" + documentURL + " password=2"); +counter++; +} +else if (counter == 1 && +tokens[0] == "error:" && +LOOLProtocol::getTokenString(tokens[1], "cmd", errorCommand) && +LOOLProtocol::getTokenString(tokens[2], "kind", errorKind) ) +{ +CPPUNIT_ASSERT_EQUAL(std::string("load"), errorCommand); +CPPUNIT_ASSERT_EQUAL(std::string("wrongpassword"), errorKind); + +// Send another load request with correct password +sendTextFrame(_socket, "load url=" + documentURL + " password=1"); +counter++; +} +else if (counter == 2 && + tokens[0] == "status:") +{ +// Entering correct password opened the document +break; +} +} +} +while (n > 0 && (flags & Poco::Net::WebSocket::FRAME_OP_BITMASK) != Poco::Net::WebSocket::FRAME_OP_CLOSE); +} + void HTTPWSTest::sendTextFrame(Poco::Net::WebSocket& socket, const std::string& string) { socket.sendFrame(string.data(), string.size()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp loolwsd/LOOLKit.cpp loolwsd/LOOLSession.cpp loolwsd/LOOLSession.hpp loolwsd/MasterProcessSession.cpp
loolwsd/ChildProcessSession.cpp | 63 +++ loolwsd/ChildProcessSession.hpp |4 ++ loolwsd/LOOLKit.cpp |5 +++ loolwsd/LOOLSession.cpp | 10 ++ loolwsd/LOOLSession.hpp | 20 loolwsd/MasterProcessSession.cpp | 30 +- 6 files changed, 126 insertions(+), 6 deletions(-) New commits: commit 3667bef9a6759181ac90b31e63633c75bf5bed72 Author: Pranav KantDate: Thu Feb 4 23:05:26 2016 +0530 loolwsd: Handle password protected documents Change-Id: Iceb5bb598ef1517bf640994c27bad4ca36bd72c1 Reviewed-on: https://gerrit.libreoffice.org/21894 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp index dfef7b7..5fd53ee 100644 --- a/loolwsd/ChildProcessSession.cpp +++ b/loolwsd/ChildProcessSession.cpp @@ -118,6 +118,10 @@ public: return std::string("LOK_CALLBACK_SET_PART"); case LOK_CALLBACK_PARTS_COUNT_CHANGED: return std::string("LOK_CALLBACK_PARTS_COUNT_CHANGED"); +case LOK_CALLBACK_DOCUMENT_PASSWORD: +return std::string("LOK_CALLBACK_DOCUMENT_PASSWORD"); +case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: +return std::string("LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY"); } return std::to_string(nType); } @@ -245,8 +249,8 @@ public: _session.sendTextFrame("unocommandresult: " + rPayload); break; case LOK_CALLBACK_DOCUMENT_PASSWORD: -break; case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY: +_session.setDocumentPassword(nType); break; case LOK_CALLBACK_ERROR: { @@ -321,12 +325,13 @@ std::recursive_mutex ChildProcessSession::Mutex; ChildProcessSession::ChildProcessSession(const std::string& id, std::shared_ptr ws, - LibreOfficeKit* /*loKit*/, + LibreOfficeKit* loKit, LibreOfficeKitDocument * loKitDocument, const std::string& jailId, std::function onLoad, std::function onUnload) : LOOLSession(id, Kind::ToMaster, ws), +_loKit(loKit), _loKitDocument(loKitDocument), _multiView(getenv("LOK_VIEW_CALLBACK")), _jailId(jailId), @@ -422,15 +427,31 @@ bool ChildProcessSession::_handleInput(const char *buffer, int length) } else if (tokens[0] == "load") { -if (_docURL != "") +if (_isDocLoaded) { sendTextFrame("error: cmd=load kind=docalreadyloaded"); return false; } -return loadDocument(buffer, length, tokens); +_isDocLoaded = loadDocument(buffer, length, tokens); +if (!_isDocLoaded && _isDocPasswordProtected) +{ +if (!_isDocPasswordProvided) +{ +std::string passwordFrame = "passwordrequired:"; +if (_docPasswordType == PasswordType::ToView) +passwordFrame += "to-view"; +else if (_docPasswordType == PasswordType::ToModify) +passwordFrame += "to-modify"; +sendTextFrame("error: cmd=load kind=" + passwordFrame); +} +else +sendTextFrame("error: cmd=load kind=wrongpassword"); +} + +return _isDocLoaded; } -else if (_docURL == "") +else if (!_isDocLoaded) { sendTextFrame("error: cmd=" + tokens[0] + " kind=nodocloaded"); return false; @@ -584,6 +605,9 @@ bool ChildProcessSession::loadDocument(const char * /*buffer*/, int /*length*/, _loKitDocument = _onLoad(getId(), _jailedFilePath); +if (!_loKitDocument) +return false; + std::unique_lock lock(Mutex); if (_multiView) @@ -606,6 +630,11 @@ bool ChildProcessSession::loadDocument(const char * /*buffer*/, int /*length*/, _loKitDocument->pClass->setPart(_loKitDocument, part); } +// 'statusindicatorfinish:' is used to let clients, and parent process know of successfull document load +// Usually, 'statusindicatorfinish:' is already sent when the load document operation finishes, +// but in case of multiple sessions accessing the same document, it won't be sent. +sendTextFrame("statusindicatorfinish:"); + // Respond by the document status, which has no arguments. if (!getStatus(nullptr, 0)) return false; @@ -1320,6 +1349,30 @@ bool ChildProcessSession::setPage(const char* /*buffer*/, int /*length*/, String
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/Storage.hpp
loolwsd/LOOLWSD.cpp |1 loolwsd/Storage.hpp | 84 2 files changed, 85 insertions(+) New commits: commit 13f9b7a2dbd88974fb328498ae31bf1910d7f982 Author: Ashod NakashianDate: Fri Feb 19 16:19:15 2016 -0500 loolwsd: Storage Abstraction support An abstract Storage abstraction class is added. There will be a factory to instantiate concrete implementation for a given backend. For WebDAV and similar hosted backends, authentication and authorization will be done by the implementation with the help of the Auth abstraction. Change-Id: I38ec5dad4c2c4ce16df30d65826df96751b10e2d Reviewed-on: https://gerrit.libreoffice.org/22513 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 75a83b2..276c5fe 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -111,6 +111,7 @@ DEALINGS IN THE SOFTWARE. #include "ChildProcessSession.hpp" #include "LOOLWSD.hpp" #include "QueueHandler.hpp" +#include "Storage.hpp" #include "Util.hpp" using namespace LOOLProtocol; diff --git a/loolwsd/Storage.hpp b/loolwsd/Storage.hpp new file mode 100644 index 000..7597783 --- /dev/null +++ b/loolwsd/Storage.hpp @@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +// Storage abstraction. +#ifndef INCLUDED_STORAGE_HPP +#define INCLUDED_STORAGE_HPP + +#include + +#include "Auth.hpp" +#include "Util.hpp" + +/// Base class of all Storage abstractions. +class StorageBase +{ +public: + +/// Returns a local file path given a URI. +/// If necessary copies the file locally first. +virtual std::string getFilePathFromURI(const std::string& uri) = 0; + +/// Writes the contents of the file back to the URI. +virtual bool restoreFileToURI(const std::string& path, const std::string& uri) = 0; + +}; + +/// Trivial implementation of local storage that does not need do anything. +class LocalStorage : public StorageBase +{ +public: + +std::string getFilePathFromURI(const std::string& uri) override +{ +// It's local already. +// TODO: Validate access? +return uri; +} + +bool restoreFileToURI(const std::string& path, const std::string& uri) +{ +// Nothing to do. +(void)path; +(void)uri; +return false; +} +}; + +class WebDAVStorage : public StorageBase +{ +public: + +WebDAVStorage(const std::string& url, std::unique_ptr authAgent) : +_url(url), +_authAgent(std::move(authAgent)) +{ +} + +std::string getFilePathFromURI(const std::string& uri) override +{ +// TODO: implement webdav GET. +return uri; +} + +bool restoreFileToURI(const std::string& path, const std::string& uri) +{ +// TODO: implement webdav PUT. +(void)path; +(void)uri; +return false; +} + +private: +const std::string _url; +std::unique_ptr _authAgent; +}; + +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/debug loleaflet/src loolwsd/Auth.hpp loolwsd/LOOLWSD.cpp loolwsd/LOOLWSD.hpp
loleaflet/debug/document/document_simple_example.html |2 loleaflet/src/core/Socket.js |2 loolwsd/Auth.hpp | 110 ++ loolwsd/LOOLWSD.cpp | 34 + loolwsd/LOOLWSD.hpp |2 5 files changed, 148 insertions(+), 2 deletions(-) New commits: commit d8df19d0642b4cd7bbe514be25e0e9d8a65fd6f3 Author: Ashod NakashianDate: Mon Feb 15 18:05:24 2016 -0500 loolwsd: Authentication and Authorization support An abstract class to request an access token, given an authorization grant. The class should be specialized for each authentication/authorization type we support. Currently it's not enabled in the code as it's an early stage in developing an general API. Change-Id: I4f2efd376d575640bd3e17c7257994020b11bbe8 Reviewed-on: https://gerrit.libreoffice.org/22512 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html index 2a222ea..001da3e 100644 --- a/loleaflet/debug/document/document_simple_example.html +++ b/loleaflet/debug/document/document_simple_example.html @@ -64,6 +64,7 @@ var filePath = getParameterByName('file_path'); var host = getParameterByName('host'); +var token = getParameterByName('token'); var permission = getParameterByName('permission'); var timestamp = getParameterByName('timestamp'); if (filePath === '') { @@ -88,6 +89,7 @@ doc: filePath, renderingOptions: renderingOptions, server: host, +token: token, //webserver: ..., /* by default derived from 'server' */ permission: permission, timestamp: timestamp, diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js index d3ed85b..cf8a531 100644 --- a/loleaflet/src/core/Socket.js +++ b/loleaflet/src/core/Socket.js @@ -9,7 +9,7 @@ L.Socket = L.Class.extend({ initialize: function (map) { this._map = map; try { - this.socket = new WebSocket(map.options.server); + this.socket = new WebSocket(map.options.server + '/?token=' + map.options.token); } catch (e) { this.fire('error', {msg: _('Socket connection error'), cmd: 'socket', kind: 'failed', id: 3}); return null; diff --git a/loolwsd/Auth.hpp b/loolwsd/Auth.hpp new file mode 100644 index 000..c234243 --- /dev/null +++ b/loolwsd/Auth.hpp @@ -0,0 +1,110 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +// Authentication and Authorization support. +#ifndef INCLUDED_AUTH_HPP +#define INCLUDED_AUTH_HPP + +#include + +#include +#include +#include + +#include "Util.hpp" + +/// Base class of all Authentication/Authorization implementations. +class AuthBase +{ +public: + +/// Called after securing an authorization code to acquire an access token. +virtual bool getAccessToken(const std::string& authorizationCode) = 0; + +/// Used to verify the validity of an access token. +virtual bool verify(const std::string& token) = 0; +}; + +class OAuth : public AuthBase +{ +public: +OAuth(const std::string& clientId, + const std::string& clientSecret, + const std::string& tokenEndPoint, + const std::string& authVerifyUrl) : +_clientId(clientId), +_clientSecret(clientSecret), +_tokenEndPoint(tokenEndPoint), +_authVerifyUrl(authVerifyUrl) +{ +} + +//TODO: This MUST be done over TLS to protect the token. +bool getAccessToken(const std::string& authorizationCode) override +{ +std::string url = _tokenEndPoint ++ "?client_id=" + _clientId ++ "_secret=" + _clientSecret ++ "_type=authorization_code" ++ "=" + authorizationCode; +// + "_uri=" + +Poco::URI uri(url); +Poco::Net::HTTPClientSession session(uri.getHost(), uri.getPort()); +Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, url, Poco::Net::HTTPMessage::HTTP_1_1); +Poco::Net::HTTPResponse response; +session.sendRequest(request); +std::istream& rs = session.receiveResponse(response); +Log::info() << "Status: " << response.getStatus() << " " <<
[Libreoffice-bugs] [Bug 92858] <100% Line spacing on first line of paragraph rendered as 100%
https://bugs.documentfoundation.org/show_bug.cgi?id=92858 Michael Stahlchanged: What|Removed |Added Summary|Line height not respected |<100% Line spacing on first ||line of paragraph rendered ||as 100% -- 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 79750] EDITING: text with less than 100% proportional line height
https://bugs.documentfoundation.org/show_bug.cgi?id=79750 Bug 79750 depends on bug 92858, which changed state. Bug 92858 Summary: Line height not respected https://bugs.documentfoundation.org/show_bug.cgi?id=92858 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |NOTABUG -- 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 92858] Line height not respected
https://bugs.documentfoundation.org/show_bug.cgi?id=92858 Michael Stahlchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |NOTABUG --- Comment #5 from Michael Stahl --- actually this is line spacing, not line height. as the commit message in comment #2 tried to say, the proportional line spacing before the first line of a paragraph is constrained to >=100% for existing documents (LO < 4.3.4) and may also be <100% for new documents; before the 2nd to last line of a paragraph, <100% line spacing will be applied in all cases. the paragraphs outside the table in the bugdoc all have only 1 line so the spacing is 100%. (this should also explains the observation in comment #3) since the line spacing was very buggy in LO versions < 4.3.4 such that 60% was actually rendered as 36%, i don't see a good reason to add extra code to handle documents written between LO 3.3 and LO 4.3.3 specially, since they will look different anyway. -- 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 97991] Reducing the size of the Windows Installer
https://bugs.documentfoundation.org/show_bug.cgi?id=97991 --- Comment #5 from Yousuf (Jay) Philips--- (In reply to Óvári from comment #2) > 1. How would the new arrangement change the installation instruction (cf. > http://www.libreoffice.org/get-help/install-howto/windows/) without > complicating them further? There would be no changes there, the changes would happen on the download page which would allow users to select which download they'd want, just like we currently have when a user selects to download help in their language. (e.g. http://www.libreoffice.org/download/libreoffice-fresh/?type=win-x86=5.1=de ) > 2. It could create confusion for LibreOffice users if there are different > downloads for different locations. If this is presented in the right way, there wont be any confusion. Here is firefox's download page, and it isnt confusing ( https://www.mozilla.org/en-US/firefox/all/ ). > 3. In multicultural Australia there is a large likelihood that there is a > person from almost every nation that LibreOffice supports is in Australia. > Spelling checkers/grammar checkers/thesauri for English and another language > is convenient by being bundled in the one installer. As stated, the full installer would still be available for to users who want all the languages, but no single user in Australia would need every language to be included in the installer, as there is a limit to the number of languages they speak/know. > 4. It was interesting to note that you listed > ro (Romanian) in LibreOffice-westEU > hu (Hungarian) in LibreOffice-eastEU > when *hu* is more west and *ro* is more east. That was a typo, but you can see that i've listed < https://en.wikipedia.org/wiki/Romanian_language > under LibreOffice-eastEU. > 5. There may be request to bundle LibreOffice on political alliances, eg. > have a installer which has all the EU member states included. Well they can grab the full installer. The main advantage of break up EU into west and east is because of the sizes of their dictionaries and the languages spoken their. Germany on the west has the largest dictionary at 70mb and the largest dictionaries on the east (hu, el, ro, ru) total to 27.5mb. > 6. The current set-up with separate downloads for each offline help in the > language seems very simple on all account, except perhaps if there a > download limits. Perhaps solutions could be found like: > a) bundling LibreOffice on the cover DVD of computing magazines > b) hosting LibreOffice on local ISP ftp servers > c) some other creative options which would not divert the resources of TDF > from enhancing LibreOffice, Document Liberation Strange that downloading separate offline help is acceptable, but we wouldnt consider the same for UI and dictionaries. Downloading multiple help files for multilingual individuals wouldnt be the simplest process. Many users wouldnt eve notice the 'LibreOffice in other languages' link on the download page, as i know i didnt notice it the first time i visited. > 7. You mentioned that this concept would not work for Linux. Microsoft may > be a temporary platform as: > a) Moving a city to Linux needs political backing, says Munich project leader > > http://www.pcworld.com/article/2082460/moving-a-city-to-linux-needs- > political-backing-says-munich-project-leader.html > b) Russia Plans to Move to Linux >http://news.softpedia.com/news/russia-plans-to-move-to-linux-500278.shtml > c) German town of Gummersbach migrates to Linux > > http://osssa.org.za/2014/10/07/german-town-of-gummersbach-migrates-to-linux/ > d) There may be other migrations to Linux happening, whether in government > or business, that are not in the news In the linux builds, we dont bundle all the language packs into the installer ( http://downloadarchive.documentfoundation.org/libreoffice/old/latest/deb/x86/ ), so users would need to download the separate language packs like they download the separate help packs on windows. Also most linux users get LibreOffice through their package manager, so they dont visit the website to download it, unlike Windows and Mac users. Windows isnt going anywhere and that wont being changing anytime soon no matter which governments switch over to linux, as there are more people in businesses and in their homes than employees in a government. (In reply to Heiko Tietze from comment #3) > To give another example: You placed en > (en_GB or en_US?) in all packages, likely to offer English to everybody. But > not taking the other big languages into account might be offending to many > people. Yes en meant en_US (our default english) so that it is available to everyone and the LibreOffice-default included all the major languages, that dont have their own dedicated installer. > Messing up language with politics is always a big problem. The organization was based on languages and geographics, not politics. > The better procedure would be to distribute only the hard-coded language and
[Libreoffice-bugs] [Bug 97991] Reducing the size of the Windows Installer
https://bugs.documentfoundation.org/show_bug.cgi?id=97991 --- Comment #5 from Yousuf (Jay) Philips--- (In reply to Óvári from comment #2) > 1. How would the new arrangement change the installation instruction (cf. > http://www.libreoffice.org/get-help/install-howto/windows/) without > complicating them further? There would be no changes there, the changes would happen on the download page which would allow users to select which download they'd want, just like we currently have when a user selects to download help in their language. (e.g. http://www.libreoffice.org/download/libreoffice-fresh/?type=win-x86=5.1=de ) > 2. It could create confusion for LibreOffice users if there are different > downloads for different locations. If this is presented in the right way, there wont be any confusion. Here is firefox's download page, and it isnt confusing ( https://www.mozilla.org/en-US/firefox/all/ ). > 3. In multicultural Australia there is a large likelihood that there is a > person from almost every nation that LibreOffice supports is in Australia. > Spelling checkers/grammar checkers/thesauri for English and another language > is convenient by being bundled in the one installer. As stated, the full installer would still be available for to users who want all the languages, but no single user in Australia would need every language to be included in the installer, as there is a limit to the number of languages they speak/know. > 4. It was interesting to note that you listed > ro (Romanian) in LibreOffice-westEU > hu (Hungarian) in LibreOffice-eastEU > when *hu* is more west and *ro* is more east. That was a typo, but you can see that i've listed < https://en.wikipedia.org/wiki/Romanian_language > under LibreOffice-eastEU. > 5. There may be request to bundle LibreOffice on political alliances, eg. > have a installer which has all the EU member states included. Well they can grab the full installer. The main advantage of break up EU into west and east is because of the sizes of their dictionaries and the languages spoken their. Germany on the west has the largest dictionary at 70mb and the largest dictionaries on the east (hu, el, ro, ru) total to 27.5mb. > 6. The current set-up with separate downloads for each offline help in the > language seems very simple on all account, except perhaps if there a > download limits. Perhaps solutions could be found like: > a) bundling LibreOffice on the cover DVD of computing magazines > b) hosting LibreOffice on local ISP ftp servers > c) some other creative options which would not divert the resources of TDF > from enhancing LibreOffice, Document Liberation Strange that downloading separate offline help is acceptable, but we wouldnt consider the same for UI and dictionaries. Downloading multiple help files for multilingual individuals wouldnt be the simplest process. Many users wouldnt eve notice the 'LibreOffice in other languages' link on the download page, as i know i didnt notice it the first time i visited. > 7. You mentioned that this concept would not work for Linux. Microsoft may > be a temporary platform as: > a) Moving a city to Linux needs political backing, says Munich project leader > > http://www.pcworld.com/article/2082460/moving-a-city-to-linux-needs- > political-backing-says-munich-project-leader.html > b) Russia Plans to Move to Linux >http://news.softpedia.com/news/russia-plans-to-move-to-linux-500278.shtml > c) German town of Gummersbach migrates to Linux > > http://osssa.org.za/2014/10/07/german-town-of-gummersbach-migrates-to-linux/ > d) There may be other migrations to Linux happening, whether in government > or business, that are not in the news In the linux builds, we dont bundle all the language packs into the installer ( http://downloadarchive.documentfoundation.org/libreoffice/old/latest/deb/x86/ ), so users would need to download the separate language packs like they download the separate help packs on windows. Also most linux users get LibreOffice through their package manager, so they dont visit the website to download it, unlike Windows and Mac users. Windows isnt going anywhere and that wont being changing anytime soon no matter which governments switch over to linux, as there are more people in businesses and in their homes than employees in a government. (In reply to Heiko Tietze from comment #3) > To give another example: You placed en > (en_GB or en_US?) in all packages, likely to offer English to everybody. But > not taking the other big languages into account might be offending to many > people. Yes en meant en_US (our default english) so that it is available to everyone and the LibreOffice-default included all the major languages, that dont have their own dedicated installer. > Messing up language with politics is always a big problem. The organization was based on languages and geographics, not politics. > The better procedure would be to distribute only the hard-coded language and
[Libreoffice-bugs] [Bug 93967] LibreOffice Crash always after try to save
https://bugs.documentfoundation.org/show_bug.cgi?id=93967 --- Comment #46 from rao...@comcast.net --- With the 5.2 Dev version I am not getting the same crashes, but the program hangs - it sits with the toolbars grayed out (in the window I was saving), and I cannot enter data/click with mouse anywhere in that window or any other window of LO that I have open (I normally work with 2 files open). How do I get a backtrace in this situation? -- 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 97991] Reducing the size of the Windows Installer
https://bugs.documentfoundation.org/show_bug.cgi?id=97991 Yousuf (Jay) Philipschanged: What|Removed |Added CC||tima...@gmail.com --- Comment #4 from Yousuf (Jay) Philips --- (In reply to V Stuart Foote from comment #1) > @Jay, @Stuart, > The problem would be in maintaining this diverse set of installers. MSI > based installers are monolithic by design--we're lucky to have Andras Timar > willing to maintain the Windows packaging for our VS build scripts. @Andras: Would be good to hear your feedback. > Frankly, I don't have any issues with current packaging of Windows > installers and offline help packs. I personally dont have any issues with the current installer as i have a 10MB fiber optics connection, i've spoken to people who had difficulties downloading it because of size (e.g. my brother who lives in Somalia where he has a shared 512kb connection and it took him ~4 hours to download it). > The size of the installer is the price of > admission--and, we distribute via ISO for DVD and in portable versions for > those bandwidth constrained. From what i could see, the ISO on DVD is available in north america and germany and most users will miss downloading the portable additions because its isnt on the standard download page for fresh and still and all links (e.g. the big 'Download Now' button on the homepage or in press releases and news articles ) link directly to < http://www.libreoffice.org/download/ >. It is interesting to see that the full portable version is only 166mb, which makes me wonder why the msi file is so much larger. > Suspect to get any traction on this, TDF would need to hire a FTE release > engineer to specialize in Windows installer packaging--probably WiX based > and move away from MS Visual Studio based packaging-- to be able to support > the more granular packaging you are suggesting. Not sure if this would help, but there are msi editors like - http://www.instedit.com/ - so likely there maybe some commandline msi apps that could automate the process. -- 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 97991] Reducing the size of the Windows Installer
https://bugs.documentfoundation.org/show_bug.cgi?id=97991 Yousuf (Jay) Philipschanged: What|Removed |Added CC||tima...@gmail.com --- Comment #4 from Yousuf (Jay) Philips --- (In reply to V Stuart Foote from comment #1) > @Jay, @Stuart, > The problem would be in maintaining this diverse set of installers. MSI > based installers are monolithic by design--we're lucky to have Andras Timar > willing to maintain the Windows packaging for our VS build scripts. @Andras: Would be good to hear your feedback. > Frankly, I don't have any issues with current packaging of Windows > installers and offline help packs. I personally dont have any issues with the current installer as i have a 10MB fiber optics connection, i've spoken to people who had difficulties downloading it because of size (e.g. my brother who lives in Somalia where he has a shared 512kb connection and it took him ~4 hours to download it). > The size of the installer is the price of > admission--and, we distribute via ISO for DVD and in portable versions for > those bandwidth constrained. >From what i could see, the ISO on DVD is available in north america and germany and most users will miss downloading the portable additions because its isnt on the standard download page for fresh and still and all links (e.g. the big 'Download Now' button on the homepage or in press releases and news articles ) link directly to < http://www.libreoffice.org/download/ >. It is interesting to see that the full portable version is only 166mb, which makes me wonder why the msi file is so much larger. > Suspect to get any traction on this, TDF would need to hire a FTE release > engineer to specialize in Windows installer packaging--probably WiX based > and move away from MS Visual Studio based packaging-- to be able to support > the more granular packaging you are suggesting. Not sure if this would help, but there are msi editors like - http://www.instedit.com/ - so likely there maybe some commandline msi apps that could automate the process. -- 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 95736] unoconv will not work - probably a wrong pyuno database
https://bugs.documentfoundation.org/show_bug.cgi?id=95736 Michael Stahlchanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||mst...@redhat.com Resolution|--- |NOTOURBUG --- Comment #3 from Michael Stahl --- resolving per comment #2 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/mailmerge-toolbar' - sw/source
sw/source/uibase/app/apphdl.cxx | 64 +++- 1 file changed, 31 insertions(+), 33 deletions(-) New commits: commit 04d239711187667032398e622857f06c5eeaa332 Author: Jan HolesovskyDate: Fri Feb 19 21:37:21 2016 +0100 mailmerge: Create the documents for printing. Now the printing from the toolbar works. Change-Id: Id52deb78f0fcce96afc7727c63e6020f1743a430 diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index ca57274..fe61bcc 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -619,6 +619,33 @@ IMPL_LINK_NOARG_TYPED(SwMailMergeWizardExecutor, CloseFrameHdl, void*, void) } } +SwMailMergeConfigItem* PerformMailMerge(SwView* pView) +{ +SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem(); +if (!pConfigItem) +return nullptr; + +svx::ODataAccessDescriptor aDescriptor; +aDescriptor.setDataSource(pConfigItem->GetCurrentDBData().sDataSource); +aDescriptor[ svx::daConnection ] <<= pConfigItem->GetConnection().getTyped(); +aDescriptor[ svx::daCursor ] <<= pConfigItem->GetResultSet(); +aDescriptor[ svx::daCommand ] <<= pConfigItem->GetCurrentDBData().sCommand; +aDescriptor[ svx::daCommandType ] <<= pConfigItem->GetCurrentDBData().nCommandType; +aDescriptor[ svx::daSelection ] <<= pConfigItem->GetSelection(); + +SwWrtShell& rSh = pView->GetWrtShell(); +pConfigItem->SetTargetView(nullptr); + +SwMergeDescriptor aMergeDesc(DBMGR_MERGE_SHELL, rSh, aDescriptor); +aMergeDesc.pMailMergeConfigItem = pConfigItem; +aMergeDesc.bCreateSingleFile = true; +rSh.GetDBManager()->MergeNew(aMergeDesc); + +pConfigItem->SetMergeDone(); + +return pConfigItem; +} + } // namespace #endif // HAVE_FEATURE_DBCONNECTIVITY @@ -735,6 +762,7 @@ void SwModule::ExecOther(SfxRequest& rReq) } // now the record has to be merged into the source document +// TODO can we re-use PerformMailMerge() here somehow? const SwDBData& rDBData = pConfigItem->GetCurrentDBData(); uno::Sequence vSelection({ uno::makeAny(pConfigItem->GetResultSetPosition()) }); svx::ODataAccessDescriptor aDescriptor(::comphelper::InitPropertySequence({ @@ -764,49 +792,19 @@ void SwModule::ExecOther(SfxRequest& rReq) break; case FN_MAILMERGE_CREATE_DOCUMENTS: { -SwView* pView = ::GetActiveView(); -SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem(); -if (!pConfigItem) -return; - -// TODO share this code somehow with the above FN_MAILMERGE_*_ENTRY -// TODO kill SwMailMergeWizard::CreateTargetDocument() -svx::ODataAccessDescriptor aDescriptor; - aDescriptor.setDataSource(pConfigItem->GetCurrentDBData().sDataSource); -aDescriptor[ svx::daConnection ] <<= pConfigItem->GetConnection().getTyped(); -aDescriptor[ svx::daCursor ] <<= pConfigItem->GetResultSet(); -aDescriptor[ svx::daCommand ] <<= pConfigItem->GetCurrentDBData().sCommand; -aDescriptor[ svx::daCommandType ] <<= pConfigItem->GetCurrentDBData().nCommandType; -aDescriptor[ svx::daSelection ] <<= pConfigItem->GetSelection(); - -SwWrtShell& rSh = pView->GetWrtShell(); -pConfigItem->SetTargetView(nullptr); - -SwMergeDescriptor aMergeDesc(DBMGR_MERGE_SHELL, rSh, aDescriptor); -aMergeDesc.pMailMergeConfigItem = pConfigItem; -aMergeDesc.bCreateSingleFile = true; -rSh.GetDBManager()->MergeNew(aMergeDesc); +SwMailMergeConfigItem* pConfigItem = PerformMailMerge(GetActiveView()); -pConfigItem->SetMergeDone(); -if (pConfigItem->GetTargetView()) +if (pConfigItem && pConfigItem->GetTargetView()) pConfigItem->GetTargetView()->GetViewFrame()->GetFrame().Appear(); } case FN_MAILMERGE_SAVE_DOCUMENTS: case FN_MAILMERGE_PRINT_DOCUMENTS: case FN_MAILMERGE_EMAIL_DOCUMENTS: { -SwView* pView = ::GetActiveView(); -SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem(); +SwMailMergeConfigItem* pConfigItem = PerformMailMerge(GetActiveView()); if (!pConfigItem) return; -if (!pConfigItem->GetTargetView()) -{ -SwView* pSourceView = pConfigItem->GetSourceView(); -assert(pSourceView); - pConfigItem->SetTargetView(SwDBManager::CreateTargetDocShell(true, >GetEditWin(), pSourceView->GetWrtShellPtr(), pSourceView->GetDocShell())); -} - SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); switch (nWhich) {
[Libreoffice-bugs] [Bug 93925] Regression: Comments lost in PDF Export of documents with comments inside margin
https://bugs.documentfoundation.org/show_bug.cgi?id=93925 --- Comment #9 from raal--- (In reply to Michael Stahl from comment #8) > > really, this commit broke something? it's just a revert of another commit > that removed "unused" code. > It can be anyone from these commits source sha:a6f5770b46506a22eae0d641ad48f9b6d239 source sha:5bc343cc723f993ed112cf5c700e3f397527d671 source sha:c6483666232a231446190d5c256857db45c5e4cc source sha:bded4ddd6da0de2c465b28a51d773720338542c3 source sha:79429448052d4b69cc235000b74f3f8d6fa5a74c source sha:7e74fe416de8f2da49d7fd2eb13759cde76e9c6c source sha:cd0474555eed3e65c145c85ed21baab8f09258d2 source sha:a843c457044acc3155b0d3c49534e78569c69d96 source sha:cfde943f59b0cf63c46cbe061fd37e53201d2363 source sha:cade2b8f9f9c39fc7bc6960f5faf591860be58ae source sha:6556043364877c0ac74c07b509856dccfe52e43a source sha:4cf3dd78870456f786d39e8946648550a655d9a3 source sha:978033d5ed9f93f2d5d9a1ba44acf6b37bc13bfe source sha:b5a4e6974a5473c44fc239b6a9ae21f233111c2a source sha:f1256611054701a2bba20225fb654814eecbf559 source sha:3b32c5898ff4e744d3f18b00421b433500426d74 > > there's just a day between the two. are you sure the bibisect result is > correct? Sure - not, sometimes I make mistakes ;-) -- 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 95050] Font background atttribute in styles: no UI to modify fo:background-color
https://bugs.documentfoundation.org/show_bug.cgi?id=95050 Michael Stahlchanged: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Michael Stahl --- seems i should have resolved this DUPLICATE *** This bug has been marked as a duplicate of bug 88276 *** -- 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 93925] Regression: Comments lost in PDF Export of documents with comments inside margin
https://bugs.documentfoundation.org/show_bug.cgi?id=93925 --- Comment #8 from Michael Stahl--- commit a6f5770b46506a22eae0d641ad48f9b6d239 Author: Michael Stahl AuthorDate: Fri Jul 3 16:53:45 2015 +0200 Revert "loplugin:unusedmethods sax,shell,stoc,basegfx" The basegfx changes appear to break Windows builds. This reverts commit 3b32c5898ff4e744d3f18b00421b433500426d74. really, this commit broke something? it's just a revert of another commit that removed "unused" code. commit 3b32c5898ff4e744d3f18b00421b433500426d74 Author: Noel Grandin AuthorDate: Thu Jul 2 14:21:30 2015 +0200 loplugin:unusedmethods sax,shell,stoc,basegfx there's just a day between the two. are you sure the bibisect result is correct? -- 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-1' - include/vcl vcl/source
include/vcl/spin.h |8 ++ vcl/source/control/spinfld.cxx | 114 + vcl/source/window/toolbox.cxx |4 - 3 files changed, 71 insertions(+), 55 deletions(-) New commits: commit 63212b4614c134233f520cee95611ec5e7b3d8a0 Author: Caolán McNamaraDate: Thu Feb 18 14:16:23 2016 + Resolves: tdf#97953 spinbuttons are not suitable for reuse as up/down arrows (cherry picked from commit 4f034adcb79684bc4138e2f9708defd8a3532f74) Change-Id: Ibcd7bd4099210a26513caac6e3b16a88a4c8abad refactor ImplDrawSpinButton there is (supposed to be anyway) no logic change here, just unwind the overly complex flow Change-Id: I9c96f41b0480a60c486b476f383d856b464cd62d (cherry picked from commit 55b33456c14aa5311fb0e3d71f1cad4fbd73cbef) Reviewed-on: https://gerrit.libreoffice.org/22486 Reviewed-by: David Ostrovsky Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/spin.h b/include/vcl/spin.h index e4ce463..0f2f3eb 100644 --- a/include/vcl/spin.h +++ b/include/vcl/spin.h @@ -24,11 +24,19 @@ class Rectangle; +// Draw Spinners as found in a SpinButton. Some themes like gtk3 will draw +- elements here, +// so these are only suitable in the context of SpinButtons void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow, const Rectangle& rUpperRect, const Rectangle& rLowerRect, bool bUpperIn, bool bLowerIn, bool bUpperEnabled = true, bool bLowerEnabled = true, bool bHorz = false, bool bMirrorHorz = false); +// Draw Up/Down buttons suitable for use in any context +void ImplDrawUpDownButtons(vcl::RenderContext& rRenderContext, + const Rectangle& rUpperRect, const Rectangle& rLowerRect, + bool bUpperIn, bool bLowerIn, bool bUpperEnabled = true, bool bLowerEnabled = true, + bool bHorz = false, bool bMirrorHorz = false); + #endif // INCLUDED_VCL_SPIN_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 750900f..d4bb3a6 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -158,49 +158,7 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow bool bUpperIn, bool bLowerIn, bool bUpperEnabled, bool bLowerEnabled, bool bHorz, bool bMirrorHorz) { -DecorationView aDecoView(); - -DrawButtonFlags nStyle = DrawButtonFlags::NoLeftLightBorder; -DrawSymbolFlags nSymStyle = DrawSymbolFlags::NONE; - -SymbolType eType1, eType2; - -const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); -if ( rStyleSettings.GetOptions() & StyleSettingsOptions::SpinArrow ) -{ -// arrows are only use in OS/2 look -if ( bHorz ) -{ -eType1 = bMirrorHorz ? SymbolType::ARROW_RIGHT : SymbolType::ARROW_LEFT; -eType2 = bMirrorHorz ? SymbolType::ARROW_LEFT : SymbolType::ARROW_RIGHT; -} -else -{ -eType1 = SymbolType::ARROW_UP; -eType2 = SymbolType::ARROW_DOWN; -} -} -else -{ -if ( bHorz ) -{ -eType1 = bMirrorHorz ? SymbolType::SPIN_RIGHT : SymbolType::SPIN_LEFT; -eType2 = bMirrorHorz ? SymbolType::SPIN_LEFT : SymbolType::SPIN_RIGHT; -} -else -{ -eType1 = SymbolType::SPIN_UP; -eType2 = SymbolType::SPIN_DOWN; -} -} - -// draw upper/left Button -DrawButtonFlags nTempStyle = nStyle; -if (bUpperIn) -nTempStyle |= DrawButtonFlags::Pressed; - bool bNativeOK = false; -Rectangle aUpRect; if (pWindow) { @@ -236,15 +194,66 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow bNativeOK = ImplDrawNativeSpinbuttons(rRenderContext, aValue); } -if (!bNativeOK) -aUpRect = aDecoView.DrawButton(rUpperRect, nTempStyle); +if (bNativeOK) +return; + +ImplDrawUpDownButtons(rRenderContext, + rUpperRect, rLowerRect, + bUpperIn, bLowerIn, bUpperEnabled, bLowerEnabled, + bHorz, bMirrorHorz); +} + +void ImplDrawUpDownButtons(vcl::RenderContext& rRenderContext, + const Rectangle& rUpperRect, const Rectangle& rLowerRect, + bool bUpperIn, bool bLowerIn, bool bUpperEnabled, bool bLowerEnabled, + bool bHorz, bool bMirrorHorz) +{ +DecorationView aDecoView(); + +SymbolType eType1, eType2; +
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 9f0e9c7c52fe2685838cfd9f71a44105a3688d1d Author: Michael StahlDate: Fri Feb 19 17:32:48 2016 +0100 sw: tdf#63022 fix drag-and-drop of text in same paragraph SplitNode() inserts new node before the existing one, so pEndTextNd and aRg.aEnd point one node too far. Change-Id: I6cea44fafd9d2b47e77e76892a260c5a8c6849fc (cherry picked from commit fabc45a6a902c8988eff087831f8b2f84ea8ae6c) Reviewed-on: https://gerrit.libreoffice.org/22510 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 8fdc824..2138bf3e6 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -4259,18 +4259,16 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, rPam.Move( fnMoveBackward, fnGoContent ); if( bChg ) rPam.Exchange(); - -aRg.aEnd = pEnd->nNode; -pEndTextNd = pEnd->nNode.GetNode().GetTextNode(); } else if( rPos == *pEnd ) { // The end was also moved pEnd->nNode--; pEnd->nContent.Assign( pDestTextNd, nContentEnd ); -aRg.aEnd = pEnd->nNode; -pEndTextNd = pEnd->nNode.GetNode().GetTextNode(); } +// tdf#63022 always reset pEndTextNd after SplitNode +aRg.aEnd = pEnd->nNode; +pEndTextNd = pEnd->nNode.GetNode().GetTextNode(); } NUMRULE_STATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/fmgridcl.hxx | 11 ++- svx/source/fmcomp/fmgridcl.cxx |2 +- 2 files changed, 3 insertions(+), 10 deletions(-) New commits: commit 4bc2e84c8bf9ff685ecb00b1bf782eae9ee93e8d Author: Caolán McNamaraDate: Fri Feb 19 16:36:07 2016 + no need for two triggerColumnContextMenu Change-Id: I7c16f510fa998b63c9e845414cb01e3acdd8a3bb Reviewed-on: https://gerrit.libreoffice.org/22509 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index a654599..c2b1173 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -37,21 +37,14 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmGridHeader protected: FmGridHeaderData* m_pImpl; -// trigger context menu execution -voidtriggerColumnContextMenu( const ::Point& _rPreferredPos ); - public: FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); virtual ~FmGridHeader(); virtual void dispose() override; public: -struct AccessControl { friend class FmGridControl; private: AccessControl() { } }; - -inline voidtriggerColumnContextMenu( const ::Point& _rPreferredPos, const AccessControl& ) -{ -triggerColumnContextMenu( _rPreferredPos ); -} +// trigger context menu execution +voidtriggerColumnContextMenu( const ::Point& _rPreferredPos ); protected: virtual void Command( const CommandEvent& rCEvt ) override; diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index ddd6a70..75ffd75 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1030,7 +1030,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt) ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) ); Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) ); -pMyHeader->triggerColumnContextMenu( aRelativePos, FmGridHeader::AccessControl() ); +pMyHeader->triggerColumnContextMenu(aRelativePos); // handled return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 86790] Support STYLEREF field fully
https://bugs.documentfoundation.org/show_bug.cgi?id=86790 --- Comment #3 from sebalis--- Interesting thought, but I would really prefer the full flexibility of STYLEREF, where you can use any style to select the paragraph from which the field contents should be derived. -- 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 96559] Convert Field/Chapter into StyleRef for Word
https://bugs.documentfoundation.org/show_bug.cgi?id=96559 --- Comment #5 from sebalis--- Are you’re wondering whether in bug 86790 I’m asking for Writer to fully support the STYLEREF field known from Word? The answer to that is yes, certainly. The chapter field is not flexible enough in my view. -- 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 'feature/mailmerge-toolbar' - 1042 commits - accessibility/inc accessibility/source android/source animations/source apple_remote/source avmedia/inc avmedia/Libr
Rebased ref, commits from common ancestor: commit 6c42a5e4597dc5d0bcbf4b02c6171a7431d84a4d Author: Jan HolesovskyDate: Wed Jan 6 12:07:55 2016 +0100 mailmerge: Create the target view independantly of the mailmerge execution. Change-Id: Ib6a53b89b0fe2a30eac104afd1c8fe75d2348edd diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index dbf9519..50601da 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -236,7 +236,7 @@ friend class SwConnectionDisposedListener_Impl; GetRowSet(css::uno::Reference< css::sdbc::XConnection>, const OUString& rTableOrQuery, SwDBSelect eTableOrQuery); -SAL_DLLPRIVATE void CreateDumpDocs(sal_Int32 ); +SAL_DLLPRIVATE static sal_Int32 GetMaxDumpDocs(); SAL_DLLPRIVATE void SetSourceProp(SwDocShell* pSourceDocSh); @@ -248,11 +248,6 @@ friend class SwConnectionDisposedListener_Impl; const SwMergeDescriptor& rMergeDescriptor, const SfxFilter* pStoreToFilter); -SAL_DLLPRIVATE void CreateTargetDocShell(sal_Int32 nMaxDumpDocs, bool bMergeShell, vcl::Window *pSourceWindow, - SwWrtShell *pSourceShell, SwDocShell *pSourceDocSh, - SfxObjectShellRef , SwDoc *, - SwWrtShell *, SwView *); - SAL_DLLPRIVATE void LockUnlockDisp(bool bLock, SwDocShell *pSourceDocSh); SAL_DLLPRIVATE void CreateWorkDoc(SfxObjectShellLock , SwView *, SwDoc *, SwDBManager *, @@ -496,6 +491,10 @@ public: SwDoc* getDoc() const; /// Stop reacting to removed database registrations. void releaseRevokeListener(); + +/// Creates & sets up the target docshell. +static SwView* CreateTargetDocShell(bool bMergeShell, vcl::Window *pSourceWindow, +SwWrtShell *pSourceShell, SwDocShell *pSourceDocSh); }; #endif diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index f219cdd..ca57274 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -55,6 +55,7 @@ #include #include +#include #include #include #include @@ -779,6 +780,8 @@ void SwModule::ExecOther(SfxRequest& rReq) aDescriptor[ svx::daSelection ] <<= pConfigItem->GetSelection(); SwWrtShell& rSh = pView->GetWrtShell(); +pConfigItem->SetTargetView(nullptr); + SwMergeDescriptor aMergeDesc(DBMGR_MERGE_SHELL, rSh, aDescriptor); aMergeDesc.pMailMergeConfigItem = pConfigItem; aMergeDesc.bCreateSingleFile = true; @@ -789,21 +792,28 @@ void SwModule::ExecOther(SfxRequest& rReq) pConfigItem->GetTargetView()->GetViewFrame()->GetFrame().Appear(); } case FN_MAILMERGE_SAVE_DOCUMENTS: -{ -SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); -pFact->ExecuteMMResultSaveDialog(); -} -break; case FN_MAILMERGE_PRINT_DOCUMENTS: -{ -SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); -pFact->ExecuteMMResultPrintDialog(); -} -break; case FN_MAILMERGE_EMAIL_DOCUMENTS: { +SwView* pView = ::GetActiveView(); +SwMailMergeConfigItem* pConfigItem = pView->GetMailMergeConfigItem(); +if (!pConfigItem) +return; + +if (!pConfigItem->GetTargetView()) +{ +SwView* pSourceView = pConfigItem->GetSourceView(); +assert(pSourceView); + pConfigItem->SetTargetView(SwDBManager::CreateTargetDocShell(true, >GetEditWin(), pSourceView->GetWrtShellPtr(), pSourceView->GetDocShell())); +} + SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); -pFact->ExecuteMMResultEmailDialog(); +switch (nWhich) +{ +case FN_MAILMERGE_SAVE_DOCUMENTS: pFact->ExecuteMMResultSaveDialog(); break; +case FN_MAILMERGE_PRINT_DOCUMENTS: pFact->ExecuteMMResultPrintDialog(); break; +case FN_MAILMERGE_EMAIL_DOCUMENTS: pFact->ExecuteMMResultEmailDialog(); break; +} } break; #endif diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index f9e9bb1..9cd0dec 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -948,9 +948,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, OUString sBodyMimeType; rtl_TextEncoding eEncoding = ::osl_getThreadTextEncoding(); -static sal_Int32 nMaxDumpDocs = 0; - -CreateDumpDocs(nMaxDumpDocs); +const sal_Int32 nMaxDumpDocs = GetMaxDumpDocs(); if(bEMail) { @@ -1000,12 +998,11 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, bCancel = false; // in case of creating
XSLT help
Hi The expression below is supposed to generate an output like , , ... depending on the value of $level [1] h However, per [2] the expression will not work for Nestcape 6, and indeed does not work on Firefox, but work in Rekonq (KHTML engine). I am running short ideas to output the string '', '' that overcomes the limitation of firefox on the elegant solution above with $level Any ideas appreciated. [1] This piece of code if in main_transform.xsl [2] http://www.w3schools.com/xsl/el_text.asp -- Olivier Hallot Comunidade LibreOffice http://ask.libreoffice.org/pt-br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 97992] LO 5.1.0.3 didn't work right
https://bugs.documentfoundation.org/show_bug.cgi?id=97992 ComputerHotlinechanged: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #4 from ComputerHotline --- I've exactly this problem 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 97388] Document properties: Wrong icon for deleting custom field row
https://bugs.documentfoundation.org/show_bug.cgi?id=97388 --- Comment #4 from Yousuf (Jay) Philips--- It would be best to change the icon reference in the UI to point to cmd/sc_cancel.png. -- 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 97985] FORMATTING : apply button in Style Dialog cannot reapply current style
https://bugs.documentfoundation.org/show_bug.cgi?id=97985 eric.cout...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 98016] FORMATTING : copy/paste characters (not entire line) paste indentation too
https://bugs.documentfoundation.org/show_bug.cgi?id=98016 eric.cout...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 98016] New: FORMATTING : copy/paste characters (not entire line) paste indentation too
https://bugs.documentfoundation.org/show_bug.cgi?id=98016 Bug ID: 98016 Summary: FORMATTING : copy/paste characters (not entire line) paste indentation too Product: LibreOffice Version: 5.0.3.2 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: eric.cout...@gmail.com How to reproduce: -Copy some text (not entire paragraph, just a word for example) from a paragrah that is already indented -Paste this text on a empty paragraph wich is indented differently or with no indentation. This new paragraph inherits of the indentation (and other paragraph level style attributes, like alignment). I think it's not normal because i want paste only text, not paragraph. -- 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 97201] crash : when user creates hyperlink to new spreadsheet
https://bugs.documentfoundation.org/show_bug.cgi?id=97201 raalchanged: What|Removed |Added Keywords||bibisected, bisected CC||sberg...@redhat.com --- Comment #7 from raal --- This seems to have begun at the below commit. Adding Cc: to Stephan Bergmann ; Could you possibly take a look at this one? Thanks 03e703b5e2a7c1a93c24a0f9eacf968092cac28f is the first bad commit commit 03e703b5e2a7c1a93c24a0f9eacf968092cac28f Author: Matthew Francis Date: Wed May 27 18:10:24 2015 +0800 source-hash-02f76dec4c54ec7fb28729941c7044307058665a Bibisect: This commit covers the following irrelevant source commit(s) 4bb76ebfb81cd2f5da89dd9f35b035f687424b15 2ac02d6083094c9b831851c8cc5be5fc41a4a818 280f1c03a71bc72e8d1222de4118424561bf8ac7 233138918dfcc5d3c19c5c018be94dcfcf61a11c e0517616fac5b9b64ad82257534db95f39df568d 9f3716cb7d99ceb5c3c390e650c13188f6515e61 61682ae51129310b62290be77c8349754845aedb commit 02f76dec4c54ec7fb28729941c7044307058665a Author: Stephan Bergmann AuthorDate: Mon Jan 19 11:00:58 2015 +0100 Commit: Stephan Bergmann CommitDate: Mon Jan 19 11:00:58 2015 +0100 Re fdo#80538: Remove read-only infobar after "Save As..." ...on a doc in r/o mode, which will switch to the newly saved document in r/w mode. Was missing from c6270de939d5ee51b61dc4ac02c52f1d9b5b1e47 "fdo#80538 Show an infobar when document is in read-only mode." Change-Id: Ie17f4213f989cb4b9d3f7fc114392ec6f516a965 :04 04 e4a1a9d4cb4982ee34f227dd3d0718ccc2bbf045 11c851736b46dcec4cc1053f1b66e874a7549b76 Mopt git bisect log # bad: [dda106fd616b7c0b8dc2370f6f1184501b01a49e] source-hash-0db96caf0fcce09b87621c11b584a6d81cc7df86 # good: [5b9dd620df316345477f0b6e6c9ed8ada7b6c091] source-hash-2851ce5afd0f37764cbbc2c2a9a63c7adc844311 git bisect start 'latest' 'oldest' # bad: [0c30a2c797b249d0cd804cb71554946e2276b557] source-hash-45aaec8206182c16025cbcb20651ddbdf558b95d git bisect bad 0c30a2c797b249d0cd804cb71554946e2276b557 # good: [770ff0d1a74d2450c2decb349b62c5087e12c46b] source-hash-549b7fad48bb9ddcba7dfa92daea6ce917853a03 git bisect good 770ff0d1a74d2450c2decb349b62c5087e12c46b # bad: [259e888083cf7697956bb7e5f2691e8153eadb4c] source-hash-1884c0bbd40f0ded41d7a1656cb64fb1f6368c36 git bisect bad 259e888083cf7697956bb7e5f2691e8153eadb4c # good: [ee7c82541a2e99f76af570d3faa897504149913a] source-hash-54defd1bd3359c95e45891c7294847d0cebca753 git bisect good ee7c82541a2e99f76af570d3faa897504149913a # bad: [504f60cf9ee84da75d4c15a62dedb18976129c14] source-hash-c8af68bc5adf093f9df803f6fe0147ac9d116169 git bisect bad 504f60cf9ee84da75d4c15a62dedb18976129c14 # bad: [00c3cacafec11fdfbdf7f0c8c279503cd109d8a0] source-hash-f21114332bf670ab7f8e9b0a7f4d83d436d8fd9e git bisect bad 00c3cacafec11fdfbdf7f0c8c279503cd109d8a0 # bad: [b6b84ffae9594f1212dae23de89ddeb029bcc135] source-hash-74b0c5d0bb91977a2392c8a58bba7f13595e4bfb git bisect bad b6b84ffae9594f1212dae23de89ddeb029bcc135 # bad: [7835737d2ddb5a36b9ce90f04022a5c5f6300555] source-hash-de900ebdd4fec0fb06d56583ae22b2adc3608a65 git bisect bad 7835737d2ddb5a36b9ce90f04022a5c5f6300555 # bad: [d7442c6ad2ad39f5d0a09b6c90abfb4b66f9157f] source-hash-1f978c136e803a0ab75fad427cde90661ed1afac git bisect bad d7442c6ad2ad39f5d0a09b6c90abfb4b66f9157f # good: [a6482bf639ab9430397492d61b73b57484b2eae6] source-hash-83e8d0166d4dba92aafead49c427d5ffddd38b72 git bisect good a6482bf639ab9430397492d61b73b57484b2eae6 # bad: [a1502d291d8f316a7ec39b48311149d2b101bc02] source-hash-bfde8099193f852330e9c9a3d7805395837e56da git bisect bad a1502d291d8f316a7ec39b48311149d2b101bc02 # good: [d276bc78a7e6affb4300c0ae437631d1dfd4f062] source-hash-592984cea1a9cc545358b8d6077113a658834aa5 git bisect good d276bc78a7e6affb4300c0ae437631d1dfd4f062 # bad: [03e703b5e2a7c1a93c24a0f9eacf968092cac28f] source-hash-02f76dec4c54ec7fb28729941c7044307058665a git bisect bad 03e703b5e2a7c1a93c24a0f9eacf968092cac28f # first bad commit: [03e703b5e2a7c1a93c24a0f9eacf968092cac28f] source-hash-02f76dec4c54ec7fb28729941c7044307058665a -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svx/AllLangResTarget_svx.mk svx/Package_inc.mk
svx/AllLangResTarget_svx.mk | 12 +--- svx/Package_inc.mk |1 - 2 files changed, 9 insertions(+), 4 deletions(-) New commits: commit bcf075eb572f1595b0144097877ad787e16edf99 Author: Damjan JovanovicDate: Fri Feb 19 17:16:19 2016 + Merge r1409397 from branches/gbuild: #i117685# own copy target for globlmn.hrc Build updates by: me diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 7aa9bf5..fd9aeb9 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -106,9 +106,6 @@ $(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/in $(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc $(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean -$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc - $(call gb_Deliver_deliver,$<,$@) - # hack !!! # just a temporary - globlmn.hrc about to be removed! ifeq ($(strip $(WITH_LANG)),) @@ -138,5 +135,14 @@ $(WORKDIR)/inc/svx/globlmn.hrc_clean : rm -f $(WORKDIR)/inc/svx/lastrun.mk \ $(WORKDIR)/inc/svx/globlmn.hrc +$(OUTDIR)/inc/svx/globlmn.hrc : $(WORKDIR)/inc/svx/globlmn.hrc + $(call gb_Deliver_deliver,$<,$@) + +.PHONY : $(OUTDIR)/inc/svx/globlmn.hrc_clean +$(OUTDIR)/inc/svx/globlmn.hrc_clean : + rm -f $(OUTDIR)/inc/svx/globlmn.hrc + +$(call gb_AllLangResTarget_get_target,svx) : $(OUTDIR)/inc/svx/globlmn.hrc + # vim: set noet sw=4 ts=4: diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index bf583b7..fda28d5 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -133,7 +133,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galleryitem.hxx,svx/galleryite $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the Design Hangout: 2016-02-19
* Present: Heiko, Jan-Marek, Kendy, Samuel, Tomaž * GSoC is close again + https://wiki.documentfoundation.org/Development/GSoC/Ideas + needs to be filed in until the next Tue + Heiko will add the ideas there (/done) /done Area Fill, Table Styles, AutText, Bibliography + we should file in the tasks that are completed from the design point of view + Table styles, Customization dialog, Sidebar, ... + design session stuff : table of contents dialog, symbol dialog, fill dialog, print dialog https://drive.google.com/folderview?id=0B6qJrVIa0SAlcFV0Q2lWMmdUcW8=sharing + done + redesign template manager https://docs.google.com/document/d/1JRPNdeHQpgqiqJv8LW-RHOjtHN8EMX0qK98QBnr10Yg/edit?usp=sharing https://docs.google.com/document/d/1Ri2jznhcQmCtk3cVygEhwN7pi8FkbIVV_OvRQce_n6Y/edit?usp=sharing + Jay: add a Styles usability improvements section + list the various things to implement to GSoC-next ideas + Ahmed, Jay: Brainstorm about some nice / more styles for Calc https://redmine.documentfoundation.org/boards/1/topics/493 [longer term - maybe better to add to the GSoC Styles task?] + Jay: Impress also needs more default object styles (only 2 are available) * Draw-related survey (Heiko) + published and continued (will close on Friday, 19 February) https://design.blog.documentfoundation.org/2016/02/07/what-do-you-expect-from-draw/ http://user-weave.com/survey/b0edf831f89d4d23bb3d6b6ba3e574a9?12 + Results https://drive.google.com/open?id=0ByWdNpQKVjM8bF91TGJCUXlFUk0 + many participants, over 1200 valid answers + first feelings: more people want improvements in the visio-like features, much less want publisher-like features + but many other interesting input too + Heiko will go deeper into the statistics + categorize the answers + extract the info... * Sidebar max width (Jan-Marek) + The side bar currently has a maximum size limit + problem for wollmux exension (Jan-Marek)sw/sdi/swriter.sdi + in general, let's give freedom to the extension developers (Kendy) + we just need to make sure any random extension does not take over the entire LO :-) (Kendy) AI: + put together few screenshots to explain the needs a bit better (Jan-Marek) - http://snag.gy/e8550.jpg - http://snag.gy/Q6pvY.jpg - http://www.wollmux.net/wiki/WollMuxBar#Suchleiste + fan of the changes, just need to be careful - fixed size has some merit too (Stuart) + having a fixed/minimum value by default and allowing a sidebar extension dev to modify this value through api (Jay) + https://www.openoffice.org/api/docs/common/ref/com/sun/star/awt/XDockableWindow.html + Sidebar Bug Reports (Stuart) The Sidebar Meta - https://bugs.documentfoundation.org/show_bug.cgi?id=65138 Sidebar "philosophy" where it needs to go - https://bugs.documentfoundation.org/show_bug.cgi?id=33223#c11 a key feature -- multiple & detatchable decks, and support in profile state https://bugs.documentfoundation.org/show_bug.cgi?id=67770 https://bugs.documentfoundation.org/show_bug.cgi?id=85905 + basically now part of the UX team wants to give the flexibility, the other wants fixed size :-) + suggested a poll - to get more info what the users are expecting (Heiko) + actually cannot exactly make my mind either (Kendy) + have some casses that are annoying, but other than that, I'd be for freedom for extensions (Kendy) + concerned about moving input to the sidebar (Heiko) + let's try to collect useful use cases, and pros and cons for them (Kendy, Heiko) https://docs.google.com/document/d/1ts5GlnrOGWcn7_V9naqRF-Ag9EWzFpsF6GwxH_uzzRw/edit?usp=sharing + would it be actually a big problem when different sidebar panels have different width? (Kendy) + added that as a questionto the poll + constantly changing side when jumping from one tab to the next isnt good UX (Jay) + will share the poll on the ML, when the questions are agreed, publish about the next week (Heiko) + What about changing the sidebar tab programatically (add API)? (Jan-Marek) + no objection from me (Kendy) + if the extension does things the user do not like, they'll de-install ;-) (Kendy) * Update Default font + https://bugs.documentfoundation.org/show_bug.cgi?id=97577 + Would be useful to change the default font in all apps rather than just impress (Jay) + Droid Sans, Serif, Mono (used on Android, available in Google Docs, available in ubuntu 12.04 & debian 6-backports) http://en.wikipedia.org/wiki/Droid_fonts + Noto Sans, Serif, Cousine (droid derivative to fully cover all scripts in unicode, available in ubuntu 14.04 & debian 7)
[Libreoffice-bugs] [Bug 98015] New: Labels Wizard
https://bugs.documentfoundation.org/show_bug.cgi?id=98015 Bug ID: 98015 Summary: Labels Wizard Product: LibreOffice Version: 5.1.0.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: mike.saps...@gmail.com The labels wizard creates a database. Is it possible to make it work like mailmerge, directly from a Calc spreadsheet, without a database? -- 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 98014] New: MAILMERGE: Request for user defined fields
https://bugs.documentfoundation.org/show_bug.cgi?id=98014 Bug ID: 98014 Summary: MAILMERGE: Request for user defined fields Product: LibreOffice Version: 5.1.0.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: mike.saps...@gmail.com Currently the form fields are predefined in the Wizard. Would it be possible to permit the user to add user defined fields? This would extend the scope to documents that do not need addresses and also documents with other data to be entered. -- 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 67478] FILEOPEN: Can't open Word 2003 XML document
https://bugs.documentfoundation.org/show_bug.cgi?id=67478 --- Comment #10 from Dennis Roczek--- Created attachment 122808 --> https://bugs.documentfoundation.org/attachment.cgi?id=122808=edit Word2013 "fixed" example This file was original the same structure. I opened it with Word2013 and simply saved it (and replaced content with lorem ipsum) Writer simply does a "text import" with LibreOffice 5.1 release. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/fixes16' - vcl/source
vcl/source/gdi/pdfextoutdevdata.cxx | 21 + vcl/source/gdi/pdfwriter_impl2.cxx | 10 -- 2 files changed, 21 insertions(+), 10 deletions(-) New commits: commit 131123238dbf003d22d54f6069f95c693d751524 Author: Marco CecchettiDate: Fri Feb 19 18:12:49 2016 +0100 pdf export - avoid to export png as jpeg Conflicts: vcl/source/gdi/pdfextoutdevdata.cxx Change-Id: Iafa5d4b347da46dedb9431b6870f34b2b6fcad99 diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index ed66e76..b787120 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -410,12 +410,20 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc if ( rOutDevData.GetIsLosslessCompression() && !rOutDevData.GetIsReduceImageResolution() ) { Graphic& rGraphic = mGraphics.front(); -if ( rGraphic.IsLink() && rGraphic.GetLink().GetType() == GFX_LINK_TYPE_NATIVE_JPG ) +if ( rGraphic.IsLink() ) { -mbGroupIgnoreGDIMtfActions = true; +GfxLinkType eType = rGraphic.GetLink().GetType(); +if ( eType == GFX_LINK_TYPE_NATIVE_JPG ) +{ +mbGroupIgnoreGDIMtfActions = true; +if ( !mbGroupIgnoreGDIMtfActions ) +mCurrentGraphic = rGraphic; +} +else if ( eType == GFX_LINK_TYPE_NATIVE_PNG ) +{ +mCurrentGraphic = rGraphic; +} } -if ( !mbGroupIgnoreGDIMtfActions ) -mCurrentGraphic = rGraphic; } break; } @@ -470,10 +478,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc } mbGroupIgnoreGDIMtfActions = false; } -else -{ -mCurrentGraphic.Clear(); -} +mCurrentGraphic.Clear(); } break; case PDFExtOutDevDataSync::CreateNamedDest: diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 7e1c9f9..0e14e4d 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -96,7 +96,13 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz aBitmapEx.Mirror( nMirrorFlags ); } -bool bIsJpeg = (i_Graphic.GetType() != GRAPHIC_NONE) && (i_Graphic.GetBitmapEx() == aBitmapEx); +bool bIsJpeg = false, bIsPng = false; +if( i_Graphic.GetType() != GRAPHIC_NONE && i_Graphic.GetBitmapEx() == aBitmapEx ) +{ +GfxLinkType eType = i_Graphic.GetLink().GetType(); +bIsJpeg = (eType == GFX_LINK_TYPE_NATIVE_JPG); +bIsPng = (eType == GFX_LINK_TYPE_NATIVE_PNG); +} if( i_rContext.m_nMaxImageResolution > 50 ) { @@ -154,7 +160,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz aBitmapEx.Convert( eConv ); } bool bUseJPGCompression = !i_rContext.m_bOnlyLosslessCompression; -if ( ( aSizePixel.Width() < 32 ) || ( aSizePixel.Height() < 32 ) ) +if ( bIsPng || ( aSizePixel.Width() < 32 ) || ( aSizePixel.Height() < 32 ) ) bUseJPGCompression = false; SvMemoryStream aStrm; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 98013] New: Microsoft Office files were not converted to PDF properly
https://bugs.documentfoundation.org/show_bug.cgi?id=98013 Bug ID: 98013 Summary: Microsoft Office files were not converted to PDF properly Product: LibreOffice Version: 5.1.0.3 release Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: chen.s...@necect.com Created attachment 122807 --> https://bugs.documentfoundation.org/attachment.cgi?id=122807=edit Microsoft 2010 Word document LibreOffice 5.1 cannot convert Mircosoft Word 2010 document correctly. lots of pictures, shapes were broken when converting the attached file to pdf. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 98012] Replace the Gentium Basic font by the Gentium Plus font
https://bugs.documentfoundation.org/show_bug.cgi?id=98012 --- Comment #1 from fallino--- Pros: - Gentium Plus supports Greek characters as well as Cyrillic compared to Gentium Basic : http://software.sil.org/gentium/support/character-set-support/#GB Cons: - heavier font -- 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 98012] New: Replace the Gentium Basic font by the Gentium Plus font
https://bugs.documentfoundation.org/show_bug.cgi?id=98012 Bug ID: 98012 Summary: Replace the Gentium Basic font by the Gentium Plus font Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: frall...@gmail.com Pros: - Gentium Plus supports Greek characters as well as Cyrillic compared to Gentium Basic : http://software.sil.org/gentium/support/character-set-support/#GB Cons: - heavier font -- 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 97183] Blacked Toolbar Icon Background When Using Breeze Theme
https://bugs.documentfoundation.org/show_bug.cgi?id=97183 thanosshad...@yahoo.com changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #5 from thanosshad...@yahoo.com --- Yes I tried a newer version (5.1) in opensuse tumbleweed and the problem persists. However I must note that, when using openSUSE Leap 42.1 Gnome 3 edition, I installed a package named something like "libreoffice-gtk". Then opened libreoffice (5.0.4 I think) and selected the breeze icon theme and to my surprise, it worked perfectly! (as it also works in ubuntu based distributions). In openSUSE Leap 42.1 KDE plasma 5 edition, I installed the package above but still the blacked box behind the icons was there. I am very curious to learn why that happens... -- 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/core/doc/DocumentContentOperationsManager.cxx |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit fabc45a6a902c8988eff087831f8b2f84ea8ae6c Author: Michael StahlDate: Fri Feb 19 17:32:48 2016 +0100 sw: tdf#63022 fix drag-and-drop of text in same paragraph SplitNode() inserts new node before the existing one, so pEndTextNd and aRg.aEnd point one node too far. Change-Id: I6cea44fafd9d2b47e77e76892a260c5a8c6849fc diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 750dcbe..334e72c 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -4264,18 +4264,16 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos, rPam.Move( fnMoveBackward, fnGoContent ); if( bChg ) rPam.Exchange(); - -aRg.aEnd = pEnd->nNode; -pEndTextNd = pEnd->nNode.GetNode().GetTextNode(); } else if( rPos == *pEnd ) { // The end was also moved pEnd->nNode--; pEnd->nContent.Assign( pDestTextNd, nContentEnd ); -aRg.aEnd = pEnd->nNode; -pEndTextNd = pEnd->nNode.GetNode().GetTextNode(); } +// tdf#63022 always reset pEndTextNd after SplitNode +aRg.aEnd = pEnd->nNode; +pEndTextNd = pEnd->nNode.GetNode().GetTextNode(); } NUMRULE_STATE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 63022] EDITING: Text drag and drop doesn't work correctly (summary: comment 5)
https://bugs.documentfoundation.org/show_bug.cgi?id=63022 Michael Stahlchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |mst...@redhat.com |desktop.org | --- Comment #8 from Michael Stahl --- fixed on master -- 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 98011] New: Scrolling and display lag while streaming video in HTML5 player
https://bugs.documentfoundation.org/show_bug.cgi?id=98011 Bug ID: 98011 Summary: Scrolling and display lag while streaming video in HTML5 player Product: LibreOffice Version: 4.4.7.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: fe...@mcci.com The problem here shows it self as delayed scrolling with seemingly random jumps as the user tries to navigate the writer document. There is a blue, dashed line between each page which takes a second or two to "load" even when using the arrow keys to scroll 1 line at a time. It was pure chance that I happened to notice it with playing some YouTube videos in the background while editing a document. Sure enough, if I had the video playing using the standard YouTube HTML5 setup, the document would have trouble scrolling. Once I stop the video, no problems. I am using Windows 10, 64 bit and Firefox 44.0.2 as my browser. I have NoScript installed as a Firefox plugin, but nothing on the YouTube page is blocked. I also happen to have Privacy Badger installed (EFF), but nothing there is explicitly blocked, although there are a number of domains who's cookies are being prevented from tracking. The document itself is local to my hard drive. I have not had any chance to test on other OSes or other browsers, so this could just as easily be a Firefox issue, but I figured I would at least report it to see if anyone else can reproduce. 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 98010] New: Interface - language
https://bugs.documentfoundation.org/show_bug.cgi?id=98010 Bug ID: 98010 Summary: Interface - language Product: LibreOffice Version: unspecified Hardware: All OS: Mac OS X (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Installation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: gsgewin...@googlemail.com Created attachment 122806 --> https://bugs.documentfoundation.org/attachment.cgi?id=122806=edit The dmg will be broken I can not change the interface from english to german. I've installed the LO program dmg and the LO language dmg. I get the information: -- 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: config_host.mk.in configure.ac RepositoryExternal.mk vcl/inc vcl/unx
RepositoryExternal.mk |6 -- config_host.mk.in |1 - configure.ac| 22 +- vcl/inc/unx/fontmanager.hxx |4 ++-- vcl/unx/generic/fontmanager/fontconfig.cxx |8 vcl/unx/generic/fontmanager/fontmanager.cxx |2 +- 6 files changed, 8 insertions(+), 35 deletions(-) New commits: commit f2984e95740cfbb9c74574f2a1225af3411d4901 Author: Caolán McNamaraDate: Fri Feb 19 11:59:32 2016 + always support packagekit if dbus is enabled Change-Id: I8eb169d33fcb0217989b180aa0c4c0110875be32 Reviewed-on: https://gerrit.libreoffice.org/22503 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fd20bfd..d0ee166 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2537,12 +2537,6 @@ $(call gb_LinkTarget_set_include,$(1),\ $(DBUS_CFLAGS) \ ) -ifeq ($(ENABLE_PACKAGEKIT),TRUE) -$(call gb_LinkTarget_add_defs,$(1),\ --DENABLE_PACKAGEKIT \ -) -endif # ENABLE_PACKAGEKIT - $(call gb_LinkTarget_add_libs,$(1),\ $(DBUS_LIBS) \ ) diff --git a/config_host.mk.in b/config_host.mk.in index 2721820..6170227 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -157,7 +157,6 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@ export ENABLE_OOENV=@ENABLE_OOENV@ export ENABLE_OPENGL=@ENABLE_OPENGL@ export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@ -export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@ export ENABLE_PCH=@ENABLE_PCH@ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@ export ENABLE_RANDR=@ENABLE_RANDR@ diff --git a/configure.ac b/configure.ac index c6a9b7d..b6f6f37 100644 --- a/configure.ac +++ b/configure.ac @@ -1216,15 +1216,9 @@ AC_ARG_ENABLE(cairo-canvas, AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [Determines whether to enable features that depend on dbus. - e.g. Presentation mode screensaver control, bluetooth presentation control]), + e.g. Presentation mode screensaver control, bluetooth presentation control, automatic font install]), ,enable_dbus=yes) -AC_ARG_ENABLE(packagekit, -AS_HELP_STRING([--enable-packagekit], -[Determines whether to enable features using packagekit. - Right now that is auto font install]), -,) - AC_ARG_ENABLE(sdremote, AS_HELP_STRING([--disable-sdremote], [Determines whether to enable Impress remote control (i.e. the server component).]), @@ -10052,20 +10046,6 @@ AC_SUBST(ENABLE_DBUS) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -AC_MSG_CHECKING([whether to enable font install via packagekit]) -if test "$ENABLE_DBUS" = "TRUE"; then -if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then -ENABLE_PACKAGEKIT=TRUE -AC_MSG_RESULT([yes]) -else -ENABLE_PACKAGEKIT= -AC_MSG_RESULT([no]) -fi -else -AC_MSG_RESULT([no, dbus disabled.]) -fi -AC_SUBST(ENABLE_PACKAGEKIT) - AC_MSG_CHECKING([whether to enable Impress remote control]) if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then AC_MSG_RESULT([yes]) diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index d365800..1ffe504 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -317,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager static bool addFontconfigDir(const OString& rDirectory); std::set m_aPreviousLangSupportRequests; -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS std::vector m_aCurrentRequests; #endif Timer m_aFontInstallerTimer; -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void ); #endif PrintFontManager(); diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 8def362..aff2848 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -37,7 +37,7 @@ using namespace psp; #include #include -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS #include #endif @@ -877,7 +877,7 @@ namespace return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS guint get_xid_for_dbus() { const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow(); @@ -887,7 +887,7 @@ namespace #endif } -#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { guint xid = get_xid_for_dbus(); @@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute(
[Libreoffice-bugs] [Bug 98010] Interface - language
https://bugs.documentfoundation.org/show_bug.cgi?id=98010 --- Comment #1 from schnobbel--- I don't have an idea what can be the 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 83248] PRINTING: "Single-line" text box always printed in black
https://bugs.documentfoundation.org/show_bug.cgi?id=83248 Charleschanged: What|Removed |Added CC||charles.clavr...@gmail.com --- Comment #21 from Charles --- Confirmed in LO 5-1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 98009] Wrong calculation in calc when dragging formula
https://bugs.documentfoundation.org/show_bug.cgi?id=98009 --- Comment #2 from David Zaragoza--- Also, I want to add that the bug only is created when pasting data from text file. If I enter the numbers manually it works ok. -- 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 98009] Wrong calculation in calc when dragging formula
https://bugs.documentfoundation.org/show_bug.cgi?id=98009 --- Comment #1 from David Zaragoza--- Created attachment 122805 --> https://bugs.documentfoundation.org/attachment.cgi?id=122805=edit The source with the numbers -- 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 98009] New: Wrong calculation in calc when dragging formula
https://bugs.documentfoundation.org/show_bug.cgi?id=98009 Bug ID: 98009 Summary: Wrong calculation in calc when dragging formula Product: LibreOffice Version: 5.1.0.3 release Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: da...@zaragoza.com.ve Hi I was doing a simple calculation in calc, please see the attached spreadsheet, and the result is wrongly displayed. In the spreadsheet, just going to write for the second row: B2=B202-E202 C2=C202-F202 D2=B2/C2 This is the same for rows 2 to 120. B,C,E,F from 202 to 321 is the input I'm using for the calculations. Steps to reproduce: * Paste the data in rows 202 to 321 from source.txt separated by spaces. * Write the formulas in B2, C2 and D2. In this moment the formula displays OK. * Select B2, C2 and D2 and pull down to do the change, now it will bug out. * After closing and opening, all formulas will be wrong. Regards -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 32581] [EDITING] Add the possibility to retrieve the filename of a movie or sound inserted in a document
https://bugs.documentfoundation.org/show_bug.cgi?id=32581 Arnold Dumaschanged: What|Removed |Added Assignee|libreoffice-b...@lists.free |arn...@dumas.at |desktop.org | --- Comment #12 from Arnold Dumas --- Hello, I would like to work on this bug, is it enough when I assign myself to 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 93085] Application window is too high, status bar is not visible (1024x600 resolution), being picked up from the StartCenter startMoudle setting and is incorrectly set to a fix
https://bugs.documentfoundation.org/show_bug.cgi?id=93085 --- Comment #12 from u.fu...@yahoo.de --- I installed LibreOffice Portable 5.1 on a USB stick and started it on my netbook (1024x600 resolution) with linux (Ubuntu 14.04 / Wine 1.6). Unlike the Linux version 5.1 everything fits. Even as the taskbar is set to always visible. See my screenshots. This should also be possible with the Linux-Version. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 93085] Application window is too high, status bar is not visible (1024x600 resolution), being picked up from the StartCenter startMoudle setting and is incorrectly set to a fix
https://bugs.documentfoundation.org/show_bug.cgi?id=93085 --- Comment #11 from u.fu...@yahoo.de --- Created attachment 122804 --> https://bugs.documentfoundation.org/attachment.cgi?id=122804=edit zipped screenshots Screenshots of LibreOffice Portable 5.1 on Kubuntu Linux -- 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 98008] New: missing menu entry (2)
https://bugs.documentfoundation.org/show_bug.cgi?id=98008 Bug ID: 98008 Summary: missing menu entry (2) Product: LibreOffice Version: 5.1.1.1 rc Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: k...@gmx.de Data > Validity is missing -- 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