LibreOffice Gerrit News for core on 2013-10-16
Moin! * Open changes on master for project core changed in the last 25 hours: + fdo#7 add support for COVARIANCE.P and COVARIANCE.S functions in https://gerrit.libreoffice.org/6135 from Winfried Donkers + sw: Smart-Art related UTs updated to new option in https://gerrit.libreoffice.org/6139 from Andres Gomez + Backport for bug fdo#70345 in https://gerrit.libreoffice.org/6250 from matthieu gay + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#70393: move libpng to a subdir of external in https://gerrit.libreoffice.org/6231 from Björn Michaelsen * Merged changes on master for project core changed in the last 25 hours: + Add the new iOS app project files in https://gerrit.libreoffice.org/6255 from Ptyl + New iOS client code in https://gerrit.libreoffice.org/6254 from Ptyl + fdo#61950 De-extensionize presentation minimizer: post clean in https://gerrit.libreoffice.org/6247 from David Ostrovsky + fix polygon rendering with clip area of one line only in https://gerrit.libreoffice.org/5709 from Tsahi Glik @ CloudOn + Use SAL_WNODEPRECATED_DECLARATIONS_PUSH/POP part2 in https://gerrit.libreoffice.org/6244 from Julien Nabet + fdo#47958: gross cut/paste signal emission nonsense in https://gerrit.libreoffice.org/6064 from Julien Nabet + fdo#57659: fix exif processing in https://gerrit.libreoffice.org/6245 from Julien Nabet + Remove Java unit tests migrated to Python in https://gerrit.libreoffice.org/6017 from David Ostrovsky + fdo#70371: Initial perl script in https://gerrit.libreoffice.org/6238 from Jelle van der Waa * Abandoned changes on master for project core changed in the last 25 hours: + fdo#61950 De-extensionize presentation minimizer: post clean in https://gerrit.libreoffice.org/6246 from David Ostrovsky * Open changes needing tweaks, but being untouched for more than a week: + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + Remove obsolete MIME associatons on MAC OS in https://gerrit.libreoffice.org/6103 from Samuel Mehrbrodt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + Remove more unusedcode in https://gerrit.libreoffice.org/5937 from Marcos Souza + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
MySQL Connector Extension Build on Linux 32bit
As some of you will probably know by now due, I attempt to provide the mysql native connector extension for Linux 32 bit, 64 bit and OSX 64bit. At present, the 32bit Linux build doesn't work on other people's machines with a similar base OS, whereas the Linux 64bit does. There is a noticeable difference in size between the two OXT files, and comparison of the two shows the following : 32bit extension : alex@Aspire-X1430:/home/Development/libo/core$ unzip -l workdir/unxlngi6.pro/Extension/mysql-connector-ooo.oxt Archive: workdir/unxlngi6.pro/Extension/mysql-connector-ooo.oxt Length DateTimeName - -- - 0 2013-09-24 11:42 META-INF/ 1388 2013-10-15 12:57 META-INF/manifest.xml 311 2013-10-14 14:45 components.rdb 255 2013-10-15 12:13 description-en-US.txt 1737 2013-10-15 12:57 description.xml 838 2013-09-24 10:20 images/extension_32.png 667046 2013-10-14 14:15 libmysqlcppconn.so 484084 2013-10-14 14:29 mysqlc.uno.so 0 2013-09-24 11:42 registration/ 436207 2013-10-15 12:57 registration/LICENSE 3561 2013-09-24 10:21 registry/data/org/openoffice/Office/DataAccess/Drivers.xcu - --- 1595427 11 files alex@Aspire-X1430:/home/Development/libo/core$ ls -an workdir/unxlngi6.pro/Extension/mysql-connector-ooo.oxt -rw-rw-r-- 1 1000 0 482261 oct. 15 12:57 workdir/unxlngi6.pro/Extension/mysql-connector-ooo.oxt 64bit extension: alex@Aspire-X1430:~$ unzip -l Downloads/mysql-connector-ooo.oxt Archive: Downloads/mysql-connector-ooo.oxt Length DateTimeName - -- - 0 2013-10-07 13:29 META-INF/ 1391 2013-10-11 16:36 META-INF/manifest.xml 311 2013-10-11 16:36 components.rdb 255 2013-10-11 16:35 description-en-US.txt 1743 2013-10-11 16:36 description.xml 838 2013-10-07 13:04 images/extension_32.png 5113839 2013-10-11 15:06 libmysqlcppconn.so 3802154 2013-10-11 16:35 mysqlc.uno.so 0 2013-10-07 13:29 registration/ 436207 2013-10-11 16:36 registration/LICENSE 3561 2013-10-07 13:04 registry/data/org/openoffice/Office/DataAccess/Drivers.xcu - --- 9360299 11 files alex@Aspire-X1430:~$ ls -an Downloads/mysql-connector-ooo.oxt -rw--- 1 1000 1000 2587648 oct. 16 07:59 Downloads/mysql-connector-ooo.oxt What I'm failing to understand is why this is happening. The basic build systems are based on Ubuntu 13.04 Raring, and use exactly the same build switches, the only difference being that the 64bit OS is Linux Mint 15 Olivia (based on Ubuntu 13.04), and the 32bit is a default Ubuntu 13.04 Raring. Something is obviously failing to be included during the 32bit build, but what ? 64bit : 5113839 2013-10-11 15:06 libmysqlcppconn.so 3802154 2013-10-11 16:35 mysqlc.uno.so 32bit : 667046 2013-10-14 14:15 libmysqlcppconn.so 484084 2013-10-14 14:29 mysqlc.uno.so Any help much appreciated. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Changing the object created by imported docx
Hi again, I think we can conclude some things from your feedback: * The most future-proof solution would be replacing all uses of Writer-kind images with Draw-kind ones, and add to the latter some missing features present in the former [1]. This is an old discussion coming from OO days [2], there's even an analysis of this task at [3]. * We could leave 0º, 90º, 180º and 270º rotated images as they are now (Writer-kind bitmaps), because they are working properly both at import and export. * It would be acceptable to use Draw-kind images to import freely-rotated pictures coming from docx documents. To export them properly, the bug #65836 [4] should be fixed. Thanks to you all. Conversations at this list are always insightful :) [1] http://wiki.openoffice.org/wiki/User:Regina/ComparisonWriterDrawPicture [2] https://issues.apache.org/ooo/show_bug.cgi?id=3545#c105 [3] http://wiki.openoffice.org/wiki/Writer/Unification_of_Graphic_Objects_and_Embedded_Objects [4] https://bugs.freedesktop.org/show_bug.cgi?id=65836 Regards, -- Jacobo Aragunde Software Engineer at Igalia El 15/10/13 09:44, Jacobo Aragunde Pérez escribió: Morning :) I've been thinking on potential solutions to #70457 [1]. It's related with rotation information lost when importing a docx that contains some bitmap. Writer bitmaps are only allowed to be rotated in 90º steps, but in Word they can be rotated to any angle. When importing a document containing a 45º bitmap the rotation is lost, and it keeps lost when the document is saved back. I wonder if importing embedded bitmaps coming from docx as Draw objects would be an acceptable solution for this bug (Draw objects allow to be rotated to any arbitrary position). Such a change should be discussed first, imho. What do you think? Thanks in advance for your time. [1] https://bugs.freedesktop.org/show_bug.cgi?id=70457 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/dataaccess/commanddefinition.hxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 7a3381c2a80de38b513e6e2b455ca5d3c70274c8 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 16 10:02:33 2013 +0200 CID#1000838 Fix overrides' exception specifications Includes also fixes for CID#1000839 CID#1000840 CID#1000841 Change-Id: I4c7d0bbaec59357af722353bdf947f5629dde1b0 diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 3a4a79c..f6afbee0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -99,13 +99,13 @@ public: { OComponentDefinition::setPropertyValue(p1, p2); } virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OComponentDefinition::getPropertyValue(p1); } -virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener p2) throw( ::com::sun::star::uno::RuntimeException ) +virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OComponentDefinition::addPropertyChangeListener(p1, p2); } -virtual void SAL_CALL removePropertyChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener p2) throw( ::com::sun::star::uno::RuntimeException ) +virtual void SAL_CALL removePropertyChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OComponentDefinition::removePropertyChangeListener(p1, p2); } -virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener p2) throw( ::com::sun::star::uno::RuntimeException ) +virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OComponentDefinition::addVetoableChangeListener(p1, p2); } -virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener p2) throw( ::com::sun::star::uno::RuntimeException ) +virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, const com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OComponentDefinition::removeVetoableChangeListener(p1, p2); } virtual com::sun::star::uno::Referencecom::sun::star::ucb::XContentIdentifier SAL_CALL getIdentifier() throw( ::com::sun::star::uno::RuntimeException ) { return OComponentDefinition::getIdentifier(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Roundtripping DOCX file in CLI vs API vs GUI - different results !
Hi Adam, On Tue, Oct 15, 2013 at 07:05:32PM +0300, Adam Fyne adam.f...@cloudon.com wrote: I was wondering if you have encountered this, or know what is the root cause of this. There are 3 different ways to perform a roundtrip of a DOCX file using LibreOffice: * GUI- This way you run LibreOfffice, open the file, do 'save as', choose 'DOCX' and type the filename * API - This way you simply load\import the LibreOffice libraries - and use the API to convert a file from one format to another * CLI - This way you type in the console something like './soffice -conver-to '. What we have noticed is - that the results of the outputted DOCX files are not visually identical in all 3 way ! One pitfall is that on the export side, we have two DOCX export filters: one is 'Office Open XML Text', the other is 'Microsoft Word 2007/2010 XML'. They are basically the same filter, but in case the ECMA standard and what Word does differs, the use can choose what does she prefer. The filter queries its name like this: http://opengrok.libreoffice.org/xref/core/sw/source/filter/ww8/docxattributeoutput.cxx#1900 In the past, for some reason --convert-to used the ECMA filter, while gui save as used the Word filter, in case docx was given as a file extension. So this can be one problem -- though I just checked with latest master, and now I don't see this anymore, even --convert-to uses the Word filter (which is good). An other pitfall is that in Writer, layout is rendered in an idle loop (there are at least two iterations, the first should be quick, the second should be more correct), so if you use --convert-to, we somehow have to wait for the layout. This kind of problem used to cause problems with unit tests as well: we wanted to test layout, but layout wasn't ready right after loading. ;-) That's why we have this code for unit tests: http://opengrok.libreoffice.org/xref/core/sw/qa/extras/inc/swmodeltestbase.hxx#92 A third pitfall is that the main() of unit tests and the desktop app is not the same, it happened in the past that desktop app exported images, while unit tests didn't. That's how we have code like this: http://opengrok.libreoffice.org/xref/core/test/source/bootstrapfixture.cxx#69 All in all, there can be multiple reasons why such output differs, of course ideally none of them should happen. Difference in naming of image files in media folder (e.g. file round trip through CLI may have image1/2/3.png as names whereas file round trip through API may have image101/102/103.png or different. I haven't noticed such difference earlier, so that's something that needs tracking down. Entire Table of Contents is lost if round trip through CLI/API whereas it is retained (largely) if done through GUI. We have this writerfilter/source/dmapper/ModelEventListener.cxx class, which reacts on this OnFocus even of the document, and does some field updating -- isn't it possible that in case of CLI/API, that event is never emitted, and that causes your problem? I don't really understand how come the filter behaves differently between CLI\API and GUI. I guess in all cases it's not the filter itself, it's the layout, filter name, some API what the filter tries to use, etc. -- that differs. If there is some duplicate code and we are doing our fixing in the wrong place than we need to be aware of it. Maybe there is some additional code to the filter in the core model that is not running in the CLI ? There is some duplication, as mentioned above for unit tests vs desktop app (desktop::Desktop::Main() vs test::BootstrapFixture::setUp()), but in your GUI/--convert-to/API case, that all should use the desktop main loop, so should not affect you. We have opened a bug https://bugs.freedesktop.org/show_bug.cgi?id=70481 for this in Bugzilla, but I was wondering if you have any thoughts about this or if you have encountered this before. As written above, not this one, but I saw similar issues, yes. Reading the bugreport, Owen mentions that the situation used to be a bit better, that is worth to investigate as well (e.g. if it's a regression, what commit caused that), I haven't done that so far. Hope this helps, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: hanging indent
Hi Russel, [ Putting back the freedesktop list to CC, removing that is considered a bit rude, I assume it happened only by accident. ] On Tue, Oct 15, 2013 at 05:27:08PM +, Russell Schmitt russjennschmi...@juno.com wrote: Bug 62176 format Negative indents in styles not saved properly is the one report I can find. I have read others. Thank you I see at https://bugs.freedesktop.org/show_bug.cgi?id=62176 that it's marked as a regression, already bibisected. Did you look at the problematic commit range to see if there is anything that is directly related to this problem? Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MySQL Connector Extension Build on Linux 32bit
On 10/16/2013 09:33 AM, Alex Thurgood wrote: 64bit : 5113839 2013-10-11 15:06 libmysqlcppconn.so 3802154 2013-10-11 16:35 mysqlc.uno.so 32bit : 667046 2013-10-14 14:15 libmysqlcppconn.so 484084 2013-10-14 14:29 mysqlc.uno.so Any help much appreciated. I would look at the readelf -d output for each of these, to see which other libraries they link against ((NEEDED) lines), and at the nm --def output for each of these, to see whether there are any glaring differences (and where the names of the missing symbols might give a hint). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl Summary|Make cropping handles |Make cropping handles for |function available for all |images (as in Draw/Impress) |LibO applications |available for all ||LibreOffice applications -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlimport/data/multi-column-separator-with-line.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 16 ++ sw/source/filter/ww8/docxattributeoutput.cxx|3 + writerfilter/source/dmapper/DomainMapper.cxx|1 4 files changed, 19 insertions(+), 1 deletion(-) New commits: commit 764432e36a19f8fd45538f5506f043a624ce2f5c Author: YogeshBharate yogesh.bhar...@synerzip.com Date: Fri Oct 11 19:08:06 2013 +0530 Code changes unit tests for fixing multicolumn section separator line issue Problem Description: In case of multicolumn sections, separator line was getting added during export to docx. Unit test cases added to verify the code changes. Change-Id: Id65ac4d3878eed298882c85082cec9575f914d83 Reviewed-on: https://gerrit.libreoffice.org/6211 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/qa/extras/ooxmlimport/data/multi-column-separator-with-line.docx b/sw/qa/extras/ooxmlimport/data/multi-column-separator-with-line.docx new file mode 100644 index 000..c19ed69 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/multi-column-separator-with-line.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 1f7e831..d801881 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -139,6 +139,7 @@ public: void testChartProp(); void testBnc779620(); void testFdo43093(); +void testMultiColumnSeparator(); CPPUNIT_TEST_SUITE(Test); #if !defined(WNT) @@ -242,6 +243,7 @@ void Test::run() {chart-prop.docx, Test::testChartProp}, {bnc779620.docx, Test::testBnc779620}, {fdo43093.docx, Test::testFdo43093}, +{multi-column-separator-with-line.docx, Test::testMultiColumnSeparator}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1570,6 +1572,9 @@ void Test::testDefaultSectBreakCols() uno::Referencebeans::XPropertySet xPageStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY); xTextColumns = getProperty uno::Referencetext::XTextColumns (xPageStyle, TextColumns); CPPUNIT_ASSERT_EQUAL(sal_Int16(0), xTextColumns-getColumnCount()); +// Check for the Column Separator value.It should be FALSE as the document does not contain separator line. +bool bValue = getProperty bool (xTextColumns, SeparatorLineIsOn); +CPPUNIT_ASSERT(!bValue) ; } void Test::testFdo69636() @@ -1635,6 +1640,17 @@ void Test::testFdo43093() } +void Test::testMultiColumnSeparator() +{ +uno::Referencebeans::XPropertySet xTextSection = getProperty uno::Referencebeans::XPropertySet (getParagraph(1, First data.), TextSection); +CPPUNIT_ASSERT(xTextSection.is()); +uno::Referencetext::XTextColumns xTextColumns = getProperty uno::Referencetext::XTextColumns (xTextSection, TextColumns); +CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xTextColumns-getColumnCount()); +// Check for the Column Separator value.It should be TRUE as the document contains separator line. +bool bValue = getProperty bool (xTextColumns, SeparatorLineIsOn); +CPPUNIT_ASSERT(bValue); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7c4b19e..5821bfc 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5886,7 +5886,8 @@ void DocxAttributeOutput::FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol pColsAttrList-add( FSNS( XML_w, XML_equalWidth ), pEquals ); -bool bHasSep = COLADJ_NONE == rCol.GetLineAdj( ); +bool bHasSep = (COLADJ_NONE != rCol.GetLineAdj()); + pColsAttrList-add( FSNS( XML_w, XML_sep ), bHasSep ? true : false ); // Write the element diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 928a64c..ad74662 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3105,6 +3105,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, PropertyMapPtr rContext, SprmType { pSectionContext-SetColumnCount( (sal_Int16)pSectHdl-GetNum() - 1 ); pSectionContext-SetColumnDistance( pSectHdl-GetSpace() ); +pSectionContext-SetSeparatorLine( pSectHdl-IsSeparator() ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: MySQL Connector Extension Build on Linux 32bit
Le 16/10/2013 10:31, Stephan Bergmann a écrit : I would look at the readelf -d output for each of these, to see which other libraries they link against ((NEEDED) lines), and at the nm --def output for each of these, to see whether there are any glaring differences (and where the names of the missing symbols might give a hint). Thanks Stephan, I'll follow those up and see what sticks its head above the parapet. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 2 commits - include/sax sax/qa sax/source
include/sax/fastattribs.hxx | 20 sax/qa/cppunit/parser.cxx| 10 -- sax/source/fastparser/fastparser.cxx |8 ++-- sax/source/tools/fastattribs.cxx | 57 +-- 4 files changed, 60 insertions(+), 35 deletions(-) New commits: commit 050247997caf09a61ead4d494c8722957d550129 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Oct 16 11:15:31 2013 +0200 fastparser: don't use OStrings in attribute list, just simple char buffer Change-Id: I4879563fae3b85c68bbd1c4b260f9833848f4bda diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 88e9d61..238b7d4 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -40,9 +40,9 @@ struct UnknownAttribute OString maName; OString maValue; -UnknownAttribute( const OUString rNamespaceURL, const OString rName, const OString rValue ); +UnknownAttribute( const OUString rNamespaceURL, const OString rName, const sal_Char* pValue ); -UnknownAttribute( const OString rName, const OString rValue ); +UnknownAttribute( const OString rName, const sal_Char* pValue ); void FillAttribute( ::com::sun::star::xml::Attribute* pAttrib ) const; }; @@ -56,9 +56,10 @@ public: virtual ~FastAttributeList(); void clear(); +void add( sal_Int32 nToken, const sal_Char* pValue, size_t nValueLength = 0 ); void add( sal_Int32 nToken, const OString rValue ); -void addUnknown( const OUString rNamespaceURL, const OString rName, const OString rValue ); -void addUnknown( const OString rName, const OString rValue ); +void addUnknown( const OUString rNamespaceURL, const OString rName, const sal_Char* pValue ); +void addUnknown( const OString rName, const sal_Char* pValue ); // XFastAttributeList virtual ::sal_Bool SAL_CALL hasAttribute( ::sal_Int32 Token ) throw (::com::sun::star::uno::RuntimeException); @@ -70,11 +71,18 @@ public: virtual ::com::sun::star::uno::Sequence ::com::sun::star::xml::FastAttribute SAL_CALL getFastAttributes() throw (::com::sun::star::uno::RuntimeException); private: +inline sal_Int32 AttributeValueLength(sal_Int32 i); + +private: +sal_Char *mpChunk; /// buffer to store all attribute values - null terminated strings +sal_Int32 mnChunkLength; /// size of allocated memory for mpChunk +// maAttributeValues stores pointers, relative to mpChunk, for each attribute value string +// length of the string is maAttributeValues[n+1] - maAttributeValues[n] - 1 +// maAttributeValues[0] == 0 +std::vector sal_Int32 maAttributeValues; std::vector sal_Int32 maAttributeTokens; -std::vector OString maAttributeValues; UnknownAttributeList maUnknownAttributes; ::com::sun::star::uno::Reference ::com::sun::star::xml::sax::XFastTokenHandler mxTokenHandler; - }; } diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index 664b28b..4a1d814 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -986,10 +986,10 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char { sal_Int32 nAttributeToken = GetTokenWithPrefix( pPrefix, nPrefixLen, pName, nNameLen ); if( nAttributeToken != FastToken::DONTKNOW ) -rEvent.mxAttributes-add( nAttributeToken, OString(awAttributes[i+1]) ); +rEvent.mxAttributes-add( nAttributeToken, awAttributes[i+1] ); else rEvent.mxAttributes-addUnknown( GetNamespaceURL( pPrefix, nPrefixLen ), -OString(pName, nNameLen), OString(awAttributes[i+1]) ); +OString(pName, nNameLen), awAttributes[i+1] ); } } else @@ -998,9 +998,9 @@ void FastSaxParser::callbackStartElement( const XML_Char* pwName, const XML_Char { sal_Int32 nAttributeToken = GetToken( pName, nNameLen ); if( nAttributeToken != FastToken::DONTKNOW ) -rEvent.mxAttributes-add( nAttributeToken, OString(awAttributes[i+1]) ); +rEvent.mxAttributes-add( nAttributeToken, awAttributes[i+1] ); else -rEvent.mxAttributes-addUnknown( OString(pName, nNameLen), OString(awAttributes[i+1]) ); +rEvent.mxAttributes-addUnknown( OString(pName, nNameLen), awAttributes[i+1] ); } } } diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx index b25ff08..8020866 100644 --- a/sax/source/tools/fastattribs.cxx +++ b/sax/source/tools/fastattribs.cxx @@ -27,13 +27,13 @@ using namespace ::com::sun::star::xml::sax; namespace sax_fastparser {
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sot/source
sot/source/sdstor/stgstrms.cxx | 27 --- 1 file changed, 20 insertions(+), 7 deletions(-) New commits: commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036 Author: Armin Le Grand a...@apache.org Date: Wed Oct 16 09:39:54 2013 + i123485 secured file import scanning existing pages diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 38420a2..326ed7b 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -29,6 +29,7 @@ #include osl/file.hxx #include tools/tempfile.hxx #include tools/debug.hxx +#include set #include sot/stg.hxx #include stgelem.hxx @@ -768,14 +769,26 @@ void StgDataStrm::Init( sal_Int32 nBgn, sal_Int32 nLen ) // determine the actual size of the stream by scanning // the FAT chain and counting the # of pages allocated nSize = 0; -sal_Int32 nOldBgn = -1; -while( nBgn = 0 nBgn != nOldBgn ) + +// there may be files with double page numbers or loops of page +// references. This is not allowed. To be able to track this and +// to exit with an error, track already scanned PageNumbers here +// and use them to see if an already counted page is re-visited +std::set sal_Int32 nUsedPageNumbers; + +while(nBgn = 0) { -nOldBgn = nBgn; -nBgn = pFat-GetNextPage( nBgn ); -if( nBgn == nOldBgn ) -rIo.SetError( ERRCODE_IO_WRONGFORMAT ); -nSize += nPageSize; +if(nUsedPageNumbers.find(nBgn) == nUsedPageNumbers.end()) +{ +nUsedPageNumbers.insert(nBgn); +nSize += nPageSize; +nBgn = pFat-GetNextPage(nBgn); +} +else +{ +rIo.SetError(ERRCODE_IO_WRONGFORMAT); +nBgn = -1; +} } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optfltr.cxx | 12 ++-- cui/source/options/optfltr.hxx |2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) New commits: commit 09edaa05cd605372ac2d2da0e010fde79f56efc8 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Tue Oct 1 14:11:59 2013 +0200 cui: allow lines in MS filter section to have independently enabled checkboxes An extra InsertEntry method is added with parameters to enable or disable the load and save checkboxes independently. Change-Id: I49233ce31e2eaf361310f89887dcede86dec0edc Reviewed-on: https://gerrit.libreoffice.org/6137 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index dc5440e..d6ec297 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -278,15 +278,23 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet ) void OfaMSFilterTabPage2::InsertEntry( const OUString _rTxt, sal_IntPtr _nType ) { +InsertEntry( _rTxt, _nType, true, true ); +} + +void OfaMSFilterTabPage2::InsertEntry( const OUString _rTxt, sal_IntPtr _nType, + sal_Bool loadEnabled, sal_Bool saveEnabled ) +{ SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( m_pCheckLB ); pEntry-AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); -pEntry-AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, +pEntry-AddItem( new SvLBoxButton( pEntry, loadEnabled? SvLBoxButtonKind_enabledCheckbox : + SvLBoxButtonKind_disabledCheckbox, 0, pCheckButtonData ) ); -pEntry-AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, +pEntry-AddItem( new SvLBoxButton( pEntry, saveEnabled? SvLBoxButtonKind_enabledCheckbox : + SvLBoxButtonKind_disabledCheckbox, 0, pCheckButtonData ) ); pEntry-AddItem( new SvLBoxString( pEntry, 0, _rTxt ) ); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 5d2bc06..a81d5c6 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -86,6 +86,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage virtual ~OfaMSFilterTabPage2(); voidInsertEntry( const OUString _rTxt, sal_IntPtr _nType ); +voidInsertEntry( const OUString _rTxt, sal_IntPtr _nType, + sal_Bool loadEnabled, sal_Bool saveEnabled ); SvTreeListEntry*GetEntry4Type( sal_IntPtr _nType ) const; public: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlimport.mk sw/qa
sw/CppunitTest_sw_ooxmlimport.mk|3 ++ sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 19 +++--- sw/qa/extras/ooxmlimport/data/smartart.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 36 ++-- 4 files changed, 42 insertions(+), 16 deletions(-) New commits: commit b3362fc9cb410599ac54fc3badfad75354c98d84 Author: Andres Gomez ago...@igalia.com Date: Fri Oct 4 19:11:21 2013 +0300 sw: Smart-Art related UTs updated to new option The ooxmlexport unit test for Smart-Art has been updated to just check for the new rendered bitmap that substitutes the generated basic shapes. The ooxmlimport has been updated with a new testSmartart unit tests which checks that the importing has been done to just basic shapes. For this, the run method has been customized so we can set the proper filter option. Slightly modified the expected results in the testChartProp unit test since linking it to additional libraries has modified the dimmensions of the imported chart in few units. Made the ooxmlimport C++ unit tests in the sw module to depend on the drawinglayer and svx components and the utl library. Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I0900a50cfee07999511d071bc9932477ad9430c5 diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk index 5831893..696b6ab 100644 --- a/sw/CppunitTest_sw_ooxmlimport.mk +++ b/sw/CppunitTest_sw_ooxmlimport.mk @@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlimport, \ sal \ test \ unotest \ +utl \ sw \ vcl \ $(gb_UWINAPI) \ @@ -52,6 +53,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ chart2/source/chartcore \ comphelper/util/comphelp \ configmgr/source/configmgr \ +drawinglayer/drawinglayer \ embeddedobj/util/embobj \ fileaccess/source/fileacc \ filter/source/config/cache/filterconfig1 \ @@ -71,6 +73,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\ svl/source/fsstor/fsstorage \ svl/util/svl \ svtools/util/svt \ +svx/util/svx \ toolkit/util/tk \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 5230635..962f09b 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1468,7 +1468,7 @@ void Test::testSmartart() CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws-getCount()); // One groupshape in the doc uno::Referencecontainer::XIndexAccess xGroup(getShape(1), uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xGroup-getCount()); // 3 rectangles and an arrow in the group +CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xGroup-getCount()); // 1 rendered bitmap from the original shapes uno::Referencebeans::XPropertySet xGroupPropertySet(getShape(1), uno::UNO_QUERY); xGroupPropertySet-getPropertyValue(OUString(InteropGrabBag)) = aGrabBag; @@ -1515,19 +1515,10 @@ void Test::testSmartart() } CPPUNIT_ASSERT(bData bLayout bQStyle bColor bDrawing); // Grab Bag has all the expected elements -uno::Referencebeans::XPropertySet xPropertySet(xGroup-getByIndex(1), uno::UNO_QUERY); -sal_Int32 nValue(0); -xPropertySet-getPropertyValue(FillColor) = nValue; -CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), nValue); // If fill color is right, theme import is OK - -uno::Referencetext::XTextRange xTextRange(xGroup-getByIndex(1), uno::UNO_QUERY); -CPPUNIT_ASSERT_EQUAL(OUString(Sample), xTextRange-getString()); // Shape has text - -uno::Referencecontainer::XEnumerationAccess xParaEnumAccess(xTextRange-getText(), uno::UNO_QUERY); -uno::Referencecontainer::XEnumeration xParaEnum = xParaEnumAccess-createEnumeration(); -xPropertySet.set(xParaEnum-nextElement(), uno::UNO_QUERY); -xPropertySet-getPropertyValue(ParaAdjust) = nValue; -CPPUNIT_ASSERT_EQUAL(sal_Int32(style::ParagraphAdjust_CENTER), nValue); // Paragraph properties are imported +uno::Referencebeans::XPropertySet xPropertySet(xGroup-getByIndex(0), uno::UNO_QUERY); +OUString nValue; +xPropertySet-getPropertyValue(Name) = nValue; +CPPUNIT_ASSERT_EQUAL(OUString(RenderedShapes), nValue); // Rendered bitmap has the proper name } void Test::testFdo69636() diff --git a/sw/qa/extras/ooxmlimport/data/smartart.docx b/sw/qa/extras/ooxmlimport/data/smartart.docx new file mode 100644 index 000..7a553f4 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/smartart.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index d801881..7fe9b40a 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -40,6 +40,7 @@ #include
[Libreoffice-commits] core.git: 2 commits - cui/source include/oox include/unotools officecfg/registry oox/Library_oox.mk oox/source sw/CppunitTest_sw_ooxmlexport.mk unotools/source
cui/source/inc/cuires.hrc |2 cui/source/options/optfltr.cxx |6 cui/source/options/optfltr.hxx |3 cui/source/options/optfltr.src |4 include/oox/drawingml/shape.hxx|5 include/unotools/fltrcfg.hxx |3 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 oox/Library_oox.mk |2 oox/source/drawingml/shape.cxx | 173 +++-- oox/source/shape/ShapeContextHandler.cxx |1 sw/CppunitTest_sw_ooxmlexport.mk |2 unotools/source/config/fltrcfg.cxx | 23 + 12 files changed, 204 insertions(+), 26 deletions(-) New commits: commit c0e3574ce0434d295f7e6f4c66c9656847b22e30 Author: Andres Gomez ago...@igalia.com Date: Thu Sep 26 20:35:48 2013 +0300 oox: added methods to lock Smart-Art edition Added the possibility of rendering the basic shapes generated for a Smart-Art into a bitmap and replacing them with it in order to not letting to edit the Smart-Art. This possibility is controlled using a configuration parameter located at Options - Load/Save - MS Office - SmartArt to LibreOffice shapes or reverse. Made the oox library to depend on the drawinglayer and svx libraries. Made the ooxmlexport C++ unit tests in the sw module to depend on the drawinglayer and svx components. Fixed to set to diagram type a new oox::drawingml::Shape representing a Smart-Art in the getShape method of the oox::shape::ShapeContextHandler class. Added the keepDiagramCompatibilityInfo and renderDiagramToGraphic protected methods to the oox::drawingml::Shape class. keepDiagramCompatibilityInfo is now called after an instance of type FRAMETYPE_DIAGRAM has added all its children in the addShape method and the proper setting is in place. keepDiagramCompatibilityInfo substitutes previous similar code in the createAndInsert method and also calls renderDiagramToGraphic. The renderDiagramToGraphic renders the basic shapes in a Smart-Art into a PNG image and replaces these basic shapes with a new GraphicObjectShape filled with the new PNG image. It also sets the MoveProtect and SizeProtect properties of the GraphicObjectShape. Change-Id: Ie4002238ff5fae758a5881b03735bf1f0721ed5b Reviewed-on: https://gerrit.libreoffice.org/6059 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 95108e7..0631c0a 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -201,6 +201,11 @@ protected: ShapeIdMap* pShapeMap, basegfx::B2DHomMatrix aTransformation ); +voidkeepDiagramCompatibilityInfo( ::oox::core::XmlFilterBase rFilterBase ); + +::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape +renderDiagramToGraphic( ::oox::core::XmlFilterBase rFilterBase ); + virtual OUString finalizeServiceName( ::oox::core::XmlFilterBase rFilter, const OUString rServiceName, diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index a20b548..dd30e70 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,oox,\ cppu \ cppuhelper \ editeng \ +drawinglayer \ msfilter \ sal \ i18nlangtag \ @@ -46,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,oox,\ sfx \ svl \ svt \ +svx \ svxcore \ sot \ tl \ diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index f174b34..f9aa426 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -37,7 +37,10 @@ #include oox/helper/propertyset.hxx #include tools/solar.h// for the F_PI180 define +#include tools/gen.hxx +#include tools/mapunit.hxx #include editeng/unoprnms.hxx +#include com/sun/star/awt/Size.hpp #include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/container/XNamed.hpp #include com/sun/star/container/XNameContainer.hpp @@ -46,14 +49,23 @@ #include com/sun/star/xml/AttributeData.hpp #include com/sun/star/drawing/HomogenMatrix3.hpp #include com/sun/star/drawing/TextVerticalAdjust.hpp +#include com/sun/star/drawing/GraphicExportFilter.hpp #include com/sun/star/text/XText.hpp #include com/sun/star/chart2/XChartDocument.hpp #include com/sun/star/style/ParagraphAdjust.hpp +#include com/sun/star/io/XOutputStream.hpp + #include basegfx/point/b2dpoint.hxx #include
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/xml/n819614_0.xml |7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) New commits: commit 3f8e73a36aeb4b029ef9e2025fd05a56011da9df Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Tue Oct 15 18:14:09 2013 +0200 sd: Fix output for unit test file n819614.pptx Change-Id: Ida2d2bab3a30beaa8e686a23355e4d6f41182f3f Reviewed-on: https://gerrit.libreoffice.org/6257 Tested-by: Miklos Vajna vmik...@collabora.co.uk Reviewed-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sd/qa/unit/data/xml/n819614_0.xml b/sd/qa/unit/data/xml/n819614_0.xml index 050ba3f..713ad74 100644 --- a/sd/qa/unit/data/xml/n819614_0.xml +++ b/sd/qa/unit/data/xml/n819614_0.xml @@ -21,12 +21,7 @@ Line2 column1=0.00 column2=101.00 column3=0.00/ Line3 column1=0.00 column2=0.00 column3=1.00/ /Transformation - InteropGrabBag - PropertyValue name=OOXColor handle=0 propertyState=DIRECT_VALUE/ - PropertyValue name=OOXData handle=0 propertyState=DIRECT_VALUE/ - PropertyValue name=OOXLayout handle=0 propertyState=DIRECT_VALUE/ - PropertyValue name=OOXStyle handle=0 propertyState=DIRECT_VALUE/ - /InteropGrabBag + InteropGrabBag/ /XShape XShape positionX=182 positionY=2544 sizeX=25125 sizeY=16293 type=com.sun.star.drawing.GroupShape XShapes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/shape.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a0b389d682f10a78a0c0e2fc9188af22088b8de2 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 16 12:36:11 2013 +0200 -Werror,-Wlogical-not-parentheses logical not is only applied to the left hand side of this comparison Change-Id: I015befe47ea9f40f83217b259e07eb01edb7d820 diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index f9aa426..69921c2 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -759,7 +759,7 @@ Reference XShape Shape::renderDiagramToGraphic( XmlFilterBase rFilterBase ) Graphic aGraphic; GraphicFilter aFilter( sal_False ); -if ( !aFilter.ImportGraphic( aGraphic, , mpTempStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, static_cast Sequence PropertyValue * ( NULL ), NULL ) == GRFILTER_OK ) +if ( aFilter.ImportGraphic( aGraphic, , mpTempStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, static_cast Sequence PropertyValue * ( NULL ), NULL ) != GRFILTER_OK ) { SAL_WARN( oox.drawingml, OSL_THIS_FUNC Unable to import rendered stream into graphic object ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source include/comphelper
comphelper/source/misc/mediadescriptor.cxx | 63 ++--- include/comphelper/mediadescriptor.hxx | 12 - 2 files changed, 14 insertions(+), 61 deletions(-) New commits: commit 0522b84769922218cc1e1c9c7baa16e9fad77538 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 16 12:43:46 2013 +0200 Straighten the removeFragment code again ...what apparently happened is: (1) First, 2c6363eb16f50a8cfd81bc8511554af4f9e06478 Be less pathetic replaced MediaDescriptor::impl_normalizeURL with removeFragment. (2) Then, b378e754ae892a044460cfbe33ccc2e51c01f5ca CMIS: fix file saving issue (plus follow-up b50d3727cf336bb536efe7bf067f484ddf864e9a WaE: unused function 'removeFragment') removed calling removeFragment at all (but re- introduced a now bogus Parse URL! ... comment that (1) had removed), which (3) 34f4d2574987b272681b5843e8f5edc374f55fde CMIS file picker: it really does not like ID Mark tried to revert again (but kept the bogus comment in), and (4) odd commit 319b160320a045b1a5b302dafbc2220ee1d4d3c3 CMIS file picker: it really does not like ID Mark (that looks like a merge conflict resolution gone wrong) erroneously re-introduced MediaDescriptor::impl_normalizeURL that (1) had removed, which caused a -Wunused-variable warning that (5) 706c5a54f662ea58e3b3a64f189eb5120191152a -Werror,-Wunused-variable tried to fix, but working under wrong assumptions. The solution is to go effectively back to the code as it was after (1). Change-Id: I62dfa9fa3adbea6b2cb10a509416fe3797c577b9 diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 095df58..fd2ff28 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -49,21 +49,22 @@ namespace comphelper{ namespace { -OUString removeFragment(OUString const uri) { -css::uno::Reference css::uri::XUriReference ref( -css::uri::UriReferenceFactory::create( -comphelper::getProcessComponentContext())- -parse(uri)); -if (ref.is()) { -ref-clearFragment(); -return ref-getUriReference(); -} else { -SAL_WARN(comphelper, cannot parse uri ); -return uri; -} +OUString removeFragment(OUString const uri) { +css::uno::Reference css::uri::XUriReference ref( +css::uri::UriReferenceFactory::create( +comphelper::getProcessComponentContext())- +parse(uri)); +if (ref.is()) { +ref-clearFragment(); +return ref-getUriReference(); +} else { +SAL_WARN(comphelper, cannot parse uri ); +return uri; } } +} + const OUString MediaDescriptor::PROP_ABORTED() { static const OUString sProp(Aborted); @@ -483,9 +484,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) throw css::uno::Exception(Found no URL., css::uno::Reference css::uno::XInterface ()); -// Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble -OUString sNormalizedURL = impl_normalizeURL( sURL ); -return impl_openStreamWithURL( removeFragment(sNormalizedURL), bLockFile ); +return impl_openStreamWithURL( removeFragment(sURL), bLockFile ); } catch(const css::uno::Exception ex) { @@ -724,40 +723,6 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString sURL, sal_Bool return xInputStream.is(); } -OUString MediaDescriptor::impl_normalizeURL(const OUString sURL) -{ -/* Remove Jumpmarks (fragments) of an URL only here. - They are not part of any URL and as a result may be - no ucb content can be created then. - On the other side arguments must exists ... because - they are part of an URL. - - Do not use the URLTransformer service here. Because - it parses the URL in another way. It's main part isnt enough - and it's complete part contains the jumpmark (fragment) parameter ... -*/ - -try -{ -css::uno::Reference css::uno::XComponentContext xContext= ::comphelper::getProcessComponentContext(); -css::uno::Reference css::uri::XUriReferenceFactory xUriFactory = css::uri::UriReferenceFactory::create(xContext);; -css::uno::Reference css::uri::XUriReference xUriRef = xUriFactory-parse(sURL); -if (xUriRef.is()) -{ -xUriRef-clearFragment(); -return xUriRef-getUriReference(); -} -} -catch(const css::uno::RuntimeException) -{ throw; } -catch(const css::uno::Exception) -{} - -// If an error ocurred ... return the original URL. -// It's a try .-) -return sURL; -} - } // namespace comphelper
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2f/c5d2946561258b012b80443cac025d851afda8
2f/c5d2946561258b012b80443cac025d851afda8 |1 + 1 file changed, 1 insertion(+) New commits: commit 94cdff6711197bb1a84d7582ecdf44e97f5c781e Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 12:00:07 2013 +0100 Notes added by 'git notes add' diff --git a/2f/c5d2946561258b012b80443cac025d851afda8 b/2f/c5d2946561258b012b80443cac025d851afda8 new file mode 100644 index 000..2804042 --- /dev/null +++ b/2f/c5d2946561258b012b80443cac025d851afda8 @@ -0,0 +1 @@ +merged as: 500822eeb46698c7317f57de72b2489d98042374 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 6f/9694374143ce181353b44df1d9da78d7dd7cc1 a1/7e221225915c140c7840904cb9b46d75731edc
6f/9694374143ce181353b44df1d9da78d7dd7cc1 |1 + a1/7e221225915c140c7840904cb9b46d75731edc |1 + 2 files changed, 2 insertions(+) New commits: commit 2f2af16a8a16a308ca7ce8a0f0c02adb183461b5 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 12:00:36 2013 +0100 Notes added by 'git notes add' diff --git a/6f/9694374143ce181353b44df1d9da78d7dd7cc1 b/6f/9694374143ce181353b44df1d9da78d7dd7cc1 new file mode 100644 index 000..1c69d41 --- /dev/null +++ b/6f/9694374143ce181353b44df1d9da78d7dd7cc1 @@ -0,0 +1 @@ +merged as: 3c54ef67ac055af374a81e1a128ff1dab8617f7f commit 8c578bea252385439e81ec772273a87a5a6d7b95 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 12:00:23 2013 +0100 Notes added by 'git notes add' diff --git a/a1/7e221225915c140c7840904cb9b46d75731edc b/a1/7e221225915c140c7840904cb9b46d75731edc new file mode 100644 index 000..eff69e7 --- /dev/null +++ b/a1/7e221225915c140c7840904cb9b46d75731edc @@ -0,0 +1 @@ +merged as: 831e35610c91556567d5e0bc14a4125ebdc2ac35 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - cui/source include/svx include/tools readlicense_oo/docs sc/source svx/source sw/source tools/source unusedcode.easy
cui/source/options/optsave.cxx | 27 +++ include/svx/fillctrl.hxx |2 - include/tools/string.hxx |9 +++--- readlicense_oo/docs/readme.xrm |4 +- sc/source/core/opencl/formulagroupcl.cxx |2 - sc/source/core/opencl/openclwrapper.cxx |2 - sc/source/filter/html/htmlexp.cxx|1 sc/source/filter/inc/namebuff.hxx| 16 ++- svx/source/tbxctrls/fillctrl.cxx | 13 - sw/source/core/edit/edattr.cxx | 10 ++- sw/source/core/text/itrcrsr.cxx | 10 ++- sw/source/core/text/txtfrm.cxx | 10 ++- tools/source/string/strimp.cxx | 29 - tools/source/string/tustring.cxx | 42 --- unusedcode.easy |2 - 15 files changed, 62 insertions(+), 117 deletions(-) New commits: commit f9768de91e1d6e6c58cf8c09dd1a4dc23877c2ba Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 10:31:02 2013 +0100 CID#1103764 uninitialized scalar field Change-Id: I828ab50e11546ba5f183e27dbff8ba87827bb426 diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index bb27605..8c6c878 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -172,22 +172,24 @@ class RangeNameBufferWK3 { private: struct Entry -{ +{ StringHashEntry aStrHashEntry; ScComplexRefDataaScComplexRefDataRel; OUStringaScAbsName; sal_uInt16 nAbsInd;// == 0 - noch keine Abs-Name! sal_uInt16 nRelInd; sal_BoolbSingleRef; -Entry( const OUString rName, const OUString rScName, const ScComplexRefData rCRD ) : -aStrHashEntry( rName ), -aScComplexRefDataRel( rCRD ), -aScAbsName( rScName ) +Entry( const OUString rName, const OUString rScName, const ScComplexRefData rCRD ) +: aStrHashEntry( rName ) +, aScComplexRefDataRel( rCRD ) +, aScAbsName( rScName ) +, nAbsInd(0) +, nRelInd(0) +, bSingleRef(false) { -nAbsInd = 0; aScAbsName = _ABS; } -}; +}; ScTokenArray* pScTokenArray; sal_uInt16 nIntCount; commit d70b46c163c9cf147fdf6aed1aa14fbde2fd2049 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 10:28:46 2013 +0100 CID#1103768 uninitialized scalar field Change-Id: I05ce7f66ca76345eabb660a12d9cd85a34ef55dd diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index e161e0d..c14bd66 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -219,6 +219,7 @@ ScHTMLExport::ScHTMLExport( SvStream rStrmP, const OUString rBaseURL, ScDocume nIndent( 0 ), bAll( bAllP ), bTabHasGraphics( false ), +bTabAlignedLeft( false ), bCalcAsShown( pDocP-GetDocOptions().IsCalcAsShown() ), bTableDataWidth( sal_True ), bTableDataHeight( sal_True ) commit 9ad3316530c1bf55b6864013d7e4fb539eaef296 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 09:45:18 2013 +0100 CID#736195 out of bounds Change-Id: I9a644a52146eb33248762c65c71fbd9a187490b7 diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index ec89c9f..3ee2bc8 100644 --- a/sw/source/core/text/txtfrm.cxx +++ b/sw/source/core/text/txtfrm.cxx @@ -2184,8 +2184,16 @@ void SwTxtFrm::CalcAdditionalFirstLineOffset() if ( pTxtNode pTxtNode-IsNumbered() pTxtNode-IsCountedInList() pTxtNode-GetNumRule() ) { +int nListLevel = pTxtNode-GetActualListLevel(); + +if (nListLevel 0) +nListLevel = 0; + +if (nListLevel = MAXLEVEL) +nListLevel = MAXLEVEL - 1; + const SwNumFmt rNumFmt = -pTxtNode-GetNumRule()-Get( static_castsal_uInt16(pTxtNode-GetActualListLevel()) ); +pTxtNode-GetNumRule()-Get( static_castsal_uInt16(nListLevel) ); if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_ALIGNMENT ) { // keep current paragraph portion and apply dummy paragraph portion commit 8df4f86d27df14d22eec4894aba86e551ea9c4a1 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 09:41:23 2013 +0100 CID#982804 out of bounds Change-Id: I134944d8c4a1312f65ff7c3df98d8828bfc96b15 diff --git a/sw/source/core/edit/edattr.cxx
[Libreoffice-commits] core.git: Branch 'feature/saxparser' - 2 commits - sax/CppunitTest_sax_attributes.mk sax/CppunitTest_sax_parser.mk sax/Module_sax.mk sax/qa
sax/CppunitTest_sax_attributes.mk | 27 sax/CppunitTest_sax_parser.mk |5 -- sax/Module_sax.mk |1 sax/qa/cppunit/attributes.cxx | 83 ++ 4 files changed, 112 insertions(+), 4 deletions(-) New commits: commit 06468f20b369a9af3e207e32894806f2c54b8d2f Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Oct 16 12:59:01 2013 +0200 small fix for d574f3781717add908985d74d2f568effaea2d5a Change-Id: I723ef9e3bb5545cb219c1131f6cbc07693b4861a diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index ed2176d..20afea7 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -20,10 +20,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ test \ )) -$(eval $(call gb_CppunitTest_use_api,sax_parser,\ -offapi \ -udkapi \ -)) +$(eval $(call gb_CppunitTest_use_sdk_api,sax_parser)) $(eval $(call gb_CppunitTest_use_ure,sax_parser)) commit 6d45403ee2d96fd098a4afff2d07e51ae4fefaab Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Oct 16 12:57:45 2013 +0200 sax: add unit test for FastAttributeList Change-Id: Ie87c80383991dca84b4f6e2074c5c53567ded0b6 diff --git a/sax/CppunitTest_sax_attributes.mk b/sax/CppunitTest_sax_attributes.mk new file mode 100644 index 000..eee7f06 --- /dev/null +++ b/sax/CppunitTest_sax_attributes.mk @@ -0,0 +1,27 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,sax_attributes)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sax_attributes, \ + sax/qa/cppunit/attributes \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sax_attributes, \ + cppu \ + sal \ + sax \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,sax_attributes)) + +$(eval $(call gb_CppunitTest_use_ure,sax_attributes)) + +# vim: set noet sw=4 ts=4: diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk index 4352282..63c993a 100644 --- a/sax/Module_sax.mk +++ b/sax/Module_sax.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets,sax,\ $(eval $(call gb_Module_add_check_targets,sax,\ CppunitTest_sax \ + CppunitTest_sax_attributes \ CppunitTest_sax_parser \ )) diff --git a/sax/qa/cppunit/attributes.cxx b/sax/qa/cppunit/attributes.cxx new file mode 100644 index 000..b0f99b0 --- /dev/null +++ b/sax/qa/cppunit/attributes.cxx @@ -0,0 +1,83 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include sal/types.h + +#include cppunit/TestFixture.h +#include cppunit/extensions/HelperMacros.h +#include cppunit/plugin/TestPlugIn.h + +#include sax/fastattribs.hxx + +using namespace css; +using namespace css::xml; + +namespace { + +class AttributesTest: public CppUnit::TestFixture +{ +bool mbException; + +public: +void test(); + +CPPUNIT_TEST_SUITE( AttributesTest ); +CPPUNIT_TEST( test ); +CPPUNIT_TEST_SUITE_END(); +}; + +void AttributesTest::test() +{ +sax_fastparser::FastAttributeList aAttributeList( NULL ); +aAttributeList.add(1, 1); +aAttributeList.add(2, OString(2)); + +// We can't test getValueToken() and getOptionalValueToken() +// without XFastTokenHandler :-( +// Uncomment to get segmantation fault: +// aAttributeList.getOptionalValueToken(1, 0); +// aAttributeList.getValueToken(2); + +CPPUNIT_ASSERT( aAttributeList.hasAttribute(1) ); +CPPUNIT_ASSERT( !aAttributeList.hasAttribute(3) ); + +CPPUNIT_ASSERT_EQUAL( aAttributeList.getOptionalValue(2), OUString(2) ); +CPPUNIT_ASSERT_EQUAL( aAttributeList.getOptionalValue(3), OUString() ); + +CPPUNIT_ASSERT_EQUAL( aAttributeList.getValue(1), OUString(1) ); +mbException = false; + +try { aAttributeList.getValue(3); } +catch (const sax::SAXException ) +{ +mbException = true; +} +CPPUNIT_ASSERT( mbException ); + +aAttributeList.addUnknown(a, a); +aAttributeList.addUnknown(b, b, b); +aAttributeList.addUnknown(c, c); +CPPUNIT_ASSERT_EQUAL( 3, aAttributeList.getUnknownAttributes().getLength() ); + +CPPUNIT_ASSERT_EQUAL( 2, aAttributeList.getFastAttributes().getLength() ); + +aAttributeList.clear(); +CPPUNIT_ASSERT( !aAttributeList.hasAttribute(1) ); +CPPUNIT_ASSERT_EQUAL( 0, aAttributeList.getFastAttributes().getLength() ); +aAttributeList.addUnknown(c, c); +
[Bug 38838] Removal/Replacement of the String/UniString with OUString once and for all.
https://bugs.freedesktop.org/show_bug.cgi?id=38838 --- Comment #76 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolan McNamara committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=255cfbbeaa090fd7a06130e2b621cb27ae9baca4 Related: fdo#38838 remove unused String::Append varients The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4bbded0631e37f30c09c95ea9f5b624aa91ccae6 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Oct 16 12:35:55 2013 +0200 Updated core Project: translations dcad65a55cb82d3d0e7764f75fb3399212ef6a65 diff --git a/translations b/translations index 7ba2edd..dcad65a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 7ba2edd74698962eeec74a3de1904ef17b4d01a8 +Subproject commit dcad65a55cb82d3d0e7764f75fb3399212ef6a65 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo69548.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 +++--- 3 files changed, 11 insertions(+), 7 deletions(-) New commits: commit 7ee2ce24c4060e16b6aa852edfcbe5c531c89b6e Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 16 09:29:56 2013 +0200 fdo#69548 do not remove last space from hyperlink target Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I7efd68fe217d9262d3e0b7400db67504e6bc diff --git a/sw/qa/extras/ooxmlimport/data/fdo69548.docx b/sw/qa/extras/ooxmlimport/data/fdo69548.docx new file mode 100644 index 000..6799f5e Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo69548.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 7fe9b40a..fa5a4b6 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -142,6 +142,7 @@ public: void testFdo43093(); void testMultiColumnSeparator(); void testSmartart(); +void testFdo69548(); CPPUNIT_TEST_SUITE(Test); #if !defined(WNT) @@ -247,6 +248,7 @@ void Test::run() {fdo43093.docx, Test::testFdo43093}, {multi-column-separator-with-line.docx, Test::testMultiColumnSeparator}, {smartart.docx, Test::testSmartart}, +{fdo69548.docx, Test::testFdo69548}, }; header(); for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i) @@ -1683,6 +1685,12 @@ void Test::testMultiColumnSeparator() CPPUNIT_ASSERT(bValue); } +void Test::testFdo69548() +{ +// The problem was that the last space in target URL was removed +CPPUNIT_ASSERT_EQUAL(OUString(#this is a bookmark), getPropertyOUString(getRun(getParagraph(1), 1), HyperLinkURL)); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 1be4289..2150362 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2225,14 +2225,10 @@ void FieldContext::AppendCommand(const OUString rPart) if (bInString) { -if (bInStringNext) -{ -sPart += OUString(' '); -sPart += sToken; -} -else +sPart += OUString(' '); +sPart += sToken; +if (!bInStringNext) { -sPart += sToken; aResult.push_back(sPart); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 69548, which changed state. Bug 69548 Summary: In the microsoft word docx format, hyperlinks with spaces in between words in the url work but then change themselves after reopening document (libreoffice deletes the space in the url). https://bugs.freedesktop.org/show_bug.cgi?id=69548 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
“Heavy InitScriptType() confusion”?
Hi all, Whenever I open a document with Arabic text in a debug build, I get a zillion of the following message, any idea what that code is confused about? warn:sw.core:23345:1:sw/source/core/text/porlay.cxx:1258: Heavy InitScriptType() confusion (have been like that since ever, but I thought may be someone is interested in clearing this confusion). Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) New commits: commit 365230c12f8c6ff7ebf83af6a64093b0ab79ba0e Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 16 09:29:56 2013 +0200 fdo#69548 do not remove last space from hyperlink target Change-Id: Idd6e28a8838245440e350f0593ea544e057483e6 diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 07654c6..5db6df4 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2138,14 +2138,10 @@ void FieldContext::AppendCommand(const OUString rPart) if (bInString) { -if (bInStringNext) -{ -sPart += OUString(' '); -sPart += sToken; -} -else +sPart += OUString(' '); +sPart += sToken; +if (!bInStringNext) { -sPart += sToken; aResult.push_back(sPart); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/chart-opengl'
New branch 'feature/chart-opengl' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Error in languagetag unittest
Hi LO guys, I'm getting this error since last week, I did a lot of pulls and it's still broken: /languagetag.cxx:674: LanguageTag::registerOnTheFly: not cross-inserted 0x51 for 'dz' have 'bo' canvasbitmaptest.cxx:183:Assertion Test name: (anonymous namespace)::CanvasBitmapTest::runTest assertion failed - Expression: pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) pRGBSt art[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue()) - Sixth pixel is not green Failures !!! Run: 2 Failure total: 1 Failures: 1 Errors: 0 warn:legacy.osl:19433:1:unotools/source/config/configmgr.cxx:167: OSL_ASSERT: items_.empty() This is a know issue, or maybe my environ is causing this? Thanks since now! signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/doc solenv/gbuild
config_host.mk.in |1 - configure.ac |4 solenv/doc/gbuild/solenv/gbuild/gbuild.mk |3 --- solenv/gbuild/gbuild.mk |3 --- 4 files changed, 11 deletions(-) New commits: commit 529ab4e735c1263f0bf5063779042898fc06e21e Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 16 14:57:11 2013 +0300 Get rid of PRODUCT, unused I hope Change-Id: I934158f892daf3ae36f265e6bc95fd9987a05ca5 diff --git a/config_host.mk.in b/config_host.mk.in index 820cb6a..c282770 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -433,7 +433,6 @@ export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@ export POSTGRESQL_INC=@POSTGRESQL_INC@ export POSTGRESQL_LIB=@POSTGRESQL_LIB@ export PREFIXDIR=@PREFIXDIR@ -export PRODUCT=@PRODUCT@ export PRODUCTNAME=@PRODUCTNAME@ export PRODUCTVERSION=@PRODUCTVERSION@ export PROEXT=@PROEXT@ diff --git a/configure.ac b/configure.ac index 04c6270..51a9716 100644 --- a/configure.ac +++ b/configure.ac @@ -3676,7 +3676,6 @@ if test -n $enable_dbgutil -a $enable_dbgutil != no; then # versions (in case there are version specific problems with it) MSVC_USE_DEBUG_RUNTIME=TRUE PROEXT= -PRODUCT= AC_MSG_RESULT([yes]) # cppunit and graphite expose STL in public headers @@ -3708,14 +3707,11 @@ if test -n $enable_dbgutil -a $enable_dbgutil != no; then else ENABLE_DBGUTIL= MSVC_USE_DEBUG_RUNTIME= -# PRODUCT is old concept, still used by build.pl . -PRODUCT=full PROEXT=.pro AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_DBGUTIL) AC_SUBST(MSVC_USE_DEBUG_RUNTIME) -AC_SUBST(PRODUCT) AC_SUBST(PROEXT) dnl Set the ENABLE_DEBUG variable. diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk index 5ff5ecd..d0fb5d2 100644 --- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk +++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk @@ -39,7 +39,6 @@ static const Path UPD; static const String LIBXML_CFLAGS; static const String OS; static const Bool DEBUG; -static const Bool PRODUCT; // gbuild global variables derived from the configure/environment // some of these are defined per platform @@ -47,8 +46,6 @@ namespace gb { /// building with generated dependencies static const Bool FULLDEPS; -/// product build or non-product build with additional assertions and tests -static const Bool PRODUCT; /// command to run awk scripts static const Command AWK; /// command to compile c source files diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index cab9953..425a699 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -26,7 +26,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild # JAVA_HOME # LIBXML_CFLAGS # OS -# PRODUCT # SOLARINC # SOLARLIB # UPD @@ -87,8 +86,6 @@ ifneq ($(strip $(TIMELOG)$(timelog)),) gb_TIMELOG := 1 endif -# This used to be PRODUCT= (for the same meaning as ENABLE_DBGUTIL=TRUE), -# but the product meaning is now only confusing. ifneq ($(ENABLE_DBGUTIL),) gb_ENABLE_DBGUTIL := $(true) else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/canvasbitmaptest.cxx | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) New commits: commit ca216af0fae6fa178c8d1debaabdeb2246bc8e63 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 16 14:43:18 2013 +0200 Improve test Change-Id: If0983696bf9a44bda6edeb746c121446106a95c5 diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index ebbedb0..c3e8cac 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -177,10 +177,15 @@ void checkCanvasBitmap( const rtl::ReferenceVclCanvasBitmap xBmp, if( nOriginalDepth 8 ) { const Color aCol(COL_GREEN); -CPPUNIT_ASSERT_MESSAGE( Sixth pixel is not green, -pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) -pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) -pRGBStart[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue())); +CPPUNIT_ASSERT_EQUAL_MESSAGE( +Sixth pixel is not green (red component), +vcl::unotools::toDoubleColor(aCol.GetRed()), pRGBStart[5].Red); +CPPUNIT_ASSERT_EQUAL_MESSAGE( +Sixth pixel is not green (green component), +vcl::unotools::toDoubleColor(aCol.GetGreen()), pRGBStart[5].Green); +CPPUNIT_ASSERT_EQUAL_MESSAGE( +Sixth pixel is not green (blue component), +vcl::unotools::toDoubleColor(aCol.GetBlue()), pRGBStart[5].Blue); } else if( nDepth = 8 ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Error in languagetag unittest
On 10/16/2013 02:05 PM, Marcos Souza wrote: /languagetag.cxx:674: LanguageTag::registerOnTheFly: not cross-inserted 0x51 for 'dz' have 'bo' canvasbitmaptest.cxx:183:Assertion Test name: (anonymous namespace)::CanvasBitmapTest::runTest assertion failed - Expression: pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) pRGBSt art[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue()) - Sixth pixel is not green I just pushed http://cgit.freedesktop.org/libreoffice/core/commit/?id=ca216af0fae6fa178c8d1debaabdeb2246bc8e63 Improve test which should give you a better idea of why that test fails. Seeing that the test compares double values, maybe it is just a rounding issue (and using CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE would be the solution). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libpng external/Module_external.mk libpng/configs libpng/Makefile libpng/Module_libpng.mk libpng/README libpng/StaticLibrary_png.mk libpng/UnpackedTarball_png.
Makefile.in|3 RepositoryModule_host.mk |1 external/Module_external.mk|3 external/libpng/Makefile |7 + external/libpng/Module_libpng.mk | 21 +++ external/libpng/README |1 external/libpng/StaticLibrary_png.mk | 39 +++ external/libpng/UnpackedTarball_png.mk | 18 +++ external/libpng/configs/pnglibconf.h | 178 + libpng/Makefile|7 - libpng/Module_libpng.mk| 21 --- libpng/README |1 libpng/StaticLibrary_png.mk| 39 --- libpng/UnpackedTarball_png.mk | 18 --- libpng/configs/pnglibconf.h| 178 - 15 files changed, 270 insertions(+), 265 deletions(-) New commits: commit 99f8cf1221b216c301e000eab88d75dbe9e9aa20 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Sat Oct 12 03:26:01 2013 +0200 fdo#70393: move libpng to a subdir of external Change-Id: Ia52da28fc6a979c4712fc191ab5e71c1926b0c93 Reviewed-on: https://gerrit.libreoffice.org/6231 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/Makefile.in b/Makefile.in index e417670..0aff4ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -186,6 +186,9 @@ distclean : clean compilerplugins-clean cmd: echo custom cmd ( $(cmd) ) +usedcxxfiles: + $(GNUMAKE) -f $(SRCDIR)/Makefile.gbuild $(@) + # # Fetch # diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 08bac243..366a885 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -98,7 +98,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,CMIS,libcmis) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ - $(call gb_Helper_optional,LIBPNG,libpng) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ $(call gb_Helper_optional,ODFGEN,libodfgen) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 70f583f..99e49752 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -39,4 +39,7 @@ $(eval $(call gb_Module_add_targets,external,\ endif endif +$(call gb_Helper_optional,LIBPNG,\ +$(eval $(call gb_Module_add_moduledir,external,libpng))) + # vim: set noet sw=4 ts=4: diff --git a/libpng/Makefile b/external/libpng/Makefile similarity index 100% rename from libpng/Makefile rename to external/libpng/Makefile diff --git a/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk similarity index 100% rename from libpng/Module_libpng.mk rename to external/libpng/Module_libpng.mk diff --git a/libpng/README b/external/libpng/README similarity index 100% rename from libpng/README rename to external/libpng/README diff --git a/libpng/StaticLibrary_png.mk b/external/libpng/StaticLibrary_png.mk similarity index 100% rename from libpng/StaticLibrary_png.mk rename to external/libpng/StaticLibrary_png.mk diff --git a/libpng/UnpackedTarball_png.mk b/external/libpng/UnpackedTarball_png.mk similarity index 92% rename from libpng/UnpackedTarball_png.mk rename to external/libpng/UnpackedTarball_png.mk index d2ac838..ed8aa59 100644 --- a/libpng/UnpackedTarball_png.mk +++ b/external/libpng/UnpackedTarball_png.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,png)) $(eval $(call gb_UnpackedTarball_set_tarball,png,$(PNG_TARBALL))) $(eval $(call gb_UnpackedTarball_add_files,png,.,\ - libpng/configs/pnglibconf.h \ + external/libpng/configs/pnglibconf.h \ )) # vim: set noet sw=4 ts=4: diff --git a/libpng/configs/pnglibconf.h b/external/libpng/configs/pnglibconf.h similarity index 100% rename from libpng/configs/pnglibconf.h rename to external/libpng/configs/pnglibconf.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70393] move external builds into subfolder
https://bugs.freedesktop.org/show_bug.cgi?id=70393 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Whiteboard|ProposedEasyHack|EasyHack DifficultyBeginner ||SkillCpp TopicCleanup CC||libreoffice@lists.freedeskt ||op.org --- Comment #2 from Björn Michaelsen bjoern.michael...@canonical.com --- no fundamental objection at http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html easyhackifying ... @Qubit: the parathesis closes before one by one .. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/lo.xcconfig.in ios/MobileLibreOffice ios/shared
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |2 - ios/lo.xcconfig.in| 14 +++--- ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 12 3 files changed, 17 insertions(+), 11 deletions(-) New commits: commit ea8028a575f666ae32e2564a0d3557287909030f Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 16 15:56:04 2013 +0300 For clarity, prefix the LO-specific Xcode configuration variables with LO_ Change-Id: I196feb392f9ebebfdcd6f6e0ecd2c9cc89707cbb diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index d29c166..f1a3b42 100644 --- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj +++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj @@ -1469,7 +1469,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = set -x\ndest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' $BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in $OUTDIR/lib/*.a $INSTDIR/program/*.a $WORKDIR/LinkTarget/StaticLibrary/*.a $WORKDIR/UnpackedTarball/*/.libs/*.a $WORKDIR/UnpackedTarball/*/src/.libs/*.a $WORKDIR/UnpackedTarball/*/src/*/.libs/*.a $WORKDIR/UnpackedTarball/openssl/*.a; do\nln $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $OUTDIR/bin/offapi.rdb $dest_resource\ncp $OUTDIR/bin/udkapi.rdb $dest_resource\ncp $OUTDIR/bin/oovbaapi.rdb $dest_resource\ncp $INSTDIR/program/services/services.rdb $dest_resource\ncp $INSTDIR/ure/share/misc/services.rdb $dest_resource/ure\n\n# copy .res files\n# program/resource is hardcoded in tools/source/r c/resmgr.cxx. Sure,\n# we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir -p $dest_resource/program/resource\ncp $INSTDIR/program/resource/*en-US.res $dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p $dest_resource/share/config\ncp -R $INSTDIR/share/config/soffice.cfg $dest_resource/share/config\n\n# \registry\\ncp -R $INSTDIR/share/registry $dest_resource/share\n\n# Set up rc, the \inifile\. See getIniFileName_Impl().\nfile=$dest_resource/rc\necho '[Bootstrap]'$file\necho 'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' $file\necho 'HOME=$APP_DATA_DIR/tmp'$file\n\n# Set up fundamentalrc, unorc, bootstraprc and versionrc.\n# Do we really need all these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]' $file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR' $file\necho 'CONFIGURATION_LAYERS=xcsxcu:${BRAND _BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/registry' $file\n\nfile=$dest_resource/unorc\necho '[Bootstrap]' $file\n\n# bootstraprc must be in $BRAND_BASE_DIR/program\nmkdir -p $dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho '[Bootstrap]' $file\necho 'InstallMode=installmode' $file\necho \ProductKey=LibreOffice $product_ver\ $file\necho 'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support' $file\n\n# Is this really needed?\nfile=$dest_resource/program/versionrc\necho '[Version]' $file\necho 'AllLanguages=en-US'$file\necho 'BuildVersion=' $file\necho \buildid=$buildid\ $file\necho 'ProductMajor=360' $file\necho 'ProductMinor=1'$file\n ; + shellScript = set -x\ndest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' $LO_BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a $LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a $LO_WORKDIR/UnpackedTarball/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb $dest_resource\ncp $LO_OUTDIR/bin/udkapi.rdb $dest_resource\ncp $LO_OUTDIR/bin/oovbaapi.rdb$dest_resource\ncp $LO_INSTDIR/program/services/services.rdb $dest_resource\ncp $LO_INSTDIR/ure/share/misc/services.rdb$dest_resource/ure\n\n# copy .res
[Bug 70393] move external builds into subfolder
https://bugs.freedesktop.org/show_bug.cgi?id=70393 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup ||target:4.2.0 --- Comment #3 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Bjoern Michaelsen committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=99f8cf1221b216c301e000eab88d75dbe9e9aa20 fdo#70393: move libpng to a subdir of external The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 5 commits - instsetoo_native/util shell/source solenv/inc
instsetoo_native/util/openoffice.lst | 24 +- shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |3 shell/source/win32/zipfile/zipfile.cxx| 115 +- solenv/inc/minor.mk |4 4 files changed, 94 insertions(+), 52 deletions(-) New commits: commit 5310f9e64589e14310faf96f306667475f77e207 Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 16 06:01:17 2013 -0700 Bump for 4.0-19 Change-Id: I4bd0056aee58a51ef3560c14b4012c14febb112b diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 29dd814..cf4f66c 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -33,7 +33,7 @@ Globals CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt -WINDOWSPATCHLEVEL 18 +WINDOWSPATCHLEVEL 19 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -50,13 +50,13 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-318 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 BASEPRODUCTVERSION 4.0 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -100,14 +100,14 @@ LibreOffice_Dev { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-318 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 BASEPRODUCTVERSION 4.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -161,7 +161,7 @@ URE PRODUCTVERSION 4.0 PACKAGEVERSION 4.0 PACKAGEREVISION 1 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 BRANDPACKAGEVERSION 4.0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 @@ -192,7 +192,7 @@ LibreOffice_SDK { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 @@ -231,7 +231,7 @@ LibreOffice_Dev_SDK { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -276,7 +276,7 @@ LibreOffice_Test { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 @@ -315,7 +315,7 @@ LibreOffice_Dev_Test { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -359,13 +359,13 @@ OxygenOffice { PRODUCTNAME OxygenOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-318 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 BASEPRODUCTVERSION 4.0 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 46df670..62f7379 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=400 -RSCREVISION=400m1(Build:318) -BUILD=318 +RSCREVISION=400m1(Build:319) +BUILD=319 LAST_MINOR=m0 SOURCEVERSION=OOO400 commit 63b2f53c88ea158d8266719187bcf6351dc41c88 Author: Tor Lillqvist t...@collabora.com Date: Fri Oct 4 19:36:57 2013 +0200 fdo#67534: try to avoid file locking in Explorer shell extensions
[Libreoffice-commits] core.git: sd/source
sd/source/ui/presenter/PresenterHelper.cxx | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit 687275db4c13daf5d31123ac65517e07172278ee Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 14:35:44 2013 +0100 canvas is null under Xdmx so createBitmap fails Change-Id: Ia7ce38ef07e6225ce785fab580343dfcd7ecb948 diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index d1180cc..eb5b185 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -454,11 +454,15 @@ Referencerendering::XBitmap SAL_CALL PresenterHelper::loadBitmap ( cppcanvas::VCLFactory::getInstance().createCanvas( Referencecss::rendering::XBitmapCanvas(rxCanvas,UNO_QUERY))); -if (pCanvas.get()!=NULL) +if (pCanvas.get() != NULL) { BitmapEx aBitmapEx = SdResId(nid); -return cppcanvas::VCLFactory::getInstance().createBitmap( -pCanvas, aBitmapEx)-getUNOBitmap(); +cppcanvas::BitmapSharedPtr xBitmap( +cppcanvas::VCLFactory::getInstance().createBitmap(pCanvas, +aBitmapEx)); +if (xBitmap.get() == NULL) +return NULL; +return xBitmap-getUNOBitmap(); } return NULL; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - configure.ac ios/lo.xcconfig.in ios/MobileLibreOffice ios/shared
configure.ac | 25 +- ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |6 -- ios/lo.xcconfig.in|5 ++ ios/shared/ios_sharedlo.xcodeproj/project.pbxproj |4 - 4 files changed, 29 insertions(+), 11 deletions(-) New commits: commit 22fbb71b5c9ca85dbf2879b212e4b3795f0dd072 Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 16 16:37:16 2013 +0300 Use ln -f to avoid warnings about existing files Some libraries exist both in solver/*/lib and in their UnpackedTarball/foo location. Change-Id: Ie312479069738b27900bd4d7021ede986d94f22a diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj index 85296c6..931bcd5 100644 --- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj +++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj @@ -1469,7 +1469,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = dest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' $LO_BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a $LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a $LO_WORKDIR/UnpackedTarball/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb $dest_resource\ncp $LO_OUTDIR/bin/udkapi.rdb $dest_resource\ncp $LO_OUTDIR/bin/oovbaapi.rdb$dest_resource\ncp $LO_INSTDIR/program/services/services.rdb $dest_resource\ncp $LO_INSTDIR/ure/share/misc/services.rdb$dest_resource/ure\n\n# copy .res files\n# program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,\n# we could set STAR_RESOURCE_PATH instead. sigh...\nmkdir -p $dest_resource/program/resource\ncp $LO_INSTDIR/program/resource/*en-US.res $dest_resource/program/resource\n\n# soffice.cfg\nmkdir -p $dest_resource/share/config\ncp -R $LO_INSTDIR/share/config/soffice.cfg $dest_resource/share/config\n\n# \registry\\ncp -R $LO_INSTDIR/share/registry $dest_resource/share\n\n# Set up rc, the \inifile\. See getIniFileName_Impl().\nfile=$dest_resource/rc\necho '[Bootstrap]'$file\necho 'URE_BOOTSTRAP=file://$APP_DATA_DIR/fundamentalrc' $file\necho 'HOME=$APP_DATA_DIR/tmp'$file\n\n# Set up fundamentalrc, unorc, bootstraprc and versionrc.\n# Do we really need all these?\nfile=$dest_resource/fundamentalrc\necho '[Bootstrap]' $file\necho 'BRAND_BASE_DIR=file://$APP_DATA_DIR' $file\ne cho 'CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/registry' $file\n\nfile=$dest_resource/unorc\necho '[Bootstrap]' $file\n\n# bootstraprc must be in $BRAND_BASE_DIR/program\nmkdir -p $dest_resource/program\nfile=$dest_resource/program/bootstraprc\necho '[Bootstrap]' $file\necho 'InstallMode=installmode' $file\necho \ProductKey=LibreOffice $product_ver\ $file\necho 'UserInstallation=file://$APP_DATA_DIR/../Library/Application%20Support' $file\n\n# Is this really needed?\nfile=$dest_resource/program/versionrc\necho '[Version]' $file\necho 'AllLanguages=en-US'$file\necho 'BuildVersion=' $file\necho \buildid=$buildid\ $file\necho 'ProductMajor=360' $file\necho 'ProductMinor=1'$file\n ; + shellScript = dest_lib=lib_link\ndest_resource=resource_link\nproduct_ver=`sed -ne 's/^\\(export PRODUCTVERSION=\\)\\(.*\\)/\\2/p' $LO_BUILDDIR/config_host.mk`\nbuildid=`git log -1 --format=%H`\n\nrm -rf $dest_lib $dest_resource\nmkdir -p $dest_lib $dest_resource\n\n# Libs #\nfor file in $LO_OUTDIR/lib/*.a $LO_INSTDIR/program/*.a $LO_WORKDIR/LinkTarget/StaticLibrary/*.a $LO_WORKDIR/UnpackedTarball/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/.libs/*.a $LO_WORKDIR/UnpackedTarball/*/src/*/.libs/*.a $LO_WORKDIR/UnpackedTarball/openssl/*.a; do\nln -f $file $dest_lib/${file##*/}\ndone\n\n# Resources #\nmkdir -p $dest_resource/ure\n\n# copy rdb files\ncp $LO_OUTDIR/bin/offapi.rdb $dest_resource\ncp $LO_OUTDIR/bin/udkapi.rdb $dest_resource\ncp
[Libreoffice-commits] core.git: comphelper/source include/comphelper writerperfect/qa
comphelper/source/streaming/seqstream.cxx |3 ++- include/comphelper/seqstream.hxx |6 ++ writerperfect/qa/unit/WPXSvStreamTest.cxx |2 +- 3 files changed, 5 insertions(+), 6 deletions(-) New commits: commit 15cbc3e54aba11fb742bef513fab6bd2d16e7aac Author: Stephan Bergmann sberg...@redhat.com Date: Wed Oct 16 15:31:41 2013 +0200 Unwind useless comphelper::ByteSequence typedef Change-Id: I59317a0d591eac188fa01636031e907357038c29 diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index 242af3a..bfc9ec5 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -33,7 +33,8 @@ using namespace ::osl; //- //-- -SequenceInputStream::SequenceInputStream(const ByteSequence rData) +SequenceInputStream::SequenceInputStream( +css::uno::Sequencesal_Int8 const rData) : m_aData(rData) , m_nPos(0) { diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx index 4f9c938..9cb122b 100644 --- a/include/comphelper/seqstream.hxx +++ b/include/comphelper/seqstream.hxx @@ -32,8 +32,6 @@ namespace comphelper { -typedef ::com::sun::star::uno::Sequencesal_Int8 ByteSequence; - //== // SequenceInputStream // stream for reading data from a sequence of bytes @@ -44,11 +42,11 @@ class COMPHELPER_DLLPUBLIC SequenceInputStream : public ::cppu::WeakImplHelper2 ::com::sun::star::io::XInputStream, ::com::sun::star::io::XSeekable { ::osl::Mutexm_aMutex; -ByteSequencem_aData; +css::uno::Sequencesal_Int8 m_aData; sal_Int32 m_nPos; public: -SequenceInputStream(const ByteSequence rData); +SequenceInputStream(css::uno::Sequencesal_Int8 const rData); // com::sun::star::io::XInputStream virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequencesal_Int8 aData, sal_Int32 nBytesToRead ) diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index fb11e4e..660d69e 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -59,7 +59,7 @@ shared_ptrWPXInputStream lcl_createStream() { using comphelper::SequenceInputStream; -const comphelper::ByteSequence aData(reinterpret_castconst sal_Int8*(aText), sizeof aText); +const css::uno::Sequencesal_Int8 aData(reinterpret_castconst sal_Int8*(aText), sizeof aText); const uno::Referenceio::XInputStream xInputStream(new SequenceInputStream(aData)); shared_ptrWPXInputStream pInputStream; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx | 16 ++-- writerfilter/source/dmapper/StyleSheetTable.hxx |2 +- 2 files changed, 11 insertions(+), 7 deletions(-) New commits: commit 628f572791c559cecd400ed402aa0d8140bfd180 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 16 15:27:33 2013 +0200 writerfilter: initial import of numbering styles Change-Id: I81205ae7010ab776cd1880f779af2f623e290da9 diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 2d1..c3fd4a8 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -787,21 +787,24 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) uno::Reference container::XNameAccess xStyleFamilies = xStylesSupplier-getStyleFamilies(); uno::Referencecontainer::XNameContainer xCharStyles; uno::Referencecontainer::XNameContainer xParaStyles; +uno::Referencecontainer::XNameContainer xNumberingStyles; PropertyNameSupplier rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); xStyleFamilies-getByName(rPropNameSupplier.GetName( PROP_CHARACTER_STYLES )) = xCharStyles; xStyleFamilies-getByName(rPropNameSupplier.GetName( PROP_PARAGRAPH_STYLES )) = xParaStyles; +xStyleFamilies-getByName(NumberingStyles) = xNumberingStyles; if(xCharStyles.is() xParaStyles.is()) { std::vector StyleSheetEntryPtr ::iterator aIt = m_pImpl-m_aStyleSheetEntries.begin(); while( aIt != m_pImpl-m_aStyleSheetEntries.end() ) { StyleSheetEntryPtr pEntry = *aIt; -if( pEntry-nStyleTypeCode == STYLE_TYPE_CHAR || pEntry-nStyleTypeCode == STYLE_TYPE_PARA ) +if( pEntry-nStyleTypeCode == STYLE_TYPE_CHAR || pEntry-nStyleTypeCode == STYLE_TYPE_PARA || pEntry-nStyleTypeCode == STYLE_TYPE_LIST ) { bool bParaStyle = pEntry-nStyleTypeCode == STYLE_TYPE_PARA; +bool bListStyle = pEntry-nStyleTypeCode == STYLE_TYPE_LIST; bool bInsert = false; -uno::Reference container::XNameContainer xStyles = bParaStyle ? xParaStyles : xCharStyles; +uno::Reference container::XNameContainer xStyles = bParaStyle ? xParaStyles : (bListStyle ? xNumberingStyles : xCharStyles); uno::Reference style::XStyle xStyle; OUString sConvertedStyleName = ConvertStyleName( pEntry-sStyleName ); @@ -821,7 +824,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) xStyle = uno::Reference style::XStyle (xDocFactory-createInstance( bParaStyle ? rPropNameSupplier.GetName( PROP_SERVICE_PARA_STYLE ) : -rPropNameSupplier.GetName( PROP_SERVICE_CHAR_STYLE )), +(bListStyle ? OUString(com.sun.star.style.NumberingStyle) : rPropNameSupplier.GetName( PROP_SERVICE_CHAR_STYLE ))), uno::UNO_QUERY_THROW); } if( !pEntry-sBaseStyleIdentifier.isEmpty() ) @@ -830,7 +833,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) { //TODO: Handle cases where a paragraph character style relation is needed StyleSheetEntryPtr pParent = FindStyleSheetByISTD( pEntry-sBaseStyleIdentifier ); -if (pParent.get() != NULL) +// Writer core doesn't support numbering styles having a parent style, it seems +if (pParent.get() != NULL !bListStyle) xStyle-setParentStyle(ConvertStyleName( pParent-sStyleName )); } catch( const uno::RuntimeException ) @@ -1020,9 +1024,9 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) } } } -catch( const uno::Exception ) +catch( const uno::Exception rException ) { -OSL_FAIL( Styles could not be imported completely); +SAL_WARN(writerfilter, Styles could not be imported completely: rException.Message); } } diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index eb3c87f..2811653 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -44,7 +44,7 @@ enum StyleType STYLE_TYPE_PARA, STYLE_TYPE_CHAR, STYLE_TYPE_TABLE, -STYLE_LIST +STYLE_TYPE_LIST }; struct StyleSheetTable_Impl; ___
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - 7 commits - instsetoo_native/util oox/inc oox/source shell/source solenv/inc
instsetoo_native/util/openoffice.lst | 24 +- oox/inc/oox/drawingml/customshapeproperties.hxx |2 oox/source/drawingml/customshapeproperties.cxx|5 oox/source/drawingml/shape.cxx|2 shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx |3 shell/source/win32/zipfile/zipfile.cxx| 115 +- solenv/inc/minor.mk |4 7 files changed, 98 insertions(+), 57 deletions(-) New commits: commit 03bbddd943f751969581fb7b68660b9c67885fd4 Author: Andras Timar andras.ti...@collabora.com Date: Wed Oct 16 06:01:17 2013 -0700 Bump for 4.0-19 Change-Id: I4bd0056aee58a51ef3560c14b4012c14febb112b diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 3fc6bd6..59317f7 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -33,7 +33,7 @@ Globals CREATE_MSP_INSTALLSET 0 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt -WINDOWSPATCHLEVEL 18 +WINDOWSPATCHLEVEL 19 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -50,13 +50,13 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-318 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 BASEPRODUCTVERSION 4.0 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -100,14 +100,14 @@ LibreOffice_Dev { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-318 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 BASEPRODUCTVERSION 4.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -161,7 +161,7 @@ URE PRODUCTVERSION 4.0 PACKAGEVERSION 4.0 PACKAGEREVISION 1 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 BRANDPACKAGEVERSION 4.0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 @@ -192,7 +192,7 @@ LibreOffice_SDK { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 @@ -231,7 +231,7 @@ LibreOffice_Dev_SDK { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -276,7 +276,7 @@ LibreOffice_Test { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 @@ -315,7 +315,7 @@ LibreOffice_Dev_Test { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -359,13 +359,13 @@ OxygenOffice { PRODUCTNAME OxygenOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -18 +PRODUCTEXTENSION -19 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-318 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-319 BASEPRODUCTVERSION 4.0 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 46df670..62f7379 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=400 -RSCREVISION=400m1(Build:318) -BUILD=318 +RSCREVISION=400m1(Build:319) +BUILD=319 LAST_MINOR=m0 SOURCEVERSION=OOO400 commit
[Libreoffice-commits] core.git: icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch icu/UnpackedTarball_icu.mk
icu/UnpackedTarball_icu.mk |1 icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch | 36 2 files changed, 37 insertions(+) New commits: commit 7693a4b9fbb60105d8438465db51c7afef4c3eb1 Author: Eike Rathke er...@redhat.com Date: Wed Oct 16 16:10:46 2013 +0200 Resolves: rhbz#1015594 CVE-2013-2924 use-after-free Added icu.10318.CVE-2013-2924_changeset_34076.patch from https://ssl.icu-project.org/trac/changeset/34076 assigned to https://ssl.icu-project.org/trac/ticket/10318 Change-Id: I93a33e59aec9b79fb8d4b1517cd0990c79ee65fb diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk index ef56ce9..dac90d5 100644 --- a/icu/UnpackedTarball_icu.mk +++ b/icu/UnpackedTarball_icu.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\ )) $(eval $(call gb_UnpackedTarball_add_patches,icu,\ + icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch \ icu/icu4c.10129.wintz.patch \ icu/icu4c-build.patch \ icu/icu4c-aix.patch \ diff --git a/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch b/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch new file mode 100644 index 000..90f50ab --- /dev/null +++ b/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch @@ -0,0 +1,36 @@ +Index: /icu/trunk/source/i18n/csrucode.cpp +=== +--- a/orig.icu/source/i18n/csrucode.cpp(revision 34075) b/icu/source/i18n/csrucode.cpp (revision 34076) +@@ -1,5 +1,5 @@ + /* + ** +- * Copyright (C) 2005-2012, International Business Machines ++ * Copyright (C) 2005-2013, International Business Machines + * Corporation and others. All Rights Reserved. + ** +@@ -34,6 +34,7 @@ + const uint8_t *input = textIn-fRawInput; + int32_t confidence = 0; ++int32_t length = textIn-fRawLength; + +-if (input[0] == 0xFE input[1] == 0xFF) { ++if (length =2 input[0] == 0xFE input[1] == 0xFF) { + confidence = 100; + } +@@ -58,6 +59,7 @@ + const uint8_t *input = textIn-fRawInput; + int32_t confidence = 0; ++int32_t length = textIn-fRawLength; + +-if (input[0] == 0xFF input[1] == 0xFE (input[2] != 0x00 || input[3] != 0x00)) { ++if (length = 4 input[0] == 0xFF input[1] == 0xFE (input[2] != 0x00 || input[3] != 0x00)) { + confidence = 100; + } +@@ -82,5 +84,5 @@ + int32_t confidence = 0; + +-if (getChar(input, 0) == 0xFEFFUL) { ++if (limit 0 getChar(input, 0) == 0xFEFFUL) { + hasBOM = TRUE; + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - shell/source
shell/source/win32/zipfile/zipfile.cxx | 115 ++--- 1 file changed, 78 insertions(+), 37 deletions(-) New commits: commit e09cfff67b021efd04235987f9c27cea3da5c72b Author: Mathieu Parent mathieu.par...@nantesmetropole.fr Date: Mon Oct 14 22:23:05 2013 +0100 fdo#56007 - Read more bytes on Zip read (for thumbnails) Change-Id: Ia8c6caa44ed8019a8139beb5a855f0f28805544d Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index cf05a56..270fbe1 100644 --- a/shell/source/win32/zipfile/zipfile.cxx +++ b/shell/source/win32/zipfile/zipfile.cxx @@ -118,18 +118,42 @@ static unsigned char readByte(StreamInterface *stream) static unsigned short readShort(StreamInterface *stream) { -unsigned short p0 = (unsigned short)readByte(stream); -unsigned short p1 = (unsigned short)readByte(stream); -return (unsigned short)(p0|(p18)); +if (!stream || stream-stell() == -1) +throw IOException(-1); +unsigned short tmpBuf; +unsigned long numBytesRead = stream-sread( +reinterpret_castunsigned char *( tmpBuf ), 2); +if (numBytesRead != 2) +throw IOException(-1); +return tmpBuf; } static unsigned readInt(StreamInterface *stream) { -unsigned p0 = (unsigned)readByte(stream); -unsigned p1 = (unsigned)readByte(stream); -unsigned p2 = (unsigned)readByte(stream); -unsigned p3 = (unsigned)readByte(stream); -return (unsigned)(p0|(p18)|(p216)|(p324)); +if (!stream || stream-stell() == -1) +throw IOException(-1); +unsigned tmpBuf; +unsigned long numBytesRead = stream-sread( +reinterpret_castunsigned char *( tmpBuf ), 4); +if (numBytesRead != 4) +throw IOException(-1); +return tmpBuf; +} + +static std::string readString(StreamInterface *stream, unsigned long size) +{ +if (!stream || stream-stell() == -1) +throw IOException(-1); +unsigned char *tmp = new unsigned char[size]; +if (!tmp) +throw IOException(-1); +unsigned long numBytesRead = stream-sread(tmp, size); +if (numBytesRead != size) +throw IOException(-1); + +std::string aStr((char *)tmp, size); +delete [] tmp; +return aStr; } static bool readCentralDirectoryEnd(StreamInterface *stream, CentralDirectoryEnd end) @@ -147,9 +171,7 @@ static bool readCentralDirectoryEnd(StreamInterface *stream, CentralDirectoryEnd end.cdir_size = readInt(stream); end.cdir_offset = readInt(stream); end.comment_size = readShort(stream); -end.comment.clear(); -for (unsigned short i = 0; i end.comment_size; i++) -end.comment.append(1,(char)readByte(stream)); +end.comment.assign(readString(stream, end.comment_size)); } catch (...) { @@ -183,15 +205,9 @@ static bool readCentralDirectoryEntry(StreamInterface *stream, CentralDirectoryE entry.external_attr = readInt(stream); entry.offset = readInt(stream); unsigned short i = 0; -entry.filename.clear(); -for (i=0; i entry.filename_size; i++) -entry.filename.append(1,(char)readByte(stream)); -entry.extra_field.clear(); -for (i=0; i entry.extra_field_size; i++) -entry.extra_field.append(1,(char)readByte(stream)); -entry.file_comment.clear(); -for (i=0; i entry.file_comment_size; i++) -entry.file_comment.append(1,(char)readByte(stream)); +entry.filename.assign(readString(stream, entry.filename_size)); +entry.extra_field.assign(readString(stream, entry.extra_field_size)); +entry.file_comment.assign(readString(stream, entry.file_comment_size)); } catch (...) { @@ -219,12 +235,8 @@ static bool readLocalFileHeader(StreamInterface *stream, LocalFileHeader header header.filename_size = readShort(stream); header.extra_field_size = readShort(stream); unsigned short i = 0; -header.filename.clear(); -for (i=0; i header.filename_size; i++) -header.filename.append(1,(char)readByte(stream)); -header.extra_field.clear(); -for (i=0; i header.extra_field_size; i++) -header.extra_field.append(1,(char)readByte(stream)); +header.filename.assign(readString(stream, header.filename_size)); +header.extra_field.assign(readString(stream, header.extra_field_size)); } catch (...) { commit 0540be231b0a10ed97da911462874a329bd089f7 Author: Michael Meeks michael.me...@collabora.com Date: Fri Oct 11 17:43:19 2013 +0100 fdo#56007 - fast zip directory find to accelerate Windows Explorer thumbnail. Change-Id: Id9436def56f40d2bb54dea35bea916bd99964653 Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx index
[Libreoffice-commits] core.git: sw/source
sw/source/core/view/viewsh.cxx |4 1 file changed, 4 deletions(-) New commits: commit 4d392f9132e5e21f0da7c043bd41a32921e0f41f Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 16 18:14:16 2013 +0300 Bin a line of dead code Change-Id: Iebbb7e5200977e9c89cbd213cb78613d3d0f3ba4 diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 5e2fd60..dc0661e 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -626,10 +626,6 @@ sal_Bool ViewShell::HasCharts() const void ViewShell::LayoutIdle() { -#ifdef TCOVER -//for TCV-version: end of start phase of the application -TCovCall::Idle(); -#endif if( !mpOpt-IsIdle() || !GetWin() || ( Imp()-HasDrawView() Imp()-GetDrawView()-IsDragObj() ) ) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Error in languagetag unittest
Hi Marcos, On Wednesday, 2013-10-16 09:05:02 -0300, Marcos Souza wrote: I'm getting this error since last week, I did a lot of pulls and it's still broken: Btw, the test failing has nothing to do with language tags, you just see an additional warning of those (unrelated, stemming from a bad MS-LangID assignment of one ID for two languages). Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpntsXhBAsus.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - sc/source
sc/source/core/data/column2.cxx | 132 ++-- 1 file changed, 126 insertions(+), 6 deletions(-) New commits: commit bae944cd7c4fb2804e9a2687a842f5a072b270bf Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Oct 16 11:40:06 2013 -0400 Redo vector ref array fetching for ranges starting with a numeric cell. The test now passes. Change-Id: I84e98e326be9cab175ecb95dbb4db4c535bca6d2 diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 32a4ded..f5be76f 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -2178,6 +2178,129 @@ bool appendDouble( return false; } +formula::VectorRefArray appendToNumBlock( +ScDocument* pDoc, sc::FormulaGroupContext rCxt, size_t nPos, +size_t nLenRequested, sc::CellStoreType::iterator it, const sc::CellStoreType::iterator itEnd ) +{ +sc::FormulaGroupContext::NumArrayType rNumArray = rCxt.maNumArrays.back(); +sc::FormulaGroupContext::StrArrayType* pStrArray = NULL; +svl::SharedStringPool rPool = pDoc-GetSharedStringPool(); +size_t nLenRemain = nLenRequested - nPos; + +for (; it != itEnd; ++it) +{ +switch (it-type) +{ +case sc::element_type_string: +{ +sc::string_block::iterator itData, itDataEnd; +getBlockIteratorssc::string_block(it, nLenRemain, itData, itDataEnd); + +if (!pStrArray) +{ +rCxt.maStrArrays.push_back( +new sc::FormulaGroupContext::StrArrayType(nLenRequested, NULL)); +pStrArray = rCxt.maStrArrays.back(); +} + +for (; itData != itDataEnd; ++itData, ++nPos) +(*pStrArray)[nPos] = itData-getDataIgnoreCase(); +} +break; +case sc::element_type_edittext: +{ +sc::edittext_block::iterator itData, itDataEnd; +getBlockIteratorssc::edittext_block(it, nLenRemain, itData, itDataEnd); + +if (!pStrArray) +{ +rCxt.maStrArrays.push_back( +new sc::FormulaGroupContext::StrArrayType(nLenRequested, NULL)); +pStrArray = rCxt.maStrArrays.back(); +} + +for (; itData != itDataEnd; ++itData, ++nPos) +{ +OUString aStr = ScEditUtil::GetString(**itData, pDoc); +(*pStrArray)[nPos] = rPool.intern(aStr).getDataIgnoreCase(); +} +} +break; +case sc::element_type_formula: +{ +sc::formula_block::iterator itData, itDataEnd; +getBlockIteratorssc::formula_block(it, nLenRemain, itData, itDataEnd); + +for (; itData != itDataEnd; ++itData, ++nPos) +{ +ScFormulaCell rFC = **itData; +sc::FormulaResultValue aRes = rFC.GetResult(); +if (aRes.meType == sc::FormulaResultValue::Invalid || aRes.mnError) +{ +if (aRes.mnError == ScErrorCodes::errCircularReference) +{ +// This cell needs to be recalculated on next visit. +rFC.SetErrCode(0); +rFC.SetDirtyVar(); +} +return formula::VectorRefArray(); +} + +if (aRes.meType == sc::FormulaResultValue::Value) +rNumArray[nPos] = aRes.mfValue; +else +{ +if (!pStrArray) +{ +rCxt.maStrArrays.push_back( +new sc::FormulaGroupContext::StrArrayType(nLenRequested, NULL)); +pStrArray = rCxt.maStrArrays.back(); +} + +(*pStrArray)[nPos] = aRes.maString.getDataIgnoreCase(); +} +} +} +break; +case sc::element_type_empty: +{ +if (nLenRemain it-size) +{ +nPos += it-size; +nLenRemain -= it-size; +} +else +{ +nPos = nLenRequested; +nLenRemain = 0; +} +} +break; +case sc::element_type_numeric: +{ +sc::numeric_block::iterator itData, itDataEnd; +getBlockIteratorssc::numeric_block(it, nLenRemain, itData, itDataEnd); + +for (; itData != itDataEnd; ++itData, ++nPos) +rNumArray[nPos] = *itData; +} +
[Libreoffice-commits] core.git: sot/source
sot/source/sdstor/stgstrms.cxx | 16 1 file changed, 12 insertions(+), 4 deletions(-) New commits: commit dfa1afd0e8b7ae9c706c4a3171a04752e24230b0 Author: Armin Le Grand a...@apache.org Date: Wed Oct 16 16:47:38 2013 +0100 i123485 secured file import scanning existing pages (cherry picked from commit 04b38114b0ca4be9895d8f9fa842b6cb390c8036 and adapted to the rewritten scanBuildPageChainCache) Change-Id: Ib90d0563be5aeb69aa14c28b3304e42f3cc46162 Reviewed-on: https://gerrit.libreoffice.org/6272 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx index 1afbf21..16deea9 100644 --- a/sot/source/sdstor/stgstrms.cxx +++ b/sot/source/sdstor/stgstrms.cxx @@ -23,6 +23,7 @@ #include sal/log.hxx #include osl/file.hxx #include unotools/tempfile.hxx +#include set #include sot/stg.hxx #include stgelem.hxx @@ -339,16 +340,23 @@ void StgStrm::scanBuildPageChainCache(sal_Int32 *pOptionalCalcSize) bool bError = false; sal_Int32 nBgn = nStart; -sal_Int32 nOldBgn = -1; sal_Int32 nOptSize = 0; -while( nBgn = 0 nBgn != nOldBgn ) + +// Track already scanned PageNumbers here and use them to +// see if an already counted page is re-visited +std::set sal_Int32 nUsedPageNumbers; + +while( nBgn = 0 !bError ) { if( nBgn = 0 ) m_aPagesCache.push_back(nBgn); -nOldBgn = nBgn; nBgn = pFat-GetNextPage( nBgn ); -if( nBgn == nOldBgn ) + +if( nUsedPageNumbers.find(nBgn) != nUsedPageNumbers.end() ) bError = true; +else +nUsedPageNumbers.insert(nBgn); + nOptSize += nPageSize; } if (bError) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst helpers/longnames_commands.csv helpers/unocmds.txt helpers/uno-commands.csv helpers/uno_hid.lst source/text
helpers/help_hid.lst|2 +- helpers/longnames_commands.csv |2 +- helpers/uno-commands.csv|2 +- helpers/uno_hid.lst |2 +- helpers/unocmds.txt |2 +- source/text/swriter/02/1009.xhp |6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 5158a5975dcc23ec1bb3dcd92fbfb5da03155596 Author: Jan Holesovsky ke...@collabora.com Date: Wed Oct 16 18:07:41 2013 +0200 PreView - Preview. diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 18e6b24..525c3c7 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -357,7 +357,7 @@ FN_PREV_TOXMARK,20984,.uno:GotoPrevIndexMark FN_PREV_WORD,20922,.uno:GoToPrevWord FN_PREV_WORD_SEL,20822,.uno:WordLeftSel FN_PRINT_LAYOUT,20237,.uno:PrintLayout -FN_PRINT_PAGEPREVIEW,21253,.uno:PrintPagePreView +FN_PRINT_PAGEPREVIEW,21253,.uno:PrintPagePreview FN_QRY_INSERT,20386,.uno:SbaInsert FN_QRY_INSERT_FIELD,20388,.uno:SbaInsertField FN_QRY_MERGE,20367,.uno:MergeDialog diff --git a/helpers/longnames_commands.csv b/helpers/longnames_commands.csv index e423fd2..61da03c 100644 --- a/helpers/longnames_commands.csv +++ b/helpers/longnames_commands.csv @@ -340,7 +340,7 @@ FN_PREV_TOXMARK,.uno:GotoPrevIndexMark FN_PREV_WORD,.uno:GoToPrevWord FN_PREV_WORD_SEL,.uno:WordLeftSel FN_PRINT_LAYOUT,.uno:PrintLayout -FN_PRINT_PAGEPREVIEW,.uno:PrintPagePreView +FN_PRINT_PAGEPREVIEW,.uno:PrintPagePreview FN_QRY_INSERT,.uno:SbaInsert FN_QRY_INSERT_FIELD,.uno:SbaInsertField FN_QRY_MERGE,.uno:MergeDialog diff --git a/helpers/uno-commands.csv b/helpers/uno-commands.csv index 3c9773e..76ef110 100644 --- a/helpers/uno-commands.csv +++ b/helpers/uno-commands.csv @@ -1283,7 +1283,7 @@ .uno:Print .uno:PrintDefault .uno:PrintLayout -.uno:PrintPagePreView +.uno:PrintPagePreview .uno:PrintPreview .uno:PrintRangesMenu .uno:PrinterSetup diff --git a/helpers/uno_hid.lst b/helpers/uno_hid.lst index 4d6f16d..b22158a 100644 --- a/helpers/uno_hid.lst +++ b/helpers/uno_hid.lst @@ -340,7 +340,7 @@ FN_PREV_TOXMARK,20984,.uno:GotoPrevIndexMark FN_PREV_WORD,20922,.uno:GoToPrevWord FN_PREV_WORD_SEL,20822,.uno:WordLeftSel FN_PRINT_LAYOUT,20237,.uno:PrintLayout -FN_PRINT_PAGEPREVIEW,21253,.uno:PrintPagePreView +FN_PRINT_PAGEPREVIEW,21253,.uno:PrintPagePreview FN_QRY_INSERT,20386,.uno:SbaInsert FN_QRY_INSERT_FIELD,20388,.uno:SbaInsertField FN_QRY_MERGE,20367,.uno:MergeDialog diff --git a/helpers/unocmds.txt b/helpers/unocmds.txt index b7bb726..bc162d8 100644 --- a/helpers/unocmds.txt +++ b/helpers/unocmds.txt @@ -795,7 +795,7 @@ .uno:Print;shared/01/0113.xhp .uno:PrintDefault;shared/02/0111.xhp .uno:PrintLayout;swriter/01/0313.xhp -.uno:PrintPagePreView;swriter/02/1009.xhp +.uno:PrintPagePreview;swriter/02/1009.xhp .uno:PrintPreview;shared/01/0112.xhp .uno:PrintRangesMenu;scalc/01/0508.xhp .uno:PrinterSetup;shared/01/0114.xhp diff --git a/source/text/swriter/02/1009.xhp b/source/text/swriter/02/1009.xhp index 6c23e1d..adb6cf0 100644 --- a/source/text/swriter/02/1009.xhp +++ b/source/text/swriter/02/1009.xhp @@ -28,9 +28,9 @@ /meta body section id=drucken -bookmark xml-lang=en-US branch=hid/.uno:PrintPagePreView id=bm_id7311881 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:PrintPagePreView id=bm_id3149290 localize=false/ -paragraph xml-lang=en-US id=hd_id3152895 role=heading level=1 l10n=U oldref=1link href=text/swriter/02/1009.xhp name=Print page viewPrint page view/linkcommentremove this page/comment/paragraphcommentid=par_id3151170 l10n=CHG oldref=2lt;AVIS hid=.uno:PrintPagePreViewgt;Opens the Print dialog to print the page preview. Use the Print options page view icon to set the printing scale and other printing properties.lt;/AVISgt;/comment +bookmark xml-lang=en-US branch=hid/.uno:PrintPagePreview id=bm_id7311881 localize=false/ +bookmark xml-lang=en-US branch=hid/.uno:PrintPagePreview id=bm_id3149290 localize=false/ +paragraph xml-lang=en-US id=hd_id3152895 role=heading level=1 l10n=U oldref=1link href=text/swriter/02/1009.xhp name=Print page viewPrint page view/linkcommentremove this page/comment/paragraphcommentid=par_id3151170 l10n=CHG oldref=2lt;AVIS hid=.uno:PrintPagePreviewgt;Opens the Print dialog to print the page preview. Use the Print options page view icon to set the printing scale and other printing properties.lt;/AVISgt;/comment /section section id=sydrucken table id=tbl_id3145414 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 203a8bbd00e30d0e251a7d0705f26775a0c1d3a6 Author: Jan Holesovsky ke...@collabora.com Date: Wed Oct 16 18:07:41 2013 +0200 Updated core Project: help 5158a5975dcc23ec1bb3dcd92fbfb5da03155596 diff --git a/helpcontent2 b/helpcontent2 index 826848d..5158a59 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 826848d005ee8d2af1b11f662f15bc3c083dde76 +Subproject commit 5158a5975dcc23ec1bb3dcd92fbfb5da03155596 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/libpng external/Module_external.mk external/msc-externals external/Package_dbghelp.mk external/Package_msms.mk external/Package_msvc80_dlls.mk exte
external/Module_external.mk|7 +-- external/Package_dbghelp.mk| 14 -- external/Package_msms.mk | 16 external/Package_msvc80_dlls.mk| 16 external/Package_msvc_dlls.mk | 18 -- external/libpng/Module_libpng.mk |4 external/msc-externals/Module_msc-externals.mk | 19 +++ external/msc-externals/Package_dbghelp.mk | 14 ++ external/msc-externals/Package_msms.mk | 16 external/msc-externals/Package_msvc80_dlls.mk | 16 external/msc-externals/Package_msvc_dlls.mk| 18 ++ 11 files changed, 84 insertions(+), 74 deletions(-) New commits: commit b63029c8072c10c03b2fc36fe82619f0cff0ca18 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Oct 16 15:15:56 2013 +0200 no need to double the conditional, once is enough - the whole module wont be loaded with --with-system-libpng because of the gb_Helper_optional thingie one level up Change-Id: I885fedf82bdbb383a3caee343422dc79528838e0 Reviewed-on: https://gerrit.libreoffice.org/6266 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk index d61375d..afb0016 100644 --- a/external/libpng/Module_libpng.mk +++ b/external/libpng/Module_libpng.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libpng)) -ifeq ($(SYSTEM_LIBPNG),NO) - $(eval $(call gb_Module_add_targets,libpng,\ StaticLibrary_png \ UnpackedTarball_png \ )) -endif - # vim: set noet sw=4 ts=4: commit 29a5707821f9ec386d5f6b90f7838db9cdff1263 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Oct 16 15:12:54 2013 +0200 move MSVC externals to subdir see http://nabble.documentfoundation.org/move-external-builds-into-subfolder-fdo-70393-td4078160.html for details Change-Id: I5ebf3a6162a8f977d1ddf0d445f076afd53332e4 Reviewed-on: https://gerrit.libreoffice.org/6265 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/external/Module_external.mk b/external/Module_external.mk index 99e49752..4f7ce0a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -22,12 +22,7 @@ $(eval $(call gb_Module_add_targets,external,\ endif ifeq ($(COM),MSC) -$(eval $(call gb_Module_add_targets,external,\ - Package_dbghelp \ - $(if $(MSM_PATH),Package_msms) \ - Package_msvc_dlls \ - $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \ -)) +$(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif ifeq ($(HAVE_READDIR_R),NO) diff --git a/external/Package_msms.mk b/external/msc-externals/Module_msc-externals.mk similarity index 55% copy from external/Package_msms.mk copy to external/msc-externals/Module_msc-externals.mk index 283e113..1caa327 100644 --- a/external/Package_msms.mk +++ b/external/msc-externals/Module_msc-externals.mk @@ -7,10 +7,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,msms,$(MSM_PATH))) +$(eval $(call gb_Module_Module,msc-externals)) -$(eval $(call gb_Package_add_files,msms,bin,\ - $(MERGE_MODULES) \ +$(eval $(call gb_Module_add_targets,msc-externals,\ + Package_dbghelp \ + $(if $(MSM_PATH),Package_msms) \ + Package_msvc_dlls \ + $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \ )) -# vim:set shiftwidth=4 tabstop=4 noexpandtab: +# vim: set noet sw=4 ts=4: diff --git a/external/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk similarity index 100% rename from external/Package_dbghelp.mk rename to external/msc-externals/Package_dbghelp.mk diff --git a/external/Package_msms.mk b/external/msc-externals/Package_msms.mk similarity index 100% rename from external/Package_msms.mk rename to external/msc-externals/Package_msms.mk diff --git a/external/Package_msvc80_dlls.mk b/external/msc-externals/Package_msvc80_dlls.mk similarity index 100% rename from external/Package_msvc80_dlls.mk rename to external/msc-externals/Package_msvc80_dlls.mk diff --git a/external/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk similarity index 100% rename from external/Package_msvc_dlls.mk rename to external/msc-externals/Package_msvc_dlls.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/Module_external.mk
external/Module_external.mk |3 --- 1 file changed, 3 deletions(-) New commits: commit e2cec503d214be6b2f6cb64bbafcad8679c7891c Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Oct 16 15:19:26 2013 +0200 empty statement is empty Change-Id: I1b9dacea79b978384b61240bdecf83b9bd924a66 Reviewed-on: https://gerrit.libreoffice.org/6267 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/external/Module_external.mk b/external/Module_external.mk index 4f7ce0a..9cbf588 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -9,9 +9,6 @@ $(eval $(call gb_Module_Module,external)) -$(eval $(call gb_Module_add_targets,external,\ -)) - ifeq ($(OS)$(COM),WNTGCC) $(eval $(call gb_Module_add_targets,external,\ CustomTarget_jawt \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 2 commits - sc/source
sc/source/core/tool/token.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a24c3ea4c4fd6c13cd5bb11326aaf5c23557222c Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Oct 16 12:26:05 2013 -0400 Enable group calculation on SUMIFS. Change-Id: I0c02204d08c73668b2564360486f843e5e7b69d0 diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 83f7852..22c1738 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1338,6 +1338,7 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocMax: case ocMaxA: case ocSum: +case ocSumIfs: case ocSumProduct: case ocCount: case ocCount2: commit be798354837d7a908830b649f194e3174176854a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Oct 16 12:14:13 2013 -0400 We actually don't want to allow group-calc on matrix inverse. This one is accelerated for a single cell calculation case only. Change-Id: I1f66fc6bb20f08f45d47ae596fb201b838b17408 diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index ab9e3a9..83f7852 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1339,7 +1339,6 @@ void ScTokenArray::CheckToken( const FormulaToken r ) case ocMaxA: case ocSum: case ocSumProduct: -case ocMatInv: case ocCount: case ocCount2: case ocVLookup: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - connectivity/source dbaccess/source forms/source
connectivity/source/commontools/FValue.cxx| 10 --- connectivity/source/commontools/dbtools.cxx |2 - dbaccess/source/core/api/RowSet.cxx |3 +- dbaccess/source/core/api/WrappedResultSet.cxx |2 - forms/source/component/CheckBox.cxx | 37 +++--- forms/source/component/CheckBox.hxx |1 6 files changed, 44 insertions(+), 11 deletions(-) New commits: commit 47459274d6187bb0ea6533f5acc0e7b7ed92 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Oct 14 17:59:10 2013 +0200 respect reference values in checkboxes Change-Id: Ifd0953f779f530af6b190425794f009a891f0afb diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index c6c038f..46fe62f 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -26,6 +26,8 @@ #include comphelper/extract.hxx #include com/sun/star/io/XInputStream.hpp #include rtl/ustrbuf.hxx +#include boost/type_traits.hpp +#include boost/static_assert.hpp using namespace ::dbtools; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 6ba64dd..e54ab30 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1905,7 +1905,7 @@ void setObjectWithInfo(const ReferenceXParameters _xParams, break; case DataType::BIT: case DataType::BOOLEAN: -_xParams-setBoolean(parameterIndex,_rValue); + _xParams-setBoolean(parameterIndex,static_castbool(_rValue)); break; case DataType::TINYINT: if ( _rValue.isSigned() ) diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 67751f2..9d352f0 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -203,6 +203,13 @@ void SAL_CALL OCheckBoxModel::read(const Referencestario::XObjectInputStream resetNoBroadcast(); } +bool OCheckBoxModel::DbUseBool() +{ +if ( ! (getReferenceValue().isEmpty() getNoCheckReferenceValue().isEmpty()) ) +return false; +return true; +} + //-- Any OCheckBoxModel::translateDbColumnToControlValue() { @@ -210,7 +217,21 @@ Any OCheckBoxModel::translateDbColumnToControlValue() // // Set value in ControlModel -sal_Bool bValue = m_xColumn-getBoolean(); +bool bValue; +if(DbUseBool()) +{ +bValue = m_xColumn-getBoolean(); +} +else +{ +const OUString sVal(m_xColumn-getString()); +if (sVal == getReferenceValue()) +bValue = true; +else if (sVal == getNoCheckReferenceValue()) +bValue = false; +else +aValue = static_castsal_Int16(getDefaultChecked()); +} if ( m_xColumn-wasNull() ) { sal_Bool bTriState = sal_True; @@ -218,8 +239,10 @@ Any OCheckBoxModel::translateDbColumnToControlValue() m_xAggregateSet-getPropertyValue( PROPERTY_TRISTATE ) = bTriState; aValue = (sal_Int16)( bTriState ? STATE_DONTKNOW : getDefaultChecked() ); } -else +else if ( !aValue.hasValue() ) +{ aValue = (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK ); +} return aValue; } @@ -241,10 +264,16 @@ sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) m_xColumnUpdate-updateNull(); break; case STATE_CHECK: -m_xColumnUpdate-updateBoolean( sal_True ); +if (DbUseBool()) +m_xColumnUpdate-updateBoolean( sal_True ); +else +m_xColumnUpdate-updateString( getReferenceValue() ); break; case STATE_NOCHECK: -m_xColumnUpdate-updateBoolean( sal_False ); +if (DbUseBool()) +m_xColumnUpdate-updateBoolean( sal_False ); +else +m_xColumnUpdate-updateString( getNoCheckReferenceValue() ); break; default: OSL_FAIL(OCheckBoxModel::commitControlValueToDbColumn: invalid value !); diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index c44ed5b..8cc9523 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -33,6 +33,7 @@ class OCheckBoxModel:public OReferenceValueComponent { protected: sal_Int16 getState(const ::com::sun::star::uno::Any rValue); +boolDbUseBool(); public: DECLARE_DEFAULT_LEAF_XTOR(
[Libreoffice-commits] core.git: Changes to 'private/matus/fastparser'
New branch 'private/matus/fastparser' available with the following commits: commit 2394b86994de9e4d4e6028603c596bb020457f31 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Oct 16 19:58:36 2013 +0200 fastparser: don't use multithreading for small documents Determined by XInputStream::available(). Change-Id: I450f4796d9c072b395393582bfc3e1e7768e243b commit 1469c6753569db2a1930c572372a33ba1ab6f477 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 15 14:43:24 2013 +0200 fastparser: don't create temporary Events; use references to event list Change-Id: I1e12fbeeb90d6020d0566d05fc0318082e1da5fc commit ed828774af8dd3918b4b6d7981095444ec8a82b4 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 15 11:39:04 2013 +0200 fastparser: fix leak by storing rtl::Reference instead of pointer Change-Id: I003dc48fed9029c9af430d4d2d361425d351ff54 commit 32a080a1bd85b4c0386b4db7630ece0a60b5ac0d Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 15 10:32:55 2013 +0200 fastparser: re-use event lists if possible Change-Id: I53800abaca51d42d7d44a98fb271de7df7f90f58 commit 283027d661ccc5d0c2fb44d1b76cd355d586e067 Author: Michael Meeks michael.me...@collabora.com Date: Fri Oct 11 14:09:52 2013 +0100 fastparser: re-work locking, add high low watermarks, change sizes etc. Change-Id: I7fe1435addc6dce5a74a8411f7825cea331a5b3f commit f80cc8bb1a3f1dc1743f555a1fea21cb85979550 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 8 23:28:32 2013 +0200 FastSaxParser: implementation using two threads Instead of calling methods directly, generate EventList - vector of Events, where arguments for the callee are stored. commit 91ffcb4f97ce553dc046b25ac91bba2f50a276a4 Author: Michael Meeks michael.me...@collabora.com Date: Fri Oct 11 21:46:45 2013 +0100 fastparser: cache default namespace token for ooxml. Change-Id: Iee98ec92380d6d0404ab236e062ddbc2378cda43 commit c6a4ada8e3ebd3c6444c743fa89cf7108acac9ac Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Oct 16 11:15:31 2013 +0200 fastparser: don't use OStrings in attribute list, just simple char buffer Change-Id: I4879563fae3b85c68bbd1c4b260f9833848f4bda commit ffa64a3188ab033a09f0d632b53b290f105af887 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Oct 11 13:11:44 2013 +0200 FastSaxParser: remove duplicated OString version methods Also remove AttributeData and make the two for-cycles faster. Change-Id: If0343992173bb333eee39c33bcb86acaa5a3d288 commit d665e72b5347ab3f2ef5c159a420aee3bf7b629f Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 8 15:17:01 2013 +0200 FastSaxParser: isolate calls to XFastContextHandler in Entity's methods Unfortunately, we have to store maNamespace in two stacks. One for future parser thread to compute tokens and one for main thread calling XFastContextHandler. Now we are prepared to implement multithreading. Change-Id: I421b55afa2e9ea80142e6068c7a515d31913ba69 commit 361292aa8fef70ef3346922091209a82c95f497b Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 8 12:42:21 2013 +0200 FastSaxParser: store mnNamespaceCount in another stack This is preparation work for multithreading. mnNamespaceCount will be handled in parser thread and the rest in main thread. Change-Id: I571026ea499f6876b8dafb4e1bdc56d1add649e5 commit 0be2ea5dfc3e31c5eb1d7b8ba4b6c546fde56f2b Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Oct 15 09:29:27 2013 +0200 FastAttributeList: use vectors instead of map; the size is small Change-Id: If0ea36155d8ab3f5c91c2aafd6932fabeadadd41 commit 0525b6af7749eaef1f71b19f37629c64a04c096c Author: Michael Meeks michael.me...@collabora.com Date: Fri Oct 11 13:51:47 2013 +0100 fastparser: don't allocate uno::Sequences when we don't need to. Change-Id: Ic2fff8cabbc077b6fc9dabffd2c6fcf555152b11 commit 624706280b5593c0ac3ed84b667e0ea80b69440e Author: Michael Meeks michael.me...@collabora.com Date: Fri Oct 11 22:51:44 2013 +0100 oox: special-case single-character a-z token mapping. Change-Id: I58a810cc6062d5b42558dd5c0f37426a8a210f40 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source include/sfx2 sfx2/sdi
cui/source/dialogs/cuihyperdlg.cxx | 30 ++ cui/source/dialogs/hlinettp.cxx| 22 -- cui/source/dialogs/hlmarkwn.cxx| 10 +- cui/source/dialogs/hlmarkwn.hrc|2 +- cui/source/dialogs/hlmarkwn.src|4 ++-- cui/source/dialogs/hltpbase.cxx|7 --- cui/source/inc/cuihyperdlg.hxx |4 +--- cui/source/inc/hlinettp.hxx|1 - cui/source/inc/hlmarkwn.hxx|4 ++-- cui/source/inc/hltpbase.hxx|1 - include/sfx2/cntids.hrc|1 - sfx2/sdi/sfx.sdi | 27 --- 12 files changed, 17 insertions(+), 96 deletions(-) New commits: commit 556997bae75be8d8876d87a43d854cb969c12ce3 Author: Thomas Arnhold tho...@arnhold.org Date: Wed Oct 16 15:58:43 2013 +0200 remove SID_INTERNET_ONLINE We have no online/offline concept for the office anymore. Change-Id: Id7e71d9c4383b47d3fae6f8cb5dc18ec22a55934 diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 0be013f..444f529 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -38,7 +38,6 @@ using ::com::sun::star::frame::XFrame; SvxHlinkCtrl::SvxHlinkCtrl( sal_uInt16 _nId, SfxBindings rBindings, SvxHpLinkDlg* pDlg ) : SfxControllerItem ( _nId, rBindings ) - ,aOnlineForwarder ( SID_INTERNET_ONLINE , *this ) ,aRdOnlyForwarder ( SID_READONLY_MODE, *this ) { pParent = pDlg; @@ -51,11 +50,6 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState, { switch ( nSID ) { -case SID_INTERNET_ONLINE : -{ -pParent-EnableInetBrowse( !( (SfxBoolItem*)pState)-GetValue() ); -} -break; case SID_HYPERLINK_GETLINK : { pParent-SetPage ( (SvxHyperlinkItem*)pState); @@ -332,19 +326,6 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) /* |* -|* Enable/Disable to browse targets in a html-doc -|* -|/ - -void SvxHpLinkDlg::EnableInetBrowse( sal_Bool bEnable ) -{ -SvxHyperlinkTabPageBase* pCurrentPage = ( SvxHyperlinkTabPageBase* ) -GetTabPage ( GetCurPageId() ); -pCurrentPage-SetOnlineMode( bEnable ); -} - -/* -|* |* Enable/Disable ReadOnly mode |* |/ diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 47c6e0d..b6d3802 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include comphelper/string.hxx #include unotools/pathoptions.hxx #include unotools/useroptions.hxx #include svl/adrparse.hxx @@ -480,25 +479,4 @@ void SvxHyperlinkInternetTp::SetMarkStr ( const OUString aStrMark ) maCbbTarget.SetText ( aStrURL ); } -/* -|* -|* Enable Browse-Button in subject to the office is in onlinemode -|* -|/ - -void SvxHyperlinkInternetTp::SetOnlineMode( sal_Bool /*bEnable*/ ) -{ -// State of target-button in subject to the current url-string -// ( Can't display any targets in an document, if there is no -// valid url to a document ) -OUString aStrCurrentTarget(comphelper::string::stripEnd(maCbbTarget.GetText(), ' ')); - -if( aStrCurrentTarget.isEmpty() || -aStrCurrentTarget.equalsIgnoreAsciiCase( sHTTPScheme ) || -aStrCurrentTarget.equalsIgnoreAsciiCase( sHTTPSScheme ) ) -maBtTarget.Enable( sal_False ); -else -maBtTarget.Enable( sal_True ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index f4673ed..d849ed9 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -309,13 +309,6 @@ void SvxHyperlinkTabPageBase::SetMarkStr ( const OUString /*aStrMark*/ ) // default-implemtation : do nothing } -// This method will be called from the dialog-class if the state off -// the online-mode has changed. -void SvxHyperlinkTabPageBase::SetOnlineMode( sal_Bool /*bEnable*/ ) -{ -// default-implemtation : do nothing -} - // Set initial focus void SvxHyperlinkTabPageBase::SetInitFocus() { diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index a372e5d..79411bb 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -40,7 +40,6 @@ class SvxHlinkCtrl : public SfxControllerItem private :
[Libreoffice-commits] core.git: 3 commits - writerfilter/source
writerfilter/source/doctok/WW8LFOTable.cxx | 11 writerfilter/source/doctok/WW8ListTable.cxx | 69 --- writerfilter/source/doctok/resources.xmi | 15 - writerfilter/source/doctok/resourcesimpl.xsl | 38 -- 4 files changed, 3 insertions(+), 130 deletions(-) New commits: commit 31d3ab5ea19268cb51a5efdd6ac0065dfce25f28 Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 16 21:01:46 2013 +0200 writerfilter: remove unused WW8ListTable class in doctok Change-Id: If13c1ce4847e5711cbb60196a77a669411496306 diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx index 5d71a39..45d0f1e 100644 --- a/writerfilter/source/doctok/WW8ListTable.cxx +++ b/writerfilter/source/doctok/WW8ListTable.cxx @@ -23,22 +23,6 @@ namespace writerfilter { namespace doctok { -sal_uInt32 WW8ListTable::getEntryCount() -{ -return getU16(0); -} - -writerfilter::ReferenceProperties::Pointer_t -WW8ListTable::getEntry(sal_uInt32 nIndex) -{ -WW8List * pList = new WW8List(this, entryOffsets[nIndex]); - -pList-setIndex(nIndex); - -return writerfilter::ReferenceProperties::Pointer_t -(pList); -} - sal_uInt32 WW8List::get_listlevel_count() { if (get_fSimpleList()) diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index d04e3aa..8dca3a7 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -2325,15 +2325,6 @@ !--Class List-- !--Class ListTable-- UML:Class xmi.id=ListTable name=ListTable - UML:ModelElement.stereotype -UML:Stereotype xmi.idref=ww8resource/ - /UML:ModelElement.stereotype - UML:ModelElement.stereotype -UML:Stereotype xmi.idref=plcf/ - /UML:ModelElement.stereotype - UML:ModelElement.stereotype -UML:Stereotype xmi.idref=ww8nopayloadoffset/ - /UML:ModelElement.stereotype UML:ModelElement.taggedValue UML:TaggedValue UML:TaggedValue.dataValuertf:LISTTABLE/UML:TaggedValue.dataValue commit ee1187452ba0312cbef6406ea95c7ae39486076d Author: Miklos Vajna vmik...@collabora.co.uk Date: Wed Oct 16 20:59:21 2013 +0200 writerfilter: remove unused WW8ListLevel class Change-Id: Ib1058fcc10100938a34fae18e94fa9fd21ebfb36 diff --git a/writerfilter/source/doctok/WW8LFOTable.cxx b/writerfilter/source/doctok/WW8LFOTable.cxx index 5c41219..aef1639 100644 --- a/writerfilter/source/doctok/WW8LFOTable.cxx +++ b/writerfilter/source/doctok/WW8LFOTable.cxx @@ -57,17 +57,6 @@ sal_uInt32 WW8LFOLevel::calcSize() { sal_uInt32 nResult = WW8LFOLevel::getSize(); -if (get_fFormatting()) -{ -WW8ListLevel aLevel(mpParent, mnOffsetInParent + nResult); - -nResult += aLevel.calcSize(); - -sal_uInt32 nXstSize = mpParent-getU16(mnOffsetInParent + nResult); - -nResult += (nXstSize + 1) * 2; -} - return nResult; } diff --git a/writerfilter/source/doctok/WW8ListTable.cxx b/writerfilter/source/doctok/WW8ListTable.cxx index 380c19d..5d71a39 100644 --- a/writerfilter/source/doctok/WW8ListTable.cxx +++ b/writerfilter/source/doctok/WW8ListTable.cxx @@ -48,60 +48,11 @@ sal_uInt32 WW8List::get_listlevel_count() } writerfilter::ReferenceProperties::Pointer_t -WW8List::get_listlevel(sal_uInt32 nIndex) +WW8List::get_listlevel(sal_uInt32 /*nIndex*/) { -WW8ListTable * pListTable = dynamic_castWW8ListTable *(mpParent); -sal_uInt32 nPayloadIndex = pListTable-getPayloadIndex(mnIndex) + nIndex; -sal_uInt32 nPayloadOffset = pListTable-getPayloadOffset(nPayloadIndex); -sal_uInt32 nPayloadSize = pListTable-getPayloadSize(nPayloadIndex); - -return writerfilter::ReferenceProperties::Pointer_t -(new WW8ListLevel(mpParent, nPayloadOffset, nPayloadSize)); -} - -OUString WW8ListLevel::get_xst() -{ -sal_uInt32 nOffset = WW8ListLevel::getSize(); - -nOffset += get_cbGrpprlPapx(); -nOffset += get_cbGrpprlChpx(); - -return getString(nOffset); +return writerfilter::ReferenceProperties::Pointer_t(); } -void WW8ListLevel::resolveNoAuto(Properties rHandler) -{ -sal_uInt32 nOffset = getSize(); - -{ -WW8PropertySet::Pointer_t pSet -(new WW8PropertySetImpl(*this, nOffset, get_cbGrpprlPapx())); - -WW8PropertiesReference aRef(pSet); -aRef.resolve(rHandler); -} - -nOffset += get_cbGrpprlPapx(); - -{ -WW8PropertySet::Pointer_t pSet -(new WW8PropertySetImpl(*this, nOffset, get_cbGrpprlChpx())); - -WW8PropertiesReference aRef(pSet); -aRef.resolve(rHandler); -} -} - -sal_uInt32 WW8ListLevel::calcSize() -{ -sal_uInt32 nResult = WW8ListLevel::getSize(); - -nResult += get_cbGrpprlPapx(); -nResult += get_cbGrpprlChpx(); -nResult += 2 + getU16(nResult) * 2; - -return
[Libreoffice-commits] core.git: forms/source
forms/source/component/CheckBox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 67cfd9f3cfd2c9beb8724b890cf5015858de027e Author: Tor Lillqvist t...@collabora.com Date: Wed Oct 16 21:58:44 2013 +0300 WaE: 'bValue' may be used uninitialized in this function Change-Id: I6fd6f679dd81707483c6834a4d4b2ca935f7c515 diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 9d352f0..5198ccc 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -217,7 +217,7 @@ Any OCheckBoxModel::translateDbColumnToControlValue() // // Set value in ControlModel -bool bValue; +bool bValue = false; if(DbUseBool()) { bValue = m_xColumn-getBoolean(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 04/b38114b0ca4be9895d8f9fa842b6cb390c8036
04/b38114b0ca4be9895d8f9fa842b6cb390c8036 |1 + 1 file changed, 1 insertion(+) New commits: commit 994261231c5ceec5f6dac0e7340019a2fa83b621 Author: Caolán McNamara caol...@redhat.com Date: Wed Oct 16 20:30:30 2013 +0100 Notes added by 'git notes add' diff --git a/04/b38114b0ca4be9895d8f9fa842b6cb390c8036 b/04/b38114b0ca4be9895d8f9fa842b6cb390c8036 new file mode 100644 index 000..0c2e9c3 --- /dev/null +++ b/04/b38114b0ca4be9895d8f9fa842b6cb390c8036 @@ -0,0 +1 @@ +merged as: dfa1afd0e8b7ae9c706c4a3171a04752e24230b0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-19'
Tag 'suse-4.0-19' created by Andras Timar andras.ti...@collabora.com at 2013-10-16 20:52 -0700 suse-4.0-19 Changes since libreoffice-4.0.2.2-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-19'
Tag 'suse-4.0-19' created by Andras Timar andras.ti...@collabora.com at 2013-10-16 20:52 -0700 suse-4.0-19 Changes since libreoffice-4.0.2.2: Petr Mladek (1): Branch suse-4.0 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-19'
Tag 'suse-4.0-19' created by Andras Timar andras.ti...@collabora.com at 2013-10-16 20:52 -0700 suse-4.0-19 Changes since libreoffice-4.0.2.2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-19'
Tag 'suse-4.0-19' created by Andras Timar andras.ti...@collabora.com at 2013-10-16 20:52 -0700 suse-4.0-19 Changes since suse-4.0-18-fix-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f46cb0c45a3e00057c1bcf73ac850ef44d470b9d Author: Eike Rathke er...@redhat.com Date: Wed Oct 16 21:52:18 2013 +0200 fixed out-of-bounds OUString access Change-Id: I971c339f2cb4cddcf4fbb447eb79282d34979220 diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 72bfec8..c35d3d6 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -956,7 +956,8 @@ void ScInputHandler::ShowTipCursor() { sal_uInt16 nPosition = 0; OUString aText = pEngine-GetWord( 0, aSel.nEndPos-1 ); -if( aText[ aSel.nEndPos-1 ] == '=' ) +/* XXX: dubious, what is this condition supposed to exactly match? */ +if (aSel.nEndPos = aText.getLength() aText[ aSel.nEndPos-1 ] == '=') { break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
error in unit test
Hi, Build error yesterday. Today fress pull and again make. Same error (below). Any simple suggestions? thanks - Cor [build DEP] LNK:Library/libsofficeapp.so [build LNK] Library/libsofficeapp.so warn:i18nlangtag:15610:1:i18nlangtag/source/languagetag/languagetag.cxx:674: LanguageTag::registerOnTheFly: not cross-inserted 0x51 for 'dz' have 'bo' canvasbitmaptest.cxx:183:Assertion Test name: (anonymous namespace)::CanvasBitmapTest::runTest assertion failed - Expression: pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) pRGBSt art[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue()) - Sixth pixel is not green Failures !!! Run: 2 Failure total: 1 Failures: 1 Errors: 0 warn:legacy.osl:15610:1:unotools/source/config/configmgr.cxx:167: OSL_ASSERT: items_.empty() Error: a unit test failed, please do one of: [] make[1]: *** [/home/cono/src/git/libo_core/workdir/unxlngi6/CppunitTest/vcl_complextext.test] Fout 1 make[1]: *** Wachten op onvoltooide taken... make: *** [build] Fout 2 -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/CustomTarget_jawt.mk external/mingw-externals external/Module_external.mk external/Package_jawt.mk external/Package_mingw_dlls.mk external/Package_mingw_gccdll
external/CustomTarget_jawt.mk | 33 - external/Module_external.mk|7 external/Package_jawt.mk | 14 external/Package_mingw_dlls.mk | 18 --- external/Package_mingw_gccdlls.mk | 17 -- external/mingw-externals/CustomTarget_jawt.mk | 33 + external/mingw-externals/Module_mingw-externals.mk | 21 + external/mingw-externals/Package_jawt.mk | 14 external/mingw-externals/Package_mingw_dlls.mk | 18 +++ external/mingw-externals/Package_mingw_gccdlls.mk | 17 ++ 10 files changed, 104 insertions(+), 88 deletions(-) New commits: commit 82a3c3f702e78232ebd4671c0061aa817bbd146b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Oct 16 21:11:11 2013 +0200 move mingw-externals to subdir Change-Id: I324225ac397d8e4bb1f58f0b8040eb08b7142ee9 Reviewed-on: https://gerrit.libreoffice.org/6277 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/external/Module_external.mk b/external/Module_external.mk index 9cbf588..506c03a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -10,12 +10,7 @@ $(eval $(call gb_Module_Module,external)) ifeq ($(OS)$(COM),WNTGCC) -$(eval $(call gb_Module_add_targets,external,\ - CustomTarget_jawt \ - Package_jawt \ - Package_mingw_dlls \ - Package_mingw_gccdlls \ -)) +$(eval $(call gb_Module_add_moduledir,external,mingw-externals)) endif ifeq ($(COM),MSC) diff --git a/external/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk similarity index 100% rename from external/CustomTarget_jawt.mk rename to external/mingw-externals/CustomTarget_jawt.mk diff --git a/external/Package_jawt.mk b/external/mingw-externals/Module_mingw-externals.mk similarity index 56% copy from external/Package_jawt.mk copy to external/mingw-externals/Module_mingw-externals.mk index cc58cf9..6d262d8 100644 --- a/external/Package_jawt.mk +++ b/external/mingw-externals/Module_mingw-externals.mk @@ -7,8 +7,15 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt))) +$(eval $(call gb_Module_Module,mingw-externals)) -$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a)) +ifeq ($(OS)$(COM),WNTGCC) +$(eval $(call gb_Module_add_targets,mingw-externals,\ + CustomTarget_jawt \ + Package_jawt \ + Package_mingw_dlls \ + Package_mingw_gccdlls \ +)) +endif -# vim:set shiftwidth=4 tabstop=4 noexpandtab: +# vim: set noet sw=4 ts=4: diff --git a/external/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk similarity index 100% rename from external/Package_jawt.mk rename to external/mingw-externals/Package_jawt.mk diff --git a/external/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk similarity index 100% rename from external/Package_mingw_dlls.mk rename to external/mingw-externals/Package_mingw_dlls.mk diff --git a/external/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk similarity index 100% rename from external/Package_mingw_gccdlls.mk rename to external/mingw-externals/Package_mingw_gccdlls.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
error in unit test
Hi, Build error yesterday. Today fress pull and again make. Same error (below). Any simple suggestions? thanks - Cor [build DEP] LNK:Library/libsofficeapp.so [build LNK] Library/libsofficeapp.so warn:i18nlangtag:15610:1:i18nlangtag/source/languagetag/languagetag.cxx:674: LanguageTag::registerOnTheFly: not cross-inserted 0x51 for 'dz' have 'bo' canvasbitmaptest.cxx:183:Assertion Test name: (anonymous namespace)::CanvasBitmapTest::runTest assertion failed - Expression: pRGBStart[5].Red == vcl::unotools::toDoubleColor(aCol.GetRed()) pRGBStart[5].Green == vcl::unotools::toDoubleColor(aCol.GetGreen()) pRGBSt art[5].Blue == vcl::unotools::toDoubleColor(aCol.GetBlue()) - Sixth pixel is not green Failures !!! Run: 2 Failure total: 1 Failures: 1 Errors: 0 warn:legacy.osl:15610:1:unotools/source/config/configmgr.cxx:167: OSL_ASSERT: items_.empty() Error: a unit test failed, please do one of: [] make[1]: *** [/home/cono/src/git/libo_core/workdir/unxlngi6/CppunitTest/vcl_complextext.test] Fout 1 make[1]: *** Wachten op onvoltooide taken... make: *** [build] Fout 2 -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
TinderBox script build question
So noticed that the TB 27 builds of the 4.1 branch has .dmg installers that are being named as 4.0.6 builds. http://nabble.documentfoundation.org/file/n4078336/lodev_OSX.png I sent Thorsten a note about it, and he had not been aware but was just running the build scripts. So anyone know what he needs to adjust? -- View this message in context: http://nabble.documentfoundation.org/TinderBox-script-build-question-tp4078336.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr1.cxx | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 5191cd8307fd7155fca5281b762d73e923c60c58 Author: Eike Rathke er...@redhat.com Date: Wed Oct 16 23:22:10 2013 +0200 fixed MIN and MAX matrix case regression Introduced with 58380c11216cb9f03a98e3d53dcee702576fedb8 If in MIN matrix minimum was 0.0 the result was always 0. If in MAX matrix maximum was 0.0 the result was always 0. Change-Id: I59bd1e9815912eae6b4846c092d98a8949b30e8d diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index d1e53df..56087c8 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -3657,7 +3657,11 @@ void ScInterpreter::ScMin( bool bTextAsZero ) { ScMatrixRef pMat = GetMatrix(); if (pMat) -nMin = pMat-GetMinValue(bTextAsZero); +{ +nVal = pMat-GetMinValue(bTextAsZero); +if (nMin nVal) +nMin = nVal; +} } break; case svString : @@ -3750,7 +3754,9 @@ void ScInterpreter::ScMax( bool bTextAsZero ) if (pMat) { nFuncFmtType = NUMBERFORMAT_NUMBER; -nMax = pMat-GetMaxValue(bTextAsZero); +nVal = pMat-GetMaxValue(bTextAsZero); +if (nMax nVal) +nMax = nVal; } } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] voting.git: include/add-header.xsl
include/add-header.xsl |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit d3e268a3c781d2fa1dfa40ede8e950017e35a05c Author: Thorsten Behrens t...@documentfoundation.org Date: Wed Oct 16 23:39:13 2013 +0200 Remove protocol from stylesheet links. diff --git a/include/add-header.xsl b/include/add-header.xsl index 5050a60..384c275 100644 --- a/include/add-header.xsl +++ b/include/add-header.xsl @@ -17,9 +17,9 @@ /xsl:template xsl:template match=head head xmlns=http://www.w3.org/1999/xhtml; - link rel=stylesheet type=text/css href=http://www.documentfoundation.org/themes/tdf/css/layout.css?m=1300292397/ - link rel=stylesheet type=text/css href=http://www.documentfoundation.org/themes/tdf/css/typography.css?m=1292094211/ - link rel=stylesheet type=text/css href=http://www.documentfoundation.org/themes/tdf/css/form.css?m=1305575430/ + link rel=stylesheet type=text/css href=//www.documentfoundation.org/themes/tdf/css/layout.css?m=1300292397/ + link rel=stylesheet type=text/css href=//www.documentfoundation.org/themes/tdf/css/typography.css?m=1292094211/ + link rel=stylesheet type=text/css href=//www.documentfoundation.org/themes/tdf/css/form.css?m=1305575430/ link rel=icon href=http://www.documentfoundation.org/favicon.ico/ xsl:copy-of select=@*/ xsl:apply-templates select=node()/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr1.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 151c55e77185aed554e3db7b92b8ec3e006bbd66 Author: Eike Rathke er...@redhat.com Date: Wed Oct 16 23:38:39 2013 +0200 re-added an omitted nFuncFmtType Gone with 58380c11216cb9f03a98e3d53dcee702576fedb8 Change-Id: I6b076d635c3d2cd37ed6b65a83c758b30e0e1522 diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 56087c8..748d044 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -3658,6 +3658,7 @@ void ScInterpreter::ScMin( bool bTextAsZero ) ScMatrixRef pMat = GetMatrix(); if (pMat) { +nFuncFmtType = NUMBERFORMAT_NUMBER; nVal = pMat-GetMinValue(bTextAsZero); if (nMin nVal) nMin = nVal; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: error in unit test
Cor Nouws wrote: - Sixth pixel is not green Interesting - are you per chance running under some reduced color depth mode? It is possible that the bitmaps generated are not truecolor then. Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/glibc external/Module_external.mk external/StaticLibrary_gnu_readdir_r.mk external/UnpackedTarball_glibc.mk Makefil
Makefile.fetch |1 config_host.mk.in |2 - configure.ac| 17 -- download.lst|1 external/Module_external.mk |9 - external/StaticLibrary_gnu_readdir_r.mk | 28 external/UnpackedTarball_glibc.mk | 19 --- external/glibc/config.h | 40 --- external/glibc/readdir_r.c | 54 9 files changed, 171 deletions(-) New commits: commit 98404a843198c532c5639b073a3a83ff3529615b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Oct 16 21:36:15 2013 +0200 remove glibc stub and tarball, it seems to be completely unused Change-Id: I1638d4cfc0e6025bd33ed6770ede8556304d6919 Reviewed-on: https://gerrit.libreoffice.org/6278 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com diff --git a/Makefile.fetch b/Makefile.fetch index dbfcc5d..61dfe6c 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -112,7 +112,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,FREETYPE,$(FREETYPE_TARBALL)) \ $(GOOGLE_DOCS_EXTENSION_PACK) \ $(call fetch_Optional,GRAPHITE,$(GRAPHITE_TARBALL)) \ - $(call fetch_Optional,GLIBC,$(GLIBC_TARBALL)) \ $(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \ $(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \ $(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \ diff --git a/config_host.mk.in b/config_host.mk.in index c282770..aba2735 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -237,7 +237,6 @@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@ export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@ export HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@ export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@ -export HAVE_READDIR_R=@HAVE_READDIR_R@ export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@ export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@ export HOST_PLATFORM=@host@ @@ -508,7 +507,6 @@ export SYSTEM_ICU=@SYSTEM_ICU@ export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@ export SYSTEM_JPEG=@SYSTEM_JPEG@ export SYSTEM_LCMS2=@SYSTEM_LCMS2@ -export SYSTEM_LIBC=@SYSTEM_LIBC@ export SYSTEM_CDR=@SYSTEM_CDR@ export SYSTEM_CMIS=@SYSTEM_CMIS@ export SYSTEM_LIBATOMIC_OPS=@SYSTEM_LIBATOMIC_OPS@ diff --git a/configure.ac b/configure.ac index ca581e3..00419d6 100644 --- a/configure.ac +++ b/configure.ac @@ -9508,23 +9508,6 @@ if test $_os = Linux; then fi fi -if test $_os != WINNT; then -AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO]) -if test $HAVE_READDIR_R = YES; then -SYSTEM_LIBC=YES -fi -else -HAVE_READDIR_R=NO -SYSTEM_LIBC=YES -fi - -if test $HAVE_READDIR_R = NO; then -BUILD_TYPE=$BUILD_TYPE GLIBC -fi - -AC_SUBST(HAVE_READDIR_R) -AC_SUBST(SYSTEM_LIBC) - dnl = dnl Check for the Windows SDK. dnl = diff --git a/download.lst b/download.lst index 2cb9371..120ac9b 100644 --- a/download.lst +++ b/download.lst @@ -43,7 +43,6 @@ export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-f export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2 export GRAPHITE_TARBALL := 7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz -export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz diff --git a/external/Module_external.mk b/external/Module_external.mk index 506c03a..538b3fd 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -17,15 +17,6 @@ ifeq ($(COM),MSC) $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif -ifeq ($(HAVE_READDIR_R),NO) -ifneq ($(OS),WNT) -$(eval $(call gb_Module_add_targets,external,\ - UnpackedTarball_glibc \ - StaticLibrary_gnu_readdir_r \ -)) -endif -endif - $(call gb_Helper_optional,LIBPNG,\ $(eval $(call gb_Module_add_moduledir,external,libpng))) diff --git a/external/StaticLibrary_gnu_readdir_r.mk b/external/StaticLibrary_gnu_readdir_r.mk deleted file mode 100644 index 51a618e..000 --- a/external/StaticLibrary_gnu_readdir_r.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This
Re: move external builds into subfolder (fdo#70393)
Hi, On Tue, Oct 15, 2013 at 05:30:37PM +0200, Eike Rathke wrote: No opposition, just please move the current content, i.e. external/*.mk, out of the way to have it one level deeper (is it all Windows related? then have windows/ subdir or some such), as is it would be quite confusing to have *.mk files there that are completely unrelated to all the external modules below then. done with: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=29a5707821f9ec386d5f6b90f7838db9cdff1263 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=82a3c3f702e78232ebd4671c0061aa817bbd146b https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=98404a843198c532c5639b073a3a83ff3529615b thus there should be now ~50 top-level dirs that can be moved to external. To anyone who is interested: https://bugs.freedesktop.org/show_bug.cgi?id=70393 Good Hunting! Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: move external builds into subfolder (fdo#70393)
On Thu, Oct 17, 2013 at 12:22:02AM +0200, bjoern wrote: Hi, On Tue, Oct 15, 2013 at 05:30:37PM +0200, Eike Rathke wrote: No opposition, just please move the current content, i.e. external/*.mk, out of the way to have it one level deeper (is it all Windows related? then have windows/ subdir or some such), as is it would be quite confusing to have *.mk files there that are completely unrelated to all the external modules below then. done with: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=29a5707821f9ec386d5f6b90f7838db9cdff1263 https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=82a3c3f702e78232ebd4671c0061aa817bbd146b https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=98404a843198c532c5639b073a3a83ff3529615b thus there should be now ~50 top-level dirs that can be moved to external. To anyone who is interested: https://bugs.freedesktop.org/show_bug.cgi?id=70393 https://gerrit.libreoffice.org/6276 Regards, Khaled ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added OS|All |Linux (All) Status|UNCONFIRMED |NEW Whiteboard||EasyHack DifficultyBeginner ||SkillScript Severity|normal |minor Priority|medium |low CC||libreoffice@lists.freedeskt ||op.org See Also||https://launchpad.net/bugs/ ||1231799 Version|unspecified |4.1.2.3 release Ever confirmed|0 |1 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: .desktop files
On Tue, Oct 15, 2013 at 02:34:18PM +0200, bjoern wrote: On Mon, Oct 14, 2013 at 07:31:16AM +0200, Jean-Baptiste Faure wrote: I would like to better understand how .desktop files work. They are in .../sysui/desktop/menus. If I read for example writer.desktop I see that the second exec command (at the end of the file) use the hard coded name libreoffice when the first one use ${UNIXBASISROOTNAME}. Is it intentional ? Indeed, even after installation of LO (upstream, build at home) I do not have any libreoffice command on my system (Ubuntu 13.04). The second one is for unity quicklist integration (the small popup menu you get from the dash on the sidebar). It indeed might only work if you use the Debian/Ubuntu provided packages (which you should anyway, if you want system integration) as those surely provide a 'libreoffice' executable in the default path. Hi, FWIW I filed an Easy Hack wrt to this: https://bugs.freedesktop.org/show_bug.cgi?id=70553 while Unity _should_ be able to read the old format, moving to the new one makes sense anyway. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - editeng/source svx/source
editeng/source/items/flditem.cxx | 322 +++ svx/source/sidebar/nbdtmg.cxx|6 2 files changed, 165 insertions(+), 163 deletions(-) New commits: commit 6aa0488da21ef21b9da68253682b174f11f305f5 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Sep 12 14:30:15 2013 +0200 this method is not supposed to throw, fdo#66241 Change-Id: I1e2eaeba47e16e6b261c4c382ec10166eb08d7f3 diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 58aeb95..1394c07 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -50,172 +50,172 @@ SvxFieldData* SvxFieldData::Create(const uno::Referencetext::XTextContent xTe aAny = xPropSet-getPropertyValue(UNO_TC_PROP_TEXTFIELD_TYPE); if ( !aAny.hassal_Int32() ) return NULL; + +sal_Int32 nFieldType = aAny.getsal_Int32(); + +switch (nFieldType) +{ +case text::textfield::Type::TIME: +case text::textfield::Type::EXTENDED_TIME: +case text::textfield::Type::DATE: +{ +sal_Bool bIsDate = false; +xPropSet-getPropertyValue(UNO_TC_PROP_IS_DATE) = bIsDate; + +if (bIsDate) +{ +util::DateTime aDateTime = xPropSet-getPropertyValue(UNO_TC_PROP_DATE_TIME).getutil::DateTime(); +Date aDate(aDateTime.Day, aDateTime.Month, aDateTime.Year); +sal_Bool bIsFixed = false; +xPropSet-getPropertyValue(UNO_TC_PROP_IS_FIXED) = bIsFixed; + +SvxDateField* pData = new SvxDateField(aDate, bIsFixed ? SVXDATETYPE_FIX : SVXDATETYPE_VAR); +sal_Int32 nNumFmt = -1; +xPropSet-getPropertyValue(UNO_TC_PROP_NUMFORMAT) = nNumFmt; +if (nNumFmt = SVXDATEFORMAT_APPDEFAULT nNumFmt = SVXDATEFORMAT_F) + pData-SetFormat(static_castSvxDateFormat(nNumFmt)); + +return pData; +} + +if (nFieldType != text::textfield::Type::TIME nFieldType != text::textfield::Type::DATE) +{ +util::DateTime aDateTime = xPropSet-getPropertyValue(UNO_TC_PROP_DATE_TIME).getutil::DateTime(); +Time aTime(aDateTime.Hours, aDateTime.Minutes, aDateTime.Seconds, aDateTime.NanoSeconds); + +sal_Bool bIsFixed = false; +xPropSet-getPropertyValue(UNO_TC_PROP_IS_FIXED) = bIsFixed; + +SvxExtTimeField* pData = new SvxExtTimeField(aTime, bIsFixed ? SVXTIMETYPE_FIX : SVXTIMETYPE_VAR); + +sal_Int32 nNumFmt = -1; +xPropSet-getPropertyValue(UNO_TC_PROP_NUMFORMAT) = nNumFmt; +if (nNumFmt = SVXTIMEFORMAT_APPDEFAULT nNumFmt = SVXTIMEFORMAT_AM_HMSH) + pData-SetFormat(static_castSvxTimeFormat(nNumFmt)); + +return pData; +} + +return new SvxTimeField(); +} +case text::textfield::Type::URL: +{ +OUString aRep, aTarget, aURL; +sal_Int16 nFmt = -1; +xPropSet-getPropertyValue(UNO_TC_PROP_URL_REPRESENTATION) = aRep; +xPropSet-getPropertyValue(UNO_TC_PROP_URL_TARGET) = aTarget; +xPropSet-getPropertyValue(UNO_TC_PROP_URL) = aURL; +xPropSet-getPropertyValue(UNO_TC_PROP_URL_FORMAT) = nFmt; +SvxURLField* pData = new SvxURLField(aURL, aRep, aRep.isEmpty() ? SVXURLFORMAT_URL : SVXURLFORMAT_REPR); +pData-SetTargetFrame(aTarget); +if (nFmt = SVXURLFORMAT_APPDEFAULT nFmt = SVXURLFORMAT_REPR) +pData-SetFormat(static_castSvxURLFormat(nFmt)); + +return pData; +} +case text::textfield::Type::PAGE: +return new SvxPageField(); +case text::textfield::Type::PAGES: +return new SvxPagesField(); +case text::textfield::Type::DOCINFO_TITLE: +return new SvxFileField(); +case text::textfield::Type::TABLE: +{ +sal_Int32 nTab = 0; +xPropSet-getPropertyValue(UNO_TC_PROP_TABLE_POSITION) = nTab; +return new SvxTableField(nTab); +} +case text::textfield::Type::EXTENDED_FILE: +{ +OUString aPresentation; +sal_Bool bIsFixed = false; +sal_Int16 nFmt = text::FilenameDisplayFormat::FULL; +xPropSet-getPropertyValue(UNO_TC_PROP_IS_FIXED) =
[Libreoffice-commits] core.git: forms/source
forms/source/component/CheckBox.cxx | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) New commits: commit 9d5e05edb20819e7b989f366fbd86ca4c2cd7cc5 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Oct 17 04:06:24 2013 +0200 bogus WaE: 'bValue' may be used uninitialized in this function Change-Id: I14983509a41bd6be0d7fed29d7f89fa4a21fe08a diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 5198ccc..5db7397 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -217,7 +217,7 @@ Any OCheckBoxModel::translateDbColumnToControlValue() // // Set value in ControlModel -bool bValue = false; +bool bValue; if(DbUseBool()) { bValue = m_xColumn-getBoolean(); @@ -241,7 +241,17 @@ Any OCheckBoxModel::translateDbColumnToControlValue() } else if ( !aValue.hasValue() ) { +// Since above either bValue is initialised, either aValue.hasValue(), +// bValue cannot be used uninitialised here. +// But GCC does not see/understand that, which breaks -Werror builds. +#if defined __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored -Wmaybe-uninitialized +#endif aValue = (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK ); +#if defined __GNUC__ +#pragma GCC diagnostic pop +#endif } return aValue; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/component/CheckBox.cxx | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) New commits: commit efd341157c3cf738756afd77a91f37b735e9a2de Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Oct 17 04:14:47 2013 +0200 MacOS X fixup to bogus WaE: 'bValue' may be used uninitialized Change-Id: I1485e7f6b9147d4cec94833c0a2b35e730c397cf diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 5db7397..d1667ea 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -211,6 +211,10 @@ bool OCheckBoxModel::DbUseBool() } //-- +#if defined __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored -Wmaybe-uninitialized +#endif Any OCheckBoxModel::translateDbColumnToControlValue() { Any aValue; @@ -244,18 +248,16 @@ Any OCheckBoxModel::translateDbColumnToControlValue() // Since above either bValue is initialised, either aValue.hasValue(), // bValue cannot be used uninitialised here. // But GCC does not see/understand that, which breaks -Werror builds. -#if defined __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored -Wmaybe-uninitialized -#endif +// Since the MacOS X compiler does not support #pragma GCC diagnostic +// within a function, moved them to outside the function. aValue = (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK ); -#if defined __GNUC__ -#pragma GCC diagnostic pop -#endif } return aValue; } +#if defined __GNUC__ +#pragma GCC diagnostic pop +#endif //- sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60698] kill pointless one-file library ...
https://bugs.freedesktop.org/show_bug.cgi?id=60698 --- Comment #4 from Marcos Souza marcos.souza@gmail.com --- I'm in the right direction here? https://gerrit.libreoffice.org/#/c/6288/ -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libpng
external/libpng/Module_libpng.mk |4 1 file changed, 4 insertions(+) New commits: commit ce40605a8f906ebb4d800798d1e0c17ded4c053a Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Oct 17 02:32:09 2013 + Revert no need to double the conditional, once is enough This reverts commit b63029c8072c10c03b2fc36fe82619f0cff0ca18 This might be a bug in gb_Helper_optional or some such, but I get: make[1]: *** No rule to make target `/home/master/src/libreoffice/workdirs/master/src/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz', needed by `/home/master/src/libreoffice/workdirs/master/workdir/unxlngx6/UnpackedTarget/9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz'. Stop. make[1]: *** Waiting for unfinished jobs make: *** [build] Error 2 Change-Id: Ib9cd0cbe800f158bf50aaeb95f848cc2fd805de3 Reviewed-on: https://gerrit.libreoffice.org/6287 Reviewed-by: Lionel Elie Mamane lio...@mamane.lu Tested-by: Lionel Elie Mamane lio...@mamane.lu diff --git a/external/libpng/Module_libpng.mk b/external/libpng/Module_libpng.mk index afb0016..d61375d 100644 --- a/external/libpng/Module_libpng.mk +++ b/external/libpng/Module_libpng.mk @@ -9,9 +9,13 @@ $(eval $(call gb_Module_Module,libpng)) +ifeq ($(SYSTEM_LIBPNG),NO) + $(eval $(call gb_Module_add_targets,libpng,\ StaticLibrary_png \ UnpackedTarball_png \ )) +endif + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac libxmlsec/ExternalProject_xmlsec.mk neon/Library_neon.mk postgresql/ExternalProject_postgresql.mk python3/ExternalPackage_python3.mk python3/ExternalProjec
RepositoryExternal.mk|4 ++-- configure.ac |4 ++-- libxmlsec/ExternalProject_xmlsec.mk |2 +- neon/Library_neon.mk |4 ++-- postgresql/ExternalProject_postgresql.mk | 10 +- python3/ExternalPackage_python3.mk |4 ++-- python3/ExternalProject_python3.mk |4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) New commits: commit bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a Author: Norbert Thiebaud nthieb...@gmail.com Date: Sat Aug 31 18:55:53 2013 -0500 Normalize DISABLE_OPENSSL to USE TRUE/nothing Change-Id: I84dd99f42e032315fbf31332dfb62eb3ef4aa4c0 Reviewed-on: https://gerrit.libreoffice.org/5724 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e064b1b..b4def01 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1262,7 +1262,7 @@ gb_LinkTarget__use_harfbuzz := endif # ENABLE_HARFBUZZ -ifeq ($(DISABLE_OPENSSL),YES) +ifeq ($(DISABLE_OPENSSL),TRUE) gb_ExternalProject__use_openssl:= gb_LinkTarget__use_openssl_headers:= @@ -1333,7 +1333,7 @@ endif # SYSTEM_OPENSSL endif # DISABLE_OPENSSL -ifeq ($(DISABLE_OPENSSL),YES) +ifeq ($(DISABLE_OPENSSL),TRUE) define gb_LinkTarget__use_gnutls $(call gb_LinkTarget_set_include,$(1),\ diff --git a/configure.ac b/configure.ac index 00419d6..42dfd44 100644 --- a/configure.ac +++ b/configure.ac @@ -9249,7 +9249,7 @@ fi dnl === dnl Check for system openssl dnl === -DISABLE_OPENSSL=NO +DISABLE_OPENSSL= AC_MSG_CHECKING([whether to disable OpenSSL usage]) if test $enable_openssl = yes; then AC_MSG_RESULT([no]) @@ -9290,7 +9290,7 @@ if test $enable_openssl = yes; then fi else AC_MSG_RESULT([yes]) -DISABLE_OPENSSL=YES +DISABLE_OPENSSL=TRUE # warn that although OpenSSL is disabled, system libraries may be depending on it AC_MSG_WARN([OpenSSL has been disabled. No code compiled by LibO will make use of it but system librares may create indirect dependencies]) diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 2d48faf..93a1b07 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -54,7 +54,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : autoreconf \ ./configure \ --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ - $(if $(and $(filter ANDROID,$(OS)),$(filter-out YES,$(DISABLE_OPENSSL))),--with-openssl=$(OUTDIR),--without-openssl) \ + $(if $(filter ANDROID,$(OS)),$(if $(DISABLE_OPENSSL),--without-openssl,--with-openssl=$(OUTDIR))) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__OOO) \ $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ diff --git a/neon/Library_neon.mk b/neon/Library_neon.mk index 2dad2ed..d391a3e 100644 --- a/neon/Library_neon.mk +++ b/neon/Library_neon.mk @@ -61,7 +61,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ )) -ifneq ($(DISABLE_OPENSSL),YES) +ifneq ($(DISABLE_OPENSSL),TRUE) $(eval $(call gb_Library_add_generated_cobjects,neon,\ UnpackedTarball/neon/src/ne_openssl \ )) @@ -89,7 +89,7 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\ )) else -ifneq ($(DISABLE_OPENSSL),YES) +ifneq ($(DISABLE_OPENSSL),TRUE) $(eval $(call gb_Library_add_generated_cobjects,neon,\ UnpackedTarball/neon/src/ne_ntlm \ )) diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 9f495c5..7690357 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -32,15 +32,15 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ ./configure \ --without-readline --disable-shared --with-ldap \ - $(if $(filter-out YES,$(DISABLE_OPENSSL)),--with-openssl) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(and $(filter YES,$(WITH_KRB5)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-krb5) \ - $(if $(and $(filter YES,$(WITH_GSSAPI)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-gssapi) \ + $(if $(DISABLE_OPENSSL),,--with-openssl \ + $(if
[Bug 70553] Update .desktop files to use freedesktop actions
https://bugs.freedesktop.org/show_bug.cgi?id=70553 --- Comment #1 from Jean-Baptiste Faure jbf.fa...@sud-ouest.org --- AFAIK .desktop files are in /core/sysui/desktop/menus/ Not sure if it is enough to modify these files. Best regards. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: forms/source
forms/source/component/CheckBox.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 2337bb6b402391983f8f96a8d0bc9e904dd124a9 Author: Tor Lillqvist t...@collabora.com Date: Thu Oct 17 08:25:28 2013 +0300 WaE: unknown warning group '-Wmaybe-uninitialized' Seriously, would it be so awful to initialise the value even if strictly speaking it is unnecessary? Hopefully avoiding that is not an attempt at manual micro-optmisation? (Or did the initialisation actually cause some warning?) Besides, Clang is not just the MacOS X compiler. I use Clang on Linux, too. It is great. Our Clang plug-in (which can be easily used only on Linux) is very useful. Change-Id: I379afed707d96745ee29979bd79467309adf0147 diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index d1667ea..4796729 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -211,7 +211,7 @@ bool OCheckBoxModel::DbUseBool() } //-- -#if defined __GNUC__ +#if defined __GNUC__ ! defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored -Wmaybe-uninitialized #endif @@ -248,14 +248,14 @@ Any OCheckBoxModel::translateDbColumnToControlValue() // Since above either bValue is initialised, either aValue.hasValue(), // bValue cannot be used uninitialised here. // But GCC does not see/understand that, which breaks -Werror builds. -// Since the MacOS X compiler does not support #pragma GCC diagnostic +// And Clang compiler does not support #pragma GCC diagnostic // within a function, moved them to outside the function. aValue = (sal_Int16)( bValue ? STATE_CHECK : STATE_NOCHECK ); } return aValue; } -#if defined __GNUC__ +#if defined __GNUC__ ! defined __clang__ #pragma GCC diagnostic pop #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 65625] EDITING: Navigator tree closes when reorganising headings
https://bugs.freedesktop.org/show_bug.cgi?id=65625 --- Comment #4 from Dominique Boutry dominique.bout...@laposte.net --- Tested with LibO 4.0.5.2 on Win7. - The 4 buttons promote/demote chapter/level work OK. - Mouse dragdrop fails frequently (for instance, in the result of moving title111 between title1 and title11 : it is moved after titles112/113/114 if they exist) - After a promote/demote, the whole tree is collapsed except the minimal path to the moved item (not randomly). - However, after moving a chapter directly in the main document, the selected one in the navigator is the one containing the caret : not the moved one but the following one. - Undo work OK (except the collapsing). Already signaled in bug 58187 and part of bug 42786, in my opinion. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54513] Label Horizontal Pitch Not to specific Label dimensions
https://bugs.freedesktop.org/show_bug.cgi?id=54513 --- Comment #19 from Winfried Donkers winfrieddonk...@libreoffice.org --- (In reply to comment #18) Based on the numbers that Avery just gave you, this calculation should be made. Total label width, that is label width times 3 labels on the page. Page width minus Total label width, then divide by the total amount of gaps between the labels and the margins. There are 4. Add this to a single label width to get the horizontal pitch. Here it is. 2.63 x 3 = 7.89 8.5 - 7.89 = .61 .61 / 4 = .1525 2.63 + .1525 = 2.7825 Horizontal Pitch = 2.7825 I suppose you could script this formula and find out how many other labels dims are off. Thanks. Thank you for your suggestion. It looks good, and probably is for some labels, but unfortunately, labels are not necessarily spread evenly on the page. Left and right margin may differ from the gap between labels and the left margin may differ from the right margin. I checked most of the 1750+ labels in the LibreOffice label wizard and found out the hard way that your suggestion will not work on all labels. I can only advise to use a margin in the label itself (i.e. start the text a bit left from the border). This margin will adsorb misalignment and small differences in actual label positioning. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59447] : Allow users to view word-breaks created by ICU Breakiterator
https://bugs.freedesktop.org/show_bug.cgi?id=59447 --- Comment #2 from livingfi...@gmail.com --- I'm not certain, but I don't think the ICU BreakIterator actually adds ZWSP to the text. Rather, it simply decides where to break the text when outputting, without actually inserting new characters into the text stream. But this has gotten me thinking: I'm unhappy with the ICU BreakIterator for Khmer because it creates chaos when non-Khmer (i.e. minority) languages are written in Khmer script. Before the ICU BreakIterator was enabled for Khmer in LO 3.6, minority languages carefully typed with ZWSP between words did line breaking perfectly. It's understandable that Cambodians don't like typing ZWSP, but what if we inserted ZWSP automatically, using an interface similar to the predictive text input on an iPhone? If this were done, then line breaking, spell checking, word counts, etc. would be greatly simplified. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59448] undefined: Allow users to turn off automatic ICU breakiterator
https://bugs.freedesktop.org/show_bug.cgi?id=59448 livingfi...@gmail.com changed: What|Removed |Added Version|3.6.4.3 release |4.1.2.3 rc --- Comment #3 from livingfi...@gmail.com --- The ICU BreakIterator creates chaos for minority languages written in Khmer script, since it inserts line breaks at all the wrong places, even when the text has been typed with ZWSP between words. This simple option would fix the problem, if LibreOffice reverted to the pre version 3.6.0 behavior of line breaking only at ZWSP, space, and punctuation. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65637] EDITING: wrong evaluation of formular after sorting
https://bugs.freedesktop.org/show_bug.cgi?id=65637 --- Comment #12 from Dominique Boutry dominique.bout...@laposte.net --- Going back to the specification : I suppose that SORT works like in EXCEL : - generally speaking, when one moves a cell (let's say from B2 to C2), B2 is updated to C2 in all formulas (all cells) containing B2, - as an exception, if cell B2 moves due to a SORT, B2 is not updated in all formula containing B2. So the formulas of the sum column in the attachments (whichever in another sheet or the same) are rightly unchanged after the SORT. Please examine the formula on the last line : =SI(NBVAL(A8:B8)0;SOMME(A8:B8);NA()). To narrow the pb, I add a NBVAL-only column and a SOMME-only column : both evaluates to the value of A8:B8 before the SORT. Editing these formulas (by adding +0 at their end) forces a reevaluation, which is then right. To summarize : recomputing of values after a SORT sometimes use values BEFORE the SORT (cached ?). Bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65999] Installer does not register LO as a program in Windows Open with...
https://bugs.freedesktop.org/show_bug.cgi?id=65999 Kumāra kumara.bhik...@gmail.com changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) OS|All |Windows (All) Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #2 from Kumāra kumara.bhik...@gmail.com --- Windows 7 HP 64bit. I've found a solution since I reported this. To make the installer register LO as a program in Windows Open with..., I have to indicate to have LO open MS doc files with LO at the end of of the installation process. If I don't, I would not be able to associate DOC/DOCX/etc with LO later on with Open with -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69462] hyperlinks containing right parenthesis in their URL fail to open
https://bugs.freedesktop.org/show_bug.cgi?id=69462 --- Comment #8 from denis.pr...@wanadoo.fr --- Hello Qubit, thanks for taking care of that bug report. I tried the steps you mentioned : I get the same result as you. But if I replace your URL by this one : http://2013-10-08 CR réunion d'organisation Patrick Frédéric Denis (DP).pdf I get the error message I mentioned in comment #1. And if I remove the single quote, the problem disappears. So it looks that I was wrong and the problem comes from single quote (I will change the bug report title). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69462] hyperlinks containing single quote in their URL fail to open
https://bugs.freedesktop.org/show_bug.cgi?id=69462 denis.pr...@wanadoo.fr changed: What|Removed |Added Summary|hyperlinks containing right |hyperlinks containing |parenthesis in their URL|single quote in their URL |fail to open|fail to open -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49602] Remove deprecated OSL Profile functionality
https://bugs.freedesktop.org/show_bug.cgi?id=49602 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Whiteboard|Need_Advice | Summary|Remove deprecated |Remove deprecated OSL |include/osl/profile.hxx |Profile functionality Ever confirmed|0 |1 --- Comment #2 from Stephan Bergmann sberg...@redhat.com --- (In reply to comment #0) Seems the only user of it is sal/rtl/source/bootstrap.cxx it could easily be replaced with something like: oslProfile profile = osl_openProfile(strProfileName.pData, Options); if( ! profile ) throw std::exception(); sal_Char aBuf[1024]; rtl::OString ret= osl_readProfileString( profile, rSection.getStr(), rEntry.getStr(), aBuf, sizeof( aBuf ), rDefault.getStr() ) ? rtl::OString( aBuf ) : rtl::OString(); osl_closeProfile(profile); return ret; Given the comment preceding the (only) use of osl::Profile in sal/rtl/bootstrap.cxx, // Going through osl::Profile, this code erroneously // does not recursively expand macros in the resulting // replacement text (and if it did, it would fail to // detect cycles that pass through here): it does not make much sense to merely unwrap that code from using the C++ osl/profile.hxx wrapper to using the underlying C osl/profile.h functionality. Also note that this is part of the stable URE interface, so cannot be modified arbitrarily (but can arguably be removed in an incompatible release, as it is deprecated for a long time and should effectively be unused by client code). So, a useful approach could be: * Adapt sal/rtl/bootstrap.cxx to no longer use the OSL Profile functionality, and in doing so fix the bug described in the comment above. * In a commit with [API CHANGE] in the commit message, remove the include/osl/profile.hxx wrapper. * In the same or a subsequent [API CHANGE] commit, also remove include/sal/profile.h and replace the implementation with stubs in sal/osl/all/compat.cxx (which are necessary as the corresponding symbols could not be removed from sal/util/sal.map without changing the sal SONAME, which we do not want to do). * Document the incompatible changes in the API Changes section of the relevant https://wiki.documentfoundation.org/ReleaseNotes. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70520] New: Enter, Autocorrection and Undo
https://bugs.freedesktop.org/show_bug.cgi?id=70520 Priority: medium Bug ID: 70520 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Enter, Autocorrection and Undo Severity: minor Classification: Unclassified OS: All Reporter: davian...@gmail.com Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Writer Product: LibreOffice When Enter key is pressed to form a new paragraph and that action causes autocorrection, like capital letter insertion, this action precedes the creation of the paragraph in Undo stack. In normal software, the autocorrection is undone first, then Enter key effect. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69043] INSTALLATION: On MS-Windows 7, upgrade using 'LibreOffice_4.1.1_Win_x86.msi' systematically complains that it needs to update files which are opened by 'Microsoft Window
https://bugs.freedesktop.org/show_bug.cgi?id=69043 --- Comment #2 from brendel bren...@nancy.inra.fr --- I have got the same problem on a windows 7 laptop : only with the newest version 4.1.2.3 the installation process complains that the Microsoft Windows Search Filter Host uses a file that needs to be update this is probably the searchProtocolHost.exe programm stopping this programm in the task manager and re-trying installation gives a new error : giving only a process ID, but which points to SmcService, which is a Symantec management Client. I actually have upgraded since the last LibreOffice installation my antivirus to Symnatec Endpoint protection V 12.1.3001.165 And I guess that this is what is causing the problem. I tried several times to stop the searchProtocolHost.exe and retry installation, and after several trials it worked and installation continued. Cheers Oliver -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70484] LibreOffice crashes on Windows New Window
https://bugs.freedesktop.org/show_bug.cgi?id=70484 --- Comment #2 from moze...@inbox.ru --- After the Reset it seems that the crash behavior is changed a little. But I can reproduce the bug. 1. New document - new window - back to the first window and close it - crash 2. New document - new window - close the new window from XP task panel - crash (not every time) 3. On some documents: new window - immediate crash. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70307] EDITING: Input fields/lists are not updated in protected sections
https://bugs.freedesktop.org/show_bug.cgi?id=70307 --- Comment #2 from h.kulov...@lohr.at --- I also tested on openSUSE 12.3 + LO 3.6:build-304 and SLED 11SP3 + LO 4.0:build305. I noticed exactly the same issue. So I think it's not only a Windows bug. Qubit, if you're unable to change the text or select a new item in the protected section you already reproduced the bug. In my opinion the intended behavior of a protected section is, that you are not able to edit any text but you are able to edit content of fields. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70521] New: Error 1335: Cab File libreoffice1.cab damaged in dutch version
https://bugs.freedesktop.org/show_bug.cgi?id=70521 Priority: medium Bug ID: 70521 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Error 1335: Cab File libreoffice1.cab damaged in dutch version Severity: major Classification: Unclassified OS: Windows (All) Reporter: ronny.ly...@gmail.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.1.1.2 release Component: Installation Product: LibreOffice Created attachment 87712 -- https://bugs.freedesktop.org/attachment.cgi?id=87712action=edit Error message during install From version 4.0.5 until the latest release it isn't possible to install the dutch version of libreoffice. Almost at the end of the installation there are problems reading de libreoffice1.cab. I downloaded every version but only version 4.0.3 is still working See error message (in dutch) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs