[Libreoffice-commits] core.git: sax/CppunitTest_sax_parser.mk sax/qa
sax/CppunitTest_sax_parser.mk |2 +- sax/qa/cppunit/parser.cxx | 13 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) New commits: commit f5ef612a6aa78481d67718ed20ab058d8ae2dcdb Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Sep 19 08:10:23 2014 +0200 Use FastSaxParser directly Change-Id: I2f21438a0ccc6bc096f3257c48e088c4114d9f45 diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk index d5ede46..a926121 100644 --- a/sax/CppunitTest_sax_parser.mk +++ b/sax/CppunitTest_sax_parser.mk @@ -17,6 +17,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sax_parser, \ comphelper \ cppu \ cppuhelper \ + expwrap \ sal \ test \ $(gb_UWINAPI) \ @@ -35,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_components,sax_parser,\ configmgr/source/configmgr \ framework/util/fwk \ i18npool/util/i18npool \ - sax/source/expatwrap/expwrap \ sfx2/util/sfx \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index c6a32c5..5674b11 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -10,12 +10,12 @@ #include sal/config.h #include com/sun/star/io/Pipe.hpp -#include com/sun/star/xml/sax/FastParser.hpp #include com/sun/star/xml/sax/FastToken.hpp #include com/sun/star/xml/sax/SAXParseException.hpp -#include com/sun/star/xml/sax/XFastParser.hpp +#include com/sun/star/xml/sax/XFastTokenHandler.hpp #include cppuhelper/implbase1.hxx +#include sax/fastparser.hxx #include test/bootstrapfixture.hxx using namespace css; @@ -57,7 +57,7 @@ public: class ParserTest: public test::BootstrapFixture { InputSource maInput; -uno::Reference XFastParser mxParser; +sax_fastparser::FastSaxParser maParser; uno::Reference XFastDocumentHandler mxDocumentHandler; uno::Reference DummyTokenHandler mxTokenHandler; @@ -78,9 +78,8 @@ private: void ParserTest::setUp() { test::BootstrapFixture::setUp(); -mxParser = css::xml::sax::FastParser::create(m_xContext); mxTokenHandler.set( new DummyTokenHandler() ); -mxParser-setTokenHandler( mxTokenHandler ); +maParser.setTokenHandler( mxTokenHandler ); } void ParserTest::tearDown() @@ -102,13 +101,13 @@ uno::Reference io::XInputStream ParserTest::createStream(const OString sInpu void ParserTest::parse() { maInput.aInputStream = createStream(a...b /../a); -mxParser-parseStream( maInput ); +maParser.parseStream( maInput ); maInput.aInputStream = createStream(b/a); bool bException = false; try { -mxParser-parseStream( maInput ); +maParser.parseStream( maInput ); } catch (const SAXParseException ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/component/Button.cxx |4 - forms/source/component/Button.hxx | 12 + forms/source/component/CheckBox.cxx |2 forms/source/component/Columns.hxx|8 +-- forms/source/component/ComboBox.cxx | 14 +++--- forms/source/component/ComboBox.hxx | 17 +++ forms/source/component/Currency.cxx |6 +- forms/source/component/DatabaseForm.cxx | 36 +++ forms/source/component/DatabaseForm.hxx |8 +-- forms/source/component/Edit.cxx |2 forms/source/component/Edit.hxx |3 - forms/source/component/EditBase.hxx |6 +- forms/source/component/EventThread.hxx|2 forms/source/component/File.cxx |4 - forms/source/component/FormComponent.cxx | 31 ++--- forms/source/component/cachedrowset.hxx |3 - forms/source/component/clickableimage.cxx | 69 +- forms/source/component/clickableimage.hxx | 21 - 18 files changed, 116 insertions(+), 132 deletions(-) New commits: commit 778dcbc53ee32517f3867ac4edd603c77a7bb70d Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Fri Sep 19 00:58:01 2014 +0200 fdo#39468 Translate German comments, clean some ws Change-Id: I4a9b3b3e0d0fefb18808b0b045ffcf3531f4ea28 Reviewed-on: https://gerrit.libreoffice.org/11524 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 2c248d5..4c6adca 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -188,7 +188,7 @@ void OButtonModel::read(const ReferenceXObjectInputStream _rxInStream) throw case 0x0003: { OStreamSection aSection( _rxInStream.get() ); -// this will skip any unknown bytes in it's dtor +// this will skip any unknown bytes in it's dtor // button type m_eButtonType = (FormButtonType)_rxInStream-readShort(); @@ -621,7 +621,7 @@ void OButtonControl::modelFeatureUrlPotentiallyChanged( ) { sal_Int16 nOldUrlFeatureId = m_nTargetUrlFeatureId; -// doe we have another TargetURL now? If so, we need to update our dispatches +// Do we have another TargetURL now? If so, we need to update our dispatches m_nTargetUrlFeatureId = getModelUrlFeatureId( ); if ( nOldUrlFeatureId != m_nTargetUrlFeatureId ) { diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 8289de1..418de7f 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -97,7 +97,7 @@ private: ResetHelper m_aResetHelper; // properties -ToggleState m_eDefaultState; // the default check state +ToggleState m_eDefaultState; // the default check state // /properties protected: using OClickableImageBaseModel::disposing; @@ -177,17 +177,13 @@ protected: private: DECL_LINK( OnClick, void* ); -/** to be called whenever the feature URL represented by our model has potentially changed -*/ +/// to be called whenever the feature URL represented by our model has potentially changed voidmodelFeatureUrlPotentiallyChanged( ); -/** retrieves the feature id (see OFormNavigationHelper) of the TargetURL of -the model. -*/ +/// retrieves the feature id (see OFormNavigationHelper) of the TargetURL of the model. sal_Int16 getModelUrlFeatureId( ) const; -/** starts or stops listening for changes in model properties we're interested in -*/ +/// starts or stops listening for changes in model properties we're interested in voidstartOrStopModelPropertyListening( bool _bStart ); }; diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 53c1195..89ef88f 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -76,7 +76,7 @@ InterfaceRef SAL_CALL OCheckBoxModel_CreateInstance(const ReferenceXMultiServic OCheckBoxModel::OCheckBoxModel(const ReferenceXComponentContext _rxFactory) :OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_CHECKBOX, FRM_SUN_CONTROL_CHECKBOX, true ) -// use the old control name for compytibility reasons +// use the old control name for compytibility reasons { m_nClassId = FormComponentType::CHECKBOX; diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index 89a95a1..669d156 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -50,15 +50,15 @@ class OGridColumn :public ::comphelper::OBaseMutex { protected: // [properties] -::com::sun::star::uno::Any m_aWidth; // column width -::com::sun::star::uno::Any m_aAlign; // column
[Libreoffice-commits] core.git: 13 commits - rsc/source
rsc/source/rscpp/cpp.h| 41 - rsc/source/rscpp/cpp1.c | 46 --- rsc/source/rscpp/cpp2.c | 122 rsc/source/rscpp/cpp3.c | 131 --- rsc/source/rscpp/cpp4.c | 53 - rsc/source/rscpp/cpp5.c |9 -- rsc/source/rscpp/cpp6.c | 25 rsc/source/rscpp/cppdef.h | 139 -- 8 files changed, 7 insertions(+), 559 deletions(-) New commits: commit 77f994bd9c780bf3ad951f92f3ff35f294fe8026 Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 10:39:44 2014 +0200 cid#983095 Resource leak Change-Id: I2792afbfedbb256e0b79236505176f932ab25ce7 diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index e6b8402..9f18dc4 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -233,7 +233,7 @@ void InitCpp1() int MAIN(int argc, char** argv) { inti; -char** useargv; +char** useargv = 0; char** pfargv; if( nRunde == 0 ) @@ -351,6 +351,8 @@ int MAIN(int argc, char** argv) if (!eflag) exit(IO_ERROR); } +if( pfargv ) +free(pfargv); return( IO_NORMAL ); } commit 60bb3e9d34a36faf438737992af468da83f6551b Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 10:26:33 2014 +0200 rsc: remove more DEC remnants Change-Id: I6b084d6b08ff2e7bd9adfba4c9eda7c8c650305c diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index 6c52de3..e6b8402 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -314,11 +314,7 @@ int MAIN(int argc, char** argv) } /* Else, just get stdin */ case 0: /* No args? */ case 1: /* No files, stdin - stdout*/ -#if (HOST == SYS_UNIX) || (HOST == SYS_UNKNOWN) work[0] = EOS; /* Unix can't find stdin name */ -#else -fgetname(stdin, work); /* Vax-11C, Decus C know name */ -#endif break; default: commit be403dcf9d1134f004cb7af9ec7482d89e1db581 Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 10:23:46 2014 +0200 rsc: NOMAIN is always true Change-Id: Ib219ab2e85f6fff3ece93b95d4c61bad48e719ac diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index a5bdd2b..6c52de3 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -355,11 +355,7 @@ int MAIN(int argc, char** argv) if (!eflag) exit(IO_ERROR); } -#ifdef NOMAIN /* BP */ /* kein exit im der LIB-Version */ return( IO_NORMAL ); -#else -exit(IO_NORMAL);/* No errors or -E option set */ -#endif } commit b4b2b434362d5854cddef1e576c4a6a7c51b45ef Author: Noel Grandin n...@peralex.com Date: Thu Sep 18 10:14:23 2014 +0200 rsc: remove support for DECUS and consequently unused define nomacargs Change-Id: Ica5da9cf03ad63bf07b3385995ebf420ffb28089 diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h index 250b0dc..7f45375 100644 --- a/rsc/source/rscpp/cpp.h +++ b/rsc/source/rscpp/cpp.h @@ -38,12 +38,7 @@ extern FILE *pDefOut; /* ER */ /* limit for reading commandfiles */ #define PARALIMIT 100 -#ifndef EOS -/* - * This is predefined in Decus C - */ #define EOS '\0'/* End of string*/ -#endif #define EOF_CHAR0 /* Returned by get() on eof */ #define NULLST ((char *) NULL) /* Pointer to nowhere (linted) */ #define DEF_NOARGS (-1)/* #define foo vs #define foo() */ @@ -202,35 +197,15 @@ typedef struct sizes { int size; /* this is the datum size value */ int psize; /* this is the pointer size */ } SIZES; -/* - * nomacarg is a built-in #define on Decus C. - */ -#ifdef nomacarg -#define cputoutput /* cput concatenates tokens */ -#else #define cput(c) { if (c != TOK_SEP) PUTCHAR(c); } -#endif - -#ifndef nomacarg #define streq(s1, s2) (strcmp(s1, s2) == 0) -#endif /* * Error codes. - * Decus C codes are defined in stdio.h. - * Others are cooked to order. */ - -/* - * Note: IO_NORMAL and IO_ERROR are defined in the Decus C stdio.h file - */ -#ifndef IO_NORMAL #define IO_NORMAL 0 -#endif -#ifndef IO_ERROR #define IO_ERROR1 -#endif /* * Externs diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c index 7d26842..62d8f4b 100644 --- a/rsc/source/rscpp/cpp5.c +++ b/rsc/source/rscpp/cpp5.c @@ -87,16 +87,7 @@ typedef struct optab { } OPTAB; static int evalue; /* Current value from evallex() */ -#ifdef nomacargs -FILE_LOCAL int -isbinary(op) -intop; -{ -return (op = FIRST_BINOP op = LAST_BINOP); -} -#else #define
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #133 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Philipp Weissenbacher committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=778dcbc53ee32517f3867ac4edd603c77a7bb70d fdo#39468 Translate German comments, clean some ws The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LiMux student kick-off
On Wed, 2014-09-17 at 11:10 +0100, Michael Meeks wrote: On Wed, 2014-09-17 at 11:47 +0200, Jan-Marek Glogowski wrote: AFAIK Miklos was Michaels suggestion for the mentoring - can't remember. Matus is the XFastParser expert =) I guess it'd be nice to have a small XFastParser unit test as well (as some sort of entry-level easy-hack there). There is one in sax/qa/cppunit/parser.cxx - but needs more love. I've added simple css::xml::sax::XFastTokenHandler implementation in 6503be5311716cf520cf534ca1bb0fd595b93d72 What I think should be done there: 1, We need a better, more complicated input :-) 2, Extend DummyTokenHandler to recognize some of the element/attribute strings used in the input. 3, Implement simple XFastDocumentHandler and use setFastDocumentHandler() examples for this: - oox/source/crypto/DocumentDecryption.cxx - but we want to use tokens, not compare strings - unoxml/test/domtest.cxx - we don't build this, maybe we should, no idea how obsolete it is http://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1xml_1_1sax_1_1XFastParser.html contains some description and there is also a link to a wiki with rather useful information. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 38884] Improve Up/Down movement in writer
https://bugs.freedesktop.org/show_bug.cgi?id=38884 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|RESOLVED|UNCONFIRMED Resolution|FIXED |--- Ever confirmed|1 |0 --- Comment #9 from Adolfo Jayme f...@libreoffice.org --- Hi Juergen, welcome to the LibreOffice community! We hope you enjoy your stay :-) I’m marking this bug “ASSIGNED”, and when your patch is accepted into the core repository, we can change the status to “FIXED”. Thanks for your contribution! -- 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
[Bug 38884] Improve Up/Down movement in writer
https://bugs.freedesktop.org/show_bug.cgi?id=38884 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Ever confirmed|0 |1 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: rsc/source
rsc/source/rscpp/cpp1.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b870ecd6c4fdf789322986f9f2cdc567f6401f22 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 19 09:01:30 2014 +0200 warning C4701: potentially uninitialized local variable Change-Id: I163033dc6f1fa17a96cb9da18f73ef8cdd367f00 diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c index 9f18dc4..7f2dce1 100644 --- a/rsc/source/rscpp/cpp1.c +++ b/rsc/source/rscpp/cpp1.c @@ -234,7 +234,7 @@ int MAIN(int argc, char** argv) { inti; char** useargv = 0; -char** pfargv; +char** pfargv = NULL; if( nRunde == 0 ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/test
desktop/test/deployment/active/active_native.cxx | 22 ++--- desktop/test/deployment/passive/passive_native.cxx | 22 ++--- 2 files changed, 22 insertions(+), 22 deletions(-) New commits: commit 474cd8ebc4a48f30fad3fd748aa363dbd0755477 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 19 09:08:19 2014 +0200 loplugin:saloverride Change-Id: I82f052cd62ea1561c3f77231cd285901ff1d6a80 diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index bb2757de..b65cff5 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -81,25 +81,25 @@ private: virtual ~Provider() {} virtual OUString SAL_CALL getImplementationName() -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const ServiceName) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence OUString SAL_CALL -getSupportedServiceNames() throw (css::uno::RuntimeException) +getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual css::uno::Reference css::frame::XDispatch SAL_CALL queryDispatch( css::util::URL const , OUString const , sal_Int32) -throw (css::uno::RuntimeException); +throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence css::uno::Reference css::frame::XDispatch SAL_CALL queryDispatches( css::uno::Sequence css::frame::DispatchDescriptor const Requests) -throw (css::uno::RuntimeException); +throw (css::uno::RuntimeException) SAL_OVERRIDE; css::uno::Reference css::uno::XComponentContext context_; }; @@ -173,32 +173,32 @@ private: virtual ~Dispatch() {} virtual OUString SAL_CALL getImplementationName() -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const ServiceName) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence OUString SAL_CALL -getSupportedServiceNames() throw (css::uno::RuntimeException) +getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual void SAL_CALL dispatch( css::util::URL const , css::uno::Sequence css::beans::PropertyValue const ) -throw (css::uno::RuntimeException); +throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( css::uno::Reference css::frame::XStatusListener const , css::util::URL const ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE {} virtual void SAL_CALL removeStatusListener( css::uno::Reference css::frame::XStatusListener const , css::util::URL const ) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE {} css::uno::Reference css::uno::XComponentContext context_; diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 38708e7..2e64bcc 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -78,25 +78,25 @@ private: virtual ~Provider() {} virtual OUString SAL_CALL getImplementationName() -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getImplementationName(); } virtual sal_Bool SAL_CALL supportsService(OUString const ServiceName) -throw (css::uno::RuntimeException) +throw (css::uno::RuntimeException) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence OUString SAL_CALL -getSupportedServiceNames() throw (css::uno::RuntimeException) +getSupportedServiceNames() throw (css::uno::RuntimeException) SAL_OVERRIDE { return static_getSupportedServiceNames(); } virtual css::uno::Reference css::frame::XDispatch SAL_CALL queryDispatch( css::util::URL const , OUString const , sal_Int32) -throw (css::uno::RuntimeException); +throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Sequence css::uno::Reference css::frame::XDispatch SAL_CALL queryDispatches(
Juergen Funk license statement
I Juergen Funk, declare that all of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Juergen Funk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
License statement: CIB
Hi all, for reference: All contributions past and present made to LibreOffice from CIB are available under the terms the MPL / LGPLv3+. Until further notice, future contributions made to LibreOffice from CIB are available under the terms the MPL / LGPLv3+. Best, Juergen Funk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablecontroller.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit e9645402b1e5aaf399aed68fe961fe6ebdb2df1e Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 19 09:43:20 2014 +0200 bogus warning C4701: potentially uninitialized local variable Change-Id: Ide596b01efeba720ce313df86d3d4578728d968e diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index c310cb2..f51cd66 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -577,8 +577,8 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) if( nRowSpan == 0 ) { // we are not in a span yet. Let's find out if the current cell is in a span. -sal_Int32 nColSpan; -sal_Int32 nSpanInfoCol; +sal_Int32 nColSpan = sal_Int32(); +sal_Int32 nSpanInfoCol = sal_Int32(); if( xSourceCell-getRowSpan() 1 ) { @@ -681,8 +681,8 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) if( nColSpan == 0 ) { // we are not in a span yet. Let's find out if the current cell is in a span. -sal_Int32 nRowSpan; -sal_Int32 nSpanInfoRow; +sal_Int32 nRowSpan = sal_Int32(); +sal_Int32 nSpanInfoRow = sal_Int32(); if( xSourceCell-getColumnSpan() 1 ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d0f4081d59e185091b2f5fbe690c885d1068a1d5 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Sep 19 09:56:04 2014 +0200 Fix build with system glm by catering for explicit constructors Change-Id: I9bb8542514aad0882935d4a347cbe452cc8fa819 diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 2ccc375..86d11bf 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -687,7 +687,7 @@ inline glm::vec3 randNormVectorInXYPlane() templatetypename T T clamp(const T rIn) { -return glm::clamp(rIn, -1.0, 1.0); +return glm::clamp(rIn, T(-1.0), T(1.0)); } boost::shared_ptrOGLTransitionImpl makeRevolvingCircles( ::sal_uInt16 nCircles , ::sal_uInt16 nPointsOnCircles ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Windows daily build broken on Windows 8.1
On 09/18/2014 05:43 PM, Stephan Bergmann wrote: On 09/18/2014 04:41 PM, V Stuart Foote wrote: sberg wrote Is there a uno.ini file somewhere else in C:\Program Files Only a pythonloader.uno.ini -- no uno.ini present in the installed build. So Tor and I have an idea now of what's going on there. Stay tuned for a fix... hopefully fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=7d5b30b419fb49232f3476d9fb8899fe3754d96d Use instsetoo_native-generated uno ini-file for both instdir and instsets Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit e9d3907c39f092ac2db367a51d1322a2d5d12eae Author: Matthew J. Francis mjay.fran...@gmail.com Date: Fri Sep 19 12:46:38 2014 +0800 Fix use of uninitialised value identified by valgrind m_pLastSyncedDbusMenu was previously only initialised in one of two constructors Change-Id: Icd29d1ab314c54544b61ae60b57b29f1fa7d0e3d Reviewed-on: https://gerrit.libreoffice.org/11530 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 86dd03c..ad8e692 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -509,6 +509,9 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, sal_uLong nStyle ) m_bDefaultPos = true; m_bDefaultSize = ( (nStyle SAL_FRAME_STYLE_SIZEABLE) ! pParent ); m_bWindowIsGtkPlug = false; +#if defined(ENABLE_DBUS) defined(ENABLE_GIO) +m_pLastSyncedDbusMenu = NULL; +#endif Init( pParent, nStyle ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-4.0-27'
Tag 'suse-4.0-27' created by Andras Timar andras.ti...@collabora.com at 2014-09-19 09:14 -0700 suse-4.0-27 Changes since suse-4.0-26-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-4.0-27'
Tag 'suse-4.0-27' created by Andras Timar andras.ti...@collabora.com at 2014-09-19 09:14 -0700 suse-4.0-27 Changes since suse-4.0-22-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-4.0-27'
Tag 'suse-4.0-27' created by Andras Timar andras.ti...@collabora.com at 2014-09-19 09:14 -0700 suse-4.0-27 Changes since suse-4.0-22-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-4.0-27'
Tag 'suse-4.0-27' created by Andras Timar andras.ti...@collabora.com at 2014-09-19 09:14 -0700 suse-4.0-27 Changes since suse-4.0-22-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - instsetoo_native/util shell/source solenv/inc
instsetoo_native/util/openoffice.lst | 24 shell/source/win32/zipfile/zipfile.cxx |2 +- solenv/inc/minor.mk|4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) New commits: commit 5c684e23e2421da1232a186c99c081c0d7983deb Author: Andras Timar andras.ti...@collabora.com Date: Wed Sep 17 15:58:20 2014 -0700 Bump for 4.0-27 Change-Id: Ib7f139bd9076c64f46e6bdaf985738af560e74b0 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index f445802..666c19c 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -33,7 +33,7 @@ Globals CREATE_MSP_INSTALLSET 1 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt -WINDOWSPATCHLEVEL 26 +WINDOWSPATCHLEVEL 27 OOOVENDOR The Document Foundation OOODOWNLOADNAME 1 BUILDIDCWS {buildidcws} @@ -50,13 +50,13 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-326 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-327 BASEPRODUCTVERSION 4.0 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -100,14 +100,14 @@ LibreOffice_Dev { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-326 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-327 BASEPRODUCTVERSION 4.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -161,7 +161,7 @@ URE PRODUCTVERSION 4.0 PACKAGEVERSION 4.0 PACKAGEREVISION 1 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 BRANDPACKAGEVERSION 4.0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 @@ -192,7 +192,7 @@ LibreOffice_SDK { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 @@ -231,7 +231,7 @@ LibreOffice_Dev_SDK { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -276,7 +276,7 @@ LibreOffice_Test { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 @@ -315,7 +315,7 @@ LibreOffice_Dev_Test { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -359,13 +359,13 @@ OxygenOffice { PRODUCTNAME OxygenOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION -26 +PRODUCTEXTENSION -27 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 ABOUTBOXPRODUCTVERSION 4.0 -ABOUTBOXPRODUCTVERSIONSUFFIX :build-326 +ABOUTBOXPRODUCTVERSIONSUFFIX :build-327 BASEPRODUCTVERSION 4.0 PCPFILENAME openoffice.pcp UPDATEURL http://update.libreoffice.org/check.php diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index dbc4b57..712555a 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,6 +1,6 @@ RSCVERSION=400 -RSCREVISION=400m1(Build:326) -BUILD=326 +RSCREVISION=400m1(Build:327) +BUILD=327 LAST_MINOR=m0 SOURCEVERSION=OOO400 commit d6b43c3a228c527e20ac6be2706d7fb2215b39a7 Author: Andras Timar andras.ti...@collabora.com Date: Thu Sep 18 00:46:16 2014 +0200 bnc#887307 ODF files not showing up on Windows search Under Windows 7, ODF and OpenOffice.org 1.1 files were not found, when the folder containing them was not indexed,
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/docrecovery.cxx | 18 +- 1 file changed, 13 insertions(+), 5 deletions(-) New commits: commit cd68903660d2ba71fe6e033b0ae7880366913a4e Author: Matthew J. Francis mjay.fran...@gmail.com Date: Thu Sep 18 21:35:45 2014 +0800 fdo#83891 Show document names including - during autorecovery Change-Id: I9c8076ec51858967ddde0dbbf109f30025975d57 Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 34de399..c119619 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -410,6 +410,19 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent a aNew.DisplayName = lInfo.getUnpackedValueOrDefault(STATEPROP_TITLE , OUString()); aNew.Module = lInfo.getUnpackedValueOrDefault(STATEPROP_MODULE , OUString()); +if (aNew.OrgURL.isEmpty()) { +// If there is no file URL, the window title is used for the display name. +// Remove any unwanted elements such as - LibreOffice Writer. +sal_Int32 i = aNew.DisplayName.indexOf( - ); +if (i 0) +aNew.DisplayName = aNew.DisplayName.copy(0, i); +} else { +// If there is a file URL, parse out the filename part as the display name. +INetURLObject aOrgURL(aNew.OrgURL); +aNew.DisplayName = aOrgURL.getName(INetURLObject::LAST_SEGMENT, true, + INetURLObject::DECODE_WITH_CHARSET); +} + // search for already existing items and update her nState value ... TURLList::iterator pIt; for ( pIt = m_lURLs.begin(); @@ -449,11 +462,6 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent a map the doc state to an UI state. */ aNew.RecoveryState = E_NOT_RECOVERED_YET; -// patch DisplayName! Because the document title contain more than the file name ... -sal_Int32 i = aNew.DisplayName.indexOf( - ); -if (i 0) -aNew.DisplayName = aNew.DisplayName.copy(0, i); - m_lURLs.push_back(aNew); if (m_pListener) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/font/PhysicalFontFamily.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 79a277072a09b486538470a546ecdcbe81e37c95 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Sep 19 10:10:22 2014 +0200 My 'SkakNew-Figurine' font has a hyphen in its name Problem was: (gdb) print pClonedFace-GetFamilyName() $1 = SkakNewFigurine (gdb) print GetFamilyName() $2 = SkakNew-Figurine and this made e.g. JunitTest_sc_complex fail. Change-Id: Id779553716611ed31c2ef24e54e7bc4b6cc0f766 diff --git a/vcl/source/font/PhysicalFontFamily.cxx b/vcl/source/font/PhysicalFontFamily.cxx index fea492f..395bcf0 100644 --- a/vcl/source/font/PhysicalFontFamily.cxx +++ b/vcl/source/font/PhysicalFontFamily.cxx @@ -294,7 +294,7 @@ void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection rFontColle PhysicalFontFace* pClonedFace = pFace-Clone(); -assert( pClonedFace-GetFamilyName().trim() == GetFamilyName().trim() ); +assert( pClonedFace-GetFamilyName().replaceAll(-, ).trim() == GetFamilyName().replaceAll(-, ).trim() ); assert( rFontCollection.FindOrCreateFamily( GetEnglishSearchFontName( pClonedFace-GetFamilyName() ) ) == pFamily ); if (! pFamily-AddFontFace( pClonedFace ) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlimport/htmlimport.cxx |4 1 file changed, 4 insertions(+) New commits: commit 2f270990f4ea53c941af0f1b8b1d06e18fc22606 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Sep 19 10:23:17 2014 +0200 Improve test for inlined html image Change-Id: I7063a50987b018b9a00bc542ae5ed1b963b17dd8 diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx index 03701c4..592aa53 100644 --- a/sw/qa/extras/htmlimport/htmlimport.cxx +++ b/sw/qa/extras/htmlimport/htmlimport.cxx @@ -57,6 +57,10 @@ DECLARE_HTMLIMPORT_TEST(testInlinedImage, inlined_image.html) CPPUNIT_ASSERT(xGraphic.is()); CPPUNIT_ASSERT(xGraphic-getType() != graphic::GraphicType::EMPTY); +OUString sGraphicURL = getProperty OUString (xShape, GraphicURL); +// Before it was data:image/png;base64,data +CPPUNIT_ASSERT(sGraphicURL.startsWith(vnd.sun.star.GraphicObject:)); + for (int n = 0; ; n++) { SwNode* pNode = pDoc-GetNodes()[ n ]; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: vs2012-ide-integration
On Thu, 2014-09-18 at 19:22 -0400, nicholas ferguson wrote: I don't understand. You wrote: If I send you my notes, could you tweak your vs2012-ide-integration, to a vs2012native-ide-integration ( or any name you choose) so that we could generate those projects? I parse that as: if I send you some notes - can you turn that into code changes for me ?. And I reply: Well; the best way is to send a patch of your own. We love patches =) developers talk code really. A patch is a representation of a code change; normally a unified diff - ie. please do the code changes yourself, no matter how small, and send a patch in. You can generate that easily with: git diff -u In general; it is more helpful to interact by asking a specific question to clarify your understanding. In general it is also polite netiquette not to top-post, and to cut the context of the mail to the minimum necessary for the discussion. All the best, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild
config_host.mk.in |1 configure.ac | 51 +++-- solenv/gbuild/JunitTest.mk |3 +- 3 files changed, 48 insertions(+), 7 deletions(-) New commits: commit 4db2d600ebc541adfaaf0a1a176df1c74e3ae0e4 Author: Peter Foley pefol...@pefoley.com Date: Tue Sep 9 22:19:42 2014 -0400 Add support for external hamcrest when using junit 4.11+ Starting with junit 4.11 hamcrest is no longer bundled, so add a --with-hamcrest option to support this. Change-Id: Icdae946af82b9c56bf25d37cbf88275fc6a6a1eb Reviewed-on: https://gerrit.libreoffice.org/11383 Reviewed-by: Stephan Bergmann sberg...@redhat.com Tested-by: Stephan Bergmann sberg...@redhat.com diff --git a/config_host.mk.in b/config_host.mk.in index e717745..605bb6b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -239,6 +239,7 @@ export GTK_LIBS=$(gb_SPACE)@GTK_LIBS@ export GTK_PRINT_CFLAGS=$(gb_SPACE)@GTK_PRINT_CFLAGS@ export GTK_PRINT_LIBS=$(gb_SPACE)@GTK_PRINT_LIBS@ export GUIBASE=@GUIBASE@ +export HAMCREST_JAR=@HAMCREST_JAR@ export HARDLINKDELIVER=@HARDLINKDELIVER@ export HAVE_GCC_AVX=@HAVE_GCC_AVX@ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ diff --git a/configure.ac b/configure.ac index e5c01e8..84add6c 100644 --- a/configure.ac +++ b/configure.ac @@ -1987,6 +1987,15 @@ AC_ARG_WITH(junit, ], ,with_junit=yes) +AC_ARG_WITH(hamcrest, +AS_HELP_STRING([--with-hamcrest], +[Specifies the hamcrest jar file to use for JUnit-based tests. + --without-junit disables those tests. Not relevant in the --without-java case.]) +[ + Usage: --with-hamcrest=absolute path to hamcrest jar +], +,with_hamcrest=yes) + AC_ARG_WITH(perl-home, AS_HELP_STRING([--with-perl-home], [If you have installed Perl 5 Distribution, on your system, please @@ -12051,23 +12060,53 @@ if test $ENABLE_JAVA != -a $with_junit != no; then if test $_os = WINNT; then OOO_JUNIT_JAR=`cygpath -m $OOO_JUNIT_JAR` fi -printf 'import org.junit.Before; import org.hamcrest.BaseDescription;' \ - conftest.java +printf 'import org.junit.Before;' conftest.java if $JAVACOMPILER -classpath $OOO_JUNIT_JAR conftest.java 5 25; then AC_MSG_RESULT([$OOO_JUNIT_JAR]) else AC_MSG_ERROR( -[cannot find JUnit 4 jar, or JUnit 4 jar does not provide Hamcrest; please -install one in the default location (/usr/share/java), specify its pathname via ---with-junit=..., or disable it via --without-junit]) +[cannot find JUnit 4 jar; please install one in the default location (/usr/share/java), + specify its pathname via --with-junit=..., or disable it via --without-junit]) fi -rm -f conftestj.class conftestj.java +rm -f conftest.class conftest.java if test $OOO_JUNIT_JAR != ; then BUILD_TYPE=$BUILD_TYPE QADEVOOO fi fi AC_SUBST(OOO_JUNIT_JAR) +HAMCREST_JAR= +if test $ENABLE_JAVA != -a $with_junit != no; then +AC_MSG_CHECKING([for included Hamcrest]) +printf 'import org.hamcrest.BaseDescription;' conftest.java +if $JAVACOMPILER -classpath $OOO_JUNIT_JAR conftest.java 5 25; then +AC_MSG_RESULT([Included in $OOO_JUNIT_JAR]) +else +AC_MSG_RESULT([Not included]) +AC_MSG_CHECKING([for standalone hamcrest jar.]) +if test $with_hamcrest = yes; then +if test -e /usr/share/lib/java/hamcrest.jar; then +HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar +else +HAMCREST_JAR=/usr/share/java/hamcrest.jar +fi +else +HAMCREST_JAR=$with_hamcrest +fi +if test $_os = WINNT; then +HAMCREST_JAR=`cygpath -m $HAMCREST_JAR` +fi +if $JAVACOMPILER -classpath $HAMCREST_JAR conftest.java 5 25; then +AC_MSG_RESULT([$HAMCREST_JAR]) +else +AC_MSG_ERROR([junit does not contain hamcrest; please use a junit jar that includes hamcrest, install a hamcrest jar in the default location (/usr/share/java), + specify its path with --with-hamcrest=..., or disable junit with --without-junit]) +fi +fi +rm -f conftest.class conftest.java +fi +AC_SUBST(HAMCREST_JAR) + AC_SUBST(SCPDEFS) diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 9801ed2..8370603 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -54,12 +54,13 @@ $(call gb_JunitTest_get_target,%) : $(CLEAN_CMD) define gb_JunitTest_JunitTest -$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) +$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Field.xba |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 7797127f00cee6f4fffd53c99856decd126a8718 Author: Jean-Pierre Ledure j...@ledure.be Date: Fri Sep 19 11:21:47 2014 +0200 Access2Base - (Re)capitalize UNO constants Some UNO constants (integer, double, ...) were lower cased by Basic IDE. Probably due to AutoCorrection options of IDE ? Change-Id: Ib599a8bc9f26d179ba5befbcd7a915d29554f948 diff --git a/wizards/source/access2base/Field.xba b/wizards/source/access2base/Field.xba index 179bf16..053245e 100644 --- a/wizards/source/access2base/Field.xba +++ b/wizards/source/access2base/Field.xba @@ -525,7 +525,7 @@ Dim oParent As Object If Column.IsNullable = com.sun.star.sdbc.ColumnValue.NULLABLE Then Column.updateNull() Else Goto Trace_Null Else Select Case Column.Type - Case .BIT, .Boolean + Case .BIT, .BOOLEAN If Not Utils._CheckArgument(pvValue, iArgNr, vbBoolean, , False) Then Goto Trace_Error_Value Column.updateBoolean(pvValue) Case .TINYINT @@ -536,7 +536,7 @@ Dim oParent As Object If Not Utils._CheckArgument(pvValue, iArgNr, Utils._AddNumeric(), , False) Then Goto Trace_Error_Value If pvValue lt; -32768 Or pvValue gt; 32767 Then Goto trace_Error_Value Column.updateInt(CLng(pvValue)) - Case .Integer + Case .INTEGER If Not Utils._CheckArgument(pvValue, iArgNr, Utils._AddNumeric(), , False) Then Goto Trace_Error_Value If pvValue lt; -2147483648 Or pvValue gt; 2147483647 Then Goto trace_Error_Value Column.updateInt(CLng(pvValue)) @@ -546,7 +546,7 @@ Dim oParent As Object Case .FLOAT If Not Utils._CheckArgument(pvValue, iArgNr, Utils._AddNumeric(), , False) Then Goto Trace_Error_Value If Abs(pvValue) lt; 3.402823E38 And Abs(pvValue) gt; 1.401298E-45 Then Column.updateFloat(CSng(pvValue)) Else Goto trace_Error_Value - Case .REAL, .Double + Case .REAL, .DOUBLE If Not Utils._CheckArgument(pvValue, iArgNr, Utils._AddNumeric(), , False) Then Goto Trace_Error_Value apos;If Abs(pvValue) lt; 1.79769313486232E308 And Abs(pvValue) gt; 4.94065645841247E-307 Then Column.updateDouble(CDbl(pvValue)) Else Goto trace_Error_Value Column.updateDouble(CDbl(pvValue)) @@ -565,7 +565,7 @@ Dim oParent As Object Case .CHAR, .VARCHAR, .LONGVARCHAR If Not Utils._CheckArgument(pvValue, iArgNr, vbString, , False) Then Goto Trace_Error_Value Column.updateString(pvValue)apos; vbString - Case .Date + Case .DATE If Not Utils._CheckArgument(pvValue, iArgNr, vbDate, , False) Then Goto Trace_Error_Value vTemp = New com.sun.star.util.Date With vTemp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/Library_odbc.mk connectivity/source
connectivity/Library_odbc.mk|1 + connectivity/source/drivers/odbc/OTools.cxx | 23 ++- 2 files changed, 3 insertions(+), 21 deletions(-) New commits: commit b3f6639495cfee011d6d6b4f7e62ba1d3c9e1136 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 19 11:41:17 2014 +0200 Better -Werror,-Wunused-function workaround ...superseding 9de4f3b3fd7843f27ea69788b6e37c5022ac2ad3 -Werror,-Wunused-function, plus additional clean-up and fixes. Change-Id: I014ca289601a8195fb297ce335b3a52993284e8f diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 181114a..8ff5fd0 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,odbc,\ )) $(eval $(call gb_Library_add_exception_objects,odbc,\ + connectivity/source/drivers/odbc/appendsqlwchars \ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ connectivity/source/drivers/odbc/OFunctions \ diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index 8b459de..13a1410 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -26,6 +26,7 @@ #include rtl/ustrbuf.hxx #include boost/static_assert.hpp +#include appendsqlwchars.hxx #include string.h #include string @@ -399,26 +400,6 @@ Sequencesal_Int8 OTools::getBytesValue(const OConnection* _pConnection, return aData; } -namespace -{ -// Approximation of #if sizeof (SQLWCHAR) == 4 sizeof (wchar_t) == 4: -#if defined SQL_WCHART_CONVERT defined SAL_UNICODE_NOTEQUAL_WCHAR_T -BOOST_STATIC_ASSERT(sizeof (wchar_t) == 4); -void append(OUStringBuffer s, wchar_t* d, sal_Int32 n) -{ -for (sal_Int32 i = 0; i n; ++i) -{ -s.appendUtf32(d[i]); -} -} -#else -void append(OUStringBuffer s, sal_Unicode* d, sal_Int32 n) -{ -s.append(d, n); -} -#endif -} - OUString OTools::getStringValue(OConnection* _pConnection, SQLHANDLE _aStatementHandle, sal_Int32 columnIndex, @@ -477,7 +458,7 @@ OUString OTools::getStringValue(OConnection* _pConnection, nReadChars = pcbValue/sizeof(SQLWCHAR); } -append(aData, waCharArray, nReadChars); +appendSQLWCHARs(aData, waCharArray, nReadChars); } break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/odbc/appendsqlwchars.cxx | 38 +++ connectivity/source/drivers/odbc/appendsqlwchars.hxx | 30 +++ 2 files changed, 68 insertions(+) New commits: commit 597fda036e98fa974b050c340174069b06d5bd5b Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 19 11:44:41 2014 +0200 Better -Werror,-Wunused-function workaround, missing files Change-Id: I8bcdbf3c2b9dec25eab943212258bc2b3a82ebc7 diff --git a/connectivity/source/drivers/odbc/appendsqlwchars.cxx b/connectivity/source/drivers/odbc/appendsqlwchars.cxx new file mode 100644 index 000..09f39e2 --- /dev/null +++ b/connectivity/source/drivers/odbc/appendsqlwchars.cxx @@ -0,0 +1,38 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include sal/config.h + +#include boost/static_assert.hpp +#include rtl/ustrbuf.hxx +#include sal/types.h + +#include appendsqlwchars.hxx + +namespace connectivity { namespace odbc { + +void appendSQLWCHARs(OUStringBuffer s, sal_Unicode* d, sal_Int32 n) +{ +s.append(d, n); +} + +#if defined SAL_UNICODE_NOTEQUAL_WCHAR_T +BOOST_STATIC_ASSERT(sizeof (wchar_t) == 4); +void appendSQLWCHARs(OUStringBuffer s, wchar_t* d, sal_Int32 n) +{ +for (sal_Int32 i = 0; i n; ++i) +{ +s.appendUtf32(d[i]); +} +} +#endif + +} } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/odbc/appendsqlwchars.hxx b/connectivity/source/drivers/odbc/appendsqlwchars.hxx new file mode 100644 index 000..1c31c72 --- /dev/null +++ b/connectivity/source/drivers/odbc/appendsqlwchars.hxx @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_APPENDSQLWCHARS_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_APPENDSQLWCHARS_HXX + +#include sal/config.h + +#include rtl/ustrbuf.hxx +#include sal/types.h + +namespace connectivity { namespace odbc { + +void appendSQLWCHARs(OUStringBuffer s, sal_Unicode* d, sal_Int32 n); + +#if defined SAL_UNICODE_NOTEQUAL_WCHAR_T +void appendSQLWCHARs(OUStringBuffer s, wchar_t* d, sal_Int32 n); +#endif + +} } + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/export.cxx | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) New commits: commit 43ed0dbb596399a134c34a5d906c5debb349f640 Author: Douglas Mencken dougmenc...@gmail.com Date: Sun Sep 7 05:52:21 2014 -0400 l10ntools/source/export.cxx: be more std:: Change-Id: Ia5f96f7d2bf366a6156d198e73e7987a471f28da Signed-off-by: Stephan Bergmann sberg...@redhat.com diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 6052e24..38cd3ed 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -26,8 +26,8 @@ #include srclex.hxx #include boost/scoped_ptr.hpp -#include stdio.h -#include stdlib.h +#include cstdio +#include cstdlib #include common.hxx #include export.hxx #include tokens.h @@ -207,9 +207,10 @@ Export::Export(const OString rOutput) pParseQueue( new ParserQueue( *this ) ) { aOutput.mPo = new PoOfstream( rOutput, PoOfstream::APP ); -if (!aOutput.mPo-isOpen()) { -fprintf(stderr, ERROR : Can't open file %s\n, rOutput.getStr()); -exit ( -1 ); +if (!aOutput.mPo-isOpen()) +{ +std::fprintf(stderr, ERROR : Can't open file %s\n, rOutput.getStr()); +std::exit(EXIT_FAILURE); } } @@ -652,8 +653,8 @@ int Export::Execute( int nToken, const char * pToken ) } break; case PRAGMA : { -fprintf(stderr, ERROR: archaic PRAGMA %s\n, sToken.getStr()); -exit(-1); +std::fprintf(stderr, ERROR: archaic PRAGMA %s\n, sToken.getStr()); +std::exit(EXIT_FAILURE); } break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - Makefile.in
Makefile.in | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) New commits: commit 16f62d80c38f3920a40fc078edecad905ba2b196 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 12:47:02 2014 +0300 Unzip the InfoPlist.strings files into correct locations Not sure how useful it is to only provide translations for the ODF document format names, though. Change-Id: I22a2e5b896e077ca3067a30635f7cdf67c2f5e7c diff --git a/Makefile.in b/Makefile.in index 2aaa297..8fc6f3d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -291,9 +291,15 @@ ifeq ($(OS_FOR_BUILD),WNT) else @ooinstall $(TESTINSTALLDIR) ifneq ($(MACOSX_CODESIGNING_IDENTITY),) -# The InfoPlist_*.zip files in bin are totally pointless and should -# not be there. I am too lazy at the moment to figure out how to -# prevent them from ending up there. +# Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories. + set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \ + bn=`basename $$F .zip`; \ + lang=$${bn#InfoPlist_}; \ + lproj=$(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/Resources/$$lang.lproj; \ + mkdir $$lproj; \ + (cd $$lproj; unzip $$F); \ + done +# And remove the bin folder which should not be there rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Windows daily build broken on Windows 8.1
Le 18/09/2014 14:13, Adam Fyne a écrit : */LibreOfficeDev 4.4 - Fatal Error/* */---/* */The program cannot be started./* */The service manager is not available./* */(Cannot open uno ini file:///C:/Program%20Files%20(x86)/LibreOfficeDev%204/URE/bin/uno.ini)/* */Start setup application to repair the installation from CD, or the folder containing the installation packages./* Same on Mac for the packaged DMG, but not the instdir app bundle. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Translation of /rsc/documentation useful?
Hi all, While looking at Noel's commits removing VAX and PDP support, I found /rsc/documentation. As the docs in there are quite large, it would be quite a time investment to translate them. So: Is it still useful to translate them, or do you guys have a good enough grasp on the subject matter already? If it's still deemed useful I'd probably would want to put it into a text file (in markdown maybe, to at least keep some formatting/structure) to ease git integration. Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Translation of /rsc/documentation useful?
On 2014-09-19 11:52 AM, Philipp Weissenbacher wrote: While looking at Noel's commits removing VAX and PDP support, I found /rsc/documentation. As the docs in there are quite large, it would be quite a time investment to translate them. So: Is it still useful to translate them, or do you guys have a good enough grasp on the subject matter already? Hi Firstly, thanks a lot for your help translating. But personally, I'd much rather have you working on translating comments in the code - that RSC stuff is hardly ever touched and it's much less useful to have good comments there than in other code. Just my 2c -- Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - connectivity/source
connectivity/source/drivers/odbc/appendsqlwchars.cxx |9 + connectivity/source/drivers/odbc/appendsqlwchars.hxx |4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) New commits: commit 1f291178605aea72a988d19db75500dfd2c23424 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Sep 19 12:05:16 2014 +0200 speed optimisation Change-Id: I8f27adf834e09702c609170e63facb1ec1ea0ab7 diff --git a/connectivity/source/drivers/odbc/appendsqlwchars.cxx b/connectivity/source/drivers/odbc/appendsqlwchars.cxx index c083c61..8a62db3 100644 --- a/connectivity/source/drivers/odbc/appendsqlwchars.cxx +++ b/connectivity/source/drivers/odbc/appendsqlwchars.cxx @@ -26,9 +26,10 @@ void appendSQLWCHARs(OUStringBuffer s, const sal_Unicode* d, sal_Int32 n) BOOST_STATIC_ASSERT(sizeof (wchar_t) == 4); void appendSQLWCHARs(OUStringBuffer s, const wchar_t* d, sal_Int32 n) { -for (sal_Int32 i = 0; i n; ++i) +const wchar_t * const end = d + n; +for (; d end; ++d) { -s.appendUtf32(d[i]); +s.appendUtf32(*d); } } #endif commit f3615c768c2d93b581eff7532c263a3905bb4785 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Sep 19 12:04:54 2014 +0200 constify Change-Id: If9866d25b228a5b84844943c17406c10f2c8515d diff --git a/connectivity/source/drivers/odbc/appendsqlwchars.cxx b/connectivity/source/drivers/odbc/appendsqlwchars.cxx index 09f39e2..c083c61 100644 --- a/connectivity/source/drivers/odbc/appendsqlwchars.cxx +++ b/connectivity/source/drivers/odbc/appendsqlwchars.cxx @@ -17,14 +17,14 @@ namespace connectivity { namespace odbc { -void appendSQLWCHARs(OUStringBuffer s, sal_Unicode* d, sal_Int32 n) +void appendSQLWCHARs(OUStringBuffer s, const sal_Unicode* d, sal_Int32 n) { s.append(d, n); } #if defined SAL_UNICODE_NOTEQUAL_WCHAR_T BOOST_STATIC_ASSERT(sizeof (wchar_t) == 4); -void appendSQLWCHARs(OUStringBuffer s, wchar_t* d, sal_Int32 n) +void appendSQLWCHARs(OUStringBuffer s, const wchar_t* d, sal_Int32 n) { for (sal_Int32 i = 0; i n; ++i) { diff --git a/connectivity/source/drivers/odbc/appendsqlwchars.hxx b/connectivity/source/drivers/odbc/appendsqlwchars.hxx index 1c31c72..b1424d1 100644 --- a/connectivity/source/drivers/odbc/appendsqlwchars.hxx +++ b/connectivity/source/drivers/odbc/appendsqlwchars.hxx @@ -17,10 +17,10 @@ namespace connectivity { namespace odbc { -void appendSQLWCHARs(OUStringBuffer s, sal_Unicode* d, sal_Int32 n); +void appendSQLWCHARs(OUStringBuffer s, const sal_Unicode* d, sal_Int32 n); #if defined SAL_UNICODE_NOTEQUAL_WCHAR_T -void appendSQLWCHARs(OUStringBuffer s, wchar_t* d, sal_Int32 n); +void appendSQLWCHARs(OUStringBuffer s, const wchar_t* d, sal_Int32 n); #endif } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/IDocumentMarkAccess.hxx|1 + sw/qa/extras/uiwriter/data/commented-word.odt |binary sw/qa/extras/uiwriter/uiwriter.cxx| 19 +++ sw/source/core/crsr/swcrsr.cxx| 12 sw/source/core/doc/docbm.cxx | 12 sw/source/core/inc/MarkManager.hxx|1 + 6 files changed, 45 insertions(+) New commits: commit 354ad43c5cb70fe32aef97cb5dddb63f7793bfd6 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Sep 19 11:56:59 2014 +0200 SwCursor::SelectWordWT: include comment anchor character of a commented word In case the user double-clicks on a word and exactly that word is commented, then we used to select only the word, but not its comment anchor character. So when the user deleted the selection, the comment left there. It is still possible to manually select only the word, but on double-click let's just select the comment anchor as well, so a simple double-click on the commented word will remove the comment as well. Change-Id: I7322af61c31e8aba108eef5596849d17d55fc7eb diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index ba6e247..e7500fe 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -256,6 +256,7 @@ class IDocumentMarkAccess virtual const_iterator_t getAnnotationMarksEnd() const = 0; virtual sal_Int32 getAnnotationMarksCount() const = 0; virtual const_iterator_t findAnnotationMark( const ::rtl::OUString rName ) const = 0; +virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition rPosition) const = 0; /** Returns the MarkType used to create the mark */ diff --git a/sw/qa/extras/uiwriter/data/commented-word.odt b/sw/qa/extras/uiwriter/data/commented-word.odt new file mode 100644 index 000..ab423fa Binary files /dev/null and b/sw/qa/extras/uiwriter/data/commented-word.odt differ diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 5d21781..6f99e9b 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -51,6 +51,7 @@ public: void testShapeTextboxVertadjust(); void testShapeTextboxAutosize(); void testFdo82191(); +void testCommentedWord(); void testChineseConversionBlank(); void testChineseConversionNonChineseText(); void testChineseConversionTraditionalToSimplified(); @@ -72,6 +73,7 @@ public: CPPUNIT_TEST(testShapeTextboxVertadjust); CPPUNIT_TEST(testShapeTextboxAutosize); CPPUNIT_TEST(testFdo82191); +CPPUNIT_TEST(testCommentedWord); CPPUNIT_TEST(testChineseConversionBlank); CPPUNIT_TEST(testChineseConversionNonChineseText); CPPUNIT_TEST(testChineseConversionTraditionalToSimplified); @@ -426,6 +428,23 @@ void SwUiWriterTest::testFdo82191() CPPUNIT_ASSERT_EQUAL(size_t(2), aTextBoxes.size()); } +void SwUiWriterTest::testCommentedWord() +{ +// This word is commented. - string in document +// 123456789 - character positions +SwDoc* pDoc = createDoc(commented-word.odt); +SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell(); +// Move the cursor into the second word. +pWrtShell-Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 5, /*bBasicCall=*/false); +// Select the word. +pWrtShell-SelWrd(); + +// Make sure that not only the word, but its comment anchor is also selected. +SwShellCrsr* pShellCrsr = pWrtShell-getShellCrsr(false); +// This was 9, only word, not wordanchor character was selected. +CPPUNIT_ASSERT_EQUAL(sal_Int32(10), pShellCrsr-End()-nContent.GetIndex()); +} + // Chinese conversion tests diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 3f41c40..e576144 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1389,6 +1389,18 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const { SetMark(); GetMark()-nContent = aBndry.startPos; +if (sw::mark::IMark* pAnnotationMark = pMarksAccess-getAnnotationMarkFor(*GetPoint())) +{ +// An annotation mark covers the selected word. Check +// if it covers only the word: in that case we select +// the comment anchor as well. +bool bStartMatch = GetMark()-nNode == pAnnotationMark-GetMarkStart().nNode +GetMark()-nContent == pAnnotationMark-GetMarkStart().nContent; +bool bEndMatch = GetPoint()-nNode == pAnnotationMark-GetMarkEnd().nNode +GetPoint()-nContent.GetIndex() + 1 == pAnnotationMark-GetMarkEnd().nContent.GetIndex(); +if (bStartMatch bEndMatch) +
[Libreoffice-commits] core.git: sw/source
sw/source/ui/app/mn.src | 27 +++ 1 file changed, 27 insertions(+) New commits: commit bd39fb69202c759445c97d099add3b6e5556d5f2 Author: Babu Vincent bavincen...@gmail.com Date: Fri Sep 19 14:20:07 2014 +0530 Bug 62947 - UI Add.. in Writer Change-Id: I7eec133246f39ce1348eddf564f30c7b4adfe3cf Reviewed-on: https://gerrit.libreoffice.org/11545 Reviewed-by: Tomaž Vajngerl qui...@gmail.com Tested-by: Tomaž Vajngerl qui...@gmail.com diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 79b797d..03c301c 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -295,10 +295,37 @@ Text[ en-US ] = Down One Level; \ }; +#define MN_NEW_PASTE_SPECIAL \ +MenuItem\ +{\ +Identifier = SID_PASTE_SPECIAL ; \ +HelpId = CMD_SID_PASTE_SPECIAL ; \ +Text [ en-US ] = Paste ~Special ; \ +SubMenu = Menu\ +{\ +ItemList = \ +{\ +MenuItem\ +{\ +Identifier = SID_PASTE_UNFORMATTED ; \ +HelpId = CMD_SID_PASTE_SPECIAL ; \ +Text [ en-US ] = ~Text Only ; \ +};\ +MenuItem\ +{\ +Identifier = SID_PASTE_SPECIAL ; \ +HelpId = CMD_SID_PASTE_SPECIAL ; \ +Text [ en-US ] = ~More ; \ +};\ +};\ +};\ +}; + #define BASE_TEXT_POPUPMENU_BEGIN \ { \ ItemList = \ { \ +MN_NEW_PASTE_SPECIAL\ MN_RESET\ _NUMBERING_RELATED_MENU \ SEPARATOR ; \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_htmlimport.mk
sw/CppunitTest_sw_htmlimport.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit ab0527fabbf9a76300bbc8cd283741528fd0d0e6 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Sep 19 12:33:25 2014 +0200 Missing dependencies Change-Id: I324da4e8ea3ae0a23cf25025fda9d316d2e6c007 diff --git a/sw/CppunitTest_sw_htmlimport.mk b/sw/CppunitTest_sw_htmlimport.mk index 425674b..dd7d6e7 100644 --- a/sw/CppunitTest_sw_htmlimport.mk +++ b/sw/CppunitTest_sw_htmlimport.mk @@ -21,6 +21,8 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_htmlimport, \ cppuhelper \ i18nlangtag \ sal \ + sfx \ + svt \ sw \ test \ tl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/OpenGLRender.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 38deb7e53b01e3636b8049ba016f4cb903526ad4 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Sep 19 12:36:26 2014 +0200 Fix chart2 with system libglm (explicit constructors) Change-Id: I582095b6b47eaff7800f6aaa68f176f06d64a34e diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index e8ac3ac..6cdb5fd 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -108,7 +108,7 @@ int OpenGLRender::InitOpenGL() //Init the Projection matrix m_Projection = glm::ortho(0.f, float(m_iWidth), -float(m_iHeight), 0.f, -1.f, 1.f); -m_Projection = m_Projection * glm::scale(1.0f, -1.0f, 1.0f); +m_Projection = m_Projection * glm::scale(glm::vec3(1.0f, -1.0f, 1.0f)); m_View = glm::lookAt(glm::vec3(0,0,1), // Camera is at (4,3,-3), in World Space glm::vec3(0,0,0), // and looks at the origin glm::vec3(0,1,0) // Head is up (set to 0,-1,0 to look upside-down) @@ -358,7 +358,7 @@ void OpenGLRender::SetSize(int width, int height) m_iWidth = width; m_iHeight = height; m_Projection = glm::ortho(0.f, float(m_iWidth), -float(m_iHeight), 0.f, -4.f, 3.f); -m_Projection = m_Projection * glm::scale(1.0f, -1.0f, 1.0f); +m_Projection = m_Projection * glm::scale(glm::vec3(1.0f, -1.0f, 1.0f)); } void OpenGLRender::SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b, sal_uInt8 nAlpha) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 84090] Speed up oox::TokenMap by removing unnecessary maUniName OUString
https://bugs.freedesktop.org/show_bug.cgi?id=84090 Matúš Kukan matus.ku...@collabora.com changed: What|Removed |Added Whiteboard||EasyHack DifficultyBeginner ||SkillCpp TopicCleanup CC||libreoffice@lists.freedeskt ||op.org -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/oox offapi/com oox/source sax/qa
include/oox/core/fasttokenhandler.hxx |2 -- offapi/com/sun/star/xml/sax/XFastTokenHandler.idl | 14 -- oox/source/core/fasttokenhandler.cxx | 11 --- oox/source/crypto/DocumentDecryption.cxx | 10 -- sax/qa/cppunit/parser.cxx | 12 5 files changed, 49 deletions(-) New commits: commit 879bfcbf84fc7b73b5475d3f02e98184a2065dc5 Author: Matúš Kukan matus.ku...@collabora.com Date: Fri Sep 19 10:49:33 2014 +0200 Remove unused XFastTokenHandler functions Change-Id: I0d8072f1194aa837932dcffd6dc6a3761bbdc74e diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 23d2076..baf0472 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -51,8 +51,6 @@ public: virtual ::com::sun::star::uno::Sequence OUString SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastTokenHandler -virtual sal_Int32 SAL_CALL getToken( const OUString rIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; -virtual OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence sal_Int8 SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence sal_Int8 Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl index 5223392..4daec30 100644 --- a/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl +++ b/offapi/com/sun/star/xml/sax/XFastTokenHandler.idl @@ -38,20 +38,6 @@ module com { module sun { module star { module xml { module sax { interface XFastTokenHandler: com::sun::star::uno::XInterface { -/** returns a integer token for the given string identifier. - -@returns -a unique integer token for the given String or FastToken::DONTKNOW -if the identifier is not known to this instance. -*/ -long getToken( [in] string Identifier ); - - -/** returns a string identifier for the given integer token. -*/ -string getIdentifier( [in] long Token ); - - /** returns a integer token for the given string @param Identifier diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index 91fb38a..3fe24ef 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -73,17 +73,6 @@ Sequence OUString SAL_CALL FastTokenHandler::getSupportedServiceNames() throw return FastTokenHandler_getSupportedServiceNames(); } -// XFastTokenHandler -sal_Int32 FastTokenHandler::getToken( const OUString rIdentifier ) throw( RuntimeException, std::exception ) -{ -return mrTokenMap.getTokenFromUnicode( rIdentifier ); -} - -OUString FastTokenHandler::getIdentifier( sal_Int32 nToken ) throw( RuntimeException, std::exception ) -{ -return mrTokenMap.getUnicodeTokenName( nToken ); -} - Sequence sal_Int8 FastTokenHandler::getUTF8Identifier( sal_Int32 nToken ) throw( RuntimeException, std::exception ) { return mrTokenMap.getUtf8TokenName( nToken ); diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx index d792f6b..50a8868 100644 --- a/oox/source/crypto/DocumentDecryption.cxx +++ b/oox/source/crypto/DocumentDecryption.cxx @@ -47,21 +47,11 @@ vectorsal_uInt8 convertToVector(Sequencesal_Int8 input) class AgileTokenHandler : public cppu::WeakImplHelper1 XFastTokenHandler { public: -virtual sal_Int32 SAL_CALL getToken( const OUString /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE -{ -return FastToken::DONTKNOW; -} - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const Sequence sal_Int8 /*nIdentifier*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return FastToken::DONTKNOW; } -virtual OUString SAL_CALL getIdentifier( sal_Int32 /*nToken*/ ) throw (RuntimeException, std::exception) SAL_OVERRIDE -{ -return OUString(); -} - virtual Sequencesal_Int8 SAL_CALL getUTF8Identifier(sal_Int32 /*nToken*/) throw (RuntimeException, std::exception) SAL_OVERRIDE { return Sequencesal_Int8(); diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx index 5674b11..5669d0f 100644 --- a/sax/qa/cppunit/parser.cxx +++ b/sax/qa/cppunit/parser.cxx @@ -29,18 +29,6 @@ public: DummyTokenHandler() {} virtual ~DummyTokenHandler() {} -virtual sal_Int32 SAL_CALL getToken( const OUString ) -
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 4 commits - cui/source instsetoo_native/util postprocess/CustomTarget_registry.mk
cui/source/dialogs/about.cxx|9 + instsetoo_native/util/openoffice.lst.in |8 postprocess/CustomTarget_registry.mk|2 +- 3 files changed, 14 insertions(+), 5 deletions(-) New commits: commit d1a776a16faf54a5c12350fd4aae047a036b815b Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 14:28:36 2014 +0300 We probably don't offer localized pages on libreoffice-from-collabora.com Change-Id: I207cecc3b4ff0ac5464137161eb02d51d9e39c5e diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 059f282..648e12f 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -113,7 +113,12 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) sURL += lofc-mac-app-store/; #endif +#if 0 // In this branch the URL is on +// libreoffice-from-collabora.com, which does not offer +// localized pages, or automatic redirection to an English +// page if a localized one does not exist. I think. localizeWebserviceURI(sURL); +#endif } // If the URL is empty, don't do anything commit d34d8e4d5a7708ce34d60a6e3ca316721e3c Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 14:08:24 2014 +0300 Use LOfC-specific STARTCENTER_INFO_URL here, too Change-Id: Ia7d5c8d28fec0e229edcdb8d23e381f21a266ae7 diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 2299f49..a541542 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -559,7 +559,7 @@ postprocess_main_SED := \ -e 's,$${PRODUCTVERSION},$(PRODUCTVERSION),g' \ -e 's,$${PRODUCTEXTENSION},.$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX),g' \ -e 's,$${STARTCENTER_ADDFEATURE_URL},http://extensions.libreoffice.org/,g' \ - -e 's,$${STARTCENTER_INFO_URL},http://www.libreoffice.org/,g' \ + -e 's,$${STARTCENTER_INFO_URL},http://libreoffice-from-collabora.com/,g' \ -e 's,$${STARTCENTER_HIDE_EXTERNAL_LINKS},0,g' \ -e 's,$${STARTCENTER_TEMPLREP_URL},http://templates.libreoffice.org/,g' \ commit 31a573d3498efbbdb75af94eb9197cb29e1526b3 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 13:37:02 2014 +0300 For a sandboxed OS X LOfC, use a more specific URL Change-Id: Ibe640c9557b987622a843d7e219f7fcd42f3b73a diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 1591f4e..059f282 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -109,6 +109,10 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON ) { sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get(); +#if defined MACOSX HAVE_FEATURE_MACOSX_SANDBOX +sURL += lofc-mac-app-store/; +#endif + localizeWebserviceURI(sURL); } commit 3a9d07e4108740303179c89db807382d3b8cb225 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 13:36:28 2014 +0300 Use LOfC-specific STARTCENTER_INFO_URL Change-Id: I5a16033851fd1e8441d451f14295e0c8d664d001 diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index c81eb72..ccb9034 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -67,7 +67,7 @@ LibreOffice CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL http://www.libreoffice.org/ +STARTCENTER_INFO_URL http://libreoffice-from-collabora.com/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -120,7 +120,7 @@ LibreOffice_Dev CODEFILENAME codes_ooodev.txt LOCALUSERDIR $ORIGIN/.. STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL http://www.libreoffice.org/ +STARTCENTER_INFO_URL http://libreoffice-from-collabora.com/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -162,7 +162,7 @@ LibreOffice_SDK CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL http://www.libreoffice.org/ +STARTCENTER_INFO_URL http://libreoffice-from-collabora.com/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -208,7 +208,7 @@
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/table-alignment.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 ++ writerfilter/source/dmapper/ConversionHelper.cxx | 12 +--- writerfilter/source/dmapper/TablePropertiesHandler.cxx |1 - writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +++--- 5 files changed, 22 insertions(+), 7 deletions(-) New commits: commit e85d8f9c5aadee9872ec6d7f33567f9ed84b478d Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Sep 19 13:52:37 2014 +0200 fdo#83728 DOCX import: fix table alignment Regression from 614b31615e69b527e669635245cf59faf9c9e2fc (Use NS_ooxml::LN_Value_ST_Jc_{right,end} constants, 2014-09-05), one more remnant from doctok. Change-Id: Ibab68eada337a3fe1bc919987a09a8b146f86ac9 diff --git a/sw/qa/extras/ooxmlexport/data/table-alignment.docx b/sw/qa/extras/ooxmlexport/data/table-alignment.docx new file mode 100644 index 000..e1efaae Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/table-alignment.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 15e0eae..953a036 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -11,6 +11,7 @@ #include com/sun/star/awt/XBitmap.hpp #include com/sun/star/graphic/XGraphic.hpp +#include com/sun/star/text/HoriOrientation.hpp #include com/sun/star/text/XTextRangeCompare.hpp #include string @@ -232,6 +233,15 @@ DECLARE_OOXMLEXPORT_TEST(testDropdownInCell, dropdown-in-cell.docx) CPPUNIT_ASSERT_EQUAL(sal_Int16(0), xTextRangeCompare-compareRegionStarts(xAnchor, xCell)); } +DECLARE_OOXMLEXPORT_TEST(testTableAlignment, table-alignment.docx) +{ +uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY); +uno::Referencetext::XTextTable xTable(xTables-getByIndex(0), uno::UNO_QUERY); +// This was LEFT_AND_WIDTH, i.e. table alignment wasn't imported correctly. +CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::RIGHT, getPropertysal_Int16(xTable, HoriOrient)); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 95d46f7..d2dd41e 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -252,9 +252,15 @@ sal_Int16 convertTableJustification( sal_Int32 nIntValue ) sal_Int16 nOrient = text::HoriOrientation::LEFT_AND_WIDTH; switch( nIntValue ) { -case 1 : nOrient = text::HoriOrientation::CENTER; break; -case 2 : nOrient = text::HoriOrientation::RIGHT; break; -case 0 : +case NS_ooxml::LN_Value_ST_Jc_center: +nOrient = text::HoriOrientation::CENTER; +break; +case NS_ooxml::LN_Value_ST_Jc_right: +case NS_ooxml::LN_Value_ST_Jc_end: +nOrient = text::HoriOrientation::RIGHT; +break; +case NS_ooxml::LN_Value_ST_Jc_left: +case NS_ooxml::LN_Value_ST_Jc_start: //no break default:; diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx index 6776a3a..1e3fa21 100644 --- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx +++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx @@ -72,7 +72,6 @@ namespace dmapper { case NS_ooxml::LN_CT_TblPrBase_jc: case 0x5400: // sprmTJc { -//table justification 0: left, 1: center, 2: right sal_Int16 nOrient = ConversionHelper::convertTableJustification( nIntValue ); TablePropertyMapPtr pTableMap( new TablePropertyMap ); pTableMap-setValue( TablePropertyMap::HORI_ORIENT, nOrient ); diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 2b22101..2fdbccd 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2741,13 +2741,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) switch (nKeyword) { case RTF_TRQL: -nParam = 0; +nParam = NS_ooxml::LN_Value_ST_Jc_left; break; case RTF_TRQC: -nParam = 1; +nParam = NS_ooxml::LN_Value_ST_Jc_center; break; case RTF_TRQR: -nParam = 2; +nParam = NS_ooxml::LN_Value_ST_Jc_right; break; default: break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sysui/desktop
sysui/desktop/macosx/Info.plist.in |2 ++ 1 file changed, 2 insertions(+) New commits: commit 68d186d3428df91c3efddb26294807d573c6306e Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 15:45:07 2014 +0300 We need CFBundleVersion, too Change-Id: I50c12ffd741baf12589069d90f47566c5324ce7f diff --git a/sysui/desktop/macosx/Info.plist.in b/sysui/desktop/macosx/Info.plist.in index b0b1984..0252518 100755 --- a/sysui/desktop/macosx/Info.plist.in +++ b/sysui/desktop/macosx/Info.plist.in @@ -1406,6 +1406,8 @@ stringmain.icns/string keyCFBundleShortVersionString/key string@MACOSX_BUNDLE_SHORTVERSION@/string + keyCFBundleVersion/key + string@MACOSX_BUNDLE_SHORTVERSION@/string keyCFBundleIdentifier/key string@MACOSX_BUNDLE_IDENTIFIER@/string keyCFBundleInfoDictionaryVersion/key ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc_sort.cxx | 18 ++ sc/source/ui/docshell/dbdocfun.cxx |1 + 2 files changed, 11 insertions(+), 8 deletions(-) New commits: commit 8af25862f1782ff1fb0f66415e3a2d624f61d737 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 19 09:12:00 2014 -0400 fdo#84009: Adjust the test case to catch this. Change-Id: I16bdc6760276b5bc0c78c3693d3f92c68ef67ed1 diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx index 95a5e42..f81a394 100644 --- a/sc/qa/unit/ucalc_sort.cxx +++ b/sc/qa/unit/ucalc_sort.cxx @@ -1320,6 +1320,7 @@ void Test::testSortRefUpdate5() void Test::testSortOutOfPlaceResult() { m_pDoc-InsertTab(0, Sort); +m_pDoc-InsertTab(1, Result); const char* pData[] = { Header, @@ -1356,7 +1357,7 @@ void Test::testSortOutOfPlaceResult() aSortData.nRow2 = 5; aSortData.bHasHeader = true; aSortData.bInplace = false; -aSortData.nDestTab = 0; +aSortData.nDestTab = 1; aSortData.nDestCol = 2; aSortData.nDestRow = 1; aSortData.maKeyState[0].bDoSort = true; @@ -1373,14 +1374,15 @@ void Test::testSortOutOfPlaceResult() CPPUNIT_ASSERT_EQUAL( 9.0, m_pDoc-GetValue(ScAddress(0,4,0))); CPPUNIT_ASSERT_EQUAL(-2.0, m_pDoc-GetValue(ScAddress(0,5,0))); -// Sort result in C2:C7. -CPPUNIT_ASSERT_EQUAL(OUString(Header), m_pDoc-GetString(ScAddress(2,1,0))); -CPPUNIT_ASSERT_EQUAL(-2.0, m_pDoc-GetValue(ScAddress(2,2,0))); -CPPUNIT_ASSERT_EQUAL( 1.0, m_pDoc-GetValue(ScAddress(2,3,0))); -CPPUNIT_ASSERT_EQUAL( 2.0, m_pDoc-GetValue(ScAddress(2,4,0))); -CPPUNIT_ASSERT_EQUAL( 9.0, m_pDoc-GetValue(ScAddress(2,5,0))); -CPPUNIT_ASSERT_EQUAL(23.0, m_pDoc-GetValue(ScAddress(2,6,0))); +// Sort result in C2:C7 on sheet Result. +CPPUNIT_ASSERT_EQUAL(OUString(Header), m_pDoc-GetString(ScAddress(2,1,1))); +CPPUNIT_ASSERT_EQUAL(-2.0, m_pDoc-GetValue(ScAddress(2,2,1))); +CPPUNIT_ASSERT_EQUAL( 1.0, m_pDoc-GetValue(ScAddress(2,3,1))); +CPPUNIT_ASSERT_EQUAL( 2.0, m_pDoc-GetValue(ScAddress(2,4,1))); +CPPUNIT_ASSERT_EQUAL( 9.0, m_pDoc-GetValue(ScAddress(2,5,1))); +CPPUNIT_ASSERT_EQUAL(23.0, m_pDoc-GetValue(ScAddress(2,6,1))); +m_pDoc-DeleteTab(1); m_pDoc-DeleteTab(0); } commit 5fd4679e7b92f344ea867e0dca1fc4c9363ae2cd Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 19 09:11:09 2014 -0400 fdo#84009: Be sure to update the sheet index when moving the sort range. Change-Id: Ic9ad51b33f6dfb6f90e76439c27eeff25ec4c7da diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 7f30a02..fe843b5 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -499,6 +499,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam rSortParam, return false; aLocalParam.MoveToDest(); +nTab = aLocalParam.nDestTab; } ScEditableTester aTester( rDoc, nTab, aLocalParam.nCol1,aLocalParam.nRow1, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: javaunohelper/com javaunohelper/test
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 20 +- javaunohelper/com/sun/star/comp/helper/ComponentContext.java| 12 +++--- javaunohelper/test/com/sun/star/comp/helper/Bootstrap_Test.java |3 + 3 files changed, 20 insertions(+), 15 deletions(-) New commits: commit 19206458555de6c1043aef8ead96067c3d8bca4d Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Fri Sep 19 12:22:32 2014 +0200 javaunohelper: use HashMap instead of Hashtable Collection Change-Id: I04e3245342a83df762fbec35a1523021a021f896 Reviewed-on: https://gerrit.libreoffice.org/11547 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java index 7b466b0..80daf4b 100644 --- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java +++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java @@ -38,7 +38,9 @@ import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; +import java.util.HashMap; import java.util.Hashtable; +import java.util.Map; import java.util.Random; /** Bootstrap offers functionality to obtain a context or simply @@ -94,7 +96,7 @@ public class Bootstrap { static public XComponentContext createInitialComponentContext( HashtableString, Object context_entries ) throws Exception { -return createInitialComponentContext((java.util.MapString,Object)context_entries); +return createInitialComponentContext((MapString, Object) context_entries); } /** Bootstraps an initial component context with service manager and basic jurt components inserted. @@ -102,7 +104,7 @@ public class Bootstrap { context entries (type class ComponentContextEntry). @return a new context. */ -static public XComponentContext createInitialComponentContext( java.util.MapString, Object context_entries ) +static public XComponentContext createInitialComponentContext( MapString, Object context_entries ) throws Exception { ServiceManager xSMgr = new ServiceManager(); @@ -116,7 +118,7 @@ public class Bootstrap { // initial component context if (context_entries == null) -context_entries = new HashtableString,Object( 1 ); +context_entries = new HashMapString,Object( 1 ); // add smgr context_entries.put( /singletons/com.sun.star.lang.theServiceManager, @@ -143,7 +145,7 @@ public class Bootstrap { static public XMultiServiceFactory createSimpleServiceManager() throws Exception { return UnoRuntime.queryInterface( -XMultiServiceFactory.class, createInitialComponentContext( null ).getServiceManager() ); +XMultiServiceFactory.class, createInitialComponentContext( (MapString, Object) null ).getServiceManager() ); } @@ -155,7 +157,7 @@ public class Bootstrap { static public final XComponentContext defaultBootstrap_InitialComponentContext() throws Exception { -return defaultBootstrap_InitialComponentContext( null, null ); +return defaultBootstrap_InitialComponentContext( (String) null, (MapString,String) null ); } /** * Backwards compatibility stub. @@ -164,7 +166,7 @@ public class Bootstrap { String ini_file, HashtableString,String bootstrap_parameters ) throws Exception { -return defaultBootstrap_InitialComponentContext(ini_file, (java.util.MapString,String)bootstrap_parameters); +return defaultBootstrap_InitialComponentContext(ini_file, (MapString,String) bootstrap_parameters); } /** Bootstraps the initial component context from a native UNO installation. @@ -178,7 +180,7 @@ public class Bootstrap { bootstrap parameters (maybe null) */ static public final XComponentContext defaultBootstrap_InitialComponentContext( -String ini_file, java.util.MapString,String bootstrap_parameters ) +String ini_file, MapString,String bootstrap_parameters ) throws Exception { // jni convenience: easier to iterate over array than calling Hashtable @@ -187,7 +189,7 @@ public class Bootstrap { { pairs = new String [ 2 * bootstrap_parameters.size() ]; int n = 0; -for (java.util.Map.EntryString, String bootstrap_parameter : bootstrap_parameters.entrySet()) { +for (Map.EntryString, String bootstrap_parameter : bootstrap_parameters.entrySet()) { pairs[ n++ ] = bootstrap_parameter.getKey(); pairs[ n++ ] = bootstrap_parameter.getValue(); } @@ -250,7 +252,7 @@ public class Bootstrap { try { // create default local component context XComponentContext
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - external/python3
external/python3/python-3.3.0-darwin.patch.1 | 11 +++ 1 file changed, 11 insertions(+) New commits: commit bb03775f9a73aeb4f25ad25c733bd88a2b6677d9 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 17:10:15 2014 +0300 Use correct CFBundleExecutable for the LibreOfficePython framework It should be the basename of the framework. The Python configury already provides that as @PYTHONFRAMEWORK@. Change-Id: I116a34c3bcc8f661abe16b2b5cc1b9268ecd2780 diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index a32b7f5..ca70279 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -61,3 +61,14 @@ no /usr/include. CPMAC=CpMac APPTEMPLATE=$(srcdir)/Resources/app +--- python3/Mac/Resources/framework/Info.plist.in python3/Mac/Resources/framework/Info.plist.in +@@ -5,7 +5,7 @@ + keyCFBundleDevelopmentRegion/key + stringEnglish/string + keyCFBundleExecutable/key +- stringPython/string ++ string@PYTHONFRAMEWORK@/string + keyCFBundleGetInfoString/key + stringPython Runtime and Library/string + keyCFBundleIdentifier/key ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Windows daily build broken on Windows 8.1
On 09/19/2014 11:50 AM, Alexander Thurgood wrote: Same on Mac for the packaged DMG, but not the instdir app bundle. ...and should be fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=7d5b30b419fb49232f3476d9fb8899fe3754d96d Use instsetoo_native-generated uno ini-file for both instdir and instsets as well (at least, I've seen that working with my local Mac build). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/python3
external/python3/python-3.3.0-darwin.patch.1 | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 24d1a89285caeaaa0289a06c6be909160ee57583 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 17:10:15 2014 +0300 Use correct CFBundleExecutable for the LibreOfficePython framework It should be the basename of the framework. The Python configury already provides that as @PYTHONFRAMEWORK@. Change-Id: I116a34c3bcc8f661abe16b2b5cc1b9268ecd2780 diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index ec4f45f..8e14381 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -61,3 +61,14 @@ no /usr/include. CPMAC=CpMac APPTEMPLATE=$(srcdir)/Resources/app +--- python3/Mac/Resources/framework/Info.plist.in python3/Mac/Resources/framework/Info.plist.in +@@ -5,7 +5,7 @@ + keyCFBundleDevelopmentRegion/key + stringEnglish/string + keyCFBundleExecutable/key +- stringPython/string ++ string@PYTHONFRAMEWORK@/string + keyCFBundleGetInfoString/key + stringPython Runtime and Library/string + keyCFBundleIdentifier/key ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - basic/qa basic/source
basic/qa/cppunit/test_vba.cxx|6 +- basic/qa/vba_tests/cdec.vb |4 - basic/qa/vba_tests/datevalue.vb |8 +- basic/qa/vba_tests/win32compat.vb| 86 basic/qa/vba_tests/win32compatb.vb | 104 +++ basic/source/runtime/dllmgr-none.cxx | 72 ++-- 6 files changed, 269 insertions(+), 11 deletions(-) New commits: commit 857f72dfe32b269a864dc30e687ce5920d1c0fda Author: Michael Meeks michael.me...@collabora.com Date: Fri Sep 19 14:45:06 2014 +0100 vba - disable Currency test / invocation on master. We're missing an effective SbxCURRENCY conversion here. Change-Id: Id6530ed3a93623b31089304f3451d9693ab4f3af diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 777b94ad..936cce3 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -51,7 +51,9 @@ void VBATest::testMiscVBAFunctions() format.vb, replace.vb, stringplusdouble.vb, +#ifndef WIN32 // missing 64bit Currency marshalling. win32compat.vb, // windows compatibility hooks. +#endif win32compatb.vb // same methods, different signatures. }; OUString sMacroPathURL = getURLFromSrc(/basic/qa/vba_tests/); diff --git a/basic/qa/vba_tests/win32compat.vb b/basic/qa/vba_tests/win32compat.vb index 7697648..681d330 100644 --- a/basic/qa/vba_tests/win32compat.vb +++ b/basic/qa/vba_tests/win32compat.vb @@ -18,8 +18,8 @@ Dim passCount As Integer Dim failCount As Integer Dim result As String -Private Declare Function QueryPerformanceCounter Lib kernel32 (lpPerformanceCount As Currency) As Long -Private Declare Function QueryPerformanceFrequency Lib kernel32 (lpFrequency As Currency) As Long +Private Declare Function QueryPerformanceCounter Lib kernel32 (ByRef lpPerformanceCount As Currency) As Long +Private Declare Function QueryPerformanceFrequency Lib kernel32 (ByRef lpFrequency As Currency) As Long ' FIXME: all this cut/paste should be factored out ! @@ -61,7 +61,7 @@ Function verify_win32compat() as String Exit Function errorHandler: -TestLog_ASSERT (False), hit error handler +TestLog_ASSERT (False), hit error handler - Err : Error$ (line : Erl ) verify_win32compat = result End Function commit 01e14011e5b38fbfa713f4dcd8ca5bf2ed75c436 Author: Michael Meeks michael.me...@collabora.com Date: Fri Sep 19 13:54:11 2014 +0100 vba: add a different variant of the same compatibility function. Change-Id: I92bc1dbceea2f10cbb055d97f68b33e575d9be11 diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx index 739e96a..777b94ad 100644 --- a/basic/qa/cppunit/test_vba.cxx +++ b/basic/qa/cppunit/test_vba.cxx @@ -51,7 +51,8 @@ void VBATest::testMiscVBAFunctions() format.vb, replace.vb, stringplusdouble.vb, -win32compat.vb +win32compat.vb, // windows compatibility hooks. +win32compatb.vb // same methods, different signatures. }; OUString sMacroPathURL = getURLFromSrc(/basic/qa/vba_tests/); // Some test data expects the uk locale diff --git a/basic/qa/vba_tests/win32compatb.vb b/basic/qa/vba_tests/win32compatb.vb new file mode 100644 index 000..d6819fa --- /dev/null +++ b/basic/qa/vba_tests/win32compatb.vb @@ -0,0 +1,104 @@ +Option VBASupport 1 +Option Explicit + +' +' This file is part of the LibreOffice project. +' +' This Source Code Form is subject to the terms of the Mozilla Public +' License, v. 2.0. If a copy of the MPL was not distributed with this +' file, You can obtain one at http://mozilla.org/MPL/2.0/. +' +' +' Test built-in compatibility versions of methods whose absence +' is really felt in VBA, and large numbers of macros import from +' the system. +' +' This module tests different signatures for the same methods. +' + +Dim passCount As Integer +Dim failCount As Integer +Dim result As String + +Private Type LARGE_INTEGER +lowpart As Long +highpart As Long +End Type + +Private Declare Function QueryPerformanceCounter Lib kernel32 (lpPerformanceCount As LARGE_INTEGER) As Long +Private Declare Function QueryPerformanceFrequency Lib kernel32 (lpFrequency As LARGE_INTEGER) As Long + +' FIXME: all this cut/paste should be factored out ! + +Function doUnitTest() As String +result = verify_win32compat() +If failCount 0 Then +doUnitTest = result +Else +doUnitTest = OK +End If +End Function + +Function convertLarge(scratch As LARGE_INTEGER) As Double +Dim ret As Double +ret = scratch.highpart +ret = ret * 65536 * 65536 +ret = ret + scratch.lowpart +convertLarge = ret +End Function + +Function verify_win32compat() as String +passCount = 0 +failCount = 0 + +result = Test Results Chr$(10) Chr$(10) + +Dim scratch as LARGE_INTEGER +Dim freq As Double +Dim count_a As Double +
Re: Windows daily build broken on Windows 8.1
Le 19/09/2014 16:14, Stephan Bergmann a écrit : On 09/19/2014 11:50 AM, Alexander Thurgood wrote: Same on Mac for the packaged DMG, but not the instdir app bundle. ...and should be fixed with T'is indeed, thanks. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LiMux student kick-off
At the moment i'm trying to get the unoxml/test/domtest.cxx (Bug 39625 https://bugs.freedesktop.org/show_bug.cgi?id=39625) working. So we'll see if it's usefull :) Cheers Tobi Am 19.09.2014 08:47, schrieb Matúš Kukan: On Wed, 2014-09-17 at 11:10 +0100, Michael Meeks wrote: On Wed, 2014-09-17 at 11:47 +0200, Jan-Marek Glogowski wrote: AFAIK Miklos was Michaels suggestion for the mentoring - can't remember. Matus is the XFastParser expert =) I guess it'd be nice to have a small XFastParser unit test as well (as some sort of entry-level easy-hack there). There is one in sax/qa/cppunit/parser.cxx - but needs more love. I've added simple css::xml::sax::XFastTokenHandler implementation in 6503be5311716cf520cf534ca1bb0fd595b93d72 What I think should be done there: 1, We need a better, more complicated input :-) 2, Extend DummyTokenHandler to recognize some of the element/attribute strings used in the input. 3, Implement simple XFastDocumentHandler and use setFastDocumentHandler() examples for this: - oox/source/crypto/DocumentDecryption.cxx - but we want to use tokens, not compare strings - unoxml/test/domtest.cxx - we don't build this, maybe we should, no idea how obsolete it is http://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1xml_1_1sax_1_1XFastParser.html contains some description and there is also a link to a wiki with rather useful information. Best, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
ScOpenclTest::testFinacialIRRFormula test error
Hi all, first sorry for my english. When I tried to build LO 4.3.2.1 with --enable-dbgutil, error occurs in test: sc/qa/unit/opencl-test.cxx(1269) : error : Assertion Test name: ScOpenclTest::testFinacialIRRFormula double equality assertion failed - Expected: 29.3418442391175 - Actual : 523 - Delta : 0.00293418442391175 More output in attachment. Software: Windows 8.1, MSVS 2012 PRO, cygwin 32bit. I checked 4.2.6.3 and 4.3.2.2 and there is the same problem. Is this a bug in test case or in Calc ? When I comment this test, all other tests passed and the build is done. I build with dbgutil, because with this feature more tests are running, am I right ? Maybe I can run extended tests without this switch, because I don't need all this debug stuff ? Regards, Jakub Kościelak F:/4321/sc/qa/unit/opencl-test.cxx(1269) : error : Assertion Test name: ScOpenclTest::testFinacialIRRFormula double equality assertion failed - Expected: 29.3418442391175 - Actual : 523 - Delta : 0.00293418442391175 Failures !!! Run: 223 Failure total: 1 Failures: 1 Errors: 0 warn:legacy.osl:10148:5868:unotools/source/config/configmgr.cxx:167: OSL_ASSERT: items_.empty() Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=gdb --args# for interactive debugging on Linux export CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_sc_opencl_test make[1]: *** [F:/4321/workdir/CppunitTest/sc_opencl_test.test] Error 1 make: *** [build] Error 2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sfx2 sfx2/sdi sw/source
include/sfx2/sfxcommands.h |1 + include/sfx2/sfxsids.hrc |1 + sfx2/sdi/sfx.sdi | 24 sw/source/ui/app/mn.src|9 - 4 files changed, 30 insertions(+), 5 deletions(-) New commits: commit 5398664eed621fbcc644ff949d4841590973bfa3 Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk Date: Fri Sep 19 17:51:52 2014 +0200 fdo#62947 make IDs unique, fixes, better names Change-Id: I6cbfd43f037fe89e0f753c67c9368b981b85bd35 diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h index cde5f46..e9b1b11 100644 --- a/include/sfx2/sfxcommands.h +++ b/include/sfx2/sfxcommands.h @@ -39,6 +39,7 @@ #define CMD_SID_GALLERY_BG_BRUSH.uno:BackgroundImage #define CMD_SID_PASTE .uno:Paste #define CMD_SID_PASTE_SPECIAL .uno:PasteSpecial +#define CMD_SID_PASTE_UNFORMATTED .uno:PasteUnformatted #define CMD_SID_PASTE_ONLY .uno:PasteOnly #define CMD_SID_PASTE_ONLY_VALUE.uno:PasteOnlyValue #define CMD_SID_PASTE_ONLY_TEXT .uno:PasteOnlyText diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 0ecdffa..5d31ca0 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -408,6 +408,7 @@ #define SID_CUT (SID_SFX_START + 710) #define SID_COPY(SID_SFX_START + 711) #define SID_PASTE (SID_SFX_START + 712) +#define SID_MENU_PASTE_SPECIAL (SID_SFX_START + 713) #define SID_BACKSPACE (SID_SFX_START + 714) #define SID_FORMATPAINTBRUSH(SID_SFX_START + 715) diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index f893324..2016f48 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -4516,6 +4516,30 @@ SfxInt16Item PasteSpecial SID_PASTE_SPECIAL GroupId = GID_EDIT; ] +SfxInt16Item PasteUnformatted SID_PASTE_UNFORMATTED +(SfxUInt32Item Format SID_PASTE_UNFORMATTED) +[ +/* flags: */ +AutoUpdate = FALSE, +Cachable = Cachable, +FastCall = FALSE, +HasCoreId = FALSE, +HasDialog = TRUE, +ReadOnlyDoc = FALSE, +Toggle = FALSE, +Container = FALSE, +RecordAbsolute = FALSE, +RecordPerSet; +Asynchron; + +/* config: */ +AccelConfig = TRUE, +MenuConfig = TRUE, +StatusBarConfig = FALSE, +ToolBoxConfig = TRUE, +GroupId = GID_EDIT; +] + SfxVoidItem PasteOnly SID_PASTE_ONLY () [ diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 03c301c..2b94310 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -295,11 +295,10 @@ Text[ en-US ] = Down One Level; \ }; -#define MN_NEW_PASTE_SPECIAL \ +#define MENU_PASTE_SPECIAL \ MenuItem\ {\ -Identifier = SID_PASTE_SPECIAL ; \ -HelpId = CMD_SID_PASTE_SPECIAL ; \ +Identifier = SID_MENU_PASTE_SPECIAL ; \ Text [ en-US ] = Paste ~Special ; \ SubMenu = Menu\ {\ @@ -308,7 +307,7 @@ MenuItem\ {\ Identifier = SID_PASTE_UNFORMATTED ; \ -HelpId = CMD_SID_PASTE_SPECIAL ; \ +HelpId = CMD_SID_PASTE_UNFORMATTED ; \ Text [ en-US ] = ~Text Only ; \ };\ MenuItem\ @@ -325,7 +324,7 @@ { \ ItemList = \ { \ -MN_NEW_PASTE_SPECIAL\ +MENU_PASTE_SPECIAL \ MN_RESET\ _NUMBERING_RELATED_MENU \ SEPARATOR ; \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - external/python3
external/python3/python-3.3.0-darwin.patch.1 | 11 +++ 1 file changed, 11 insertions(+) New commits: commit a925583c009d2829e313cea11ed6cf7b40eca097 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 18:56:05 2014 +0300 Use correct CFBundleExecutable in the Info.plist for Python.app Apparently the Python build machinery apparently does not use proper autoconfigury to expand this Info.plist.in file, so can't use @PYTHONFRAMEWORK@ as for the Info.plist for the framework itself, but have to hardcode LibreOfficePython. As such I am not sure that Python's way of including an app bundle inside a framework's Resources subtree is acceptable in the stricter code signing and Gatekeeper rules that soon will be in effect. Will see. Change-Id: I1ef9e7b748d41ec4b32d80e721d5fba5e7a90d18 diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index ca70279..78a2e7a 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -72,3 +72,14 @@ no /usr/include. keyCFBundleGetInfoString/key stringPython Runtime and Library/string keyCFBundleIdentifier/key +--- python3/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/Info.plist.in +@@ -18,7 +18,7 @@ + /dict + /array + keyCFBundleExecutable/key +- stringPython/string ++ stringLibreOfficePython/string + keyCFBundleGetInfoString/key + string%version%, (c) 2004-2013 Python Software Foundation./string + keyCFBundleHelpBookFolder/key ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/python3
external/python3/python-3.3.0-darwin.patch.1 | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 5e2492b9c4715e286c92c84ffb18333c94e25710 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 18:56:05 2014 +0300 Use correct CFBundleExecutable in the Info.plist for Python.app The Python build machinery apparently does not use proper autoconfigury to expand this Info.plist.in file, so can't use @PYTHONFRAMEWORK@ as for the Info.plist for the framework itself, but have to hardcode LibreOfficePython. As such I am not sure that Python's way of including an app bundle inside a framework's Resources subtree is acceptable in the stricter code signing and Gatekeeper rules that soon will be in effect. Will see. Change-Id: I1ef9e7b748d41ec4b32d80e721d5fba5e7a90d18 diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index 8e14381..2a737c3 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -72,3 +72,14 @@ no /usr/include. keyCFBundleGetInfoString/key stringPython Runtime and Library/string keyCFBundleIdentifier/key +--- python3/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/Info.plist.in +@@ -18,7 +18,7 @@ + /dict + /array + keyCFBundleExecutable/key +- stringPython/string ++ stringLibreOfficePython/string + keyCFBundleGetInfoString/key + string%version%, (c) 2004-2013 Python Software Foundation./string + keyCFBundleHelpBookFolder/key ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source
sw/qa/extras/ww8export/data/redline-export-1.odt |binary sw/qa/extras/ww8export/ww8export.cxx | 13 + sw/source/filter/ww8/attributeoutputbase.hxx |2 sw/source/filter/ww8/wrtw8nds.cxx| 50 +-- sw/source/filter/ww8/wrtww8.hxx |2 sw/source/filter/ww8/ww8atr.cxx |4 - sw/source/filter/ww8/ww8attributeoutput.hxx |2 7 files changed, 55 insertions(+), 18 deletions(-) New commits: commit 1e882a1dc49cc60aed7bae98b4924871ea1bf935 Author: Caolán McNamara caol...@redhat.com Date: Fri Sep 19 13:15:36 2014 +0100 consider following redline as well a) In word each range that character properties affect are just stored by their end. So the range is from the last end to the current one. b) In word the paragraph end marker is a real character, in writer it is not. c) So for redlining if a paragraph is redlined, but the previous one is not then the redlining propes of the 2nd para will affect the end marker of the previous one if the previous char properties do not include the para end mark. We were currently handing the case where a paragraph end mark *is* inside redlining and including it in the char property range, but we were not considering the case where the paragraph end mark is *not* inside redlining but the following paragraph *is* to get the end of the previous paragraph not part of the following paragraph character run, we emit an empty char section of it for this case. Change-Id: I816335067f60d1d9332bfdb1117fb1448b564972 diff --git a/sw/qa/extras/ww8export/data/redline-export-1.odt b/sw/qa/extras/ww8export/data/redline-export-1.odt new file mode 100644 index 000..31aacce Binary files /dev/null and b/sw/qa/extras/ww8export/data/redline-export-1.odt differ diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 61655ee..184815d 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -344,6 +344,19 @@ DECLARE_WW8EXPORT_TEST(testBorderColoursExport, bordercolours.odt) #endif } +DECLARE_WW8EXPORT_TEST(testRedlineExport1, redline-export-1.odt) +{ +uno::Referencetext::XTextRange xParagraph = getParagraph(1); +uno::Referencecontainer::XEnumerationAccess xRunEnumAccess(xParagraph, uno::UNO_QUERY); +uno::Referencecontainer::XEnumeration xRunEnum = xRunEnumAccess-createEnumeration(); +//there must be no redline information on the first line before or after reloading +while (xRunEnum-hasMoreElements()) +{ +uno::Referencetext::XTextRange xRun(xRunEnum-nextElement(), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(false, hasProperty(xRun, RedlineType)); +} +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx index a823b5f..0a644c2 100644 --- a/sw/source/filter/ww8/attributeoutputbase.hxx +++ b/sw/source/filter/ww8/attributeoutputbase.hxx @@ -224,7 +224,7 @@ public: /// Output FKP (Formatted disK Page) - necessary for binary formats only. /// FIXME having it in AttributeOutputBase is probably a hack, it /// should be in WW8AttributeOutput only... -virtual void OutputFKP() {} +virtual void OutputFKP(bool /*bForce*/ = false) {} /// Output style. virtual void ParagraphStyle( sal_uInt16 nStyle ) = 0; diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index fbd1d54..c17e3af 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -1252,7 +1252,7 @@ int SwWW8AttrIter::OutAttrWithRange(sal_Int32 nPos) return nRet; } -bool SwWW8AttrIter::IsRedlineAtEnd( sal_Int32 nEnd ) const +bool SwWW8AttrIter::IncludeEndOfParaCRInRedlineProperties( sal_Int32 nEnd ) const { // search next Redline for( sal_uInt16 nPos = nCurRedlinePos; @@ -1260,16 +1260,32 @@ bool SwWW8AttrIter::IsRedlineAtEnd( sal_Int32 nEnd ) const { const SwRangeRedline *pRange = m_rExport.pDoc-getIDocumentRedlineAccess().GetRedlineTbl()[nPos]; const SwPosition* pEnd = pRange-End(); +const SwPosition* pStart = pRange-Start(); +// In word the paragraph end marker is a real character, in writer it is not. +// Here we find out if the para end marker we will emit is affected by +// redlining, in which case it must be included by the range of character +// attributes that contains the redlining information. if (pEnd-nNode == rNd) { -// In word the paragraph end marker is a real character, in writer it is not. if (pEnd-nContent.GetIndex() == nEnd) { -// This condition detects if the pseudo-char we will export is affected -// by
[Libreoffice-commits] core.git: external/python3
external/python3/python-3.3.0-darwin.patch.1 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 280efe54ee7d9edd54ce550965e1d4ace34af803 Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 19:59:16 2014 +0300 Make the patch apply Change-Id: Ic773b86a1ebaa66a1b0ae236429276f35776deb8 diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1 index 2a737c3..a709473 100644 --- a/external/python3/python-3.3.0-darwin.patch.1 +++ b/external/python3/python-3.3.0-darwin.patch.1 @@ -81,5 +81,5 @@ no /usr/include. - stringPython/string + stringLibreOfficePython/string keyCFBundleGetInfoString/key - string%version%, (c) 2004-2013 Python Software Foundation./string + string%version%, (c) 2004-2014 Python Software Foundation./string keyCFBundleHelpBookFolder/key ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/opengl/oglplayer.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6b2cd65b8370ff8a2be2e4effa59139cd0f5a7b5 Author: Jan Holesovsky ke...@collabora.com Date: Fri Sep 19 18:34:52 2014 +0200 Related fdo#84000: Improve framerate of the models. This will start working when we switch to using high-precision timers. Change-Id: I2115cb3e044578bac1a30c008d787613ec81570a diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index c7f0c05..36f5e68 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -121,7 +121,7 @@ bool OGLPlayer::create( const OUString rURL ) } // Set timer -m_aTimer.SetTimeout(10); +m_aTimer.SetTimeout(1); m_aTimer.SetTimeoutHdl(LINK(this,OGLPlayer,TimerHandler)); return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
High-precision timers on Windows
Hi Michael, Stephan, all, I've re-implemented the Windows WinSalTimer using the Timer Queues to get higher precision than ~15.6ms; please see https://gerrit.libreoffice.org/#/c/11552/ With my testing, all seems to work as before, and even the parts that need this high precision really get the events quickly :-) Michael S. - does it fit your threading plans, please? Checking / testing / feedback appreciated; I'll merge the change to master on Tuesday, if there are no problems. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - chart2/inc chart2/source
chart2/inc/ChartView.hxx |3 chart2/source/tools/DiagramHelper.cxx | 153 chart2/source/view/main/ChartView.cxx | 589 ++ 3 files changed, 396 insertions(+), 349 deletions(-) New commits: commit be775a1ab40ccedfbc9659120b82867d6c128e6a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 19 13:14:25 2014 -0400 Move the code that creates shapes for axis titles to own method. This change also creates a struct that keeps track of states during shape creation, to make it easier to extract methods as necessary. Change-Id: I0d84dbee9dba5b9c59d22e4a1be318c5e8c6c6c3 diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index cf217b7..51b6a48 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -56,6 +56,7 @@ class SeriesPlotterContainer; class VDataSeries; class GL3DPlotterBase; class GL2DRenderer; +struct CreateShapeParam2D; enum TimeBasedMode { @@ -204,6 +205,7 @@ private: //methods void createShapes(); void createShapes2D( const css::awt::Size rPageSize ); +bool createAxisTitleShapes2D( const css::awt::Size rPageSize, CreateShapeParam2D rParam ); void createShapes3D(); bool isReal3DChart(); void getMetaFile( const ::com::sun::star::uno::Reference ::com::sun::star::io::XOutputStream xOutStream diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 7194c3c..34f0ee1 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -130,6 +130,32 @@ class theExplicitValueProviderUnoTunnelId : public rtl::StaticUnoTunnelIdInit, } +struct CreateShapeParam2D +{ +css::awt::Rectangle maRemainingSpace; + +boost::shared_ptrVTitle mpVTitleX; +boost::shared_ptrVTitle mpVTitleY; +boost::shared_ptrVTitle mpVTitleZ; + +boost::shared_ptrVTitle mpVTitleSecondX; +boost::shared_ptrVTitle mpVTitleSecondY; + +bool mbAutoPosTitleX; +bool mbAutoPosTitleY; +bool mbAutoPosTitleZ; + +bool mbAutoPosSecondTitleX; +bool mbAutoPosSecondTitleY; + +CreateShapeParam2D() : +mbAutoPosTitleX(true), +mbAutoPosTitleY(true), +mbAutoPosTitleZ(true), +mbAutoPosSecondTitleX(true), +mbAutoPosSecondTitleY(true) {} +}; + class GL2DRenderer : public IRenderer { public: @@ -2992,8 +3018,11 @@ void ChartView::createShapes2D( const awt::Size rPageSize ) // but the draw page does not support XPropertySet formatPage( mrChartModel, rPageSize, mxRootShape, m_xShapeFactory ); -//sal_Int32 nYDistance = static_castsal_Int32(aPageSize.Height*lcl_getPageLayoutDistancePercentage()); -awt::Rectangle aRemainingSpace( 0, 0, rPageSize.Width, rPageSize.Height ); +CreateShapeParam2D aParam; +aParam.maRemainingSpace.X = 0; +aParam.maRemainingSpace.Y = 0; +aParam.maRemainingSpace.Width = rPageSize.Width; +aParam.maRemainingSpace.Height = rPageSize.Height; //create the group shape for diagram and axes first to have title and legends on top of it uno::Reference XDiagram xDiagram( mrChartModel.getFirstDiagram() ); @@ -3013,14 +3042,16 @@ void ChartView::createShapes2D( const awt::Size rPageSize ) bool bAutoPositionDummy = true; -lcl_createTitle( TitleHelper::MAIN_TITLE, mxRootShape, m_xShapeFactory, mrChartModel -, aRemainingSpace, rPageSize, ALIGN_TOP, bAutoPositionDummy ); -if(aRemainingSpace.Width=0||aRemainingSpace.Height=0) +lcl_createTitle( +TitleHelper::MAIN_TITLE, mxRootShape, m_xShapeFactory, mrChartModel, +aParam.maRemainingSpace, rPageSize, ALIGN_TOP, bAutoPositionDummy); +if (aParam.maRemainingSpace.Width = 0 || aParam.maRemainingSpace.Height = 0) return; -lcl_createTitle( TitleHelper::SUB_TITLE, mxRootShape, m_xShapeFactory, mrChartModel -, aRemainingSpace, rPageSize, ALIGN_TOP, bAutoPositionDummy ); -if(aRemainingSpace.Width=0||aRemainingSpace.Height=0) +lcl_createTitle( +TitleHelper::SUB_TITLE, mxRootShape, m_xShapeFactory, mrChartModel, +aParam.maRemainingSpace, rPageSize, ALIGN_TOP, bAutoPositionDummy ); +if (aParam.maRemainingSpace.Width = 0|| aParam.maRemainingSpace.Height = 0) return; SeriesPlotterContainer aSeriesPlotterContainer( m_aVCooSysList ); @@ -3045,63 +3076,24 @@ void ChartView::createShapes2D( const awt::Size rPageSize ) } } -lcl_createLegend( LegendHelper::getLegend( mrChartModel ), mxRootShape, m_xShapeFactory, m_xCC -, aRemainingSpace, rPageSize, mrChartModel, aSeriesPlotterContainer.getLegendEntryProviderList() -, lcl_getDefaultWritingModeFromPool( m_pDrawModelWrapper ) ); -if(aRemainingSpace.Width=0||aRemainingSpace.Height=0) -return; - -Reference chart2::XChartType xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); -
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/dllmgr-none.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 234b5de79fd10bd99b75d7b968581af7b6ffe44b Author: Michael Meeks michael.me...@collabora.com Date: Fri Sep 19 20:15:09 2014 +0100 vba: calm down bool - long casting concerns. Change-Id: Ib32a66d891242701d2f5c55519e5c52a6dd3df3c diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx index 426b2b1..90d628d 100644 --- a/basic/source/runtime/dllmgr-none.cxx +++ b/basic/source/runtime/dllmgr-none.cxx @@ -42,7 +42,7 @@ namespace { SbError returnInt64InOutArg(SbxArray *pArgs, SbxVariable rRetVal, sal_Int64 nValue) { -if (!rRetVal.PutLong(true) !rRetVal.PutInteger(true)) +if (!rRetVal.PutLong(1) !rRetVal.PutInteger(1)) return ERRCODE_BASIC_BAD_ARGUMENT; if (!pArgs || pArgs-Count() != 2) return ERRCODE_BASIC_BAD_ARGUMENT; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/CppunitTest_svx_unit.mk svx/Module_svx.mk svx/qa svx/source
include/svx/svdotext.hxx | 10 ++ svx/CppunitTest_svx_unit.mk | 32 svx/Module_svx.mk |4 ++ svx/qa/unit/svdraw/test_SdrTextObject.cxx | 48 ++ svx/source/svdraw/svdotxat.cxx| 43 ++ 5 files changed, 123 insertions(+), 14 deletions(-) New commits: commit 5013ac55090ab7a64b9549df67196aa5c7479542 Author: Tobias Lippert d...@fastmail.fm Date: Thu Aug 7 22:30:58 2014 +0200 fdo#84061 Fix setting text style sheet listeners in SdrTextObj The code in SdrTextObj::ImpSetTextStyleSheetListeners is obviously not working correctly. The families of the stylesheets are appended to the name of the family for further usage. An encoded string looks like STYLE_NAME|3 The family is then extracted by copying the first (length-6) bytes, e.g., STYLE_NAME in this example. Then another copy starting a position 1 is created, e.g., TYLE_NAME. This string is cast to an Int32. Since this is not possible, 0 is returned, and the originally stored family is lost. This patch corrects this behavior, and adds a unit test. Change-Id: I60c0add6e4b670acbbc264cc77672452f282f737 Reviewed-on: https://gerrit.libreoffice.org/10818 Reviewed-by: Matúš Kukan matus.ku...@collabora.com Tested-by: Matúš Kukan matus.ku...@collabora.com diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 9922e5e..a2b7b1f 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -25,6 +25,7 @@ #include svx/svdoattr.hxx #include svx/svdtrans.hxx #include tools/datetime.hxx +#include rsc/rscsfx.hxx #include svx/xtextit0.hxx #include svx/svdtext.hxx #include vector @@ -40,6 +41,7 @@ class OutlinerParaObject; class SdrOutliner; class SdrTextObj; +class SdrTextObjTest; class SvxFieldItem; class ImpSdrObjTextLink; class EditStatus; @@ -271,6 +273,12 @@ private: SVX_DLLPRIVATE ImpSdrObjTextLinkUserData* GetLinkUserData() const; // void ImpCheckItemSetChanges(const SfxItemSet rAttr); +/** Appends the style family to a provided style name */ +static void AppendFamilyToStyleName(OUString styleName, SfxStyleFamily family); + +/** Reads the style family from a style name to which the family has been appended. */ +static SfxStyleFamily ReadFamilyFromStyleName(const OUString styleName); + protected: bool ImpCanConvTextToCurve() const; SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr = false) const; @@ -591,6 +599,8 @@ public: Also checks for one empty paragraph. */ static bool HasTextImpl( SdrOutliner* pOutliner ); + +friend class ::SdrTextObjTest; }; diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk new file mode 100644 index 000..82d9cd4 --- /dev/null +++ b/svx/CppunitTest_svx_unit.mk @@ -0,0 +1,32 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,svx_unit)) + +$(eval $(call gb_CppunitTest_use_external,svx_unit,boost_headers)) + +$(eval $(call gb_CppunitTest_use_api,svx_unit, \ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_set_include,svx_unit,\ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \ + svx/qa/unit/svdraw/test_SdrTextObject \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,svx_unit, \ + sal \ + svxcore \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 492f6f7..67dbe01 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -32,6 +32,10 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\ UIConfig_svx \ )) +$(eval $(call gb_Module_add_check_targets,svx,\ + CppunitTest_svx_unit \ +)) + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal \ diff --git a/svx/qa/unit/svdraw/test_SdrTextObject.cxx b/svx/qa/unit/svdraw/test_SdrTextObject.cxx new file mode 100644 index 000..fe16805 --- /dev/null +++ b/svx/qa/unit/svdraw/test_SdrTextObject.cxx @@ -0,0 +1,48 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include svx/svdotext.hxx +#include rtl/ustring.hxx + +#include cppunit/TestAssert.h +#include
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/undosort.hxx | 37 - sc/source/ui/inc/undosort.hxx | 37 + 2 files changed, 37 insertions(+), 37 deletions(-) New commits: commit 0772786dcb7aacaa74adb8203e33fd1a2aa1b799 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 19 17:48:34 2014 -0400 Move this header file to a better place. undo headers are all located in source/ui/inc. Change-Id: I9111cad08b64e161f22ebf7ff7fe8f2dd2d10a14 diff --git a/sc/inc/undosort.hxx b/sc/source/ui/inc/undosort.hxx similarity index 100% rename from sc/inc/undosort.hxx rename to sc/source/ui/inc/undosort.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - configure.ac Makefile.in registry/Module_registry.mk Repository.mk solenv/bin solenv/gbuild svx/Module_svx.mk
Makefile.in | 11 ++ Repository.mk | 10 - configure.ac |2 - registry/Module_registry.mk |6 ++- solenv/bin/macosx-codesign-app-bundle | 58 +++--- solenv/gbuild/platform/macosx.mk |9 - svx/Module_svx.mk |2 + 7 files changed, 59 insertions(+), 39 deletions(-) New commits: commit 09f5eed074e6dd8474447bce5ba7ca9bd8198757 Author: Tor Lillqvist t...@collabora.com Date: Sat Sep 20 01:12:17 2014 +0300 This test was the wrong way surely? Change-Id: I3470fbd2992cd96a772452d75fb2f0320bb529bf diff --git a/configure.ac b/configure.ac index e5b4d02..b3bb9ba 100644 --- a/configure.ac +++ b/configure.ac @@ -12732,7 +12732,7 @@ if test $enable_mpl_subset = yes; then AC_MSG_ERROR([need to --disable-ext-mariadb-connector - mariadb/mysql support.]) fi if test -n $ENABLE_PDFIMPORT; then -if test x$SYSTEM_POPPLER != xNO; then +if test x$SYSTEM_POPPLER = xNO; then AC_MSG_ERROR([need to disable PDF import via poppler or use system library]) fi fi commit beb30bbd867f9a28878e0d004458c3507f6c0956 Author: Tor Lillqvist t...@collabora.com Date: Sat Sep 20 01:01:09 2014 +0300 Skip some executables in the OS X sandboxed (Mac App Store) case I doubt end-users will miss gengal.bin, regview, or regmerge. Change-Id: I353610c0d039f25fa415f35902fe2b9890cd423f diff --git a/Repository.mk b/Repository.mk index bebbef4..9976a3c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -76,7 +76,9 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ )) $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ - gengal \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + gengal \ + )\ )) $(eval $(call gb_Helper_register_executables,OOO, \ @@ -123,8 +125,10 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \ - regmerge \ - regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + regmerge \ + regview \ + ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \ )) diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk index fb962c6..5f70ed9 100644 --- a/registry/Module_registry.mk +++ b/registry/Module_registry.mk @@ -12,8 +12,10 @@ $(eval $(call gb_Module_Module,registry)) $(eval $(call gb_Module_add_targets,registry,\ Library_reg \ $(if $(filter-out $(OS),IOS), \ - Executable_regmerge \ - Executable_regview \ + $(if $(ENABLE_MACOSX_SANDBOX),, \ + Executable_regmerge \ + Executable_regview \ + ) \ StaticLibrary_registry_helper \ ) \ )) diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index 80f2bd7..0e63435 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -34,11 +34,13 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +ifeq (,$(ENABLE_MACOSX_SANDBOX)) $(eval $(call gb_Module_add_targets,svx,\ Executable_gengal.bin \ Package_gengal \ )) endif +endif ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ commit 69c2fc6cfb12b939a076856bb82a18812afdfccc Author: Tor Lillqvist t...@collabora.com Date: Fri Sep 19 22:58:16 2014 +0300 OS X code signing fixes Remove unnecessary Python executables and stuff that complicates code signing in the test-install target. Sign executables in codesign-macosx-app-bundle, not when building them. It is more uniform to do all code signing in just one place. All executables must have the com.apple.security.app-sandbox entitlement. Change-Id: Ic6a640eb03964fe9ce75d3a8fff071971a3e1939 diff --git a/Makefile.in b/Makefile.in index 8fc6f3d..af2096a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -291,6 +291,7 @@ ifeq ($(OS_FOR_BUILD),WNT) else @ooinstall $(TESTINSTALLDIR) ifneq ($(MACOSX_CODESIGNING_IDENTITY),) +# # Unzip bin/InfoPlist_*.zip files into corresponding Resources/*.lproj directories. set -x; for F in $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin/InfoPlist_*.zip; do \ bn=`basename $$F .zip`; \ @@ -299,8 +300,18 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) mkdir $$lproj; \ (cd $$lproj; unzip $$F); \ done +# # And remove the bin folder which should not be there rm -rf $(TESTINSTALLDIR)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,Dev).app/Contents/bin +# +# Remove unnecessary executables in the LibreOfficePython framework + rm -rf
PARTICIPAR
CORDIAL SALUDO MI NOMBRE ES JUAN ESTEBAN ARCILA RESTREPO QUIERO SER PARTE DE LIBREOFFICE POR QUE DESEO APRENDER MUCHO SOBRE PROGRAMACIÓN. -- * JUAN ESTEBAN ARCILA RESTREPO* *APRENDIZ SENA* *CENTRO DE SERVICIOS Y GESTIÓN EMPRESARIAL* -- El servicio de correo misena es soportado tecnológicamente por © Google y ofrecido por el Servicio Nacional de Aprendizaje – SENA de manera gratuita a todos los colombianos y en especial a los aprendices e instructores de Programas de Formación Titulada y Complementaria. Los contenidos, textos, imágenes, archivos y puntos de vista enviados en este mensaje son responsabilidad exclusiva del remitente y no reflejan ni comprometen oficialmente a la institución. No se autoriza el uso de esta herramienta para el intercambio de correos masivos, cadenas o spam, ni de mensajes ofensivos, de carácter político, sexual o religioso, con fines de lucro, con propósitos delictivos o cualquier otro mensaje que se considere indebido o que vaya en contra de la Ley. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Saverio Nardi - License statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f8a66093ef5baeae57fbf12a4010d615462be0e Author: Tor Lillqvist t...@collabora.com Date: Sat Sep 20 01:43:50 2014 +0300 Bump build number for new App Store attempt Change-Id: Icdc0cc6b06b4354a2068a8dc8a1a9182da8e8d97 diff --git a/configure.ac b/configure.ac index b3bb9ba..1f3c898 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.10.9],[],[],[https://libreoffice-from-collabora.com/]) +AC_INIT([LibreOffice],[4.2.10.10],[],[],[https://libreoffice-from-collabora.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - chart2/inc chart2/source
chart2/inc/ChartView.hxx | 12 -- chart2/source/inc/BaseGFXHelper.hxx |2 chart2/source/tools/BaseGFXHelper.cxx |5 + chart2/source/view/main/ChartView.cxx | 169 -- 4 files changed, 92 insertions(+), 96 deletions(-) New commits: commit 3b6dcf40f1ac395af3301af08f47c4db9cd1e1e0 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 19 16:44:34 2014 -0400 These are no longer used. Change-Id: I55a19ab06108825ece00844bb20c3fd5f65dfe37 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 747ebe8..3a6e6f5 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -3090,9 +3090,6 @@ void ChartView::createShapes2D( const awt::Size rPageSize ) if (getAvailablePosAndSizeForDiagram(aParam, rPageSize, mrChartModel.getFirstDiagram())) { -awt::Point aAvailablePosDia(aParam.maRemainingSpace.X, aParam.maRemainingSpace.Y); -awt::Size aAvailableSizeForDiagram(aParam.maRemainingSpace.Width, aParam.maRemainingSpace.Height); - awt::Rectangle aUsedOuterRect = impl_createDiagramAndContent(aSeriesPlotterContainer, aParam, rPageSize); if (aParam.mxPlotAreaWithAxes.is()) commit 9396f59a3c3012cc7514d50f1b3f6476cb73ca9d Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Sep 19 16:41:41 2014 -0400 Finally, move the group shape object for the diagram with axes to the param. Change-Id: I134275076256bb1b5441ae7804eac689d171 diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 1d90414..dc3d495 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -222,10 +222,9 @@ private: //methods void render(); -::com::sun::star::awt::Rectangle impl_createDiagramAndContent( SeriesPlotterContainer rSeriesPlotterContainer -, const ::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes xDiagramPlusAxes_Shapes -, const CreateShapeParam2D rParam -, const ::com::sun::star::awt::Size rPageSize ); +css::awt::Rectangle impl_createDiagramAndContent( +SeriesPlotterContainer rSeriesPlotterContainer, +const CreateShapeParam2D rParam, const css::awt::Size rPageSize ); DECL_LINK( UpdateTimeBased, void* ); diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index a40799f..747ebe8 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -144,6 +144,8 @@ struct CreateShapeParam2D css::uno::Referencecss::drawing::XShape mxMarkHandles; css::uno::Referencecss::drawing::XShape mxPlotAreaWithAxes; +css::uno::Referencecss::drawing::XShapes mxDiagramWithAxesShapes; + bool mbAutoPosTitleX; bool mbAutoPosTitleY; bool mbAutoPosTitleZ; @@ -1430,10 +1432,9 @@ sal_Int16 lcl_getDefaultWritingModeFromPool( const boost::shared_ptrDrawModelWr } //end anonymous namespace -awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer rSeriesPlotterContainer -, const uno::Reference drawing::XShapes xDiagramPlusAxes_Shapes -, const CreateShapeParam2D rParam -, const awt::Size rPageSize ) +awt::Rectangle ChartView::impl_createDiagramAndContent( +SeriesPlotterContainer rSeriesPlotterContainer, +const CreateShapeParam2D rParam, const awt::Size rPageSize ) { //return the used rectangle awt::Rectangle aUsedOuterRect(rParam.maRemainingSpace.X, rParam.maRemainingSpace.Y, 0, 0); @@ -1490,7 +1491,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount); bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram); {//create diagram -aVDiagram.init(xDiagramPlusAxes_Shapes, m_xShapeFactory); +aVDiagram.init(rParam.mxDiagramWithAxesShapes, m_xShapeFactory); aVDiagram.createShapes( awt::Point(rParam.maRemainingSpace.X, rParam.maRemainingSpace.Y), awt::Size(rParam.maRemainingSpace.Width, rParam.maRemainingSpace.Height)); @@ -1501,7 +1502,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer aVDiagram.reduceToMimimumSize(); } -uno::Reference drawing::XShapes xTextTargetShapes( AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory)-createGroup2D(xDiagramPlusAxes_Shapes) ); +uno::Reference drawing::XShapes xTextTargetShapes = + AbstractShapeFactory::getOrCreateShapeFactory(m_xShapeFactory)-createGroup2D(rParam.mxDiagramWithAxesShapes); // - create axis and grids for all coordinate systems @@ -1519,7 +1521,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer //calculate resulting size respecting axis label layout and fontscaling -uno::Reference drawing::XShape xBoundingShape(
Re: ScOpenclTest::testFinacialIRRFormula test error
On Fri, 2014-09-19 at 10:51 +0200, Jakub Kościelak wrote: Hi all, first sorry for my english. When I tried to build LO 4.3.2.1 with --enable-dbgutil, error occurs in test: sc/qa/unit/opencl-test.cxx(1269) : error : Assertion Test name: ScOpenclTest::testFinacialIRRFormula double equality assertion failed - Expected: 29.3418442391175 - Actual : 523 - Delta : 0.00293418442391175 More output in attachment. Software: Windows 8.1, MSVS 2012 PRO, cygwin 32bit. I checked 4.2.6.3 and 4.3.2.2 and there is the same problem. Is this a bug in test case or in Calc ? Likely an issue with your GPU and/or driver for your GPU since that test computes formula results using your GPU. Markus was at one point trying to gather all problematic GPU's to add to our black list, and it's possible that your hardware needs to be on that list. He wrote a detector program you can run to get the detailed information of your GPU... I don't remember where to get that program though I need to dig up the archive a bit to find out. When I comment this test, all other tests passed and the build is done. Use this as a workaround for now. Markus is on vacation until mid-October. I build with dbgutil, because with this feature more tests are running, am I right ? It's unlikely that that would affect the result of that OpenCL test, but maybe it does. I don't know. Maybe I can run extended tests without this switch, because I don't need all this debug stuff ? That's a possibility. The vast majority of us recommend using dbgutil turned on, but that also adds extra baggage that you may or may not need (plus extra build time and disk space). So, if you are interested in doing just casual coding, then using a non-dbgutil build may be an option. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Performance samples for LibreOffice ...
On 09/13/2014 05:43 PM, Jan Hubicka wrote: I updated to current tree and my ODR checker reports no more violations during of libmergedlo. Did you integrated more stuff to it? I at least didn't address any further issues from your list than the ones I'd reported as fixed. Iant fixed the 65536 ELF sections limit issue and I can build TOT libreoffice again. Here is list of Wodr warning I setill get. The Xlib one looks particularly entertaining so does the difference in bases... Honza /usr/include/X11/Xlib.h:948:3: warning: type ‘struct XAnyEvent’ violates one definition rule [-Wodr] } XAnyEvent; ^ /usr/include/X11/Xlib.h:948:3: note: a different type is defined in another translation unit } XAnyEvent; ^ /usr/include/X11/Xlib.h:947:9: note: the first difference of corresponding definitions is field ‘window’ Window window; /* window on which event was requested in event mask */ ^ /usr/include/X11/Xlib.h:947:9: note: a field of same name but different type is defined in another translation unit Window window; /* window on which event was requested in event mask */ ^ /usr/include/X11/X.h:96:13: note: type ‘XLIB_Window’ should match type ‘Window’ typedef XID Window; ^ /usr/include/X11/X.h:96:13: note: the incompatible type is defined here typedef XID Window; ^ /usr/include/X11/Xlib.h:579:3: warning: type ‘struct XKeyEvent’ violates one definition rule [-Wodr] } XKeyEvent; ^ /usr/include/X11/Xlib.h:579:3: note: a different type is defined in another translation unit } XKeyEvent; ^ /usr/include/X11/Xlib.h:570:9: note: the first difference of corresponding definitions is field ‘window’ Window window; /* event window it is reported relative to */ ^ /usr/include/X11/Xlib.h:570:9: note: a field of same name but different type is defined in another translation unit Window window; /* event window it is reported relative to */ ^ /usr/include/X11/X.h:96:13: note: type ‘XLIB_Window’ should match type ‘Window’ typedef XID Window; ^ /usr/include/X11/X.h:96:13: note: the incompatible type is defined here typedef XID Window; ^ /usr/include/X11/Xlib.h:597:3: warning: type ‘struct XButtonEvent’ violates one definition rule [-Wodr] } XButtonEvent; ^ /usr/include/X11/Xlib.h:597:3: note: a different type is defined in another translation unit } XButtonEvent; ^ /usr/include/X11/Xlib.h:588:9: note: the first difference of corresponding definitions is field ‘window’ Window window; /* event window it is reported relative to */ ^ /usr/include/X11/Xlib.h:588:9: note: a field of same name but different type is defined in another translation unit Window window; /* event window it is reported relative to */ ^ /usr/include/X11/X.h:96:13: note: type ‘XLIB_Window’ should match type ‘Window’ typedef XID Window; ^ /usr/include/X11/X.h:96:13: note: the incompatible type is defined here typedef XID Window; ^ /usr/include/X11/Xlib.h:615:3: warning: type ‘struct XMotionEvent’ violates one definition rule [-Wodr] } XMotionEvent; ^ /usr/include/X11/Xlib.h:615:3: note: a different type is defined in another translation unit } XMotionEvent; ^ /usr/include/X11/Xlib.h:606:9: note: the first difference of corresponding definitions is field ‘window’ Window window; /* event window reported relative to */ ^ /usr/include/X11/Xlib.h:606:9: note: a field of same name but different type is defined in another translation unit Window window; /* event window reported relative to */ ^ /usr/include/X11/X.h:96:13: note: type ‘XLIB_Window’ should match type ‘Window’ typedef XID Window; ^ /usr/include/X11/X.h:96:13: note: the incompatible type is defined here typedef XID Window; ^ /usr/include/X11/Xlib.h:638:3: warning: type ‘struct XCrossingEvent’ violates one definition rule [-Wodr] } XCrossingEvent; ^ /usr/include/X11/Xlib.h:638:3: note: a different type is defined in another translation unit } XCrossingEvent; ^ /usr/include/X11/Xlib.h:623:9: note: the first difference of corresponding definitions is field ‘window’ Window window; /* event window reported relative to */ ^ /usr/include/X11/Xlib.h:623:9: note: a field of same name but different type is defined in another translation unit Window window; /* event window reported relative to */ ^ /usr/include/X11/X.h:96:13: note: type ‘XLIB_Window’ should match type ‘Window’ typedef XID Window; ^ /usr/include/X11/X.h:96:13: note: the incompatible type is defined here typedef XID Window; ^ /usr/include/X11/Xlib.h:656:3: warning: type ‘struct XFocusChangeEvent’ violates one definition rule [-Wodr] } XFocusChangeEvent; ^ /usr/include/X11/Xlib.h:656:3: note: a different type is defined in another translation unit } XFocusChangeEvent; ^
Re: [Libreoffice-qa] LibreOffice 4.3.2 rc2 test builds available
Hi Robinson, * Robinson Tryon wrote on 18-09-14 22:47: For the upcoming new version 4.3.2 the builds for RC2 are now available on pre-releases. I've missed the RC1 on our Dutch public pre-releases site http://nl.libreoffice.org/download/pre-releases/ Has anything changed there? Ciao, Cor -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice 4.3.2 rc2 test builds available
Hi, On Fri, Sep 19, 2014 at 12:24:35PM +0200, Cor Nouws wrote: Robinson Tryon wrote on 18-09-14 22:47: For the upcoming new version 4.3.2 the builds for RC2 are now available on pre-releases. I've missed the RC1 on our Dutch public pre-releases site http://nl.libreoffice.org/download/pre-releases/ Has anything changed there? No, it hasn't been anywhere (neither on the english main one) except on the pre-releases server. No idea why. I wondered too and gave up waiting. :( Apparently mirroring of it also took only time on Wednesday or Thursday (.5 weeks after it should have been announced in the first place) and still no rc1 there either. (OK, by then it didn't make sense anymore to announce it at all.) Hopefully rc2 will appear in a sensible time - and more importantly the release will not be delayed. Regards, Rene ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice 4.3.2 rc2 test builds available
On Fri, Sep 19, 2014 at 5:24 AM, Cor Nouws oo...@nouenoff.nl wrote: Hi Robinson, * Robinson Tryon wrote on 18-09-14 22:47: For the upcoming new version 4.3.2 the builds for RC2 are now available on pre-releases. I've missed the RC1 on our Dutch public pre-releases site http://nl.libreoffice.org/download/pre-releases/ Has anything changed there? Hi Cor, Apologies for the delay with RC1. Cloph's been helping me to get up to speed with all of the release engineering pieces, and I've been asking a lot of questions :-) AFAIK the RC1 should be out on the public mirrors, but might not have shown up as visible in Silverstripe yet. Once I have more information, I'll let you know. Best, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice 4.3.2 rc2 test builds available
On Fri, Sep 19, 2014 at 12:59 PM, Rene Engelhard r...@debian.org wrote: Hopefully rc2 will appear in a sensible time - and more importantly the release will not be delayed. RC2 is available on the pre-release server, and will be pushed out to the mirrors in a bit. Now that I've gone through the process for RC1 and have a nice stack of notes, I believe that we're right on track for the 4.3.2 release schedule. As always, if you have any questions or concerns, please feel free to drop me an email, and I'll be more than happy to sort things out! Thanks, --R -- Robinson Tryon QA Engineer - The Document Foundation LibreOffice Community Outreach Herald qu...@libreoffice.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice 4.3.2 rc2 test builds available
Hi Qubit, Robinson Tryon wrote on 19-09-14 21:17: Apologies for the delay with RC1. Cloph's been helping me to get up to speed with all of the release engineering pieces, and I've been asking a lot of questions :-) AFAIK the RC1 should be out on the public mirrors, but might not have shown up as visible in Silverstripe yet. No need to apologise - it's great that Cloph can enjoy a vacation thanks to you ;) Once I have more information, I'll let you know. Pls don't - I just see that they arrived. thanks Cor -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Some needQAAdvice bugs
Thanks Owen for taking the time to check them out. Regards, Jay Philips On 09/14/2014 08:50 AM, Owen Genat wrote: jphilipz wrote Well i've been triaging today and came across a few bugs that i thought i'd need the more experience QA or dev team to give their opinions on. I have commented in the first bug and provided an example with some clarity. Appears to be a rounding / floating point(?) issue as you indicate. I think the other two are fine and offer a couple of improvements to LO. I have noticed the Draw toolbar one before. Strange behaviour, although IMO it really should not be doing that. Well done, Owen. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Some-needQAAdvice-bugs-tp4122205p4122208.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 84022] FORMATTING: SORTING DATA
https://bugs.freedesktop.org/show_bug.cgi?id=84022 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #3 from ign_christian ign_christ...@yahoo.com --- Hello Ian.. Welcome to the club :) Unfortunately your file is too complex you didn't provide exact reproducible steps to see the problem. Please tell the exact step by step procedure, then change status to UNCONFIRMED *) Possibly your report is duplicate to Bug 81633 (new behavior introduced since LO 4.3.1), please read that bug and all duplicate/related bugs. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84056] EDITING: Dependent cells are sometimes not recalculated/updated
https://bugs.freedesktop.org/show_bug.cgi?id=84056 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Priority|medium |high CC||ign_christ...@yahoo.com Keywords||regression --- Comment #2 from ign_christian ign_christ...@yahoo.com --- Tried several times with LO 4.3.1.2 portable - Win7 x86, not reproducible. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84067] FILEOPEN: DOC - crashes on importing some documents
https://bugs.freedesktop.org/show_bug.cgi?id=84067 --- Comment #1 from todven...@suomi24.fi --- Doesn't crash on 4.3.0.4 Win 7 64-bit. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84036] FORMATTING: Copy/Paste breaks conditional format ranges into many small range fragments. Undo wont fix this.
https://bugs.freedesktop.org/show_bug.cgi?id=84036 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from ign_christian ign_christ...@yahoo.com --- Hello Michael, thanks for reporting. Enhancement request regarding this issue has been filed. You'll be CCed on that bug then *** This bug has been marked as a duplicate of bug 80768 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 80768] Cell ranges with the same Conditional Formatting should be consolidated to 1 range.
https://bugs.freedesktop.org/show_bug.cgi?id=80768 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added CC||mich...@wyraz.de --- Comment #20 from ign_christian ign_christ...@yahoo.com --- *** Bug 84036 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #133 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Philipp Weissenbacher committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=778dcbc53ee32517f3867ac4edd603c77a7bb70d fdo#39468 Translate German comments, clean some ws The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84055] EDITING: Error in ordereing tables with linked tables in other sheets
https://bugs.freedesktop.org/show_bug.cgi?id=84055 --- Comment #2 from ign_christian ign_christ...@yahoo.com --- Hi Gabriele..I think your file is too complex to observe (at least for me). Could you please provide simple test case exact reproducible steps? Without macros if possible, unless the problem is in macros. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84057] Other: Localized string is truncated
https://bugs.freedesktop.org/show_bug.cgi?id=84057 --- Comment #4 from Adolfo Jayme f...@libreoffice.org --- I tried editing that .ui file in Glade and setting that label to wrap, but when I previewed it in Glade it didn’t have the correct alignment, and when I tested my edited .ui in a LibreOffice build it didn’t wrap at all, but an ellipsis was added at the end. I’m no coder so I just shortened the label. https://gerrit.libreoffice.org/11531 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] OSX - hang / poor performance when reading table containing binary encoded data using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #3 from Alex Thurgood ipla...@yahoo.co.uk --- The problem is also apparent on Linux Mint 17 64bit, so confirming, and with LibreOffice Version: 4.2.6.3 Build ID: 420m0(Build:3) With this version, there is clearly a display refresh issue as well as the performance of moving the cursor from one position to another position. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] Hang / poor performance when reading table containing binary encoded data using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Summary|OSX - hang / poor |Hang / poor performance |performance when reading|when reading table |table containing binary |containing binary encoded |encoded data using native |data using native mysql |mysql connector |connector Version|4.4.0.0.alpha0+ Master |4.2.6.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] Hang / poor performance when reading table containing binary encoded data using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] Hang / poor performance when reading table containing binary encoded data string using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Summary|Hang / poor performance |Hang / poor performance |when reading table |when reading table |containing binary encoded |containing binary encoded |data using native mysql |data string using native |connector |mysql connector -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49033] Change case - Sentence case doesn't honor selection; case of entire sentence changes
https://bugs.freedesktop.org/show_bug.cgi?id=49033 --- Comment #4 from Ljiljan lili...@gmail.com --- The bug is still not corrected (Libre Office 4.3) I recorded video so effects of the bug could be easily understood: https://www.youtube.com/watch?v=n3n5P5Aqu44feature=youtu.be -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] Hang / poor performance when reading table containing binary encoded data string using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 --- Comment #4 from Alex Thurgood ipla...@yahoo.co.uk --- If I try and click at more than one cursor position over a 20s interval, I can get the system to bring up the This application has stopped responding message. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 49033] Change case - Sentence case doesn't honor selection; case of entire sentence changes
https://bugs.freedesktop.org/show_bug.cgi?id=49033 Ljiljan lili...@gmail.com changed: What|Removed |Added Hardware|Other |All OS|Windows (All) |All -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84080] New: Editing: Copy and paste
https://bugs.freedesktop.org/show_bug.cgi?id=84080 Priority: medium Bug ID: 84080 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Editing: Copy and paste Severity: normal Classification: Unclassified OS: Windows (All) Reporter: stefan.b...@kirche-erndtebrueck.de Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.3.1.2 release Component: Database Product: LibreOffice Copy and paste does not work with shortcut STRG+C / STRG+V / STRG+X -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] Hang / poor performance when reading table containing binary encoded data string using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 --- Comment #5 from Alex Thurgood ipla...@yahoo.co.uk --- Also tested on OSX 10.9.4 with 32bit LibreOffice 3.6.7.2 with mysql connector 1.0.1 The first load of the table is slow, after that, cursor movements, e.g start to end are noticeably quicker, although the spinning beachball still takes pride of place on screen while waiting for the new display to be updated -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] Hang / poor performance when reading table containing binary encoded data string using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Version|4.2.6.2 release |3.6.7.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84057] Other: Localized string is truncated
https://bugs.freedesktop.org/show_bug.cgi?id=84057 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||caol...@redhat.com --- Comment #5 from Julien Nabet serval2...@yahoo.fr --- Caolan: thought you might interested in this one. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83999] Hang / poor performance when reading table containing binary encoded data string using native mysql connector
https://bugs.freedesktop.org/show_bug.cgi?id=83999 --- Comment #6 from Alex Thurgood ipla...@yahoo.co.uk --- In fact 3.6.7.2 is disticntly quicker, the previous lags with this version came as a result of an erroneous tuple copy operation. The performance hit becomes noticeable in 3.6.7.2 when a copy/paste of a tuple is attempted. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84084] New: FILEOPEN DOC: wrong page
https://bugs.freedesktop.org/show_bug.cgi?id=84084 Priority: medium Bug ID: 84084 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILEOPEN DOC: wrong page Severity: normal Classification: Unclassified OS: Windows (All) Reporter: ivanet-m...@list.ru Hardware: All Status: UNCONFIRMED Version: 4.3.1.2 release Component: Writer Product: LibreOffice Created attachment 106539 -- https://bugs.freedesktop.org/attachment.cgi?id=106539action=edit wrong file hi2all The gap between the text and the table In an attachment (norm.jpg) correctly being displayed file. The picture shows as the file looks in MS 2007. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84084] FILEOPEN DOC: wrong page
https://bugs.freedesktop.org/show_bug.cgi?id=84084 --- Comment #1 from Ivan ivanet-m...@list.ru --- Created attachment 106540 -- https://bugs.freedesktop.org/attachment.cgi?id=106540action=edit norm -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84085] New: Recent files list opens up slowly if it contains items from a pen drive
https://bugs.freedesktop.org/show_bug.cgi?id=84085 Priority: medium Bug ID: 84085 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Recent files list opens up slowly if it contains items from a pen drive Severity: normal Classification: Unclassified OS: All Reporter: kelem...@ubuntu.com Hardware: Other Status: UNCONFIRMED Version: 4.3.1.2 release Component: UI Product: LibreOffice I keep a lot of documents (ODF and OOXML both) on a pen drive. These end up in the recent files list, which then takes several seconds to open. If I remove the pen drive, the recent files list opens up instantly. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84086] New: Find and fix anti-patterns that result in use-after-free of strings
https://bugs.freedesktop.org/show_bug.cgi?id=84086 Priority: high Bug ID: 84086 CC: noelgran...@gmail.com, t...@iki.fi Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Find and fix anti-patterns that result in use-after-free of strings Severity: major Classification: Unclassified OS: All Reporter: fdb...@neosheffield.co.uk Hardware: Other Status: NEW Version: 4.4.0.0.alpha0+ Master Component: Libreoffice Product: LibreOffice In the codebase there are currently some examples of code like this: gchar* aItemCommandStr = (gchar*) OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr(); This fails as a pattern, because the destructor of the anonymous temporary OString is called at the end of this expression, before the gchar* that is returned can be used. (the destructor is only called at the very end of the expression, so in this case it would suffice to wrap with a g_strdup() on the same line, or alternatively to split the expression into two with a named OString) See bug 69090 for one example of this that resulted in a visible bug. There may be other related issues of a similar nature. A clang plugin would potentially be a good way to guard against these. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs