Re: Build LO for Android on Mac OS 10.8
ld: warning: ignoring file /opt/local/lib/libiconv.dylib, file was built for unsupported file forma ld: warning: ignoring file /opt/local/lib/libz.dylib, file was built for unsupported file format ld: in /opt/local/lib/libiconv.2.dylib, file was built for unsupported file format Hmm, what is this /opt/local/lib? In general the LO build for MacOSX will break if it tries to use some existing add-on builds of common 3rd-party libraries, like MacPorts etc. At least that is what everybody says, I don't have personal experience as I don't have MacPorts... Try to make sure this /opt/local stuff is not found when building LibreOffice, removing /opt/local/bin from PATH (if you have it there) probably helps. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build LO for Android on Mac OS 10.8
ld: warning: ignoring file /opt/local/lib/libiconv.dylib, file was built for unsupported file forma ld: warning: ignoring file /opt/local/lib/libz.dylib, file was built for unsupported file format ld: in /opt/local/lib/libiconv.2.dylib, file was built for unsupported file format Hmm, what is this /opt/local/lib? In general the LO build for MacOSX will break if it tries to use some existing add-on builds of common 3rd-party libraries, like MacPorts etc. At least that is what everybody says, I don't have personal experience as I don't have MacPorts... Try to make sure this /opt/local stuff is not found when building LibreOffice, removing /opt/local/bin from PATH (if you have it there) probably helps. --tml Thanks for pointing out and the hints. Removing /opt/local/bin from PATH does not work for me. I turn out to reinstall the lib as universal binary via MacPort as others suggest to similar issue. E.g.: sudo port upgrade --enforce-variants libiconv +universal I probably should override the linker path to prevent the build to link against the MacPort version of libs? Anyway, it's on the track now. :P James ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: notice: module dictionaries converted to gbuild
Hi, On Thu, Aug 09, 2012 at 06:41:50PM +0200, Andras Timar wrote: Hi David, 2012/8/7 David Tardon dtar...@redhat.com Hi all, this is just an announce that I have converted dictionaries to gbuild on branch feature/gbuild_dictionaries. I am not looking for testers this time, because there is no platform-dependent stuff there :-) I am just going to run a couple more rebuilds to ensure there are no missing deps and then push it into master. When testing the conversion--I wrote a script to compare the old and new content of all the dictionaries--I have identified several files that have not been packed into the extensions previously and I wonder if perhaps they should be. Anyone has any opinion? The list is here: I think they were left out by mistake. On the other hand I wonder if we could omit multiple instances GPL/LGPL text from bundled dictionary packages, while we have a central LICENSE.odt covering for the dictionaries, too. Do you mean we should put in the standard LICENSE text like the normal extensions do? Or not even that? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: fdo 50950 make (ISO)WEEKNUM comply with ODFF1.2, advise asked
Hi Eike, All your comments have been processed in the code (I learned some new things too, thank you !). It now works fine for all possible argument values, including leaving out the optional value for WEEKNUM and illegal arguments. Now I will start on seeing how old-style documents are interpreted and how I can handle that as 'smooth' as possible (unnoticeable for user, I mean). (It may be after my holidays before you hear from again) I have searched a bit and found some functions in sc/source/core/tool/compiler.cxx that might be extended to convert old-style ISOWEEKNUM() use when reading old (pre ODFF1.2) documents. Unfortunately alle these functions seem te be called too when entering a function in an existing (open) sheet or recalculating. It will be probably most efficient to convert only when reading a saved document. Can you give any hint(s) as where I might put the conversion code for old-style ISOWEEKNUM() to ODFF1.2? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk vcl/Library_vcl.mk
RepositoryExternal.mk | 16 +--- vcl/Library_vcl.mk| 11 --- 2 files changed, 21 insertions(+), 6 deletions(-) New commits: commit fd9c2cca78227f634e34790aa127cc31e4302a56 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 13 10:00:55 2012 +0300 Bypass pdfwriter for non-desktop OSes without any Mozilla stuff for now Change-Id: I9ee43cb79212eba58c17c0f9679044e9c0cc9fae diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e6abe34..4aa52ab 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -211,9 +211,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/outmap \ vcl/source/gdi/pdfextoutdevdata \ vcl/source/gdi/pdffontcache \ -vcl/source/gdi/pdfwriter \ -vcl/source/gdi/pdfwriter_impl2 \ -vcl/source/gdi/pdfwriter_impl \ vcl/source/gdi/pngread \ vcl/source/gdi/pngwrite \ vcl/source/gdi/print2 \ @@ -287,6 +284,14 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ # optional parts +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Library_add_exception_objects,vcl,\ +vcl/source/gdi/pdfwriter \ +vcl/source/gdi/pdfwriter_impl2 \ +vcl/source/gdi/pdfwriter_impl \ +)) +endif + ## handle Graphite ifneq ($(ENABLE_GRAPHITE),) # add defines, graphite sources for all platforms commit 9dc7f059558aa4088b354ce509bf5044073ee01d Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 13 09:19:35 2012 +0300 No Mozilla stuff on non-desktop OSes Change-Id: Ib2125fa688005c6139358959a45222fdd96c50d2 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 478bf25..5c0dd05 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1508,7 +1508,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ endif # SYSTEM_POSTGRESQL - +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) ifeq ($(SYSTEM_MOZILLA),YES) # Nothing needed here ATM @@ -1582,7 +1582,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(OUTDIR)/lib/mozreg_s.lib \ ) -endif +endif # !GCC else ifeq ($(GUI),UNX) @@ -1609,7 +1609,7 @@ $(call gb_LinkTarget_add_cxxflags,$(1),\ $(if $(filter MACOSX NETBSD,$(OS)),-Wno-deprecated) \ ) -endif +endif # UNX endef @@ -1624,6 +1624,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ )) endif # SYSTEM_MOZILLA +endif # DESKTOP ifeq ($(ENABLE_KDE),TRUE) @@ -1882,6 +1883,14 @@ $(call gb_LinkTarget_add_libs,$(1), \ endef +ifeq (,$(filter DESKTOP,$(BUILD_TYPE))) + +define gb_LinkTarget__use_nss3 + +endef + +else + ifeq ($(SYSTEM_NSS),YES) define gb_LinkTarget__use_nss3 @@ -1937,6 +1946,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef endif +endif # DESKTOP ### Jars ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build LO for Android on Mac OS 10.8
On 08/13/2012 08:38 AM, James Chen wrote: ld: warning: ignoring file /opt/local/lib/libiconv.dylib, file was built for unsupported file forma ld: warning: ignoring file /opt/local/lib/libz.dylib, file was built for unsupported file format ld: in /opt/local/lib/libiconv.2.dylib, file was built for unsupported file format Hmm, what is this /opt/local/lib? In general the LO build for MacOSX will break if it tries to use some existing add-on builds of common 3rd-party libraries, like MacPorts etc. At least that is what everybody says, I don't have personal experience as I don't have MacPorts... Try to make sure this /opt/local stuff is not found when building LibreOffice, removing /opt/local/bin from PATH (if you have it there) probably helps. --tml Thanks for pointing out and the hints. Removing /opt/local/bin from PATH does not work for me. Even not with a clean rebuild from scratch afterwards? I'd assume some mis-configuration (likely caused by picking up MacPort's /opt/local/bin/pkg-check) was still manifest in your build. Stephan I turn out to reinstall the lib as universal binary via MacPort as others suggest to similar issue. E.g.: sudo port upgrade --enforce-variants libiconv +universal I probably should override the linker path to prevent the build to link against the MacPort version of libs? Anyway, it's on the track now. :P ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
setting LibreOffice settings automatically
To enable Sinhala spell checker I have to do few configurations in LibreOffice. It won't work by default. Is there a way to set some values for LibreOffice by editing a config file on GNU/Linux? For example, how to enable tools- options - languages - enable for Asian and CTL Thanks, -- Danishka Navin http://danishkanavin.blogspot.com http://twitter.com/danishkanavin http://www.flickr.com/photos/danishkanavin/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On 2012-08-09 21:53, bfo wrote: If I may propose anything, please add: - zero tolerance policy for regression issues during development - zero tolerance policy for crash issues during development People who advocate zero tolerance for such things are welcome to provide the time and financial resources necessary to achieve this. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: cui/source
cui/source/tabpages/autocdlg.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a91805241c64694b0e4ba16b90edcf56fab2cf5a Author: Andras Timar ati...@suse.com Date: Mon Aug 13 09:56:00 2012 +0200 wider listbox for language names Change-Id: I2d7d742a393e5b44a2c7584e6a2b8c63ee04cd36 diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 4ae5397..fd1d6e1 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -94,7 +94,7 @@ TabDialog RID_OFA_AUTOCORR_DLG ListBox LB_LANG { Pos = MAP_APPFONT ( 150 , 3 ) ; -Size = MAP_APPFONT ( 60 , 100 ) ; +Size = MAP_APPFONT ( 80 , 100 ) ; DropDown = TRUE; TabStop = TRUE ; Border = TRUE ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/registry connectivity/source connectivity/workben
connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu |2 +- connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component |2 +- connectivity/source/drivers/postgresql/postgresql-sdbc.component |2 +- connectivity/source/drivers/postgresql/pq_connection.cxx |2 +- connectivity/source/drivers/postgresql/pq_driver.cxx |4 ++-- connectivity/workben/postgresql/metadata.py |2 +- connectivity/workben/postgresql/preparedstatement.py |2 +- connectivity/workben/postgresql/sdbcx.py |2 +- connectivity/workben/postgresql/statement.py |2 +- 9 files changed, 10 insertions(+), 10 deletions(-) New commits: commit f50a41437ee99aee499dbabd1d36ef8197db5559 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 13 09:52:43 2012 +0200 fdo#53246 Fresh postgresql-sdbc implementation names The descriptions for fdo#53246 Libo36 does not start, InvalidRegistryException from program/services/postgresql-sdbc.rdb make it look like the user had installed the functionality that comes bundled in postgresql-sdbc.rdb also as an extension installed per-user or shared. http://wiki.documentfoundation.org/PostgreSQL-SDBC indicates that what is now bundled due to c97d74b5f0608866bad3f7ae943811bdff4f7986 fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part indeed was once available as a freestanding postgresql-sdbc-*.oxt that could have been installed per-user or shared. To prevent problems with such scenarios, rename the relevant implementation names by adding a .noext suffix. Change-Id: I43414a64461ba643f0ca0b2749450099cb6c8a4d diff --git a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu index 8958123..75328ef 100644 --- a/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu @@ -56,7 +56,7 @@ node oor:name=Installed install:module=postgresql node oor:name=sdbc:postgresql:* oor:op=replace prop oor:name=Driver -valueorg.openoffice.comp.connectivity.pq.Driver/value +valueorg.openoffice.comp.connectivity.pq.Driver.noext/value /prop prop oor:name=DriverTypeDisplayName oor:type=xs:string value xml:lang=en-USPostgreSQL/value diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component index bd3c38c..407a0e6 100644 --- a/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component +++ b/connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component @@ -29,7 +29,7 @@ component loader=com.sun.star.loader.SharedLibrary xmlns=http://openoffice.org/2010/uno-components; - implementation name=org.openoffice.comp.connectivity.pq.Connection + implementation name=org.openoffice.comp.connectivity.pq.Connection.noext service name=com.sun.star.sdbc.Connection/ /implementation /component diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component b/connectivity/source/drivers/postgresql/postgresql-sdbc.component index 016029e..f691963 100644 --- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component +++ b/connectivity/source/drivers/postgresql/postgresql-sdbc.component @@ -29,7 +29,7 @@ component loader=com.sun.star.loader.SharedLibrary xmlns=http://openoffice.org/2010/uno-components; - implementation name=org.openoffice.comp.connectivity.pq.Driver + implementation name=org.openoffice.comp.connectivity.pq.Driver.noext service name=com.sun.star.sdbc.Driver/ /implementation /component diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index e1e3754..209ca09 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -160,7 +160,7 @@ public: OUStringConnectionGetImplementationName() { -return OUString( RTL_CONSTASCII_USTRINGPARAM( org.openoffice.comp.connectivity.pq.Connection ) ); +return OUString( RTL_CONSTASCII_USTRINGPARAM( org.openoffice.comp.connectivity.pq.Connection.noext ) ); } com::sun::star::uno::Sequencertl::OUString ConnectionGetSupportedServiceNames(void) { diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index 98ee8ea..ed8480c 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -106,7 +106,7 @@ OUString
Re: shadow drawing regression
Hi Ivan, On Fri, Aug 10, 2012 at 05:21:34PM +0400, Ivan Timofeev timofeev@gmail.com wrote: so it first paints background then shadow. But try to zoom out with at least 2 pages - the second page gets painted after the first page, and the shadow overlaps the already rendered page. It worked earlier on because the shadow image is nearly transparent, it was hard to notice the effect. Now it is evidently noticeable. :) No idea how to fix this, maybe it is possible to get the size of the gap between the pages and set a clip region?... Should I file a bug report? Yes, please do and add me to CC. (As usual, it's extra helpful if you can attach two screenshots, showing good and bad output + versions where this is good/bad.) Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-6] fdo#53246 Fresh postgresql-sdbc implementation names
Besides the general problem of LO 3.6 not starting due to duplicate UNO implementations caused by the bundled extension prereg mechanism, there are also reports for a more specific problem of not starting due to duplicate UNO implementations of org.openoffice.comp.connectivity.pq.Driver, https://bugs.freedesktop.org/show_bug.cgi?id=53246 Libo36 does not start, InvalidRegistryException from program/services/postgresql-sdbc.rdb. This appears to be caused by an old postgresql-sdbc-*.oxt installed per-user or shared (http://wiki.documentfoundation.org/PostgreSQL-SDBC) while the same functionality is included as a non-extension today (http://cgit.freedesktop.org/libreoffice/core/commit/?id=c97d74b5f0608866bad3f7ae943811bdff4f7986 fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part.). http://cgit.freedesktop.org/libreoffice/core/commit/?id=f50a41437ee99aee499dbabd1d36ef8197db5559 fdo#53246 Fresh postgresql-sdbc implementation names works around that on master, with a rather trivial patch of choosing new names for the relevant UNO implementations. I verified that it does not break things with the instructions from http://lists.freedesktop.org/archives/libreoffice/2012-January/024333.html [Libreoffice] [PATCH] rpath / ... for extensions (and the case of PostgreSQL-SDBC). Please review and consider for backporting to libreoffice-3-6. Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/inc/FieldDescControl.hxx |2 -- dbaccess/source/ui/inc/RtfReader.hxx|1 - 2 files changed, 3 deletions(-) New commits: commit b3a7f6d51bd437ddb93ec45b38b27f27b42343eb Author: Philipp Riemer ruderphil...@gmail.com Date: Sun Aug 12 18:57:23 2012 +0200 removed commented out calls This is a follow-up patch of 401a454c2da7560d5ec41ef07ac116403956c55a. Change-Id: I5304467333c9d1554ed4426962e42d7c0ce58b9f diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 991a85a..98d9561 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -177,10 +177,8 @@ namespace dbaui virtual ~OFieldDescControl(); voidDisplayData(OFieldDescription* pFieldDescr ); -// voidDisplayData(const OColumn* pColumn); voidSaveData( OFieldDescription* pFieldDescr ); -// voidSaveData( OColumn* pColumn); voidSetControlText( sal_uInt16 nControlId, const String rText ); String GetControlText( sal_uInt16 nControlId ); diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 22ae95a..af33779 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -32,7 +32,6 @@ namespace dbaui { ::std::vectorsal_Int32m_vecColor; -// void insertValueIntoColumn(); protected: virtual sal_BoolCreateTable(int nToken); virtual voidNextToken( int nToken ); // base class ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build LO for Android on Mac OS 10.8
Hi, Stephan, Thanks for pointing out and the hints. Removing /opt/local/bin from PATH does not work for me. Even not with a clean rebuild from scratch afterwards? I'd assume some mis-configuration (likely caused by picking up MacPort's /opt/local/bin/pkg-check) was still manifest in your build. Good point. Need time to figure it out. Thanks. James ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Thu, 2012-08-09 at 12:53 -0700, bfo wrote: If I may propose anything, please add: - zero tolerance policy for regression issues during development - zero tolerance policy for crash issues during development So - incidentally; we already have something like this in place. If you can find a regression or crasher running a master build **that is not in the last stable release** - you are encouraged to mail the developers list with it. ie. we want to find out about regressions ASAP while the work in a given area is going on. Of course - that makes it necessary to run a master build - please do :-) I was seriously amazed after reading Most annoying bugs section of Release notes for 3.6. Right; the near-zero-tolerance change here is intended to encourage developers / QA / bug-reporters to rebel against the all-too-common just delete your profile - it works - WORKSFORME resolution cycle that we see. And yes - time based releases means that (while we slipped a week to try to fix it), 3.6.0 is really not as good as we wanted; that is certainly true. On the other hand giving all developers the idea that testing / bug fixing can be endlessly deferred since we'll never release - is a really poor plan too; one aspect of that is that it's not fair on the people that work diligently to test and fix things so we can release at a given time. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/qa writerfilter/source
dev/null |binary sw/qa/extras/odfimport/data/fdo53210.odt |binary sw/qa/extras/odfimport/odfimport.cxx | 23 +++ writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 - writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 +-- writerfilter/source/rtftok/rtftokenizer.cxx|4 ++-- 6 files changed, 18 insertions(+), 17 deletions(-) New commits: commit 10e02dfdffb5ef3a02a40b52c6cda176f7f4447c Author: Miklos Vajna vmik...@suse.cz Date: Mon Aug 13 10:59:26 2012 +0200 fdo#53210 testcase Change-Id: I23606a7601b71890acf7e260951e1bacc0fc2df9 diff --git a/sw/qa/extras/odfimport/data/fdo53210.odt b/sw/qa/extras/odfimport/data/fdo53210.odt new file mode 100644 index 000..cfa5044 Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo53210.odt differ diff --git a/sw/qa/extras/odfimport/data/hello.odt b/sw/qa/extras/odfimport/data/hello.odt deleted file mode 100644 index 23ce6a4..000 Binary files a/sw/qa/extras/odfimport/data/hello.odt and /dev/null differ diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index d473893..ef51e31 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -32,13 +32,13 @@ using rtl::OUString; class Test : public SwModelTestBase { public: -void testHello(); void testEmptySvgFamilyName(); +void testHideAllSections(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) -CPPUNIT_TEST(testHello); CPPUNIT_TEST(testEmptySvgFamilyName); +CPPUNIT_TEST(testHideAllSections); #endif CPPUNIT_TEST_SUITE_END(); @@ -52,18 +52,25 @@ void Test::load(const OUString rFilename) mxComponent = loadFromDesktop(getURLFromSrc(/sw/qa/extras/odfimport/data/) + rFilename); } -void Test::testHello() -{ -load(hello.odt); -CPPUNIT_ASSERT_EQUAL(12, getLength()); -} - void Test::testEmptySvgFamilyName() { // .odt import did crash on the empty font list (which I think is valid according SVG spec) load( empty-svg-family-name.odt ); } +void Test::testHideAllSections() +{ +// This document has a section that is conditionally hidden, but has no empty paragraph after it. +load(fdo53210.odt); +uno::Referencetext::XTextFieldsSupplier xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XNameAccess xMasters = xTextFieldsSupplier-getTextFieldMasters(); +// Set _CS_Allgemein to 0 +uno::Referencebeans::XPropertySet xMaster(xMasters-getByName(com.sun.star.text.fieldmaster.User._CS_Allgemein), uno::UNO_QUERY); +xMaster-setPropertyValue(Content, uno::makeAny(OUString(0))); +// This used to crash +uno::Referenceutil::XRefreshable(xTextFieldsSupplier-getTextFields(), uno::UNO_QUERY)-refresh(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); commit 7b87ccf916547b4d59d0e892519600a2bf53b867 Author: Miklos Vajna vmik...@suse.cz Date: Mon Aug 13 10:45:42 2012 +0200 drop unnecessary RTFDocumentImpl::isEmpty Change-Id: I657266697c30be0760971528adb1abf07f03ea23 diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index adfb18c..2d66ed3 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3902,11 +3902,6 @@ int RTFDocumentImpl::getGroup() const return m_nGroup; } -bool RTFDocumentImpl::isEmpty() const -{ -return m_aStates.empty(); -} - void RTFDocumentImpl::setDestinationText(OUString rString) { m_aStates.top().aDestinationText.setLength(0); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index c05a0f5..0759a4c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -424,8 +424,7 @@ namespace writerfilter { void seek(sal_uInt32 nPos); uno::Referencelang::XMultiServiceFactory getModelFactory(); RTFParserState getState(); -/// If the stack of states is empty. -bool isEmpty() const; +/// Number of states on the stack. int getGroup() const; void setDestinationText(rtl::OUString rString); /// Resolve a picture: If not inline, then anchored. diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index e596aae..abe8cff 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -95,7 +95,7 @@ int RTFTokenizer::resolveParse() if (m_rImport.getGroup() 0) return ERROR_GROUP_UNDER; -if (!m_rImport.isEmpty() m_rImport.getState().nInternalState == INTERNAL_BIN) +if (m_rImport.getGroup() 0 m_rImport.getState().nInternalState
Re: problem
Hi Molly, Molly Hafer píše v Ne 12. 08. 2012 v 17:42 -0700: I opened a document in Libre office an not only can i edit the document but it wont let me close libre office AND I cant open Libre office until it gets closed thanks. It is sad but such things happen. We need to debug this. Could you please open a new but at at https://bugs.freedesktop.org/ against the product LibreOffice and attach the problematic document there? You might also use the Bugzilla assistant at https://www.libreoffice.org/get-help/bug/ See also http://wiki.documentfoundation.org/BugReport Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all s...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sections .. fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sections Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f (cherry picked from commit bb6bd1ff9cd3eecec7eb2cd7bd0a4dcef584c903) --- M sw/source/core/doc/docfld.cxx 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/403/1 -- To view, visit https://gerrit.libreoffice.org/403 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Change in core[libreoffice-3-6]: fix crash on start
Gerrit píše v So 11. 08. 2012 v 06:02 +: From Ivan Timofeev timofeev@gmail.com: fix crash on start Change-Id: Ieee907d38711761f4770b802f54bd38c4e807807 --- M l10ntools/source/help/HelpCompiler.cxx 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/388/1 -- To view, visit https://gerrit.libreoffice.org/388 I see this pushed in the 3-6 branch. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all s...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sections .. fdo#53210 SwDoc::UpdateExpFlds don't crash when hiding all sections (cherry picked from commit bb6bd1ff9cd3eecec7eb2cd7bd0a4dcef584c903) Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f --- M sw/source/core/doc/docfld.cxx 1 file changed, 27 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/404/1 -- To view, visit https://gerrit.libreoffice.org/404 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b7a61f18f987214708195a89f6e346c865c7f9f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Looking for a code portion: import/export document formats
Hi, I want to re-use in other project the LibreOffice's document transformation features. For example, read a MS Word document and save it as Adobe PDF file. I've downloaded the source codes and looked at them, but LO is a very large project. Where I can found those sources? Thanks, Pablo. -- View this message in context: http://nabble.documentfoundation.org/Looking-for-a-code-portion-import-export-document-formats-tp4000925.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] .: Branch 'libreoffice-3-6' - desktop/source
desktop/source/app/app.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 8609e601b7351fd9480475e12e9e2c1aa7811c78 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Aug 10 19:36:08 2012 +0200 fdo#53006: Remove directories too, not just plain files ... that was an oversight in 5300f6f711c2167931d45248c1b72dbce3a7df38; thanks Petr for spotting it. Change-Id: I4d0179165bc3b29d698cd776f7e1aa51fa73ebe3 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 6efc9f4..eff4d04 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -185,11 +185,16 @@ void removeTree(OUString const url) { } else { if (osl::File::remove(stat.getFileURL()) != osl::FileBase::E_None) { throw css::uno::RuntimeException( -cannot remove + stat.getFileURL(), +cannot remove file + stat.getFileURL(), css::uno::Reference css::uno::XInterface ()); } } } +if (osl::Directory::remove(url) != osl::FileBase::E_None) { +throw css::uno::RuntimeException( +cannot remove directory + url, +css::uno::Reference css::uno::XInterface ()); +} } // Remove any existing UserInstallation's user/extensions/bundled cache ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk RepositoryFixes.mk
RepositoryExternal.mk |2 +- RepositoryFixes.mk|1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit fc2b42ed182c8e7d20a8626712b8a416d7a5bae5 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 13 11:46:50 2012 +0200 Proper sorting Change-Id: Ibf8303cd065ebd4c02b696077d402bf9221012b0 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5c0dd05..0d6c660 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1918,9 +1918,9 @@ else $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ nspr4 \ -smime3 \ nss3 \ plc4 \ +smime3 \ )) define gb_LinkTarget__use_nss3 commit 066cf169e843719db02cc1171be162e75cd8c7d7 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 13 11:46:21 2012 +0200 Missing ismime3.lib on Windows Change-Id: I289a4da4473d58736ecdf3846864ccde9a1a03d1 diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index b5ecb1c..829967f 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -139,6 +139,7 @@ gb_Library_NOILIBFILENAMES += \ nspr4 \ nss3 \ shlwapi \ +smime3 \ uwinapi \ version \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Looking for a code portion: import/export document formats
On 13/08/12 11:26, docminer wrote: Hi, I want to re-use in other project the LibreOffice's document transformation features. For example, read a MS Word document and save it as Adobe PDF file. I've downloaded the source codes and looked at them, but LO is a very large project. Where I can found those sources? the document conversion engines in LibreOffice are called Writer, Calc, Draw and Impress. conversion from e.g. DOCX to ODT happens by importing the DOCX file with the DOCX import filter into Writer, and then exporting the document from Writer with the ODF export filter. the best option of using LibreOffice for your purpose is to install it and connect to it via UNO; read the OOo Dev Guide for details: http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/FirstSteps/First_Contact there is a simple example program that prints documents from Python: http://cgit.freedesktop.org/libreoffice/core/tree/bin/convwatch.py ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build LO for Android on Mac OS 10.8
Encounter another error while building freetype log for /Users/jamchen/Developer/Android/libreoffice_core/freetype dmake: /Users/jamchen/Developer/Android/libreoffice_core/solenv/inc/settings.mk: line 55: Error: -- Include file /Users/jamchen/Developer/Android/libreoffice_core/solver/unxandr.pro/inc/37 0minor.mk, not found log for /Users/jamchen/Developer/Android/libreoffice_core/ridljar/prj [ build JVM ] CustomTarget/ridljar/javamaker/done [ build CUS ] ridljar/javamaker [ build JCS ] Jar/ridl Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: /Users/jamchen/Developer/Android/libreoffice_core/ridljar/com/sun/star/lib/ util/WeakMap.java uses unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. [ build JAR ] ridl cat: /Users/jamchen/Developer/Android/libreoffice_core/workdir/unxandr.pro/Misc/ DUMMY: No such file or directory rm: /Users/jamchen/Developer/Android/libreoffice_core/workdir/unxandr.pro/Jar/r idl.jar: No such file or directory make[2]: *** [/Users/jamchen/Developer/Android/libreoffice_core/workdir/unxandr.pro/Jar/ ridl.jar] Error 1 James ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - reportdesign/inc reportdesign/source
reportdesign/inc/UndoEnv.hxx |2 reportdesign/source/core/api/Section.cxx | 87 ++- reportdesign/source/core/inc/Section.hxx | 34 +--- 3 files changed, 82 insertions(+), 41 deletions(-) New commits: commit 05218c101df486302bf4cfe8be23ad840daa3f73 Author: Michael Stahl mst...@redhat.com Date: Thu Aug 9 22:18:42 2012 +0200 fdo#53154: fix report design wizard crash: As described by Stephan in the bug report, the XAggregation usage in OSection of SvxFmDrawPage is broken; replace it by explicit forwarding of the XDrawPage, XShapeGrouper, XFormsSupplier2 methods; it seems to fix the crash here. Also get rid of horrid refcount manipulation etc. while at it. (cherry picked from commit 8ec791316c1d90b25e85c94ad105e9cc62e568e2) Change-Id: Ib08830d2092bd2026db5b57c1c2e165b946889b3 Signed-off-by: Miklos Vajna vmik...@suse.cz diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index e48cd25..7d7ab35 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -32,6 +32,8 @@ #include com/sun/star/beans/PropertyChangeEvent.hpp #include com/sun/star/container/XContainerListener.hpp #include com/sun/star/report/XReportDefinition.hpp + +#include cppuhelper/compbase3.hxx #include memory #include svl/lstner.hxx diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 6c6aba2..678808c 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -143,8 +143,6 @@ OSection::OSection(const uno::Reference report::XReportDefinition _xParent OSection::~OSection() { DBG_DTOR( rpt_OSection,NULL); -if ( m_xProxy.is() ) -m_xProxy-setDelegator( NULL ); } //-- //IMPLEMENT_FORWARD_XINTERFACE2(OSection,SectionBase,SectionPropertySet) @@ -159,7 +157,7 @@ uno::Any SAL_CALL OSection::queryInterface( const uno::Type _rType ) throw (uno if ( !aReturn.hasValue() OReportControlModel::isInterfaceForbidden(_rType) ) return aReturn; -return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy-queryAggregation(_rType) : aReturn); +return aReturn; } // - @@ -206,33 +204,18 @@ void OSection::init() { uno::Reference report::XReportDefinition xReport = getReportDefinition(); ::boost::shared_ptrrptui::OReportModel pModel = OReportDefinition::getSdrModel(xReport); -OSL_ENSURE(pModel,No odel set at the report definition!); +assert(pModel); //No model set at the report definition! if ( pModel ) { -// DO NOT TOUCH THIS BLOCKS, WE HAVE A COMPILER PROBLEM UNDER SOLARIS X86 -osl_incrementInterlockedCount( m_refCount ); -{ -uno::Referencereport::XSection xTemp = this; -{ -{ - m_xProxy.set(pModel-createNewPage(xTemp)-getUnoPage(),uno::UNO_QUERY); -} -{ -::comphelper::query_aggregation(m_xProxy,m_xDrawPage); -} - -// set ourself as delegator -{ -if ( m_xProxy.is() ) -{ -m_xProxy-setDelegator( xTemp ); -} -} -} -xTemp.clear(); -} -// DO NOT TOUCH THIS BLOCKS, WE HAVE A COMPILER PROBLEM UNDER SOLARIS X86 -osl_decrementInterlockedCount( m_refCount ); +uno::Referencereport::XSection const xSection(this); +m_xDrawPage.set(pModel-createNewPage(xSection)-getUnoPage(), +uno::UNO_QUERY_THROW); +m_xDrawPage_ShapeGrouper.set(m_xDrawPage, uno::UNO_QUERY_THROW); +// apparently we may also get OReportDrawPage which doesn't support this +m_xDrawPage_FormSupplier.set(m_xDrawPage, uno::UNO_QUERY); +// createNewPage _should_ have stored away 2 uno::References to this, +// so our ref count cannot be 1 here, so this isn't destroyed here +assert(m_refCount 1); } } // - @@ -546,14 +529,14 @@ uno::Type SAL_CALL OSection::getElementType( ) throw (uno::RuntimeException) uno::Any SAL_CALL OSection::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); -return m_xDrawPage-getByIndex(Index); +return m_xDrawPage.is() ? m_xDrawPage-getByIndex(Index) : uno::Any(); } // - // XEnumerationAccess uno::Reference container::XEnumeration SAL_CALL OSection::createEnumeration( ) throw (uno::RuntimeException) { ::osl::MutexGuard
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svtools/source
svtools/source/control/ruler.cxx | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit 6f86c8e38a5263e609ec189b2a01d4fad7cd0e4e Author: Ivan Timofeev timofeev@gmail.com Date: Wed Aug 8 16:46:19 2012 +0400 fdo#50654: update virtual device width on modifying WB_EXTRAFIELD flag Writer sets this flag dynamically via Ruler::SetStyle depending on the text direction, the flag is set by default and gets unset for the vertical ruler, because the initial text direction is horizontal, see SwView::StateTabWin. Ruler::SetStyle calls Ruler::ImplInitExtraField, which modifies mnVirOff, however mnVirWidth depends on mnVirOff, but gets updated only in Resize. This patch copies the code from Resize to ImplInitExtraField, we cannot just call Resize from ImplInitExtraField due to possible infinite recursion. Change-Id: Ic7bb897059295aebe86c11977c37419017b55787 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index a50e465..a8e8e8f 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1206,6 +1206,8 @@ void Ruler::ImplFormat() void Ruler::ImplInitExtraField( sal_Bool bUpdate ) { +Size aWinSize = GetOutputSizePixel(); + // Extra-Field beruecksichtigen if ( mnWinStyle WB_EXTRAFIELD ) { @@ -1215,7 +1217,6 @@ void Ruler::ImplInitExtraField( sal_Bool bUpdate ) maExtraRect.Bottom() = RULER_OFF+mnVirHeight-1; if(mpData-bTextRTL) { -Size aWinSize = GetOutputSizePixel(); if(mnWinStyle WB_HORZ) maExtraRect.Move(aWinSize.Width() - maExtraRect.GetWidth() - maExtraRect.Left(), 0); else @@ -1232,6 +1233,19 @@ void Ruler::ImplInitExtraField( sal_Bool bUpdate ) mnVirOff = 0; } +// mnVirWidth depends on mnVirOff +if ( (mnVirWidth RULER_MIN_SIZE) || + ((aWinSize.Width() RULER_MIN_SIZE) (aWinSize.Height() RULER_MIN_SIZE)) ) +{ +if ( mnWinStyle WB_HORZ ) +mnVirWidth = aWinSize.Width()-mnVirOff; +else +mnVirWidth = aWinSize.Height()-mnVirOff; + +if ( mnVirWidth RULER_MIN_SIZE ) +mnVirWidth = 0; +} + if ( bUpdate ) { mbCalc = sal_True; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svtools/source
svtools/source/control/ruler.cxx | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit 1500bc8970dc61f96697a186d6bb0d1aacc2ce67 Author: Ivan Timofeev timofeev@gmail.com Date: Wed Aug 8 16:46:19 2012 +0400 fdo#50654: update virtual device width on modifying WB_EXTRAFIELD flag Writer sets this flag dynamically via Ruler::SetStyle depending on the text direction, the flag is set by default and gets unset for the vertical ruler, because the initial text direction is horizontal, see SwView::StateTabWin. Ruler::SetStyle calls Ruler::ImplInitExtraField, which modifies mnVirOff, however mnVirWidth depends on mnVirOff, but gets updated only in Resize. This patch copies the code from Resize to ImplInitExtraField, we cannot just call Resize from ImplInitExtraField due to possible infinite recursion. Change-Id: Ic7bb897059295aebe86c11977c37419017b55787 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 00fc759..de371f7 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1359,6 +1359,8 @@ void Ruler::ImplFormat() void Ruler::ImplInitExtraField( sal_Bool bUpdate ) { +Size aWinSize = GetOutputSizePixel(); + // Extra-Field beruecksichtigen if ( mnWinStyle WB_EXTRAFIELD ) { @@ -1368,7 +1370,6 @@ void Ruler::ImplInitExtraField( sal_Bool bUpdate ) maExtraRect.Bottom() = RULER_OFF+mnVirHeight-1; if(mpData-bTextRTL) { -Size aWinSize = GetOutputSizePixel(); if(mnWinStyle WB_HORZ) maExtraRect.Move(aWinSize.Width() - maExtraRect.GetWidth() - maExtraRect.Left(), 0); else @@ -1385,6 +1386,19 @@ void Ruler::ImplInitExtraField( sal_Bool bUpdate ) mnVirOff = 0; } +// mnVirWidth depends on mnVirOff +if ( (mnVirWidth RULER_MIN_SIZE) || + ((aWinSize.Width() RULER_MIN_SIZE) (aWinSize.Height() RULER_MIN_SIZE)) ) +{ +if ( mnWinStyle WB_HORZ ) +mnVirWidth = aWinSize.Width()-mnVirOff; +else +mnVirWidth = aWinSize.Height()-mnVirOff; + +if ( mnVirWidth RULER_MIN_SIZE ) +mnVirWidth = 0; +} + if ( bUpdate ) { mbCalc = sal_True; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6] fdo#53006: Remove directories too, not just plain files
Petr Mladek píše v Po 13. 08. 2012 v 11:38 +0200: Stephan Bergmann píše v Pá 10. 08. 2012 v 19:41 +0200: On 08/10/2012 05:29 PM, Petr Mladek wrote: Just to be sure. removeTree(url) removes only files and not directories. Is it by intention? I think that both variants would be fine. Oh, good catch. No, it was an oversight to not remove directories. So http://cgit.freedesktop.org/libreoffice/core/commit/?id=0ab5ce54c441b12ea6c12a2cedb9069f36cfd0f4 fdo#53006: Remove directories too, not just plain files fixes that. I think it is best to backport it to libreoffice-3-6, too. (Seen working as intended on both Linux and Windows master.) Yup, looks and works fine = pushed into 3-6 branch. Marking thread as pushed. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 15 commits - sc/inc sc/qa sc/source
sc/inc/colorscale.hxx | 29 +-- sc/qa/unit/data/ods/colorScale.ods |binary sc/qa/unit/subsequent_filters-test.cxx | 47 ++ sc/source/core/data/colorscale.cxx | 221 + sc/source/filter/excel/xecontent.cxx | 23 +-- sc/source/filter/inc/condformatbuffer.hxx |3 sc/source/filter/inc/condformatcontext.hxx |3 sc/source/filter/inc/extlstcontext.hxx |6 sc/source/filter/oox/condformatbuffer.cxx | 16 -- sc/source/filter/oox/condformatcontext.cxx | 27 ++- sc/source/filter/oox/extlstcontext.cxx | 46 -- sc/source/filter/oox/worksheethelper.cxx |1 sc/source/filter/xml/xmlcondformat.cxx | 13 + sc/source/filter/xml/xmlexprt.cxx | 38 +++- sc/source/ui/condformat/colorformat.cxx| 71 ++--- sc/source/ui/condformat/condformatdlg.cxx | 123 +--- sc/source/ui/src/colorformat.src |2 sc/source/ui/src/condformatdlg.src |2 18 files changed, 400 insertions(+), 271 deletions(-) New commits: commit 462907d48f18c8dab4f705203c840dee3253d268 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Aug 13 00:49:14 2012 +0200 add simple test for ods color scale import Change-Id: I539c6bfec17febbdd97c724fbde55b75da7700f6 diff --git a/sc/qa/unit/data/ods/colorScale.ods b/sc/qa/unit/data/ods/colorScale.ods new file mode 100644 index 000..1c3fe6e Binary files /dev/null and b/sc/qa/unit/data/ods/colorScale.ods differ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 23b298f..5667348 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -130,6 +130,10 @@ public: void testRepeatedColumnsODS(); void testDataValidityODS(); +void testColorScale(); +void testDataBar(); +void testCondFormat(); + //change this test file only in excel and not in calc void testSharedFormulaXLSX(); void testCellValueXLSX(); @@ -170,6 +174,10 @@ public: CPPUNIT_TEST(testCellValueXLSX); CPPUNIT_TEST(testControlImport); +CPPUNIT_TEST(testColorScale); +CPPUNIT_TEST(testDataBar); +CPPUNIT_TEST(testCondFormat); + //disable testPassword on MacOSX due to problems with libsqlite3 //also crashes on DragonFly due to problems with nss/nspr headers #if !defined(MACOSX) !defined(DRAGONFLY) !defined(WNT) @@ -1172,6 +1180,45 @@ void ScFiltersTest::testControlImport() xDocSh-DoClose(); } +void ScFiltersTest::testColorScale() +{ +const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(colorScale.)); +rtl::OUString aFileExtension(aFileFormats[ODS].pName, strlen(aFileFormats[ODS].pName), RTL_TEXTENCODING_UTF8 ); +rtl::OUString aFilterName(aFileFormats[ODS].pFilterName, strlen(aFileFormats[ODS].pFilterName), RTL_TEXTENCODING_UTF8) ; +rtl::OUString aFileName; +createFileURL(aFileNameBase, aFileExtension, aFileName); +rtl::OUString aFilterType(aFileFormats[ODS].pTypeName, strlen(aFileFormats[ODS].pTypeName), RTL_TEXTENCODING_UTF8); +std::cout aFileFormats[ODS].pName Test std::endl; +ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), aFilterType, aFileFormats[ODS].nFormatType); + +CPPUNIT_ASSERT_MESSAGE(Failed to load colorScale.ods, xDocSh.Is()); + +ScDocument* pDoc = xDocSh-GetDocument(); + +const ScPatternAttr* pPattern = pDoc-GetPattern(1,1,0); +sal_uLong nIndex = static_castconst SfxUInt32Item(pPattern-GetItem(ATTR_CONDITIONAL)).GetValue(); +CPPUNIT_ASSERT(nIndex); +ScConditionalFormatList* pCondFormatList = pDoc-GetCondFormList(0); +const ScConditionalFormat* pFormat = pCondFormatList-GetFormat(nIndex); +CPPUNIT_ASSERT(pFormat); + +pPattern = pDoc-GetPattern(1,5,0); +nIndex = static_castconst SfxUInt32Item(pPattern-GetItem(ATTR_CONDITIONAL)).GetValue(); +CPPUNIT_ASSERT(nIndex); +pFormat = pCondFormatList-GetFormat(nIndex); +CPPUNIT_ASSERT(pFormat); +} + +void ScFiltersTest::testDataBar() +{ + +} + +void ScFiltersTest::testCondFormat() +{ + +} + ScFiltersTest::ScFiltersTest() : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sc/qa/unit/data)) { commit b2e6a5717db9cbe6d9fa59ceaf860697b925ba76 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Aug 13 00:34:07 2012 +0200 also write the value for COLORSCALE_VALUE into the model Change-Id: I4e34f8d5c3eb3880e2ef3e7d65736057689b50bf diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 387fb3e..a84103c 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -727,6 +727,7 @@ void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox rType, const break; case 3: pEntry-SetType(COLORSCALE_VALUE); +pEntry-SetValue(nVal);
[Libreoffice-commits] .: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo47495.rtf | 164 + sw/qa/extras/rtfimport/rtfimport.cxx |9 + sw/qa/extras/swmodeltestbase.hxx | 15 ++ writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 4 files changed, 192 insertions(+), 1 deletion(-) New commits: commit ad72a47dbd16f65316432df71dffe3b9b835fcc7 Author: Miklos Vajna vmik...@suse.cz Date: Mon Aug 13 12:23:05 2012 +0200 fdo#47495 fix RTF import of multiple shapes inside textframes Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 diff --git a/sw/qa/extras/rtfimport/data/fdo47495.rtf b/sw/qa/extras/rtfimport/data/fdo47495.rtf new file mode 100644 index 000..d7a7ca6 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo47495.rtf @@ -0,0 +1,164 @@ +{\rtf1\adeflang1025\ansi\ansicpg1251\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1049\deflangfe1049\themelang1049\themelangfe0\themelangcs0 +\pard \ltrpar\qc \li0\ri0\nowidctlpar\pvpg\phpg\posx632\posy2159\absh-139\absw10653\wrapdefault\faauto\rin0\lin0\itap0 +{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang1024\langfe1024\noproof\insrsid2168934 +{\shp +{\*\shpinst\shpleft420\shptop16200\shpright11460\shpbottom16200\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz0\shplid1026 +{\sp +{\sn shapeType} +{\sv 20} +} +{\sp +{\sn fFlipH} +{\sv 0} +} +{\sp +{\sn fFlipV} +{\sv 0} +} +{\sp +{\sn lineWidth} +{\sv 0} +} +{\sp +{\sn fShadow} +{\sv 0} +} +{\sp +{\sn posrelh} +{\sv 1} +} +{\sp +{\sn posrelv} +{\sv 1} +} +{\sp +{\sn fLayoutInCell} +{\sv 0} +} +{\sp +{\sn fBehindDocument} +{\sv 1} +} +{\sp +{\sn fPseudoInline} +{\sv 0} +} +{\sp +{\sn fLayoutInCell} +{\sv 0} +} +} +{\shprslt +{\*\do\dobxpage\dobypage\dodhgt0\dpline\dpptx0\dppty0\dpptx11040\dppty0\dpx420\dpy16200\dpxsize11040\dpysize0\dplinew0\dplinecor0\dplinecog0\dplinecob0} +} +} +{\shp +{\*\shpinst\shpleft476\shptop4742\shpright11298\shpbottom4952\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz1\shplid1027 +{\sp +{\sn shapeType} +{\sv 1} +} +{\sp +{\sn fFlipH} +{\sv 0} +} +{\sp +{\sn fFlipV} +{\sv 0} +} +{\sp +{\sn fFilled} +{\sv 0} +} +{\sp +{\sn lineWidth} +{\sv 0} +} +{\sp +{\sn fShadow} +{\sv 0} +} +{\sp +{\sn posrelh} +{\sv 1} +} +{\sp +{\sn posrelv} +{\sv 1} +} +{\sp +{\sn fLayoutInCell} +{\sv 0} +} +{\sp +{\sn fBehindDocument} +{\sv 1} +} +{\sp +{\sn fPseudoInline} +{\sv 0} +} +{\sp +{\sn fLayoutInCell} +{\sv 0} +} +} +{\shprslt +{\*\do\dobxpage\dobypage\dodhgt1\dprect\dpx476\dpy4742\dpxsize10822\dpysize210 +\dpfillfgcr255\dpfillfgcg255\dpfillfgcb255\dpfillbgcr255\dpfillbgcg255\dpfillbgcb255\dpfillpat0\dplinew0\dplinecor0\dplinecog0\dplinecob0} +} +} +{\shp +{\*\shpinst\shpleft8626\shptop4742\shpright8626\shpbottom4953\shpfhdr0\shpbxpage\shpbxignore\shpbypage\shpbyignore\shpwr3\shpwrk0\shpfblwtxt1\shpz2\shplid1028 +{\sp +{\sn shapeType} +{\sv 20} +} +{\sp +{\sn fFlipH} +{\sv 0} +} +{\sp +{\sn fFlipV} +{\sv 0} +} +{\sp +{\sn lineWidth} +{\sv 0} +} +{\sp +{\sn fShadow} +{\sv 0} +} +{\sp +{\sn posrelh} +{\sv 1} +} +{\sp +{\sn posrelv} +{\sv 1} +} +{\sp +{\sn fLayoutInCell} +{\sv 0} +} +{\sp +{\sn fBehindDocument} +{\sv 1} +} +{\sp +{\sn fPseudoInline} +{\sv 0} +} +{\sp +{\sn fLayoutInCell} +{\sv 0} +} +} +{\shprslt +{\*\do\dobxpage\dobypage\dodhgt2\dpline\dpptx0\dppty0\dpptx0\dppty211\dpx8626\dpy4742\dpxsize0\dpysize211\dplinew0\dplinecor0\dplinecog0\dplinecob0} +} +} +} +\pard \par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 92d306c..e153f01 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -103,6 +103,7 @@ public: void testFdo36089(); void testFdo49892(); void testFdo48446(); +void testFdo47495(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -148,6 +149,7 @@ public: CPPUNIT_TEST(testFdo36089); CPPUNIT_TEST(testFdo49892); CPPUNIT_TEST(testFdo48446); +CPPUNIT_TEST(testFdo47495); #endif CPPUNIT_TEST_SUITE_END(); @@ -896,6 +898,13 @@ void Test::testFdo48446() getParagraph(1, aExpected); } +void Test::testFdo47495() +{ +load(fdo47495.rtf); +// Used to have 4 paragraphs, as a result the original bugdoc had 2 pages instead of 1. +CPPUNIT_ASSERT_EQUAL(2, getParagraphs()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/qa/extras/swmodeltestbase.hxx b/sw/qa/extras/swmodeltestbase.hxx index 9210fa8..11669fb 100644 --- a/sw/qa/extras/swmodeltestbase.hxx +++ b/sw/qa/extras/swmodeltestbase.hxx @@ -162,6 +162,21 @@ protected: return data; } +/// Get number of paragraphs of the document. +int getParagraphs() +{ +uno::Referencetext::XTextDocument xTextDocument(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XEnumerationAccess xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY); +
[PUSHED 3-6] fdo#53246 Fresh postgresql-sdbc implementation names
On Mon, 2012-08-13 at 10:20 +0200, Stephan Bergmann wrote: http://cgit.freedesktop.org/libreoffice/core/commit/?id=f50a41437ee99aee499dbabd1d36ef8197db5559 fdo#53246 Fresh postgresql-sdbc implementation names works around that on master, with a rather trivial patch of choosing new names for the relevant UNO implementations. I verified that it does not break things with the instructions from Cherry-picked that commit, thanks for that :-) at worst it breaks the postgresql driver in return for making startup not bomb-out ;-) At best it makes everything work nicely. Incidentally; have we also pushed a patch to not bomb-out on duplicate components, but warn / cope instead ? Thanks anyhow ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Looking for a code portion: import/export document formats
Hi, Thank you for the info. But what I trying to achieve is displaying documents on mobile devices and desktops regardless the format and the platform. So, I guess I need to run some LO source code on those platforms. At the present, DocMiner (www.docminer.com) is able to display any document ODF, MS Office, Adobe PDF,... on mobile devices by using a LO instance on a remote server in order to transform them. Example: MS Office - LibreOffice - PDF - SWFTools - SWF - Adobe AIR - iOS Android. Well, at the present DocMiner uses jodConverter which looks similar to UNO transformation service (in essence). I want to replace the transformation remote service by a local service. The only way is by running LibreOffice (entirely or partially) on mobile platforms. So, I've two alternatives: 1. Run the entire LibreOffice suite on Android, iOS ,... and use UNO (performance problems?) 2. Use some relevant LO source code parts only to transform document formats. What do you recommend? Tip: in order to run LibreOffice on Android, iOS, Windows, MacOS X, and Linux ( this last requires Flash on Google Chrome browser) I will use Adobe's Alchemy 2 which can compile C/C++ source code in AVM bytecodes - C/C++ runs on Flash Player/AIR. Thanks, Pablo. -- View this message in context: http://nabble.documentfoundation.org/Looking-for-a-code-portion-import-export-document-formats-tp4000925p4000941.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
Re: Looking for a code portion: import/export document formats
On Mon, 2012-08-13 at 11:52 +0200, Michael Stahl wrote: the best option of using LibreOffice for your purpose is to install it and connect to it via UNO; read the OOo Dev Guide for details: Or to run it from the command-line with: --headless --convert-to pdf foo.doc The UNO / remote automation stuff has always seemed a horrible way of doing the simpler conversion cases, and now we have the commandline sorted out - I'd love to encourage people to spawn that directly. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 7ed9e024726747f9d0a70365c83ab619fac889e6 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Mon Aug 13 12:36:37 2012 +0200 these test should not have been disabled diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 49beff8..1d55a84 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -219,7 +219,6 @@ public: void testFindAreaPosColRight(); CPPUNIT_TEST_SUITE(Test); -#if 0 CPPUNIT_TEST(testCollator); CPPUNIT_TEST(testInput); CPPUNIT_TEST(testCellFunctions); @@ -261,7 +260,6 @@ public: CPPUNIT_TEST(testAutoFill); CPPUNIT_TEST(testCopyPasteFormulas); CPPUNIT_TEST(testCopyPasteFormulasExternalDoc); -#endif CPPUNIT_TEST(testFindAreaPosRowDown); CPPUNIT_TEST(testFindAreaPosColRight); CPPUNIT_TEST_SUITE_END(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-3-6]: fdo#47495 fix RTF import of multiple shapes inside textframe...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#47495 fix RTF import of multiple shapes inside textframes .. fdo#47495 fix RTF import of multiple shapes inside textframes (cherry-picked from commit ad72a47dbd16f65316432df71dffe3b9b835fcc7) Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/405/1 -- To view, visit https://gerrit.libreoffice.org/405 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-5]: fdo#47495 fix RTF import of multiple shapes inside textframe...
From Miklos Vajna vmik...@suse.cz: Miklos Vajna has uploaded a new change for review. Change subject: fdo#47495 fix RTF import of multiple shapes inside textframes .. fdo#47495 fix RTF import of multiple shapes inside textframes (cherry-picked from commit ad72a47dbd16f65316432df71dffe3b9b835fcc7) Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/406/1 -- To view, visit https://gerrit.libreoffice.org/406 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee8541ff9e88139648d45f08968476f2b1d4e1b3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-5 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: freetype/prj
freetype/prj/build.lst |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 0209269f770f68dac5c3bfa6d555b7f6908a0902 Author: Michael Stahl mst...@redhat.com Date: Mon Aug 13 12:43:08 2012 +0200 freetype: add missing solenv dependency Change-Id: I317c7e641ecee750b858e3c120544dfa14ae4044 diff --git a/freetype/prj/build.lst b/freetype/prj/build.lst index 5d58fed..c72011f 100644 --- a/freetype/prj/build.lst +++ b/freetype/prj/build.lst @@ -1,3 +1,2 @@ -ft freetype : NULL -ft freetype usr1- u ft_mkout NULL +ft freetype : solenv NULL ft freetype nmake - u ft_libfreetype NULL ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Looking for a code portion: import/export document formats
So it's clear: I only need someone running LO on Android and iOS and then invoke the command line in order to transform document formats. I'll look for those distributions (if they exists...?) Alternatively, I've an Adobe's Alchemy 2 compiler, and I'll try to compile LO too by using it. Although I would prefer to use a native LO distribution for mobile OS. Thanks, Pablo. -- View this message in context: http://nabble.documentfoundation.org/Looking-for-a-code-portion-import-export-document-formats-tp4000925p4000951.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
Re: Looking for a code portion: import/export document formats
On Mon, 2012-08-13 at 03:57 -0700, docminer wrote: So it's clear: I only need someone running LO on Android and iOS and then invoke the command line in order to transform document formats. I'll look for those distributions (if they exists...?) Ah - well, I'd play with our Android cross-compile vs. master - you can generate a nice native app there that will convert anything to anything for you :-) so building a PDF from it is fine. We're building a native viewer component from that as well, that is going rather well; checkout android/experimental/LibreOffice4Android there. You'll need the SDK and NDK installed. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build LO for Android on Mac OS 10.8
On Mon, 2012-08-13 at 12:53 +0200, Michael Stahl wrote: this indicates freetype is missing a dependency on the solenv module, have fixed that on master now, please try again Oooh - I've seen that for ages and not seen how to fix it - and just worked around it by re-running make ;-) Thanks for the fix, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Looking for a code portion: import/export document formats
Hi, On Mon, Aug 13, 2012 at 11:37:24AM +0100, Michael Meeks wrote: On Mon, 2012-08-13 at 11:52 +0200, Michael Stahl wrote: the best option of using LibreOffice for your purpose is to install it and connect to it via UNO; read the OOo Dev Guide for details: Or to run it from the command-line with: --headless --convert-to pdf foo.doc The UNO / remote automation stuff has always seemed a horrible way of doing the simpler conversion cases, and now we have the commandline sorted out - I'd love to encourage people to spawn that directly. Note however that for batch conversion, there are limits due to commandline length and starting an new instance again and again wouldnt improve performance either. Your best bet for large batch conversions is using the unoconv wrapper and which can reuse one instance of LibreOffice and remotely trigger the conversion via UNO(*) without having to restart an instance again and again. http://askubuntu.com/questions/171243/error-converting-thousands-of-documents-with-libreoffice/171249#171249 Best, Bjoern (*) Despite Michaels anti-UNO rants, which you should ignore in this case. I suspect Michael has an I hate UNO sticker on his bumper and is the president of the UNO hater club. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: setting LibreOffice settings automatically
Hi Danishka, Danishka Navin píše v Po 13. 08. 2012 v 12:46 +0530: To enable Sinhala spell checker I have to do few configurations in LibreOffice. It won't work by default. Is there a way to set some values for LibreOffice by editing a config file on GNU/Linux? For example, how to enable tools- options - languages - enable for Asian and CTL IMHO, the best way to modify user setting for more installations is to create an extension. You might take inspiration in the attached sample extension. It modifies the application background color. .oxt is actually a zip archive, so you could simply look inside. The important part is setting.xcu. I created it the following way: 1. format and safe current user registry modifications cd ~/.config/libreoffice/3/user xmllint -format registrymodifications.xcu registrymodifications.xcu.old 2. start LO, modify configuration as needed and close LO 3. format updated configuration xmllint -format registrymodifications.xcu registrymodifications.xcu.new 4. compare the configurations diff -up registrymodifications.xcu.old registrymodifications.xcu.new registrymodifications.xcu.diff 5. take the new configuration and remove the parts that were not modified (as found in the .diff file). Note that you need to end with valid xml file, so you need to keep the header and the right context cp registrymodifications.xcu.new setting.xcu $EDITOR setting.xcu Best Regards, Petr company-setting.oxt Description: application/vnd.openofficeorg.extension ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6 ] No more prereg, no more unopkg sync
On Fri, 2012-08-10 at 16:32 +0200, Stephan Bergmann wrote: Quoting http://cgit.freedesktop.org/libreoffice/core/commit/?id=6dcb3d4ef46312729bb6f16c473b433474863f68 Related fdo#51252: No more prereg, no more unopkg sync: Now that 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 'fdo#51252 Disable copying share/prereg/bundled to avoid startup crashes' removed the use of share/prereg, there is no longer need to generate it in the first place (by calling 'unopkg sync' at build or installation time), and so no need for the 'unopkg sync' sub-command, either. This looks like a really nice change. Yes it -looks- invasive, but the weight of the LOC change is (as Tor points out) substantially redundant code removal (I love it). IMHO - the less complicated and un-necessary stuff we run as we install the MSI file the more reliable our install will be, and the fewer un-needed dark-alley code-paths we have lying around the safer we all are. Hence, I would suggest to not jeopardize LO 3.6.1 with this clean up, but only backport it to libreoffice-3-6 after branch-off of libreoffice-3-6-1 early next week. My concern is that we don't necessarily get better testing of this (except perhaps on master ?) by merging it later - and indeed, most of the heavy-duty upgrade testing we want done should (I hope) happen around 3.6.1 rc1. IMHO I'd prefer to have an RC3 for 3.6.1 than the potential for regression by including this in 3.6.2 - and having the state-of-the-art code that is shared between master and -3-6 for testing seems sensible (to me). (This clean up would nicely remove the root for https://bugs.freedesktop.org/show_bug.cgi?id=44628 unopkg.exe does not find VC runtime during install (extension registration), but it might be better to address that with yet another targeted band-aid fix for LO 3.6.1, like by just not calling unopkg sync from the msi install scripts.) Yep - so I read it through; and I'm +1 for -3-6 (and hence -3-6-1) I'd love someone else to read it too. The only gotcha I spotted was the: @@ -222,18 +211,6 @@ NodeJava::NodeJava(Layer layer): constructor; but it seems we initialize m_layer earlier already so just remove a duplicate initialization. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/pt_PT.xml |3 +++ 1 file changed, 3 insertions(+) New commits: commit 01e1f4eca5f89d685769833076df440a202b6a08 Author: Eike Rathke er...@redhat.com Date: Mon Aug 13 13:51:27 2012 +0200 added -MM-DD HH:MM format code to [pt-PT] Change-Id: I294c9b665a9314169515fe20b97b4558580662e9 diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml index 1908218..98a9b56 100644 --- a/i18npool/source/localedata/data/pt_PT.xml +++ b/i18npool/source/localedata/data/pt_PT.xml @@ -159,6 +159,9 @@ FormatElement msgid=DateTimeFormatskey2 default=false type=medium usage=DATE_TIME formatindex=47 FormatCodeDD-MM- HH:MM:SS/FormatCode /FormatElement +FormatElement msgid=DateTimeFormatskey3 default=false type=medium usage=DATE_TIME formatindex=55 + FormatCode-MM-DD HH:MM/FormatCode +/FormatElement FormatElement msgid=FixedFormatskey1 default=true type=medium usage=FIXED_NUMBER formatindex=0 FormatCodeGeral/FormatCode /FormatElement ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#35079: EDITING: Drawing element completely in mouse selection frame not selected
I have found a solution for the Bug that 1. increased the size of the bounding box for frame selection 2. increased the size of the bounding box for exporting the selection to a jpeg. It appeared on rotated, custom shapes. https://bugs.freedesktop.org/show_bug.cgi?id=35079 This patch keeps the hidden Shape elements from being included in the bounding box. greetings - Lennard Wasserthal From fa61f74f1201ecdfe4548494dc056f613ce7ecc9 Mon Sep 17 00:00:00 2001 From: Lennard wassert...@nefkom.net Date: Sat, 11 Aug 2012 20:29:24 +0200 Subject: [PATCH] Fixed Bug [35079] Drawing: Fixed Custom Shape Frame-Selection Bounding box bug Change-Id: Ia14feba446358cb195922477e0aa9576e9be2ae6 Signed-off-by: Lennard wassert...@nefkom.net --- .../source/primitive2d/baseprimitive2d.cxx | 29 ++-- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx index 964e552..9197592 100644 --- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx @@ -121,25 +121,26 @@ namespace drawinglayer basegfx::B2DRange getB2DRangeFromPrimitive2DReference(const Primitive2DReference rCandidate, const geometry::ViewInformation2D aViewInformation) { basegfx::B2DRange aRetval; - if(rCandidate.is()) { -// try to get C++ implementation base -const BasePrimitive2D* pCandidate(dynamic_cast BasePrimitive2D* (rCandidate.get())); - -if(pCandidate) -{ -// use it if possible -aRetval.expand(pCandidate-getB2DRange(aViewInformation)); -} -else +if ((dynamic_cast BasePrimitive2D*(rCandidate.get()))-getPrimitive2DID()!=61) //Ignores auxilliary geometry that may be malpositioned { -// use UNO API call instead -const uno::Sequence beans::PropertyValue rViewParameters(aViewInformation.getViewInformationSequence()); -aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(rCandidate-getRange(rViewParameters))); +// try to get C++ implementation base +const BasePrimitive2D* pCandidate(dynamic_cast BasePrimitive2D* (rCandidate.get())); + +if(pCandidate) +{ +// use it if possible +aRetval.expand(pCandidate-getB2DRange(aViewInformation)); +} +else +{ +// use UNO API call instead +const uno::Sequence beans::PropertyValue rViewParameters(aViewInformation.getViewInformationSequence()); +aRetval.expand(basegfx::unotools::b2DRectangleFromRealRectangle2D(rCandidate-getRange(rViewParameters))); +} } } - return aRetval; } -- 1.7.9.5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-6 ] No more prereg, no more unopkg sync
On 08/13/2012 01:48 PM, Michael Meeks wrote: IMHO I'd prefer to have an RC3 for 3.6.1 than the potential for regression by including this in 3.6.2 - and having the state-of-the-art code that is shared between master and -3-6 for testing seems sensible (to me). In the end, I'd be fine either way. An additional review might make sense when integrating it now. The only gotcha I spotted was the: @@ -222,18 +211,6 @@ NodeJava::NodeJava(Layer layer): constructor; but it seems we initialize m_layer earlier already so just remove a duplicate initialization. Yes, the removed else-branch was redundant. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW-3-6] [PUSHED 3-6] correctly calculate the percentile for upper data bar limit
On 08/11/2012 07:20 PM, Markus Mohrhard wrote: Hey, the attached patch corrects the code that calculates the value if you select percentile for the upper limit. Until now it incorrectly used the lower bounds values to calculate these value. This will be fixed in master a bit differently. Sounds reasonable. Pushed to 3-6 with my sign-off. Best, Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/source
svtools/source/control/ruler.cxx | 12 1 file changed, 12 deletions(-) New commits: commit 7fbab3fc351212cd8474159391bc744cee2d7e68 Author: Ivan Timofeev timofeev@gmail.com Date: Mon Aug 13 17:25:32 2012 +0400 remove duplicate code, thanks to Petr Mladek for spotting Change-Id: I136dc9e314197ac100f1f0d12d1f485dc659af9f diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index d7f4e79..7e17e6d 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -2120,18 +2120,6 @@ void Ruler::Resize() mbCalc = sal_True; } -// Wenn Ruler eine Groesse hat, dann Groesse vom VirtualDevice setzen -if ( (mnVirWidth RULER_MIN_SIZE) || - ((aWinSize.Width() RULER_MIN_SIZE) (aWinSize.Height() RULER_MIN_SIZE)) ) -{ -if ( mnWinStyle WB_HORZ ) -mnVirWidth = aWinSize.Width()-mnVirOff; -else -mnVirWidth = aWinSize.Height()-mnVirOff; -if ( mnVirWidth RULER_MIN_SIZE ) -mnVirWidth = 0; -} - // Gegebenenfalls ein Teil vom Rand loeschen, da 3D-Effekt/Trennlinie am // Fensterrand if ( bVisible ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6 3-5] fdo#50654: update virtual device width on modifying WB_EXTRAFIELD flag
Hi Petr, On 13.08.2012 14:29, Petr Mladek wrote: BTW: I wonder if we could remove the duplicated code from Ruler::Resize(). It calls ImplInitExtraField just few lines above. I am not 100% sure but it seems that the code in between does not affect mnVirWidth and the other variables. It does not make sense to call it twice. It might be enough to do this clean up in master. Oh, cool, thanks! :) Done: http://cgit.freedesktop.org/libreoffice/core/commit/?id=7fbab3fc351212cd8474159391bc744cee2d7e68 Thanks a lot for digging into it. Thanks for reviewing my commits! All the best, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: filter/inc filter/source
filter/inc/filter/msfilter/util.hxx | 18 + filter/source/msfilter/util.cxx | 127 2 files changed, 145 insertions(+) New commits: commit 1a8d78656a5773d285a430f6f88602beda173a8e Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 13 15:07:13 2012 +0100 The missing docs as to the ranges of the MS text categories especially the definition of Complex Scripts Change-Id: I693936f1dd150aefd4a632530439acf8edcbdd74 diff --git a/filter/inc/filter/msfilter/util.hxx b/filter/inc/filter/msfilter/util.hxx index d772a24..607566a 100644 --- a/filter/inc/filter/msfilter/util.hxx +++ b/filter/inc/filter/msfilter/util.hxx @@ -70,6 +70,24 @@ MSFILTER_DLLPUBLIC rtl::OString DateTimeToOString( const DateTime rDateTime ); MSFILTER_DLLPUBLIC sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cBullet, rtl_TextEncoding r_ioChrSet, rtl::OUString r_ioFontName, bool bDisableUnicodeSupport = false); + +enum TextCategory +{ +latin, //Latin +cs, //Complex Script +ea, //East Asian +sym //Symbol +}; + +/** Categorize codepoints according to how MS seems to do it. + + It's been bugging me for ages as to what codepoint MS considers in + what category. Tom Jebo has a post suggesting the criteria used here + and indicating its been submitting to the standards working group + as a proposed resolution. +*/ +MSFILTER_DLLPUBLIC TextCategory categorizeCodePoint(sal_uInt32 codePoint, const rtl::OUString rBcp47LanguageTag); + } } diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index ddb9f14..db8aa6c 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -179,6 +179,133 @@ sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, return cChar; } +/* + http://social.msdn.microsoft.com/Forums/hu-HU/os_openXML-ecma/thread/1bf1f185-ee49-4314-94e7-f4e1563b5c00 + + The following information is being submitted to the standards working group as + a proposed resolution to a defect report and is not yet part of ISO 29500-1. + ... + For each Unicode character in DrawingML text, the font face can be any of four + font âslotsâ: latin (§21.1.2.3.7), cs (§21.1.2.3.1), ea (§21.1.2.3.3), or sym + (§21.1.2.3.10), as specified in the following table. For all ranges not + explicitly called out below, the ea font shall be used. + + U+âU+007F Use latin font + U+0080âU+00A6 Use latin font + U+00A9âU+00AF Use latin font + U+00B2âU+00B3 Use latin font + U+00B5âU+00D6 Use latin font + U+00D8âU+00F6 Use latin font + U+00F8âU+058F Use latin font + U+0590âU+074F Use cs font + U+0780âU+07BF Use cs font + U+0900âU+109F Use cs font + U+10A0âU+10FF Use latin font + U+1200âU+137F Use latin font + U+13A0âU+177F Use latin font + U+1D00âU+1D7F Use latin font + U+1E00âU+1FFF Use latin font + U+1780âU+18AF Use cs font + U+2000âU+200B Use latin font + U+200CâU+200F Use cs font + U+2010âU+2029 Use latin font Except, for the quote characters in the range +2018 â 201E, use ea font if the text has one of the following language +identifiers: ii-CN, ja-JP, ko-KR, zh-CN, zh-HK, zh-MO, zh-SG, zh-TW. + U+202AâU+202F Use cs font + U+2030âU+2046 Use latin font + U+204AâU+245F Use latin font + U+2670âU+2671 Use cs font + U+27C0âU+2BFF Use latin font + U+3099âU+309A Use ea font + U+D835 Use latin font + U+F000âU+F0FF Symbol, use sym font + U+FB00âU+FB17 Use latin font + U+FB1DâU+FB4F Use cs font + U+FE50âU+FE6F Use latin font + Otherwise Use ea font +*/ +TextCategory categorizeCodePoint(sal_uInt32 codePoint, const rtl::OUString rBcp47LanguageTag) +{ +TextCategory eRet = ea; +if (codePoint = 0x007F) +eRet = latin; +else if (0x0080 = codePoint codePoint = 0x00A6) +eRet = latin; +else if (0x00A9 = codePoint codePoint = 0x00AF) +eRet = latin; +else if (0x00B2 = codePoint codePoint = 0x00B3) +eRet = latin; +else if (0x00B5 = codePoint codePoint = 0x00D6) +eRet = latin; +else if (0x00D8 = codePoint codePoint = 0x00F6) +eRet = latin; +else if (0x00F8 = codePoint codePoint = 0x058F) +eRet = latin; +else if (0x0590 = codePoint codePoint = 0x074F) +eRet = cs; +else if (0x0780 = codePoint codePoint = 0x07BF) +eRet = cs; +else if (0x0900 = codePoint codePoint = 0x109F) +eRet = cs; +else if (0x10A0 = codePoint codePoint = 0x10FF) +eRet = latin; +else if (0x1200 = codePoint codePoint = 0x137F) +eRet = latin; +else if (0x13A0 = codePoint codePoint = 0x177F) +eRet = latin; +else if (0x1D00 = codePoint codePoint = 0x1D7F) +eRet = latin; +else if (0x1E00 = codePoint codePoint = 0x1FFF) +eRet = latin; +else if (0x1780 = codePoint codePoint = 0x18AF) +eRet = cs; +else if
Re: [Libreoffice-ux-advise] [REVIEW 3-6] Window background of toolbars
Hi, I tend Jan Holesovsky píše v Pá 10. 08. 2012 v 17:22 +0200: I've pushed a change to master that (I hope) improves the situation: http://cgit.freedesktop.org/libreoffice/core/commit/?id=03dbe1a97c0050365ac3820575134bace0908e2b [for cherry-picking purposes, probably easier to check the non-whitespace changes version: http://cgit.freedesktop.org/libreoffice/core/commit/?id=03dbe1a97c0050365ac3820575134bace0908e2bignorews=1 ] With this patch, it looks like this: http://artax.karlin.mff.cuni.cz/~kendy/design-list/vertical-toolbars-1.png http://artax.karlin.mff.cuni.cz/~kendy/design-list/vertical-toolbars-2.png Please let me know what do you prefer from the UX point of view: 1) status quo - 3.6 vertical / floating toolbars use the 'native' theming (inconsistent with the new 3.6 look) 2) half-way solution - my screenshots above; more consistent look, but no line splitting the vertical toolbars from the workspace 3) complete solution - will take some larger reviewing, as this touches look on all platforms; I'll see if I can find a brave reviewer :-) Would be good to have a decision until the Monday's 3.6.1 RC1 freeze, so that if we put it in, we are able to revert that in RC2, should it cause trouble. I tend to push it for rc1. It will be easier to revert to the old code for rc2 than to push new code for rc2 :-) You have last chance to stop me ;-) Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/generic
vcl/generic/fontmanager/fontmanager.cxx | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) New commits: commit 90496967fe7ddb8a616dce8c70013fa4450c5983 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 13 15:52:43 2012 +0100 Resolves: fdo#53258 Aquabase-spanish-support busts ttf reader again Once as #i107552# and now again as fdo#53258. This is one sick puppy of a font. It makes fontforge and fontconfig jump through hoops as well. Change-Id: Ifee780bb1463dca4e8b045828a07369e6c3863fc diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index a53d283..090cabb 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -1541,9 +1541,14 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const if( aInfo.usubfamily ) pFont-m_aStyleName = OUString( aInfo.usubfamily ); -pFont-m_nPSName = m_pAtoms-getAtom( ATOM_PSNAME, -rtl::OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding), -sal_True ); +SAL_WARN_IF( !aInfo.psname, vcl, No PostScript name in font: aFile.getStr() ); + +rtl::OUString sPSName = aInfo.psname ? +rtl::OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : +m_pAtoms-getString(ATOM_FAMILYNAME, pFont-m_nFamilyName); // poor font does not have a postscript name + +pFont-m_nPSName = m_pAtoms-getAtom( ATOM_PSNAME, sPSName, sal_True ); + switch( aInfo.weight ) { case FW_THIN: pFont-m_eWeight = WEIGHT_THIN; break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
gstreamer-1.0 support ...
JFYI - I pushed the gstreamer 1.0 support I've been working on to master somewhat prematurely by accident. But it's there now ... so - what's it all about ? After years of a 0.10 release - it seems the gst guys have decided to bump to 1.0 and tweak their ABI at the same time. To handle that (since 0.10 will be what is deployed in most places for the next year or so), I've tweaked avmedia to re-compile (mostly) the same code twice - once for gst 0.10 and once for gst 1.0. For packagers (Petr I forget what the packaging list is) that means that for the next release: 3.7 packagers will want to choose between: --enable-gstreamer --enable-gstreamer-0-10 For the generic linux build we prolly want to ship both of these backends for a while - we should fall-back through them activating first gst-1.0 then gst-0.10. Having said that IIRC there is no gstreamer-1.0 release yet, and the 1.0 code-paths are rather un-tested [ help appreciated ], but the fall-back 0.10 paths seem to continue to work nicely for me. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - vcl/Library_vcl.mk vcl/source
vcl/Library_vcl.mk| 11 +++ vcl/source/gdi/pdfwriter_impl.cxx | 25 +++-- 2 files changed, 26 insertions(+), 10 deletions(-) New commits: commit e554121fcabefa01b531c1b5b63c227f5a9a97fa Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 13 17:49:53 2012 +0300 Make it compile for Android again (and iOS, I hope) Change-Id: Ib0a4f4ea4858d52ed70e9a4d1b7904325f36c361 diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 026f1a6..ca44916 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -82,6 +82,7 @@ #include cppuhelper/implbase1.hxx +#if !defined(ANDROID) !defined(IOS) // NSS header files for PDF signing support #include nss.h #include cert.h @@ -89,6 +90,7 @@ #include sechash.h #include cms.h #include cmst.h +#endif using namespace vcl; @@ -5916,12 +5918,14 @@ bool PDFWriterImpl::emitCatalog() else aInitPageRef.append( 0 ); +#if !defined(ANDROID) !defined(IOS) if (m_nSignatureObject != -1) // Document will be signed { aLine.append(/Perms/DocMDP ); aLine.append(m_nSignatureObject); aLine.append( 0 R); } +#endif switch( m_aContext.PDFDocumentAction ) { @@ -6049,14 +6053,20 @@ bool PDFWriterImpl::emitCatalog() } aLine.append( \n] ); +#if !defined(ANDROID) !defined(IOS) if (m_nSignatureObject != -1) aLine.append( /SigFlags 3); +#endif aLine.append( /DR ); aLine.append( getResourceDictObj() ); aLine.append( 0 R ); // /NeedAppearances must not be used if PDF is signed -if( m_bIsPDF_A1 || ( m_nSignatureObject != -1 ) ) +if( m_bIsPDF_A1 +#if !defined(ANDROID) !defined(IOS) +|| ( m_nSignatureObject != -1 ) +#endif +) aLine.append( \n ); else aLine.append( /NeedAppearances true\n ); @@ -6083,6 +6093,8 @@ bool PDFWriterImpl::emitCatalog() return true; } +#if !defined(ANDROID) !defined(IOS) + bool PDFWriterImpl::emitSignature() { if( !updateObject( m_nSignatureObject ) ) @@ -6358,6 +6370,8 @@ bool PDFWriterImpl::finalizeSignature() return true; } +#endif + sal_Int32 PDFWriterImpl::emitInfoDict( ) { sal_Int32 nObject = createObject(); @@ -7139,6 +7153,7 @@ bool PDFWriterImpl::emit() // needed for widget tab order sortWidgets(); +#if !defined(ANDROID) !defined(IOS) if( m_aContext.SignPDF ) { // sign the document @@ -7146,6 +7161,7 @@ bool PDFWriterImpl::emit() aSignature.Name = OUString(Signature1); createControl( aSignature, 0 ); } +#endif // emit additional streams CHECK_RETURN( emitAdditionalStreams() ); @@ -7153,14 +7169,18 @@ bool PDFWriterImpl::emit() // emit catalog CHECK_RETURN( emitCatalog() ); +#if !defined(ANDROID) !defined(IOS) if (m_nSignatureObject != -1) // if document is signed, emit sigdict CHECK_RETURN( emitSignature() ); +#endif // emit trailer CHECK_RETURN( emitTrailer() ); +#if !defined(ANDROID) !defined(IOS) if (m_nSignatureObject != -1) // finalize the signature CHECK_RETURN( finalizeSignature() ); +#endif osl_closeFile( m_aFile ); m_bOpen = false; @@ -12058,6 +12078,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget rControl, sa createDefaultEditAppearance( rNewWidget, rEdit ); } +#if !defined(ANDROID) !defined(IOS) else if( rControl.getType() == PDFWriter::Signature) { const PDFWriter::SignatureWidget rSig = static_castconst PDFWriter::SignatureWidget(rControl); @@ -12073,7 +12094,7 @@ sal_Int32 PDFWriterImpl::createControl( const PDFWriter::AnyWidget rControl, sa // let's add a fake appearance rNewWidget.m_aAppearances[ N ][ Standard ] = new SvMemoryStream(); } - +#endif // if control is a hidden signature, do not convert coordinates since we // need /Rect [ 0 0 0 0 ] commit 15bbf66efadf1b522303347c44b28450d92b3007 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 13 17:26:29 2012 +0300 Revert Bypass pdfwriter for non-desktop OSes without any Mozilla stuff for now This reverts commit fd9c2cca78227f634e34790aa127cc31e4302a56. diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 4aa52ab..e6abe34 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -211,6 +211,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/gdi/outmap \ vcl/source/gdi/pdfextoutdevdata \ vcl/source/gdi/pdffontcache \ +vcl/source/gdi/pdfwriter \ +vcl/source/gdi/pdfwriter_impl2 \ +vcl/source/gdi/pdfwriter_impl \ vcl/source/gdi/pngread \ vcl/source/gdi/pngwrite \ vcl/source/gdi/print2 \ @@ -284,14 +287,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ # optional parts -ifneq (,$(filter
[Libreoffice-commits] .: 2 commits - avmedia/Library_avmediagst_0_10.mk filter/source i18npool/source jvmfwk/plugins mysqlc/source sw/source wizards/com
avmedia/Library_avmediagst_0_10.mk|6 +- filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java |7 +- i18npool/source/localedata/data/so_SO.xml |2 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 30 +++--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 16 + mysqlc/source/DataAccess.xcu |1 sw/source/filter/ww8/docxexport.cxx |3 - wizards/com/sun/star/wizards/form/FormWizard.java | 18 -- wizards/com/sun/star/wizards/form/StyleApplier.java | 18 +- 9 files changed, 45 insertions(+), 56 deletions(-) New commits: commit e49926725f95eab4d6a215db093cc1c724b1a064 Author: Michael Meeks michael.me...@suse.com Date: Mon Aug 13 15:58:26 2012 +0100 tweak old-school gstreamer link line Change-Id: If3f42a53ccfb4829009171c9b8325b2cb06277c2 diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 0279717..84b5ad4 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,avmediagst_0_10,\ -I$(SRCDIR)/avmedia/source/inc \ $(GSTREAMER_0_10_CFLAGS) \ )) -$(eval $(call gb_Library_add_libs,avmediagst_0_10,$(GSTREAMER_0_10_LIBS))) $(eval $(call gb_Library_use_sdk_api,avmediagst_0_10)) @@ -55,6 +54,11 @@ $(eval $(call gb_Library_use_libraries,avmediagst_0_10,\ $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_libs,avmediagst_0_10,\ + $(GSTREAMER_0_10_LIBS) \ + -lgstinterfaces-0.10 \ +)) + $(eval $(call gb_Library_add_exception_objects,avmediagst_0_10,\ avmedia/source/gstreamer/gst_0_10 \ )) commit f57d0649b913f0192ed90de4082ff449f1f7083b Author: Michael Meeks michael.me...@suse.com Date: Mon Aug 13 11:35:38 2012 +0100 misc. cleanup. diff --git a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java index fab9fc3..49b4c75 100644 --- a/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java +++ b/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/Base64.java @@ -1,5 +1,3 @@ -package com.sun.star.comp.xsltfilter; - /* * This file is part of the LibreOffice project. * @@ -17,6 +15,9 @@ package com.sun.star.comp.xsltfilter; * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +package com.sun.star.comp.xsltfilter; + /** * pEncodes and decodes to and from Base64 notation./p * pHomepage: a href=http://iharder.net/base64;http://iharder.net/base64/a./p @@ -44,7 +45,7 @@ package com.sun.star.comp.xsltfilter; * Base64.InputStream class to encode and decode on the fly which uses * less memory than encoding/decoding an entire file into memory before writing./li * liv2.2.1 - Fixed bug using URL_SAFE and ORDERED encodings. Fixed bug - * when using very small files (~ 40 bytes)./li + * when using very small files (~lt; 40 bytes)./li * liv2.2 - Added some helper methods for encoding/decoding directly from * one file to the next. Also added a main() method to support command line * encoding/decoding from one file to the next. Also added these Base64 dialects: diff --git a/i18npool/source/localedata/data/so_SO.xml b/i18npool/source/localedata/data/so_SO.xml index 8a4fd49..73de637 100644 --- a/i18npool/source/localedata/data/so_SO.xml +++ b/i18npool/source/localedata/data/so_SO.xml @@ -1,4 +1,4 @@ -?xml version=1.0 encoding=UTF-8 ? +?xml version=1.0 encoding=UTF-8 ? !DOCTYPE Locale SYSTEM 'locale.dtd' !-- * This file is part of the LibreOffice project. diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 58ede7b..bbffc8c 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -98,25 +98,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } } -//Only do something if the sunjavaplugin created this JavaInfo -rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM(Sun Microsystems Inc.)); -rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM(Oracle Corporation)); -rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM(IBM Corporation)); -rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM(Blackdown Java-Linux Team)); -rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM(Apple Inc.)); -rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM(Apple Computer, Inc.)); -rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM(BEA Systems, Inc.)); -rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM(Free Software Foundation, Inc.)); -rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM(The FreeBSD Foundation)); -if ( !
--with-mozilla-build required on windows ?
Hello, Since 500261a6b6e9dbeacce7f693b01a1c32a112f4fb nss seems to be needed for vcl. I'd push attached patch to fix W2008R2_16-minimal_build but It would fail anyway because one needs Mozilla build tools for that ? So - what's wrong ? Running configure on windows without --with-mozilla-build ? I also may have missed something. Thanks, Matus 0001-nss-is-now-required-unconditionally-in-vcl.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/core/layout/paintfrm.cxx | 21 - 1 file changed, 16 insertions(+), 5 deletions(-) New commits: commit 93e819418070deb2750a918a1c3ea52376558d21 Author: Miklos Vajna vmik...@suse.cz Date: Mon Aug 13 16:03:17 2012 +0200 fdo#53439 SwPageFrm::PaintBorderAndShadow fix painting at small zoom Change-Id: I235895caaf95225148e61d96f4c3b14bf9f5542e (cherry picked from commit c5b9c197d70a0fb7d75bcedf2d70e6320175e846) Signed-off-by: Ivan Timofeev timofeev@gmail.com diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index ad81f20..74936a1 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -5677,13 +5677,24 @@ sal_Bool SwPageFrm::IsLeftShadowNeeded() const } } +enum PaintArea {LEFT, RIGHT, TOP, BOTTOM}; + /// Wrapper around pOut-DrawBitmapEx. -void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx rBitmapEx) +void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx rBitmapEx, PaintArea eArea) { // The problem is that if we get called multiple times and the color is // partly transparent, then the result will get darker and darker. To avoid // this, always paint the background color before doing the real paint. Rectangle aRect(aPoint, rBitmapEx.GetSizePixel()); + +switch (eArea) +{ +case LEFT: aRect.Left() = aRect.Right() - 1; break; +case RIGHT: aRect.Right() = aRect.Left() + 1; break; +case TOP: aRect.Top() = aRect.Bottom() - 1; break; +case BOTTOM: aRect.Bottom() = aRect.Top() + 1; break; +} + pOut-SetFillColor( SwViewOption::GetAppBackgroundColor()); pOut-SetLineColor(); pOut-DrawRect(pOut-PixelToLogic(aRect)); @@ -5795,7 +5806,7 @@ void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx rBitmap aPageTopRightShadow ); BitmapEx aPageRightShadow = aPageRightShadowBase; aPageRightShadow.Scale( 1, aPagePxRect.Height() - 2 * (mnShadowPxWidth - 1) ); -lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Right() + mnShadowPxWidth, aPagePxRect.Top() + mnShadowPxWidth - 1), aPageRightShadow ); +lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Right() + mnShadowPxWidth, aPagePxRect.Top() + mnShadowPxWidth - 1), aPageRightShadow, RIGHT ); } // Left shadows and corners @@ -5807,15 +5818,15 @@ void lcl_paintBitmapExToRect(OutputDevice *pOut, Point aPoint, BitmapEx rBitmap pOut-DrawBitmapEx( pOut-PixelToLogic( Point( lLeft, aPagePxRect.Top() - mnShadowPxWidth ) ), aPageTopLeftShadow ); BitmapEx aPageLeftShadow = aPageLeftShadowBase; aPageLeftShadow.Scale( 1, aPagePxRect.Height() - 2 * (mnShadowPxWidth - 1) ); -lcl_paintBitmapExToRect(pOut, Point( lLeft, aPagePxRect.Top() + mnShadowPxWidth - 1), aPageLeftShadow); +lcl_paintBitmapExToRect(pOut, Point( lLeft, aPagePxRect.Top() + mnShadowPxWidth - 1), aPageLeftShadow, LEFT); } BitmapEx aPageBottomShadow = aPageBottomShadowBase; aPageBottomShadow.Scale( aPaintRect.Width(), 1 ); -lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Left(), aPagePxRect.Bottom() + 1 ), aPageBottomShadow); +lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Left(), aPagePxRect.Bottom() + 1 ), aPageBottomShadow, BOTTOM); BitmapEx aPageTopShadow = aPageTopShadowBase; aPageTopShadow.Scale( aPaintRect.Width(), 1 ); -lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Left(), aPagePxRect.Top() - mnShadowPxWidth ), aPageTopShadow ); +lcl_paintBitmapExToRect(pOut, Point( aPaintRect.Left(), aPagePxRect.Top() - mnShadowPxWidth ), aPageTopShadow, TOP); } //mod #i6193# paint sidebar for notes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/source
sw/source/ui/docvw/PageBreakWin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbb047527d856258b7b925dc37f56f0e9b0b3e90 Author: Ivan Timofeev timofeev@gmail.com Date: Fri Aug 10 16:14:17 2012 +0400 Page Break: don't show if mouse is gone and button is still invisible (fdo#46518) it seems when the mouse leaves the dashed line, it immediately appears inside a button (if the mouse motion is not super-fast). Change-Id: I43c792fdba59feafd761bde8529a8683c07bf3d3 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/ui/docvw/PageBreakWin.cxx index c96f280..02a3dcb 100644 --- a/sw/source/ui/docvw/PageBreakWin.cxx +++ b/sw/source/ui/docvw/PageBreakWin.cxx @@ -87,7 +87,7 @@ namespace { // don't fade if we just move to the 'button' Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() ); -if ( !m_pWin-Contains( aEventPos ) ) +if ( !m_pWin-Contains( aEventPos ) || !m_pWin-IsVisible() ) m_pWin-Fade( false ); } else if ( !m_pWin-IsVisible() ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: gstreamer-1.0 support ...
On 13/08/12 16:55, Michael Meeks wrote: For the generic linux build we prolly want to ship both of these backends for a while - we should fall-back through them activating first gst-1.0 then gst-0.10. Having said that IIRC there is no gstreamer-1.0 release yet, and the 1.0 code-paths are rather un-tested [ help appreciated ], but the fall-back 0.10 paths seem to continue to work nicely for me. uhm... considering that this newfangled thing isn't even released yet, i would prefer (for now) to default to 0.10 and fall back to 1.0 in any generic binary builds; we can always switch the default to 1.0 for the next release once we have some experiences and know there aren't any serious problems. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: Page Break: don't show if mouse is gone and button is still ...
From Petr Mladek pmla...@suse.cz: Petr Mladek has submitted this change and it was merged. Change subject: Page Break: don't show if mouse is gone and button is still invisible .. Page Break: don't show if mouse is gone and button is still invisible it seems when the mouse leaves the dashed line, it immediately appears inside a button (if the mouse motion is not super-fast). Change-Id: I43c792fdba59feafd761bde8529a8683c07bf3d3 --- M sw/source/ui/docvw/PageBreakWin.cxx 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/389 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43c792fdba59feafd761bde8529a8683c07bf3d3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Ivan Timofeev timofeev@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - oox/inc oox/Library_oox.mk oox/source sw/source
oox/Library_oox.mk |1 oox/inc/oox/export/vmlexport.hxx | 21 +++- oox/source/export/vmlexport.cxx | 42 sw/source/filter/ww8/docxattributeoutput.cxx | 46 ++- sw/source/filter/ww8/docxattributeoutput.hxx |6 ++- sw/source/filter/ww8/docxexport.cxx |2 - 6 files changed, 112 insertions(+), 6 deletions(-) New commits: commit 9c374a17fd440865ecceb1867c4142adf3d7fbd3 Author: Miklos Vajna vmik...@suse.cz Date: Mon Aug 13 17:37:46 2012 +0200 fdo#53113 docx export: initial shape text support Text is written, but paragraph and character properties are not yet handled. Change-Id: I828f8b6096bde000347066b23925376f6f945dbc diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 8a93e1d..da3c926 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -36,7 +36,6 @@ #include oox/token/tokens.hxx #include oox/export/drawingml.hxx #include oox/export/utils.hxx -#include oox/export/vmlexport.hxx #include oox/mathml/export.hxx #include i18npool/mslangid.hxx @@ -85,6 +84,7 @@ #include editeng/blnkitem.hxx #include editeng/charhiddenitem.hxx #include editeng/opaqitem.hxx +#include editeng/editobj.hxx #include svx/svdmodel.hxx #include svx/svdobj.hxx @@ -2368,6 +2368,50 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame rFrame, const Po m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_POSTPONE ); } +void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject rParaObj) +{ +const EditTextObject rEditObj = rParaObj.GetTextObject(); +MSWord_SdrAttrIter aAttrIter( m_rExport, rEditObj, TXT_HFTXTBOX ); + +sal_uInt16 nPara = rEditObj.GetParagraphCount(); + +m_pSerializer-startElementNS( XML_w, XML_textbox, FSEND ); +m_pSerializer-startElementNS( XML_w, XML_txbxContent, FSEND ); +for (sal_uInt16 n = 0; n nPara; ++n) +{ +if( n ) +aAttrIter.NextPara( n ); + +String aStr( rEditObj.GetText( n )); +xub_StrLen nAktPos = 0; +xub_StrLen nEnd = aStr.Len(); + +m_pSerializer-startElementNS( XML_w, XML_p, FSEND ); +do { +xub_StrLen nNextAttr = aAttrIter.WhereNext(); +if( nNextAttr nEnd ) +nNextAttr = nEnd; + +m_pSerializer-startElementNS( XML_w, XML_r, FSEND ); +bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos ); +if( !bTxtAtr ) +{ +String aOut( aStr.Copy( nAktPos, nNextAttr - nAktPos ) ); +RunText(aOut); +} + +m_pSerializer-endElementNS( XML_w, XML_r ); + +nAktPos = nNextAttr; +aAttrIter.NextPos(); +} +while( nAktPos nEnd ); +m_pSerializer-endElementNS( XML_w, XML_p ); +} +m_pSerializer-endElementNS( XML_w, XML_txbxContent ); +m_pSerializer-endElementNS( XML_w, XML_textbox ); +} + void DocxAttributeOutput::StartStyle( const String rName, bool bPapFmt, sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 /*nWwId*/, sal_uInt16 nId, bool bAutoUpdate ) { diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 1761009..f549784 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -33,6 +33,7 @@ #include vector #include boost/scoped_ptr.hpp +#include oox/export/vmlexport.hxx class SwGrfNode; class SdrObject; @@ -59,7 +60,7 @@ enum DocxColBreakStatus }; /// The class that has handlers for various resource types when exporting as DOCX. -class DocxAttributeOutput : public AttributeOutputBase +class DocxAttributeOutput : public AttributeOutputBase, public oox::vml::VMLTextExport { public: /// Export the state of RTL/CJK. @@ -633,6 +634,9 @@ public: bool HasPostitFields() const; void WritePostitFields(); + +/// VMLTextExport +virtual void WriteOutliner(const OutlinerParaObject rParaObj); }; #endif // _DOCXATTRIBUTEOUTPUT_HXX_ diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index 79ab70e..b19b47b 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -813,7 +813,7 @@ DocxExport::DocxExport( DocxExportFilter *pFilter, SwDoc *pDocument, SwPaM *pCur m_pAttrOutput = new DocxAttributeOutput( *this, m_pDocumentFS, m_pDrawingML ); // the related VMLExport -m_pVMLExport = new VMLExport( m_pDocumentFS ); +m_pVMLExport = new VMLExport( m_pDocumentFS, m_pAttrOutput ); } DocxExport::~DocxExport() commit 7fd28f4de77d12acb68a6b7f5fb578fedd8b76bb Author: Miklos Vajna vmik...@suse.cz Date: Mon Aug 13 17:36:50 2012 +0200 fdo#53113 oox::VMLExport: allow a callback to be registered for shape
[Libreoffice-commits] .: desktop/source
desktop/source/app/app.cxx| 75 ++ desktop/source/deployment/registry/component/dp_component.cxx |7 2 files changed, 55 insertions(+), 27 deletions(-) New commits: commit e9631f40ee49a244b6c6816e5cfb36814b9bafba Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 13 17:48:25 2012 +0200 fdo#53006: And detect LO downgrading scenarios... ...that reinstall potentially broken prereg data but do not touch the buildid file. Change-Id: I1b02d2c265523dd751d8ef7f2dccb59ed048f568 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 960a6e4..87c34e8 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -216,6 +216,18 @@ void removeTree(OUString const url) { // detected here and lead to a removal of user/extensions/bundled, so that // Desktop::SynchronizeExtensionRepositories will then definitely resync // share/extensions.) +// As a special case, if you create a UserInstallation with LO = 3.6.1, then +// run an old LO = 3.5.x using share/prereg/bundled on the same +// UserInstallation (so that it partially overwrites user/extensions/bundled, +// potentially duplicating component information, but not touching +// user/extensions/bundled/buildid), and then run the new LO = 3.6.1 on the +// same UserInstallation again, it can fail to start (due to the duplicated +// component information). Even though such downgrading scenarios at best work +// by luck in general, the special token LIBO_NON_PREREG_BUNDLED_EXTENSIONS=TRUE +// is used to detect and fix that problem: The assumption is that if an old LO +// = 3.5.x messed with user/extensions/bundled in the meantime, then it would +// have rewritten the unorc (dropping the token), and LO = 3.6.1 can detect +// that. void refreshBundledExtensionsDir() { OUString buildId( ${$BRAND_BASE_DIR/program/ SAL_CONFIGFILE(version) :buildid}); @@ -223,36 +235,44 @@ void refreshBundledExtensionsDir() { OUString dir($BUNDLED_EXTENSIONS_USER); rtl::Bootstrap::expandMacros(dir); //TODO: detect failure OUString url(dir + /buildid); -osl::File f(url); -switch (f.open(osl_File_OpenFlag_Read)) { -case osl::FileBase::E_None: -{ -rtl::ByteSequence s1; -osl::FileBase::RC rc = f.readLine(s1); -if (f.close() != osl::FileBase::E_None) { -SAL_WARN(desktop, cannot close + url + after reading); -} -if (rc != osl::FileBase::E_None) { -throw css::uno::RuntimeException( -cannot read from + url, -css::uno::Reference css::uno::XInterface ()); -} -OUString s2( -reinterpret_cast char const * (s1.getConstArray()), -s1.getLength(), RTL_TEXTENCODING_ISO_8859_1); -// using ISO 8859-1 avoids any and all conversion errors; the -// content should only be a subset of ASCII, anyway -if (s2 == buildId) { -return; +OUString nonPrereg( +${$BUNDLED_EXTENSIONS_USER/registry/ +com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc: +LIBO_NON_PREREG_BUNDLED_EXTENSIONS}); +rtl::Bootstrap::expandMacros(nonPrereg); +if (nonPrereg == TRUE) { +osl::File f(url); +switch (f.open(osl_File_OpenFlag_Read)) { +case osl::FileBase::E_None: +{ +rtl::ByteSequence s1; +osl::FileBase::RC rc = f.readLine(s1); +if (f.close() != osl::FileBase::E_None) { +SAL_WARN( +desktop, cannot close + url + after reading); +} +if (rc != osl::FileBase::E_None) { +throw css::uno::RuntimeException( +cannot read from + url, +css::uno::Reference css::uno::XInterface ()); +} +OUString s2( +reinterpret_cast char const * (s1.getConstArray()), +s1.getLength(), RTL_TEXTENCODING_ISO_8859_1); +// using ISO 8859-1 avoids any and all conversion errors; +// the content should only be a subset of ASCII, anyway +if (s2 == buildId) { +return; +} +break; } +case osl::FileBase::E_NOENT: break; +default: +throw css::uno::RuntimeException( +cannot open + url + for reading, +css::uno::Reference css::uno::XInterface ()); } -case osl::FileBase::E_NOENT: -break; -default: -throw css::uno::RuntimeException( -cannot open + url + for reading, -css::uno::Reference css::uno::XInterface ()); } removeTree(dir); switch
[REVIEW 3-6] fdo#53006: And detect LO downgrading scenarios
As Petr found out, if you first run LO 3.6.1, then some old LO 3.5.x (making use of share/prereg/bundled), then LO 3.6.1 again, all on the same UserInstallation, it can still happen that LO 3.6.1 refuses to start (as LO 3.5.x copied potentially broken data to user/extensions/bundled but did not touch user/extensions/bundled/buildid, so that LO 3.6.1 would not detect that it needs to remove the potentially poisonous data again). http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9631f40ee49a244b6c6816e5cfb36814b9bafba fdo#53006: And detect LO downgrading scenarios... addresses that by adding yet another pirouette (even though one could argue that such downgrading scenarios never worked by design, anyway). Between Petr and me, we have seen it to be effective for both Linux and Windows (master, at least). Please review and consider for backporting to libreoffice-3-6. Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] fdo#47674 Calc: save settings for import ascii text dialog
Hi jumbo444, On Friday, 2012-08-10 06:26:52 -0700, jumbo444 wrote: I propose a patch for fdo#47674 I'll follow up on that tomorrow. Open Text-CSV saved settings of ScImportAsciiDlg dialog, but not Paste Unformatted Text and Data Text to Columns. This patch adds two groups in Calc.xcs to save the settings (which are independent). cSep last parameter of ScImportAsciiDlg constructor was removed as it was useless (parameter is controlled by settings). Browsing through it seems your approach is fine, I'll look at details later. I set \t as default separator for both Paste Unformatted Text and Text to Columns. I set DetectSpecialNumbers at true as default for Paste Unformatted Text. Why is it not set to true for import CSV file? It seems to me to be the more common behavior. That DetectSpecialNumbers may get in the way as it also detects abbreviated dates and other not so obvious strings that can be converted to numeric values. Many times that is not wanted for file data. Whether it's good to have it enabled as default for clipboard and column data I'm not sure. I think it doesn't harm to try.. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp80eXtEmMJf.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt |1 - instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |2 -- 2 files changed, 3 deletions(-) New commits: commit 72e21d7a5621846782f86e2fc645811efbf5f18a Author: Andras Timar ati...@suse.com Date: Mon Aug 13 18:07:44 2012 +0200 remove already removed SetInstallLocation from install sequences Change-Id: I9a8e4a39ebc6d5f5a6092c58658f833b0f58d668 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt index 2dd9e91..ede3f7c 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt @@ -11,4 +11,3 @@ InstallFinalize 400 InstallInitialize 250 InstallValidate200 ScheduleReboot ISSCHEDULEREBOOT375 -SetInstallLocation1390 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index cfcd7ca..115ac87 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -56,8 +56,6 @@ ScheduleRebootISSCHEDULEREBOOT3125 SelfRegModules 2850 SelfUnregModules 1100 SetARPInstallLocation 990 -SetInstallLocation13140 -SetInstallLocation23141 SetODBCFolders 550 StartServices VersionNT 2800 StopServices VersionNT 950 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-6 ] No more prereg, no more unopkg sync
Hi, 2012/8/13 Stephan Bergmann sberg...@redhat.com On 08/13/2012 01:48 PM, Michael Meeks wrote: IMHO I'd prefer to have an RC3 for 3.6.1 than the potential for regression by including this in 3.6.2 - and having the state-of-the-art code that is shared between master and -3-6 for testing seems sensible (to me). In the end, I'd be fine either way. An additional review might make sense when integrating it now. I cherry-picked it to libreoffice-3-6 branch with a little tweak. See the separate commit in master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=72e21d7a5621846782f86e2fc645811efbf5f18a Windows installer worked, I did not see any issues. Andras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Triaging Update
Hi All, As most of you know we've started a major push to triage the unconfirmed bugs and I am going to give updates periodically for 2 reasons: 1. just so we all know the progress :) 2. to remind people that we always need more individuals helping out at least until we get a grasp on the 12+ month back log. A reminder of where the organization is for the the project: https://docs.google.com/spreadsheet/ccc?key=0ApS-XtOUGGH5dDIwaXN1YnNsM0h4RXFKdVhvb2RRb0E#gid=1 Start Date: 05/08/2012 # of Unconfirmed Bugs: 1,472 Today's Date: 13/08/2012 # of Unconfirmed Bugs: 1,317* That's 145 bugs triaged in some way or another in about a week! :) Thank you to those helping, for those who have a bit of time please feel free to join, for developers, I hope this helps in some way ;) All the best, Joel *These bugs are the ones that were open at the time of the start of the project, doesn't include ones opened in the last week. I think if we can get through the back log we'll only need a few members to stay active in triaging weekly to keep new bugs under control :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sot/source svtools/inc svtools/source sw/inc tools/source unusedcode.easy vcl/inc vcl/unx
sot/source/sdstor/storage.cxx | 14 -- svtools/inc/svtools/PlaceEditDialog.hxx|2 svtools/source/dialogs/PlaceEditDialog.cxx |5 -- svtools/source/misc/transfer.cxx |7 --- sw/inc/unofield.hxx|1 tools/source/fsys/tempfile.cxx |5 -- unusedcode.easy|5 -- vcl/inc/unx/salgdi.h |7 --- vcl/unx/generic/gdi/salgdi2.cxx| 61 - 9 files changed, 107 deletions(-) New commits: commit 582e06f71c63d70189e1ecd4fe365c541648cf83 Author: Thomas Arnhold tho...@arnhold.org Date: Mon Aug 13 16:55:38 2012 +0200 unusedcode.easy: remove unused code Change-Id: I87e7264ffd3086796aaa8e136c2f9b77fde7b74f diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index eb3880d..56a3679 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -1148,20 +1148,6 @@ sal_Bool SotStorage::GetProperty( const String rName, ::com::sun::star::uno::An } } -sal_Bool SotStorage::GetProperty( const String rEleName, const String rName, ::com::sun::star::uno::Any rValue ) -{ -UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg ); -if ( pStg ) -{ -return pStg-GetProperty( rEleName, rName, rValue ); -} -else -{ -DBG_WARNING(W1:Not implemented!); -return sal_False; -} -} - sal_Bool SotStorage::IsOLEStorage() const { UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg ); diff --git a/svtools/inc/svtools/PlaceEditDialog.hxx b/svtools/inc/svtools/PlaceEditDialog.hxx index 997707e..14a1fb0 100644 --- a/svtools/inc/svtools/PlaceEditDialog.hxx +++ b/svtools/inc/svtools/PlaceEditDialog.hxx @@ -100,8 +100,6 @@ public : rtl::OUString GetServerName() { return m_aEDServerName.GetText(); } rtl::OUString GetServerUrl(); - ResId GetResId( sal_uInt16 nId ); - private: void InitDetails( ); diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 6d3d12b..9807050 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -159,11 +159,6 @@ rtl::OUString PlaceEditDialog::GetServerUrl() return sUrl; } -ResId PlaceEditDialog::GetResId(sal_uInt16 nId) -{ -return SvtResId( nId ); -} - boost::shared_ptrPlace PlaceEditDialog::GetPlace() { boost::shared_ptrPlace newPlace( new Place( m_aEDServerName.GetText(), GetServerUrl(), true ) ); diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index a85cf1f..0a80eb8 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -2197,13 +2197,6 @@ sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor rFlavor, Refe // - -sal_Bool TransferableDataHelper::GetInterface( const DataFlavor rFlavor, Reference XInterface rIf ) -{ -const Any aAny( GetAny( rFlavor ) ); -return( aAny.hasValue() ( aAny = rIf ) ); -} - -// - void TransferableDataHelper::Rebind( const Reference XTransferable _rxNewContent ) { mxTransfer = _rxNewContent; diff --git a/sw/inc/unofield.hxx b/sw/inc/unofield.hxx index c583353..ddcc2e8 100644 --- a/sw/inc/unofield.hxx +++ b/sw/inc/unofield.hxx @@ -108,7 +108,6 @@ public: SwDoc* GetDoc() {return m_pDoc;} sal_BoolIsDescriptor()const {return m_bIsDescriptor;} -sal_uInt16 GetResId() const {return nResTypeId;} }; struct SwFieldProperties_Impl; diff --git a/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx index c438561..407af3e 100644 --- a/tools/source/fsys/tempfile.cxx +++ b/tools/source/fsys/tempfile.cxx @@ -244,11 +244,6 @@ TempFile::~TempFile() delete pImp; } -sal_Bool TempFile::IsValid() const -{ -return pImp-aName.Len() != 0; -} - String TempFile::GetName() const { rtl::OUString aTmp; diff --git a/unusedcode.easy b/unusedcode.easy index 2efaa7e..7e85a7c 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,5 +1,4 @@ FontSelectPattern::FontSelectPattern(PhysicalFontFace const, Size const, float, int, bool) -PlaceEditDialog::GetResId(unsigned short) PopupMenu::SetSelectedEntry(unsigned short) SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequencesigned char, com::sun::star::uno::Sequencesigned char, unsigned char) SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) @@ -8,11 +7,9 @@ ScVbaFormatooo::vba::excel::XStyle::getAddIndent() ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any const) ScVbaFormatooo::vba::excel::XStyle::setNumberFormat(com::sun::star::lang::Locale, rtl::OUString const)
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 44628, which changed state. Bug 44628 Summary: unopkg.exe does not find VC runtime during install (extension registration) https://bugs.freedesktop.org/show_bug.cgi?id=44628 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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] .: Branch 'libreoffice-3-6' - desktop/source
desktop/source/app/app.cxx| 75 ++ desktop/source/deployment/registry/component/dp_component.cxx |7 2 files changed, 55 insertions(+), 27 deletions(-) New commits: commit aed059b816a1df35be33598916acf341dd1a31ac Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 13 17:48:25 2012 +0200 fdo#53006: And detect LO downgrading scenarios... ...that reinstall potentially broken prereg data but do not touch the buildid file. Change-Id: I1b02d2c265523dd751d8ef7f2dccb59ed048f568 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cb9d3c3..4611ef3 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -211,6 +211,18 @@ void removeTree(OUString const url) { // detected here and lead to a removal of user/extensions/bundled, so that // Desktop::SynchronizeExtensionRepositories will then definitely resync // share/extensions.) +// As a special case, if you create a UserInstallation with LO = 3.6.1, then +// run an old LO = 3.5.x using share/prereg/bundled on the same +// UserInstallation (so that it partially overwrites user/extensions/bundled, +// potentially duplicating component information, but not touching +// user/extensions/bundled/buildid), and then run the new LO = 3.6.1 on the +// same UserInstallation again, it can fail to start (due to the duplicated +// component information). Even though such downgrading scenarios at best work +// by luck in general, the special token LIBO_NON_PREREG_BUNDLED_EXTENSIONS=TRUE +// is used to detect and fix that problem: The assumption is that if an old LO +// = 3.5.x messed with user/extensions/bundled in the meantime, then it would +// have rewritten the unorc (dropping the token), and LO = 3.6.1 can detect +// that. void refreshBundledExtensionsDir() { OUString buildId( ${$BRAND_BASE_DIR/program/ SAL_CONFIGFILE(version) :buildid}); @@ -218,36 +230,44 @@ void refreshBundledExtensionsDir() { OUString dir($BUNDLED_EXTENSIONS_USER); rtl::Bootstrap::expandMacros(dir); //TODO: detect failure OUString url(dir + /buildid); -osl::File f(url); -switch (f.open(osl_File_OpenFlag_Read)) { -case osl::FileBase::E_None: -{ -rtl::ByteSequence s1; -osl::FileBase::RC rc = f.readLine(s1); -if (f.close() != osl::FileBase::E_None) { -SAL_WARN(desktop, cannot close + url + after reading); -} -if (rc != osl::FileBase::E_None) { -throw css::uno::RuntimeException( -cannot read from + url, -css::uno::Reference css::uno::XInterface ()); -} -OUString s2( -reinterpret_cast char const * (s1.getConstArray()), -s1.getLength(), RTL_TEXTENCODING_ISO_8859_1); -// using ISO 8859-1 avoids any and all conversion errors; the -// content should only be a subset of ASCII, anyway -if (s2 == buildId) { -return; +OUString nonPrereg( +${$BUNDLED_EXTENSIONS_USER/registry/ +com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc: +LIBO_NON_PREREG_BUNDLED_EXTENSIONS}); +rtl::Bootstrap::expandMacros(nonPrereg); +if (nonPrereg == TRUE) { +osl::File f(url); +switch (f.open(osl_File_OpenFlag_Read)) { +case osl::FileBase::E_None: +{ +rtl::ByteSequence s1; +osl::FileBase::RC rc = f.readLine(s1); +if (f.close() != osl::FileBase::E_None) { +SAL_WARN( +desktop, cannot close + url + after reading); +} +if (rc != osl::FileBase::E_None) { +throw css::uno::RuntimeException( +cannot read from + url, +css::uno::Reference css::uno::XInterface ()); +} +OUString s2( +reinterpret_cast char const * (s1.getConstArray()), +s1.getLength(), RTL_TEXTENCODING_ISO_8859_1); +// using ISO 8859-1 avoids any and all conversion errors; +// the content should only be a subset of ASCII, anyway +if (s2 == buildId) { +return; +} +break; } +case osl::FileBase::E_NOENT: break; +default: +throw css::uno::RuntimeException( +cannot open + url + for reading, +css::uno::Reference css::uno::XInterface ()); } -case osl::FileBase::E_NOENT: -break; -default: -throw css::uno::RuntimeException( -cannot open + url + for reading, -css::uno::Reference css::uno::XInterface ()); }
Re: [PUSHED 3-6] fdo#53006: And detect LO downgrading scenarios
Stephan Bergmann píše v Po 13. 08. 2012 v 18:01 +0200: As Petr found out, if you first run LO 3.6.1, then some old LO 3.5.x (making use of share/prereg/bundled), then LO 3.6.1 again, all on the same UserInstallation, it can still happen that LO 3.6.1 refuses to start (as LO 3.5.x copied potentially broken data to user/extensions/bundled but did not touch user/extensions/bundled/buildid, so that LO 3.6.1 would not detect that it needs to remove the potentially poisonous data again). http://cgit.freedesktop.org/libreoffice/core/commit/?id=e9631f40ee49a244b6c6816e5cfb36814b9bafba fdo#53006: And detect LO downgrading scenarios... addresses that by adding yet another pirouette (even though one could argue that such downgrading scenarios never worked by design, anyway). Between Petr and me, we have seen it to be effective for both Linux and Windows (master, at least). Please review and consider for backporting to libreoffice-3-6. It works fine. It is great that you have found this solution. I have pushed it into the 3-6 branch. Thanks a lot for coping with this annoying bug. I keep my finger crossed. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Translate German comments in sw/source/core/docnode/ndnotxt....
From Bertrand Lorentz bertrand.lore...@gmail.com: Bertrand Lorentz has uploaded a new change for review. Change subject: Translate German comments in sw/source/core/docnode/ndnotxt.cxx .. Translate German comments in sw/source/core/docnode/ndnotxt.cxx Change-Id: Ibc948a9f1770945e5d9d37891570f0836ef3e231 --- M sw/source/core/docnode/ndnotxt.cxx 1 file changed, 6 insertions(+), 15 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/407/1 -- To view, visit https://gerrit.libreoffice.org/407 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc948a9f1770945e5d9d37891570f0836ef3e231 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Bertrand Lorentz bertrand.lore...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 8054472f666c87d6437dcea064c3cef379916245 Author: Miklos Vajna vmik...@suse.cz Date: Fri Aug 10 17:48:57 2012 +0200 fdo#48446 implement RTF_CPG (cherry picked from commit f6a24ace5ad12e79f0cc90709a290a30e3758781) Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 2074d69..1355501 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2373,6 +2373,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_ANSICPG: m_aStates.top().nCurrentEncoding = rtl_getTextEncodingFromWindowsCodePage(nParam); break; +case RTF_CPG: +m_aFontEncodings[m_nCurrentFontIndex] = rtl_getTextEncodingFromWindowsCodePage(nParam); +break; case RTF_CF: { // NS_sprm::LN_CIco won't work, that would be an index in a static table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-3-6]: fdo#48446 implement RTF_CPG
From Petr Mladek pmla...@suse.cz: Petr Mladek has submitted this change and it was merged. Change subject: fdo#48446 implement RTF_CPG .. fdo#48446 implement RTF_CPG (cherry picked from commit f6a24ace5ad12e79f0cc90709a290a30e3758781) Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3 --- M writerfilter/source/rtftok/rtfdocumentimpl.cxx 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/386 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 98e895db332446b3fe2fc901a6cf9cff64d2b1b8 Author: Miklos Vajna vmik...@suse.cz Date: Fri Aug 10 17:48:57 2012 +0200 fdo#48446 implement RTF_CPG (cherry picked from commit f6a24ace5ad12e79f0cc90709a290a30e3758781) Change-Id: I2fb2004f2f755ce337ddd1419acf2510f17622f3 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 8e34ad3..32366cc 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2390,6 +2390,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam) case RTF_ANSICPG: m_aStates.top().nCurrentEncoding = rtl_getTextEncodingFromWindowsCodePage(nParam); break; +case RTF_CPG: +m_aFontEncodings[m_nCurrentFontIndex] = rtl_getTextEncodingFromWindowsCodePage(nParam); +break; case RTF_CF: { // NS_sprm::LN_CIco won't work, that would be an index in a static table ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
Noel Grandin wrote - zero tolerance policy for regression issues during development - zero tolerance policy for crash issues during development People who advocate zero tolerance for such things are welcome to provide the time and financial resources necessary to achieve this. Hi. Or maybe change in the base code workflow is needed? 1. design the change 2. find out which modules are affected 3. plan testing 4. code 5. prepare unit tests 6. careful code review (not just OKeying) 7. commit in the unstable branch 8. QA confirm 9. commit in the stable branch I think many bugs introduced are an effect of omitting one (or more) steps from that list by the developer. Using best coding practices always would help a lot. Maybe gerrit will help to achieve this in some way... Best regards. -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4000217p4001027.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
Re: minutes of ESC call ...
Michael Meeks-2 wrote On the other hand giving all developers the idea that testing / bug fixing can be endlessly deferred since we'll never release - is a really poor plan too; one aspect of that is that it's not fair on the people that work diligently to test and fix things so we can release at a given time. Hi. Sure, nobody want to repeat 10 OpenOffice 3.3.0 RCs nonsense... Best regards. -- View this message in context: http://nabble.documentfoundation.org/minutes-of-ESC-call-tp4000217p4001028.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
Re: minutes of ESC call ...
On Mon, Aug 13, 2012 at 10:26:57AM -0700, bfo wrote: Or maybe change in the base code workflow is needed? 1. design the change currently done 2. find out which modules are affected would require a lot of cleanup in the codebase to make sensible predictions for nontrivial changes here. We are working towards that, but we inherited a _lot_ of cruft. 3. plan testing If you change e.g. refactor SfxItemSet that might impact ~everything. From a prediction point of view our tests are good enough. Realistically though there are cornercases, that wont get cought by unittests or subsequenttest. And we wont catch those cornercases if we spend a year on writing tests. They are cornercases and our codebase is huge. 4. code 5. prepare unit tests Shouldnt 5 come first? 6. careful code review (not just OKeying) Will you help there? 7. commit in the unstable branch currently done. 8. QA confirm currently done implicitly for every bug not reported by QA at branchoff (because there is to few testing of master). 9. commit in the stable branch currently done I think many bugs introduced are an effect of omitting one (or more) steps from that list by the developer. nope, I think you are just underestimating the size of the codebase (and the range of our target platforms). Suggested reading: Michael Feathers, Working Effectively with Legacy Code Maybe gerrit will help to achieve this in some way... It will, with automated testing and, if the QA community grows a bit (well a lot), also with manual testing. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/inc sc/qa sc/source
sc/inc/stringutil.hxx | 26 +++ sc/qa/unit/data/html/numberformat.html |8 +++ sc/qa/unit/subsequent_filters-test.cxx | 37 +++-- sc/qa/unit/ucalc.cxx |2 - sc/source/core/data/column3.cxx|4 +-- sc/source/core/data/dpoutput.cxx |6 ++--- sc/source/core/tool/stringutil.cxx |2 - sc/source/filter/rtf/eeimpars.cxx |2 - sc/source/ui/docshell/impex.cxx|4 +-- 9 files changed, 75 insertions(+), 16 deletions(-) New commits: commit 51f1fc69aa539dec8035195b98e0b128026388e9 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Aug 13 14:20:13 2012 -0400 fdo#53089: Avoid setting valid numbers as text during html import. Change-Id: I5fa9a54f70e8e4d8aac42687f2a204b2925d4619 diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index a178beb..75c378c 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -41,6 +41,25 @@ class SvNumberFormatter; */ struct SC_DLLPUBLIC ScSetStringParam { +enum TextFormatPolicy +{ +/** + * Set Text number format no matter what the input string is. + */ +Always, + +/** + * Set Text number format only when the input string is considered a + * special number but we only want to detect a simple number. + */ +SpecialNumberOnly, + +/** + * Never set Text number format. + */ +Never +}; + /** * Stores the pointer to the number formatter instance to be used during * number format detection. The caller must manage the life cycle of the @@ -56,11 +75,10 @@ struct SC_DLLPUBLIC ScSetStringParam bool mbDetectNumberFormat; /** - * When true, set the format of the cell to Text when a string cell is - * requested for a number input. We may want to do this during text file - * import (csv, html etc). + * Determine when to set the 'Text' number format to the cell where the + * input string is being set. */ -bool mbSetTextCellFormat; +TextFormatPolicy meSetTextNumFormat; /** * When true, treat input with a leading apostrophe / single quote special diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index e8b959b..8a401e2 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -370,7 +370,7 @@ void Test::testInput() // Customized string handling policy. ScSetStringParam aParam; aParam.mbDetectNumberFormat = false; -aParam.mbSetTextCellFormat = true; +aParam.meSetTextNumFormat = ScSetStringParam::Always; aParam.mbHandleApostrophe = false; m_pDoc-SetString(0, 0, 0, 000123, aParam); m_pDoc-GetString(0, 0, 0, test); diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 61edb03..1d2e21c 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1339,7 +1339,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String rString, } } } -else if (!aParam.mbSetTextCellFormat) +else if (aParam.meSetTextNumFormat != ScSetStringParam::Always) { // Only check if the string is a regular number. const LocaleDataWrapper* pLocale = aParam.mpNumFormatter-GetLocaleData(); @@ -1365,7 +1365,7 @@ bool ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String rString, if (!pNewCell) { -if (aParam.mbSetTextCellFormat aParam.mpNumFormatter-IsNumberFormat(rString, nIndex, nVal)) +if (aParam.meSetTextNumFormat != ScSetStringParam::Never aParam.mpNumFormatter-IsNumberFormat(rString, nIndex, nVal)) { // Set the cell format type to Text. sal_uInt32 nFormat = aParam.mpNumFormatter-GetStandardFormat(NUMBERFORMAT_TEXT); diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index b57d639..a3c3a99 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -790,13 +790,13 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, if (bNumeric) { aParam.mbDetectNumberFormat = true; -aParam.mbSetTextCellFormat = false; +aParam.meSetTextNumFormat = ScSetStringParam::Never; aParam.mbHandleApostrophe = true; } else { aParam.mbDetectNumberFormat = false; -aParam.mbSetTextCellFormat = true; +aParam.meSetTextNumFormat = ScSetStringParam::Always; aParam.mbHandleApostrophe = false; } pDoc-SetString(nCol, nRow, nTab, rData.Caption, aParam); @@ -834,7 +834,7 @@ void ScDPOutput::FieldCell( // Avoid unwanted automatic format detection. ScSetStringParam
Re: gstreamer-1.0 support ...
Hi Michael, On Mon, 2012-08-13 at 17:21 +0200, Michael Stahl wrote: uhm... considering that this newfangled thing isn't even released yet, i would prefer (for now) to default to 0.10 and fall back to 1.0 in any generic binary builds The 'for now' is only in master. The order is to try to use the latest greatest; if it is not there (by default it is not even compiled so = that's the majority case) it'll discover that quickly and move on. we can always switch the default to 1.0 for the next release once we have some experiences and know there aren't any serious problems. Hopefully end-user systems would tend to have only one version of gstreamer installed, hopefully the latest one. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/qa
sc/qa/unit/data/csv/numberformat.csv |3 +++ sc/qa/unit/subsequent_filters-test.cxx | 30 ++ 2 files changed, 33 insertions(+) New commits: commit b8430f71d37ea5181fc812fc07a20555b07a0b3c Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Aug 13 14:45:59 2012 -0400 Add test for csv filter as well. The content is intentionally identical to the html counterpart. Change-Id: Ie9a91ceafdb56a0c915bc0175d49bb494c38e9af diff --git a/sc/qa/unit/data/csv/numberformat.csv b/sc/qa/unit/data/csv/numberformat.csv new file mode 100644 index 000..2111b94 --- /dev/null +++ b/sc/qa/unit/data/csv/numberformat.csv @@ -0,0 +1,3 @@ +Product,Price,Note +Google Nexus 7 (8GB),199.98,This should be imported as a number, not text. + diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 4f7a23b..32cfb76 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -149,6 +149,7 @@ public: void testControlImport(); void testNumberFormatHTML(); +void testNumberFormatCSV(); CPPUNIT_TEST_SUITE(ScFiltersTest); CPPUNIT_TEST(testRangeNameXLS); @@ -184,6 +185,7 @@ public: CPPUNIT_TEST(testCondFormat); CPPUNIT_TEST(testNumberFormatHTML); +CPPUNIT_TEST(testNumberFormatCSV); //disable testPassword on MacOSX due to problems with libsqlite3 //also crashes on DragonFly due to problems with nss/nspr headers @@ -1209,6 +1211,34 @@ void ScFiltersTest::testNumberFormatHTML() // B2 should be imported as a value cell. bool bHasValue = pDoc-HasValueData(1, 1, 0); CPPUNIT_ASSERT_MESSAGE(Fail to import number as a value cell., bHasValue); +CPPUNIT_ASSERT_MESSAGE(Incorrect value., pDoc-GetValue(1, 1, 0) == 199.98); + +xDocSh-DoClose(); +} + +void ScFiltersTest::testNumberFormatCSV() +{ +OUString aFileNameBase(numberformat.); +OUString aFileExt = OUString::createFromAscii(aFileFormats[CSV].pName); +OUString aFilterName = OUString::createFromAscii(aFileFormats[CSV].pFilterName); +OUString aFilterType = OUString::createFromAscii(aFileFormats[CSV].pTypeName); + +rtl::OUString aFileName; +createFileURL(aFileNameBase, aFileExt, aFileName); +ScDocShellRef xDocSh = load (aFilterName, aFileName, rtl::OUString(), aFilterType, aFileFormats[CSV].nFormatType); +CPPUNIT_ASSERT_MESSAGE(Failed to load numberformat.html, xDocSh.Is()); + +ScDocument* pDoc = xDocSh-GetDocument(); + +// Check the header just in case. +CPPUNIT_ASSERT_MESSAGE(Cell value is not as expected, pDoc-GetString(0, 0, 0) == Product); +CPPUNIT_ASSERT_MESSAGE(Cell value is not as expected, pDoc-GetString(1, 0, 0) == Price); +CPPUNIT_ASSERT_MESSAGE(Cell value is not as expected, pDoc-GetString(2, 0, 0) == Note); + +// B2 should be imported as a value cell. +bool bHasValue = pDoc-HasValueData(1, 1, 0); +CPPUNIT_ASSERT_MESSAGE(Fail to import number as a value cell., bHasValue); +CPPUNIT_ASSERT_MESSAGE(Incorrect value., pDoc-GetValue(1, 1, 0) == 199.98); xDocSh-DoClose(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 81 +++ 1 file changed, 81 insertions(+) New commits: commit bf222b4985ca535903835980357687ae6e137ba1 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Aug 13 15:07:56 2012 -0400 Unit test for pivot table's text number field member output. Change-Id: Id7aa174fa26adb601ce652ba57c032e6b1c79dab diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 8a401e2..ea545f6 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -168,6 +168,7 @@ public: void testPivotTableNumberGrouping(); void testPivotTableDateGrouping(); void testPivotTableEmptyRows(); +void testPivotTableTextNumber(); void testSheetCopy(); void testSheetMove(); @@ -239,6 +240,7 @@ public: CPPUNIT_TEST(testPivotTableNumberGrouping); CPPUNIT_TEST(testPivotTableDateGrouping); CPPUNIT_TEST(testPivotTableEmptyRows); +CPPUNIT_TEST(testPivotTableTextNumber); CPPUNIT_TEST(testSheetCopy); CPPUNIT_TEST(testSheetMove); CPPUNIT_TEST(testExternalRef); @@ -2837,6 +2839,85 @@ void Test::testPivotTableEmptyRows() m_pDoc-DeleteTab(0); } +void Test::testPivotTableTextNumber() +{ +m_pDoc-InsertTab(0, OUString(Data)); +m_pDoc-InsertTab(1, OUString(Table)); + +// Raw data +const char* aData[][2] = { +{ Name, Value }, +{ 0001, 1 }, +{ 0002, 2 }, +{ 0003, 3 }, +{ 0004, 4 }, +}; + +// Dimension definition +DPFieldDef aFields[] = { +{ Name, sheet::DataPilotFieldOrientation_ROW, 0 }, +{ Value, sheet::DataPilotFieldOrientation_DATA, sheet::GeneralFunction_SUM }, +}; + +// Insert raw data such that the first column values are entered as text. +size_t nRowCount = SAL_N_ELEMENTS(aData); +for (size_t nRow = 0; nRow nRowCount; ++nRow) +{ +ScSetStringParam aParam; +aParam.mbDetectNumberFormat = false; +aParam.meSetTextNumFormat = ScSetStringParam::Always; +m_pDoc-SetString(0, nRow, 0, OUString::createFromAscii(aData[nRow][0]), aParam); +aParam.meSetTextNumFormat = ScSetStringParam::Never; +m_pDoc-SetString(1, nRow, 0, OUString::createFromAscii(aData[nRow][1]), aParam); + +if (nRow == 0) +// Don't check the header row. +continue; + +// Check the data rows. +CPPUNIT_ASSERT_MESSAGE(This cell is supposed to be text., m_pDoc-HasStringData(0, nRow, 0)); +CPPUNIT_ASSERT_MESSAGE(This cell is supposed to be numeric., m_pDoc-HasValueData(1, nRow, 0)); +} + +ScRange aDataRange(0, 0, 0, 1, 4, 0); + +ScDPObject* pDPObj = createDPFromRange( +m_pDoc, aDataRange, aFields, SAL_N_ELEMENTS(aFields), false); + +ScDPCollection* pDPs = m_pDoc-GetDPCollection(); +bool bSuccess = pDPs-InsertNewTable(pDPObj); + +CPPUNIT_ASSERT_MESSAGE(failed to insert a new pivot table object into document., bSuccess); +CPPUNIT_ASSERT_MESSAGE(there should be only one data pilot table., + pDPs-GetCount() == 1); +pDPObj-SetName(pDPs-CreateNewName()); + +ScRange aOutRange = refresh(pDPObj); + +{ +// Expected output table content. 0 = empty cell +const char* aOutputCheck[][2] = { +{ Name, 0 }, +{ 0001, 1 }, +{ 0002, 2 }, +{ 0003, 3 }, +{ 0004, 4 }, +{ Total Result, 10 }, +}; + +bSuccess = checkDPTableOutput2(m_pDoc, aOutRange, aOutputCheck, Text number field members); +CPPUNIT_ASSERT_MESSAGE(Table output check failed, bSuccess); +} + +pDPs-FreeTable(pDPObj); +CPPUNIT_ASSERT_EQUAL_MESSAGE(There should be no more tables., pDPs-GetCount(), static_castsize_t(0)); +CPPUNIT_ASSERT_EQUAL_MESSAGE(There shouldn't be any more cache stored., + pDPs-GetSheetCaches().size(), static_castsize_t(0)); + +m_pDoc-DeleteTab(1); +m_pDoc-DeleteTab(0); +} + void Test::testSheetCopy() { OUString aTabName(TestTab); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] Fix for fdo#53089
Hi there, I'd like http://cgit.freedesktop.org/libreoffice/core/commit/?id=51f1fc69aa539dec8035195b98e0b128026388e9 cherry-picked to the 3-6 branch. It fixes https://bugs.freedesktop.org/show_bug.cgi?id=53089 while making sure that https://bugs.freedesktop.org/show_bug.cgi?id=52205 and https://bugs.freedesktop.org/show_bug.cgi?id=43109 remain fixed. The highlight of this commit is 1) revert my original fix for fdo#43109 and Eike's subsequent fix for fdo#52205, and 2) fix fdo#43109 the right way (such that it won't introduce fdo#53089). I've added 3 new unit tests for this (on master), one for each bug. They all pass. Review and cherry-pick appreciated. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #8
On Mon, 13 Aug 2012 20:39:34 +0200, Michael Meeks michael.me...@suse.com wrote: Hi Marco, On Mon, 2012-08-13 at 17:25 +0200, Marco Cecchetti wrote: scp foo.svg git-account-name@users.freedesktop.org: ... thanks a lot for having pointed out this solution! I wasn't aware of that. It will simplify my work for sure. :) I have a problem with the above solution. I usually push the the remote git repository by using my gpg pass-phrase and for sure I created a freedesktop account but I have no clue on which the account name is. Ho hum - so if you look at your core/.git/config - you should see a line something like: url = ssh://mich...@git.freedesktop.org/git/libreoffice/core Where I have michael@ you have git-account-name@ - which is what you should use in the ssh command above :-) Hope that helps ! Thanks a lot Michael, it works! Now all my sample presentations included the last one are available at http://users.freedesktop.org/~mcecchetti/svg-export/samples/ Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Missing ICU Library
Hi, when trying to compile LO on Ubuntu 12.04, I get the following error in tail_build followed by a long list of 'undefined reference' warnings: /usr/bin/ld: warning: libicuuc.so.49, needed by solver/unxlngi6.pro/lib/libicui18n.so, not found (try using -rpath or -rpath-link) On my system I have libicu48, how can I get the new version or is there another way to compile with the old version? Thanks Samuel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC 2012][Collaboration] brief status
Hi Eike, On 8 August 2012 17:51, Eike Rathke er...@redhat.com wrote: And also when we are collaborating and either we or the other side gets offline, message is printed in the terminal and the mode is switched back to normal. Wow! That's great! How do you detect offline? In fact, it does not work as expected :-(. Because when the contact closes the document, he is still online, so we don't know about closed channel. Then I thought chat-state-changed [1] could work, but does not seem to. (I've only now found it's deprecated, I will try the new version also.) Now I use signal emitted when the channel is closed but then the info popup is displayed also when we close the document. Or maybe I could work on 'Live updated presence indicators in calc' This sounds feasible, and could be done in a Calc independent manner. What do you mean by Calc independent manner ? I think this was about displaying which cells are the other contact(s) on, like in google docs. Sorry, it took me so long to reply, Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSOC-UPDATE] Impress Remote
Hi everyone, Today's updates: - Refactoring of the Communication Service for fully threaded networking. - Pairing now works!* * Pairing by itself works, if the correct IP address is known. Finding servers / their IP addresses also works. (I don't yet know whether the two combined work -- I'm currently away from home, and without access to a wireless router -- server finding doesn't work in the emulator, and tethering doesn't allow communication between phone and computer -- I'm still looking at how to test this, but from the weekend I'm home again where I can properly test.) Finally, the Libreoffice dialog needed for pairing works, but still needs some GUI work. Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSoC 2012][Collaboration] brief status
Hello, Wow! That's great! How do you detect offline? In fact, it does not work as expected :-(. Because when the contact closes the document, he is still online, so we don't know about closed channel. My 2 cents: Could you use something like a keepalive signal ? A timeout could then be used to detect that other end has quit either by crashing, loosing network or just by closing the document. -- Jean-Tiare LE BIGOT ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Missing ICU Library
Hi, Did you try to follow this page: http://wiki.documentfoundation.org/Development/Native_Build ? (above all http://wiki.documentfoundation.org/Development/Linux_Build_Dependencies) Which sources are you compiling ? 3.5, 3.6, master from git ? Julien -- View this message in context: http://nabble.documentfoundation.org/Missing-ICU-Library-tp4001056p4001061.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
[PATCH] fdo#35323 - fix for The standard date format for Swedish is ...
From Albert Thuswaldner albert.thuswald...@gmail.com: Albert Thuswaldner has uploaded a new change for review. Change subject: fdo#35323 - fix for The standard date format for Swedish is wrong .. fdo#35323 - fix for The standard date format for Swedish is wrong Change-Id: I967b75b54a330692fb88783609e714d016506f89 --- M i18npool/source/localedata/data/sv_SE.xml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/408/1 -- To view, visit https://gerrit.libreoffice.org/408 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I967b75b54a330692fb88783609e714d016506f89 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Albert Thuswaldner albert.thuswald...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Missing ICU Library
Yes, I followed the instructions there. I already had a successful build, but that was last year and on an older Ubuntu version. I am compiling from master, pulled yesterday. http://wiki.documentfoundation.org/Development/How_to_build/Configure_options On this page I saw a configure option '--with-system-icu'. Is there an option to use the internal icu? Samuel Am 13.08.2012 21:40, schrieb julien2412: Hi, Did you try to follow this page: http://wiki.documentfoundation.org/Development/Native_Build ? (above all http://wiki.documentfoundation.org/Development/Linux_Build_Dependencies) Which sources are you compiling ? 3.5, 3.6, master from git ? Julien -- View this message in context: http://nabble.documentfoundation.org/Missing-ICU-Library-tp4001056p4001061.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 mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] More STL'ification (7)
On 13/08/12 15:37, Noel Grandin wrote: Hi These patches convert various places from using tools/list.hxx to using normal STL containers. thanks, pushed to master. patch #2 had some problems; nIdx becomes n here: (ridiculous indentation by original code author) - aCharPropList.Insert( pNewCPS, nIdx + 1 ); + aCharPropList.insert( aCharPropList.begin() + n + 1, pNewCPS ); n++ missing: - aCharPropList.Insert( pBefCPS, n++ ); + aCharPropList.insert( aCharPropList.begin() + n, pBefCPS ); this is broken because the same nCurPos is used for both the paragraph properties and the character properties, while actually a single paragraph may have multiple character properties/text portions, so it's necessary to have 2 independent iterators. -PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader rPropReader, const PPTStyleSheet rStyleSheet, +PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader rPropReader, sal_uInt32 nCurPos, const PPTStyleSheet rStyleSheet, sal_uInt32 nInstance, PPTTextRulerInterpreter rRuler ) : -PPTParaPropSet ( *( (PPTParaPropSet*)rPropReader.aParaPropList.GetCurObject() ) ), +PPTParaPropSet ( *rPropReader.aParaPropList[nCurPos] ), PPTNumberFormatCreator ( NULL ), PPTTextRulerInterpreter ( rRuler ), mrStyleSheet( rStyleSheet ), @@ -5645,18 +5643,18 @@ PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader rPropReader, const PPT mnPortionCount ( 0 ), mpPortionList ( NULL ) { -sal_uInt32 nCurPos = rPropReader.aCharPropList.GetCurPos(); -PPTCharPropSet* pCharPropSet = (PPTCharPropSet*)rPropReader.aCharPropList.GetCurObject(); +PPTCharPropSet* pCharPropSet = rPropReader.aCharPropList[nCurPos]; if ( pCharPropSet ) { sal_uInt32 nCurrentParagraph = pCharPropSet-mnParagraph; -for ( ; pCharPropSet ( pCharPropSet-mnParagraph == nCurrentParagraph ); pCharPropSet = (PPTCharPropSet*)rPropReader.aCharPropList.Next() ) +for ( sal_uInt32 n = nCurPos; + n rPropReader.aCharPropList.size() rPropReader.aCharPropList[n]-mnParagraph == nCurrentParagraph; ++n ) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] logerrit: Fix some typos.
From Tim Retout t...@retout.co.uk: Tim Retout has uploaded a new change for review. Change subject: logerrit: Fix some typos. .. logerrit: Fix some typos. Change-Id: I0d6f3f5521d32dad1ffaa8675d5f43c7d7fa7cea --- M logerrit 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/409/1 -- To view, visit https://gerrit.libreoffice.org/409 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d6f3f5521d32dad1ffaa8675d5f43c7d7fa7cea Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tim Retout t...@retout.co.uk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/workbookhelper.cxx | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit ae296a60781a2b5d5b7523cbda3444e3dd21506f Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Aug 13 17:08:57 2012 -0400 fdo#53456: initialize pivot tables *after* the formula cells. Or else all the formula cells within pivot table's source ranges would be treated as if they are empty. Change-Id: Ib04f4902863b091c483711eeaf31a282f6feaf67 diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index db6342d..bf7b955 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -590,7 +590,14 @@ void WorkbookGlobals::finalize() aPropSet.setProperty( PROP_IsExecuteLinkEnabled, true ); // #i79826# enable updating automatic row height after loading the document aPropSet.setProperty( PROP_IsAdjustHeightEnabled, true ); + getFormulaBuffer().finalizeImport(); + +// Insert all pivot tables. Must be done after loading all sheets and +// formulas, because data pilots expect existing source data on +// creation. +getPivotTables().finalizeImport(); + // #i76026# enable Undo after loading the document aPropSet.setProperty( PROP_IsUndoEnabled, true ); // disable editing read-only documents (e.g. from read-only files) @@ -657,10 +664,6 @@ void WorkbookHelper::finalizeWorkbookImport() mrBookGlob.getWorkbookSettings().finalizeImport(); mrBookGlob.getViewSettings().finalizeImport(); -/* Insert all pivot tables. Must be done after loading all sheets, because -data pilots expect existing source data on creation. */ -mrBookGlob.getPivotTables().finalizeImport(); - /* Insert scenarios after all sheet processing is done, because new hidden sheets are created for scenarios which would confuse code that relies on certain sheet indexes. Must be done after pivot tables too. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW 3-6] Fix pivot table import from xlsx (fdo#53456)
Hi there, I'd like http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae296a60781a2b5d5b7523cbda3444e3dd21506f cherry-picked into 3-6. This fixes https://bugs.freedesktop.org/show_bug.cgi?id=53456 The gist of the bug is that, pivot table would treat all formula cells within its source range as empty, and the reason was simply because the formula cells were imported *after* the pivot tables were initialized...(so they were indeed empty at the time of pivot table construction) Simply switching the order to put the pivot table initialization after the formula cells fixes the problem. Review and cherry-pick appreciated. I think this one is a pretty safe simple fix. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'feature/unitymenus' - vcl/source vcl/unx
vcl/source/window/menu.cxx| 68 +- vcl/unx/gtk/window/gtksalmenu.cxx | 24 ++--- 2 files changed, 27 insertions(+), 65 deletions(-) New commits: commit 8af3f23b0632beec4147329877717d431c6942c0 Author: Antonio Fernandez antonio.fernan...@aentos.es Date: Mon Aug 13 22:19:30 2012 +0100 All menu labels are now displayed. There are some issues with repeated labels. Change-Id: I1b92b91f34003f20aaa56558c1c0e231d1de6f94 diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 3a14ca6..e921805 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -3244,6 +3244,15 @@ void Menu::HighlightItem( sal_uInt16 nItemPos ) } } +void Menu::Freeze() { +SalMenu *pSalMenu = ImplGetSalMenu(); + +if ( pSalMenu ) { +pSalMenu-Freeze(); +} +} + + // --- // - MenuBar - // --- @@ -6069,63 +6078,4 @@ ImplMenuDelData::~ImplMenuDelData() const_cast Menu* ( mpMenu )-ImplRemoveDel( *this ); } -#include iostream - -using namespace std; - -void printMenu( AbstractMenu* pMenu ) { -if ( pMenu ) { -sal_uInt16 itemCount = pMenu-GetItemCount(); -MenuItemList *items = ((Menu*)pMenu)-GetItemList(); - -for (int i=0; i itemCount; i++) { -MenuItemData *itemData = items-GetDataFromPos(i); -sal_uInt16 itemId = pMenu-GetItemId(i); - -if (itemData-eType == MENUITEM_SEPARATOR) { -cout --- endl; -} else { -rtl::OUString itemText = itemData-aText; -rtl::OUString cmdString = itemData-aCommandStr; -cout Item ID: itemIdText: itemText CMD: cmdString endl; - -if (itemData-pSubMenu) { -cout SUBMENU endl; -//FIXME: This callback would introduce some noise in accessibility software. -itemData-pSubMenu-Activate(); -printMenu( itemData-pSubMenu ); -} -} -} -} -} - -void generateMenuHierarchy( AbstractMenu* pMenu ) { -if ( pMenu ) { -sal_uInt16 itemCount = pMenu-GetItemCount(); -MenuItemList *items = ((Menu*)pMenu)-GetItemList(); - -for (int i=0; i itemCount; i++) { -MenuItemData *itemData = items-GetDataFromPos(i); - -if (itemData-pSubMenu) { -itemData-pSubMenu-Activate(); -generateMenuHierarchy( itemData-pSubMenu ); -} -} -} -} - -void Menu::Freeze() { -//printMenu( this ); -generateMenuHierarchy( this ); -//cout endl; - -SalMenu *pSalMenu = ImplGetSalMenu(); - -if ( pSalMenu ) { -pSalMenu-Freeze(); -} -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index c0a69c1..163564a 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -451,20 +451,32 @@ bool GtkSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle rRe return TRUE; } +void updateNativeMenu( GtkSalMenu* pMenu ) { +if ( pMenu ) { +for (int i=0; i pMenu-maItems.size(); i++) { +GtkSalMenuItem* pSalMenuItem = pMenu-maItems[ i ]; +String aText = pSalMenuItem-mpVCLMenu-GetItemText( pSalMenuItem-mnId ); + +// Force updating of native menu labels. +pMenu-SetItemText( i, pSalMenuItem, aText ); + +if ( pSalMenuItem-mpSubMenu pSalMenuItem-mpSubMenu-mpVCLMenu ) { +pSalMenuItem-mpSubMenu-mpVCLMenu-Activate(); +updateNativeMenu( pSalMenuItem-mpSubMenu ); +} +} +} +} void GtkSalMenu::Freeze() { -cout __FUNCTION__ endl; -GLOActionGroup *mpActionGroup = g_lo_action_group_new(); +updateNativeMenu( this ); -//GMenuModel *pMenuModel = generateMenuModelAndActions( this, mpActionGroup ); +GLOActionGroup *mpActionGroup = g_lo_action_group_new(); generateActions( this, mpActionGroup ); -//this-publishMenu( mpMenuModel, G_ACTION_GROUP( mpActionGroup ) ); - // Menubar would have one section only. this-publishMenu( mpMenuModel, G_ACTION_GROUP( mpActionGroup ) ); -//g_object_unref( pMenuModel ); } // === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/download.pm | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) New commits: commit 4b180f51c5cbaaabfcaba6899b5047c89d623cc2 Author: Tim Retout t...@retout.co.uk Date: Mon Aug 13 22:18:17 2012 +0100 installer::download: Clean up get_versionstring and make private Change-Id: I9499b7eb580b499ea63bbf8d6ba5bf45a1c460e1 diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 8174067..ac48fe5 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -542,18 +542,16 @@ sub get_downloadname_addon # This has to be the only content of this file. # -sub get_versionstring +sub _get_versionstring { my ( $versionfile ) = @_; my $versionstring = ; -for ( my $i = 0; $i = $#{$versionfile}; $i++ ) +for ( @{$versionfile} ) { -my $oneline = ${$versionfile}[$i]; - -if ( $oneline =~ /^\s*\#/ ) { next; } # comment line -if ( $oneline =~ /^\s*\\s*(.*?)\s*\\s*$/ ) +next if /^\s*\#/; # comment line +if ( /^\s*\\s*(.*?)\s*\\s*$/ ) { $versionstring = $1; last; @@ -580,7 +578,7 @@ sub get_current_version $infoline = File $filename exists. Trying to find current version.\n; push( @installer::globals::logfileinfo, $infoline); my $versionfile = installer::files::read_file($filename); -$versionstring = get_versionstring($versionfile); +$versionstring = _get_versionstring($versionfile); $infoline = Setting version string: $versionstring\n; push( @installer::globals::logfileinfo, $infoline); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Solarmutex Deadlock when Closing Calc which contains functions with XVolatileResult return values
Michael Stahl-2 wrote On 09/08/12 15:56, anwen wrote: I am also interested in XDocumentEventBroadcaster/XDocumentEventListener. I am wondering if you could correct my following code which tries to register a XDocumentListener with the XDocumentEventBroadcaster in a Calc Extension. I did some research on this topic. Most of examples initialize a EventBroadcaster following a bootstrap() method which could not be used in Calc Extension. i don't think documents implement XDocumentEventBroadcaster, but there is a GlobalEventBroadcaster service that you can get from the service factory: Object oGEB = m_xMSF.createInstance( com.sun.star.frame.GlobalEventBroadcaster); m_xGEB = UnoRuntime.queryInterface(XDocumentEventBroadcaster.class, oGEB); iirc the DocumentEvent that your listener gets then contains something that identifies the document that the event is for. I implemented the above code with c++ . However, it did not work. Anything wrong with the following code: m_xCC is a given ReferenceXComponentContext ReferenceXEventBroadcaster xBrd(m_xCC-getServiceManager()-createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.frame.GlobalEventbroadcaster)), m_xCC), UNO_QUERY); //xBrd is still empty, not sure why? if (xBrd.is()) { Reference XEventListener xDocListener( static_castXEventListener*(new CalcListener()), UNO_QUERY); xBrd-addEventListener(xDocListener); } Thanks, Wendi -- View this message in context: http://nabble.documentfoundation.org/Solarmutex-Deadlock-when-Closing-Calc-which-contains-functions-with-XVolatileResult-return-values-tp3998056p4001090.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] .: 2 commits - basic/source
basic/source/comp/dim.cxx | 14 - basic/source/comp/exprnode.cxx | 16 +- basic/source/comp/exprtree.cxx | 29 --- basic/source/comp/symtbl.cxx |4 +- basic/source/inc/expr.hxx | 61 - basic/source/runtime/step1.cxx |2 - 6 files changed, 61 insertions(+), 65 deletions(-) New commits: commit 65095170ffa3689d60792e0a9d7aa88471b08704 Author: Takeshi Abe t...@fixedpoint.jp Date: Tue Aug 14 07:34:12 2012 +0900 Remove declared but not defined function Change-Id: I74836b55375a6e2e57a989234bacf7186325b33e diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx index fa1dbac..92a67b9 100644 --- a/basic/source/inc/expr.hxx +++ b/basic/source/inc/expr.hxx @@ -235,7 +235,6 @@ public: short GetSize() { return nExpr; } short GetDims() { return nDim;} SbiExpression* Get( short ); -sal_Bool Test( const SbiProcDef );// parameter checks void Gen();// code generation void addExpression( SbiExpression* pExpr ); }; commit 1f224b02c8e9ff9420cec310a3bab567fc653c5f Author: Takeshi Abe t...@fixedpoint.jp Date: Tue Aug 14 07:32:51 2012 +0900 sal_Bool to bool Change-Id: Idb5ef3cebdd45bd91f7c0ae34e422fd651d395c9 diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index b5357cb..7fa0c00 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -867,21 +867,21 @@ SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl ) Next(); else for(;;) { -sal_Bool bByVal = sal_False; -sal_Bool bOptional = sal_False; -sal_Bool bParamArray = sal_False; +bool bByVal = false; +bool bOptional = false; +bool bParamArray = false; while( Peek() == BYVAL || Peek() == BYREF || Peek() == _OPTIONAL_ ) { -if ( Peek() == BYVAL ) Next(), bByVal = sal_True; -else if ( Peek() == BYREF ) Next(), bByVal = sal_False; -else if ( Peek() == _OPTIONAL_ )Next(), bOptional = sal_True; +if ( Peek() == BYVAL ) Next(), bByVal = true; +else if ( Peek() == BYREF ) Next(), bByVal = false; +else if ( Peek() == _OPTIONAL_ )Next(), bOptional = true; } if( bCompatible Peek() == PARAMARRAY ) { if( bByVal || bOptional ) Error( SbERR_UNEXPECTED, PARAMARRAY ); Next(); -bParamArray = sal_True; +bParamArray = true; } SbiSymDef* pPar = VarDecl( NULL, sal_False, sal_False ); if( !pPar ) diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx index 8f1ca35..a863413 100644 --- a/basic/source/comp/exprnode.cxx +++ b/basic/source/comp/exprnode.cxx @@ -158,7 +158,7 @@ SbiExprNode* SbiExprNode::GetRealNode() // This method transform the type, if it fits into the Integer range -sal_Bool SbiExprNode::IsIntConst() +bool SbiExprNode::IsIntConst() { if( eNodeType == SbxNUMVAL ) { @@ -169,24 +169,24 @@ sal_Bool SbiExprNode::IsIntConst() { nVal = (double) (short) nVal; eType = SbxINTEGER; -return sal_True; +return true; } } } -return sal_False; +return false; } -sal_Bool SbiExprNode::IsNumber() +bool SbiExprNode::IsNumber() { -return sal_Bool( eNodeType == SbxNUMVAL ); +return eNodeType == SbxNUMVAL; } -sal_Bool SbiExprNode::IsVariable() +bool SbiExprNode::IsVariable() { -return sal_Bool( eNodeType == SbxVARVAL ); +return eNodeType == SbxVARVAL; } -sal_Bool SbiExprNode::IsLvalue() +bool SbiExprNode::IsLvalue() { return IsVariable(); } diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx index 053bf42..710965d 100644 --- a/basic/source/comp/exprtree.cxx +++ b/basic/source/comp/exprtree.cxx @@ -32,8 +32,7 @@ SbiExpression::SbiExpression( SbiParser* p, SbiExprType t, SbiExprMode eMode, const KeywordSymbolInfo* pKeywordSymbolInfo ) { pParser = p; -bError = false; -bByVal = bBased = bBracket = sal_False; +bBased = bError = bByVal = bBracket = false; nParenLevel = 0; eCurExpr = t; m_eMode = eMode; @@ -52,8 +51,7 @@ SbiExpression::SbiExpression( SbiParser* p, double n, SbxDataType t ) pParser = p; eCurExpr = SbOPERAND; pNext = NULL; -bError = false; -bByVal = bBased = bBracket = sal_False; +bBased = bError = bByVal = bBracket = false; pExpr = new SbiExprNode( pParser, n, t ); pExpr-Optimize(); } @@ -62,8 +60,7 @@ SbiExpression::SbiExpression( SbiParser* p, const SbiSymDef r, SbiExprList* pPa { pParser = p; pNext = NULL; -