LibreOffice Gerrit News for core on 2014-04-03
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + WIP: fdo#74697 Add Bluez 5 support in https://gerrit.libreoffice.org/8821 from Andrzej Hunt about module sd End of freshness + Fix a memory leak by freeing last pBytes in https://gerrit.libreoffice.org/8822 from Takeshi Abe about module extensions * Merged changes on master for project core changed in the last 25 hours: + fdo#71720 fix transalate strings in https://gerrit.libreoffice.org/8819 from Winfried Donkers + fdo#73147 add Excel2010 functions NETWORKDAYS.INTL and WORKDAY.INTL in https://gerrit.libreoffice.org/8772 from Winfried Donkers + configure.ac: require g++ 4.1 or above in https://gerrit.libreoffice.org/8812 from Douglas Mencken + fdo#76586 Table column separators from individual cell widths in https://gerrit.libreoffice.org/8767 from Vinaya Mandke * Abandoned changes on master for project core changed in the last 25 hours: + Fixed revert of the previous commit in https://gerrit.libreoffice.org/8788 from Milan Zelenka * Open changes needing tweaks, but being untouched for more than a week: + new method INetURLObject::getData() for data urls in https://gerrit.libreoffice.org/8737 from Christina Roßmanith + fdo#67544 Slide transistion sound(other sound) is not included in present in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt + fdo#57950: Replace chained O(U)StringBuffer::append() with operator+ in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal + Refactored in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal + fdo#75757 Remove inheritance to std::map from PropertyMap in https://gerrit.libreoffice.org/8656 from Krisztian Pinter + Remove visual noise from ios in https://gerrit.libreoffice.org/8274 from Alexander Wilms + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - sal/rtl shell/Library_recentfile.mk shell/source stoc/Library_stocservices.mk stoc/source
sal/rtl/bootstrap.cxx |6 --- shell/Library_recentfile.mk |1 shell/source/unix/sysshell/recently_used_file_handler.cxx |8 ++-- stoc/Library_stocservices.mk |2 + stoc/source/implementationregistration/implreg.cxx|5 +- stoc/source/inspect/introspection.cxx |3 - stoc/source/javavm/interact.cxx |7 +-- stoc/source/javavm/javavm.cxx | 11 +- stoc/source/uriproc/ExternalUriReferenceTranslator.cxx| 10 ++--- stoc/source/uriproc/UriReferenceFactory.cxx | 18 +- stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 16 +++- stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 16 +++- stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 10 ++--- 13 files changed, 49 insertions(+), 64 deletions(-) New commits: commit c04f4393f5ec63dbd546b5c503ddc82d9cd2377e Author: Stephan Bergmann sberg...@redhat.com Date: Wed Apr 2 18:23:43 2014 +0200 Unused declaration Change-Id: Ib753cacf91baa6a761ac8f971b67c0f5ade555b6 diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index b3accdc..edcb739 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -229,9 +229,6 @@ class IntrospectionAccessStatic_Impl: public salhelper::SimpleReferenceObject // Sequence of Listener, that can be registered Sequence Type maSupportedListenerSeq; -// BaseInit (should be done later in the application!) -void BaseInit( void ); - // Helper-methods for adjusting sizes of Sequences void checkPropertyArraysSize ( commit 5cd46e2b3b8bbc81aca4d45717be05d2424a6c59 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Apr 2 18:22:07 2014 +0200 Use boost::noncopyable Change-Id: I9cba1299c54f196a5a7b35384f4c15bbbea273bb diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 9c0cb84..3c5dc90 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_use_libraries,stocservices,\ $(gb_UWINAPI) \ )) +$(eval $(call gb_Library_use_external,stocservices,boost_headers)) + $(eval $(call gb_Library_set_componentfile,stocservices,stoc/util/stocservices)) $(eval $(call gb_Library_add_exception_objects,stocservices,\ diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index 8a53877..3174547 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -21,6 +21,7 @@ #include string.h #include list +#include boost/noncopyable.hpp #include cppuhelper/queryinterface.hxx #include cppuhelper/weak.hxx #include cppuhelper/implbase3.hxx @@ -64,7 +65,7 @@ using namespace osl; namespace { -struct StringPool +struct StringPool: private boost::noncopyable { OUString slash_UNO_slash_REGISTRY_LINKS; OUString slash_IMPLEMENTATIONS; @@ -90,8 +91,6 @@ struct StringPool , com_sun_star_registry_SimpleRegistry(com.sun.star.registry.SimpleRegistry ) , Registry( Registry ) {} -private: -StringPool( const StringPool ); }; const StringPool spool() diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx index 3edc3ff..78f393a 100644 --- a/stoc/source/javavm/interact.cxx +++ b/stoc/source/javavm/interact.cxx @@ -20,6 +20,7 @@ #include interact.hxx +#include boost/noncopyable.hpp #include com/sun/star/java/JavaDisabledException.hpp #include com/sun/star/java/JavaVMCreationFailureException.hpp #include com/sun/star/task/XInteractionAbort.hpp @@ -33,7 +34,8 @@ using stoc_javavm::InteractionRequest; namespace { class AbortContinuation: -public cppu::WeakImplHelper1 css::task::XInteractionAbort +public cppu::WeakImplHelper1css::task::XInteractionAbort, +private boost::noncopyable { public: inline AbortContinuation() {} @@ -41,9 +43,6 @@ public: virtual void SAL_CALL select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} private: -AbortContinuation(AbortContinuation ); // not implemented -void operator =(AbortContinuation); // not implemented - virtual inline ~AbortContinuation() {} }; diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 36fd069..e38367c 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -119,16 +119,14 @@ class NoJavaIniException: public css::uno::Exception }; class SingletonFactory: -private cppu::WeakImplHelper1 css::lang::XEventListener +private cppu::WeakImplHelper1 css::lang::XEventListener , +
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/signal.c | 30 +- 1 file changed, 1 insertion(+), 29 deletions(-) New commits: commit 0a1cc7826beade023be930ac966a465c11819d55 Author: Tor Lillqvist t...@collabora.com Date: Thu Apr 3 10:08:18 2014 +0300 Kill Portal Demo HACK, whatever it is Change-Id: Ie07576d2d63f4db9acf7ebf09ebd25a4f7bd014b diff --git a/sal/osl/unx/signal.c b/sal/osl/unx/signal.c index 351047d..93da6c6 100644 --- a/sal/osl/unx/signal.c +++ b/sal/osl/unx/signal.c @@ -158,7 +158,6 @@ static sal_Bool bErrorReportingEnabled = sal_True; static sal_Bool bInitSignal = sal_False; static oslMutex SignalListMutex; static oslSignalHandlerImpl* SignalList; -static sal_Bool bDoHardKill = sal_False; static sal_Bool bSetSEGVHandler = sal_False; static sal_Bool bSetWINCHHandler = sal_False; static sal_Bool bSetILLHandler = sal_False; @@ -209,28 +208,6 @@ static sal_Bool InitSignal() if (is_soffice_Impl()) { -sal_uInt32 argi; -sal_uInt32 argc; -rtl_uString *ustrCommandArg = 0; - -argc = osl_getCommandArgCount(); -for ( argi = 0; argi argc; argi++ ) -{ -if (osl_Process_E_None == osl_getCommandArg (argi, ustrCommandArg)) -{ -if (0 == rtl_ustr_ascii_compare (rtl_uString_getStr (ustrCommandArg), -bean)) -{ -bDoHardKill = sal_True; -break; -} -} -} -if (ustrCommandArg) -{ -rtl_uString_release (ustrCommandArg); -ustrCommandArg = 0; -} - // WORKAROUND FOR SEGV HANDLER CONFLICT // // the java jit needs SIGSEGV for proper work @@ -249,7 +226,7 @@ static sal_Bool InitSignal() } #ifdef DBG_UTIL -bSetSEGVHandler = bSetWINCHHandler = bSetILLHandler = bDoHardKill = sal_False; +bSetSEGVHandler = bSetWINCHHandler = bSetILLHandler = sal_False; #endif SignalListMutex = osl_createMutex(); @@ -980,11 +957,6 @@ void SignalHandlerFunction(int Signal) ReportCrash( Signal ); -/* Portal Demo HACK !*/ -if (bDoHardKill (Info.Signal == osl_Signal_AccessViolation)) -_exit(255); -/* Portal Demo HACK !*/ - switch (CallSignalHandler(Info)) { case osl_Signal_ActCallNextHdl: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - offapi/com sw/inc sw/qa sw/source writerfilter/source
offapi/com/sun/star/table/CellProperties.idl| 10 ++ offapi/com/sun/star/text/TextTable.idl | 10 ++ sw/inc/unoprnms.hxx |2 sw/qa/extras/ooxmlexport/data/table-theme-preservation.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 22 sw/source/core/bastyp/init.cxx |2 sw/source/core/unocore/unomap.cxx |2 sw/source/filter/ww8/docxattributeoutput.cxx| 60 +++- writerfilter/source/dmapper/DomainMapperTableHandler.cxx| 11 ++ writerfilter/source/dmapper/PropertyIds.cxx |2 writerfilter/source/dmapper/PropertyIds.hxx |2 writerfilter/source/dmapper/TablePropertiesHandler.cxx | 10 +- 12 files changed, 125 insertions(+), 8 deletions(-) New commits: commit 3e9d9b073f1b8fd934e00c8cff69fb0f9ef40781 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Wed Apr 2 16:39:06 2014 +0200 oox: Preserve table style. Table style is a property that defines a set of background and line attributes for cells. These attributes depend on theme settings (e.g. theme colors). We added a grabbag to the table object to save the table style name. We detect that name on export and write it back to the document. Finally, modified an existing unit test to check this attribute too. TODO: To get the table style working properly after a roundtrip, we must preserve it and also check that its values are not being overwritten by different cell or table properties. Change-Id: Id0e022a389561960c21ab874db33649499735024 diff --git a/offapi/com/sun/star/text/TextTable.idl b/offapi/com/sun/star/text/TextTable.idl index c637fe0..9771210 100644 --- a/offapi/com/sun/star/text/TextTable.idl +++ b/offapi/com/sun/star/text/TextTable.idl @@ -211,6 +211,16 @@ published service TextTable */ [optional, property] boolean CollapsingBorders; +/** Grab bag of table properties, used as a string-any map for interim interop purposes. + +@since LibreOffice 4.3 + +pThis property is intentionally not handled by the ODF filter. Any +member that should be handled there should be first moved out from this grab +bag to a separate property./p +*/ +[optional, property] sequencecom::sun::star::beans::PropertyValue TableInteropGrabBag; + }; diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 280c7e4..be90c9d 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -840,6 +840,7 @@ #define UNO_NAME_CHAR_INTEROP_GRAB_BAG CharInteropGrabBag #define UNO_NAME_TEXT_VERT_ADJUST TextVerticalAdjust #define UNO_NAME_CELL_INTEROP_GRAB_BAG CellInteropGrabBag +#define UNO_NAME_TABLE_INTEROP_GRAB_BAG TableInteropGrabBag #endif diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 04f474c..15a5ddf 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1953,6 +1953,10 @@ DECLARE_OOXMLEXPORT_TEST(testTableThemePreservation, table-theme-preservation.d assertXPath(pXmlDocument, /w:document/w:body/w:tbl/w:tr[2]/w:tc[3]/w:tcPr/w:shd, themeFill, accent6); assertXPath(pXmlDocument, /w:document/w:body/w:tbl/w:tr[2]/w:tc[3]/w:tcPr/w:shd, themeFillShade, 80); assertXPath(pXmlDocument, /w:document/w:body/w:tbl/w:tr[2]/w:tc[3]/w:tcPr/w:shd, themeFillTint, ); + +// check table style has been preserved +assertXPath(pXmlDocument, /w:document/w:body/w:tbl/w:tblPr/w:tblStyle, val, Sombreadoclaro-nfasis1); + } DECLARE_OOXMLEXPORT_TEST(testcantSplit, 2_table_doc.docx) diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index af76602..fce0a3b 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -195,6 +195,7 @@ sal_uInt16 aTableSetRange[] = { RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS, // -- collapsing RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, +RES_FRMATR_GRABBAG, RES_FRMATR_GRABBAG, 0 }; diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 7e0a059..efe34b1 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -1100,6 +1100,7 @@ const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(s // #i29550# { OUString(UNO_NAME_COLLAPSING_BORDERS), RES_COLLAPSING_BORDERS, cppu::UnoTypebool::get(), PROPERTY_NONE, 0}, _REDLINE_NODE_PROPERTIES +{ OUString(UNO_NAME_TABLE_INTEROP_GRAB_BAG), RES_FRMATR_GRABBAG, cppu::UnoType cppu::UnoSequenceTypecss::beans::PropertyValue ::get(), PROPERTY_NONE, 0 }, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docnew.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6055c6670ff592923c3526515cb53eca2244d7a7 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Apr 3 09:59:24 2014 +0200 sw: translate internal name of default char/para style Change-Id: Icda048beb9b4b580cdf2843ee34698decc035d04 diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 4666eb36..27d333ba 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -106,8 +106,8 @@ using namespace ::com::sun::star::document; const sal_Char sFrmFmtStr[] = Frameformat; const sal_Char sEmptyPageStr[] = Empty Page; const sal_Char sColumnCntStr[] = Columncontainer; -const sal_Char sCharFmtStr[] = Zeichenformat; -const sal_Char sTxtCollStr[] = Textformatvorlage; +const sal_Char sCharFmtStr[] = Character style; +const sal_Char sTxtCollStr[] = Paragraph style; const sal_Char sGrfCollStr[] = Graphikformatvorlage; /* ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - sc/source
sc/source/filter/excel/xestream.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce2c62175858a6dd1fc9c5e62904442009177833 Author: Eike Rathke er...@redhat.com Date: Wed Apr 2 16:54:17 2014 +0200 resolved fdo#76949 correct grammar is GRAM_OOXML Regression introduced with ca8ca8c28742879220f3ff88ae0d71c8d69b11cd that used GRAM_ENGLISH_XL_OOX instead, which is English UI function names with OOXML reference syntax. Change-Id: If6b73e85a45e57f6ef281d1edf8e34dec7cb9bb8 (cherry picked from commit 31e4419ac7581aa7864905bcd4ce42e14df6c9bb) Reviewed-on: https://gerrit.libreoffice.org/8818 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 3e9935d..035a827 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -824,7 +824,7 @@ OUString XclXmlUtils::ToOUString( ScDocument rDocument, const ScAddress rAddress, const ScTokenArray* pTokenArray ) { ScCompiler aCompiler( rDocument, rAddress, const_castScTokenArray(*pTokenArray)); -aCompiler.SetGrammar(FormulaGrammar::GRAM_ENGLISH_XL_OOX); +aCompiler.SetGrammar(FormulaGrammar::GRAM_OOXML); OUStringBuffer aBuffer( pTokenArray-GetLen() * 5 ); aCompiler.CreateStringFromTokenArray( aBuffer ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo76589.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 14 ++ sw/source/filter/ww8/docxattributeoutput.cxx |2 +- 3 files changed, 15 insertions(+), 1 deletion(-) New commits: commit 8902a25c1ad11161fe7b9d263e9d7afe23f95e50 Author: Pallavi Jadhav pallavi.jad...@synerzip.com Date: Thu Mar 27 14:55:16 2014 +0530 fdo#76589 : FILESAVE: DOCX: Numbered list is not preserved after RT Issue : Numbered list without suffix does not get preserved after Roudtrip. Description : - For level zero LO was writing w:lvlText with epmty value. - This was because in DocxAttributeOutput::NumberingLevel() check was based on empty NumberingString. - But for deciaml also rNumberingString appears to be empty for level-0 Implementation : - Added check to write empty value for w:lvlText only if NumberingType is bullet with level-0. - This will not write empty w:lvlText with level-0 and NumberingType as decimal. Reviewed on: https://gerrit.libreoffice.org/8768 Change-Id: Ic6ece45e0122da05013beac93a6e11fac926514d diff --git a/sw/qa/extras/ooxmlexport/data/fdo76589.docx b/sw/qa/extras/ooxmlexport/data/fdo76589.docx new file mode 100644 index 000..d501b1b Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo76589.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 15a5ddf..b68b872 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2991,6 +2991,20 @@ DECLARE_OOXMLEXPORT_TEST(test76317_2K10, test76317_2K10.docx) assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:prstGeom[1]/a:avLst[1]/a:gd[1], name, adj); } +DECLARE_OOXMLEXPORT_TEST(testfdo76589 , fdo76589.docx) +{ +/* Numbered list was not preserve after RT. + * In numbering.xml, when NumberingType is decimal and level is zero, + * w:val of w:lvlText was empty. + * It should be w:lvlText w:val=%1 / + */ +xmlDocPtr pXmlDoc = parseExport(word/numbering.xml); +if (!pXmlDoc) +return; + +assertXPath ( pXmlDoc, /w:numbering/w:abstractNum[1]/w:lvl[1]/w:lvlText,val,%1 ); +} + DECLARE_OOXMLEXPORT_TEST(testAuthorPropertySdt, author-property.docx) { xmlDocPtr pXmlDoc = parseExport(word/document.xml); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index dd8ee93..caea79e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5006,7 +5006,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel, aBuffer.append( pPrev, pIt - pPrev ); // If bullet char is empty, set lvlText as empty -if ( aText.equals ( OUString(sal_Unicode(0)) ) ) +if ( aText.equals ( OUString(sal_Unicode(0)) ) nNumberingType == SVX_NUM_CHAR_SPECIAL ) { m_pSerializer-singleElementNS( XML_w, XML_lvlText, FSNS( XML_w, XML_val ), , FSEND ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salbmp.cxx |8 1 file changed, 8 insertions(+) New commits: commit 0f6149593129c3d208f07d0d017dec0c71760778 Author: Tor Lillqvist t...@collabora.com Date: Thu Apr 3 12:37:59 2014 +0300 Make it easier to catch code that assumes SalBitmaps are created pre-cleared In a DBG_UTIL build fill the maContextBuffer and maUserBuffer of a QuartzSalBitmap with an easily recognized pattern. Helps catch situations where by coincidence they appear pre-filled with zeros most of the time and almost everything usually looks fine. Or is the QuartzSalBitmap implementation wrong, and SalBitmaps *should* be created filled with zeros? Change-Id: Ib5207779f2a47b9b7e539d8646b4128fea0ec150 diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 5ecc507..973a675 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -211,6 +211,10 @@ bool QuartzSalBitmap::CreateContext() try { maContextBuffer.reset( new sal_uInt8[ mnHeight * nContextBytesPerRow ] ); +#ifdef DBG_UTIL +for (size_t i = 0; i mnHeight * nContextBytesPerRow; i++) +maContextBuffer.get()[i] = (i 0xFF); +#endif if( !bSkipConversion ) ConvertBitmapData( mnWidth, mnHeight, @@ -261,6 +265,10 @@ bool QuartzSalBitmap::AllocateUserData() { if( mnBytesPerRow ) maUserBuffer.reset( new sal_uInt8[mnBytesPerRow * mnHeight] ); +#ifdef DBG_UTIL +for (size_t i = 0; i mnBytesPerRow * mnHeight; i++) +maUserBuffer.get()[i] = (i 0xFF); +#endif } catch( const std::bad_alloc ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sccomp/source
sccomp/source/solver/CoinMPSolver.cxx |2 +- sccomp/source/solver/LpsolveSolver.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 31a24849bac2b3bc080eb341d8150b3994432395 Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Apr 3 11:52:11 2014 +0200 override specifier 'override' not allowed on a destructor Change-Id: I8bcc31900a95f2b7600645decafdfe528343d6d7 diff --git a/sccomp/source/solver/CoinMPSolver.cxx b/sccomp/source/solver/CoinMPSolver.cxx index 13ecd3b..a7127e3 100644 --- a/sccomp/source/solver/CoinMPSolver.cxx +++ b/sccomp/source/solver/CoinMPSolver.cxx @@ -35,7 +35,7 @@ class CoinMPSolver : public SolverComponent { public: CoinMPSolver() {} -virtual ~CoinMPSolver() SAL_OVERRIDE {} +virtual ~CoinMPSolver() {} private: virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sccomp/source/solver/LpsolveSolver.cxx b/sccomp/source/solver/LpsolveSolver.cxx index 3c2a014..a977f91 100644 --- a/sccomp/source/solver/LpsolveSolver.cxx +++ b/sccomp/source/solver/LpsolveSolver.cxx @@ -68,7 +68,7 @@ class LpsolveSolver : public SolverComponent { public: LpsolveSolver() {} -virtual ~LpsolveSolver() SAL_OVERRIDE {} +virtual ~LpsolveSolver() {} private: virtual void SAL_CALL solve() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docsh.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a4f09f8c2ef3ae82b86d1b4f0c6c90d1a61614fa Author: Aditya Kale voilavoil...@yahoo.in Date: Tue Apr 1 15:18:11 2014 +0100 fdo#73552 - Set name of CSV import sheet to something friendly Change-Id: Ia68283947d954d648fa25356f2b95ba0ab7010aa Reviewed-on: https://gerrit.libreoffice.org/8811 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 7e505f4..28ae7fa 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1207,6 +1207,8 @@ bool ScDocShell::ConvertFrom( SfxMedium rMedium ) aDocument.StartAllListeners(); sc::SetFormulaDirtyContext aCxt; aDocument.SetAllFormulasDirty(aCxt); +INetURLObject aURLObjForDefaultNameSheetName(rMedium.GetName()); + aDocument.RenameTab(0,aURLObjForDefaultNameSheetName.GetBase()); bOverflowRow = aImpEx.IsOverflowRow(); bOverflowCol = aImpEx.IsOverflowCol(); bOverflowCell = aImpEx.IsOverflowCell(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/source sc/uiconfig vcl/source
sc/source/ui/dbgui/PivotLayoutDialog.cxx| 117 +--- sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 41 +--- sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 18 --- sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 28 + sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx |2 sc/source/ui/inc/PivotLayoutDialog.hxx |5 - sc/source/ui/inc/PivotLayoutTreeListData.hxx|2 sc/source/ui/inc/PivotLayoutTreeListLabel.hxx |2 sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui |6 - vcl/source/window/window2.cxx |7 + 10 files changed, 160 insertions(+), 68 deletions(-) New commits: commit 8302e1221ec4b023db319f5048195e45369b9848 Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Thu Apr 3 11:35:20 2014 +0200 pivot: In Data Field Options dialog change Add - Ok Change-Id: Ie6b1670445fd15e2ba791b13e4b6cd6803b2b9df diff --git a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui index e71439a..9f532a2 100644 --- a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui +++ b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui @@ -25,8 +25,8 @@ property name=can_focusFalse/property property name=layout_styleend/property child - object class=GtkButton id=add -property name=labelgtk-add/property + object class=GtkButton id=ok +property name=labelgtk-ok/property property name=visibleTrue/property property name=can_focusTrue/property property name=can_defaultTrue/property @@ -552,7 +552,7 @@ /object /child action-widgets - action-widget response=0add/action-widget + action-widget response=0ok/action-widget action-widget response=0close/action-widget action-widget response=0help/action-widget /action-widgets commit 19d71217aba8700dac913c278767d6e387ce65a1 Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Thu Apr 3 11:33:04 2014 +0200 pivot: Apply changes made in Data Field and Data Field Options Change-Id: If8560d47c5b4e64367c441237c1e38f964cf6825 diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 48b4874..4acc758 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -16,8 +16,12 @@ #include rangeutl.hxx #include uiitems.hxx +#include dputil.hxx + +#include vector #include com/sun/star/sheet/DataPilotFieldOrientation.hpp +#include com/sun/star/sheet/DataPilotFieldSortMode.hpp using namespace css::uno; using namespace css::sheet; @@ -156,6 +160,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog( FillValuesToListBoxes(); +// Initialize Options const ScDPSaveData* pSaveData = maPivotTableObject.GetSaveData(); if (pSaveData == NULL) { @@ -446,65 +451,108 @@ void ScPivotLayoutDialog::UpdateSourceRange() bool ScPivotLayoutDialog::ApplyChanges() { ScDPSaveData aSaveData; -aSaveData.SetIgnoreEmptyRows(mpCheckIgnoreEmptyRows-IsChecked()); -aSaveData.SetRepeatIfEmpty(mpCheckIdentifyCategories-IsChecked()); -aSaveData.SetColumnGrand(mpCheckTotalColumns-IsChecked()); -aSaveData.SetRowGrand(mpCheckTotalRows-IsChecked()); -aSaveData.SetFilterButton(mpCheckAddFilter-IsChecked()); -aSaveData.SetDrillDown(mpCheckDrillToDetail-IsChecked()); +ApplySaveData(aSaveData); +ApplyLabelData(aSaveData); + +ScRange aDestinationRange; +bool bToNewSheet = false; + +if (!GetDestination(aDestinationRange, bToNewSheet)) +return false; + +SetDispatcherLock(false); +SwitchToDocument(); + +sal_uInt16 nWhichPivot = SC_MOD()-GetPool().GetWhich(SID_PIVOT_TABLE); +ScPivotItem aPivotItem(nWhichPivot, aSaveData, aDestinationRange, bToNewSheet); +mpViewData-GetViewShell()-SetDialogDPObject(maPivotTableObject); + +SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); +SfxCallMode nCallMode = SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD; +const SfxPoolItem* pResult = pDispatcher-Execute(SID_PIVOT_TABLE, nCallMode, aPivotItem, NULL, 0); + +if (pResult != NULL) +{ +const SfxBoolItem* pItem = reinterpret_castconst SfxBoolItem*(pResult); +if (pItem) +{ +return pItem-GetValue(); +} +} + +SetDispatcherLock(true); +return true; +} + +void ScPivotLayoutDialog::ApplySaveData(ScDPSaveData rSaveData) +{ +rSaveData.SetIgnoreEmptyRows(mpCheckIgnoreEmptyRows-IsChecked()); +rSaveData.SetRepeatIfEmpty(mpCheckIdentifyCategories-IsChecked()); +rSaveData.SetColumnGrand(mpCheckTotalColumns-IsChecked()); +rSaveData.SetRowGrand(mpCheckTotalRows-IsChecked()); +rSaveData.SetFilterButton(mpCheckAddFilter-IsChecked()); +rSaveData.SetDrillDown(mpCheckDrillToDetail-IsChecked());
[Libreoffice-commits] core.git: svx/source
svx/source/smarttags/SmartTagMgr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4c8325ea9cbffeff91de49d5e1f1f026be319de Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 12:59:21 2014 +0200 Support SmartTagRecognizers again The XContentEnumerationAccess is at the service manager, not the component context. Regression introduced in LO 4.0 with 4381f3dd5ae9e042840a16f69d07267208160420 fdo#46808, Use BreakIterator ::create method. Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 023a9ff..b812393 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -345,7 +345,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent rEvent ) throw( Run */ void SmartTagMgr::LoadLibraries() { -Reference container::XContentEnumerationAccess rContent( mxContext , UNO_QUERY ); +Reference container::XContentEnumerationAccess rContent( mxContext-getServiceManager(), UNO_QUERY ); if ( !rContent.is() ) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/smarttags/SmartTagMgr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit afb34a6851b81a06f077f18e692944dcd5360767 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 12:59:21 2014 +0200 Support SmartTagRecognizers again The XContentEnumerationAccess is at the service manager, not the component context. Regression introduced in LO 4.0 with 4381f3dd5ae9e042840a16f69d07267208160420 fdo#46808, Use BreakIterator ::create method. Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d (cherry picked from commit d4c8325ea9cbffeff91de49d5e1f1f026be319de) Reviewed-on: https://gerrit.libreoffice.org/8824 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 218406c..6a97d3c 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -345,7 +345,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent rEvent ) throw( Run */ void SmartTagMgr::LoadLibraries() { -Reference container::XContentEnumerationAccess rContent( mxContext , UNO_QUERY ); +Reference container::XContentEnumerationAccess rContent( mxContext-getServiceManager(), UNO_QUERY ); if ( !rContent.is() ) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig include/svx sc/uiconfig sfx2/source svx/source sw/uiconfig
cui/uiconfig/ui/connpooloptions.ui |1 cui/uiconfig/ui/menuassignpage.ui |1 cui/uiconfig/ui/password.ui |2 cui/uiconfig/ui/wordcompletionpage.ui |3 - include/svx/dialogs.hrc |1 sc/uiconfig/scalc/ui/movecopysheet.ui |7 +-- sc/uiconfig/scalc/ui/xmlsourcedialog.ui |1 sfx2/source/dialog/basedlgs.cxx | 45 +--- svx/source/sidebar/possize/PosSizePropertyPanel.cxx |4 - sw/uiconfig/swriter/ui/labelformatpage.ui |2 10 files changed, 45 insertions(+), 22 deletions(-) New commits: commit 333282478a956709e648427b412d90f90fc1437b Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 12:04:56 2014 +0100 Related: fdo#75307 use the unique auto help id to identify tabpages and dialogs that are loaded from the .ui format Change-Id: I37aea52a3973d8d8f6a2ce8dabf80bb1e64db43f diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 7687f94..c5c57c7 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -81,7 +81,6 @@ #define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216) #define RID_SVXPAGE_PICK_NUM(RID_SVX_START + 217) #define RID_SVXPAGE_PICK_BMP(RID_SVX_START + 218) -#define RID_SVXPAGE_POSITION_SIZE (RID_SVX_START + 87) #define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303) #define RID_SVXPAGE_HATCH (RID_SVX_START + 57) #define RID_SVXPAGE_BITMAP (RID_SVX_START + 58) diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 15cde96..51e70ce 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -98,7 +98,16 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster, const SfxHint rHint ) void SfxModalDialog::SetDialogData_Impl() { // save settings (position and user data) -SvtViewOptions aDlgOpt( E_DIALOG, OUString::number( nUniqId ) ); +OUString sConfigId; +if (isLayoutEnabled()) +sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8); +else +{ +SAL_WARN(sfx.config, Dialog needs to be converted to .ui format); +sConfigId = OUString::number(nUniqId); +} + +SvtViewOptions aDlgOpt(E_DIALOG, sConfigId); aDlgOpt.SetWindowState(OStringToOUString( GetWindowState(WINDOWSTATE_MASK_POS), RTL_TEXTENCODING_ASCII_US)); if ( !aExtraData.isEmpty() ) @@ -116,7 +125,16 @@ void SfxModalDialog::GetDialogData_Impl() */ { -SvtViewOptions aDlgOpt( E_DIALOG, OUString::number( nUniqId ) ); +OUString sConfigId; +if (isLayoutEnabled()) +sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8); +else +{ +SAL_WARN(sfx.config, Dialog needs to be converted to .ui format); +sConfigId = OUString::number(nUniqId); +} + +SvtViewOptions aDlgOpt(E_DIALOG, sConfigId); if ( aDlgOpt.Exists() ) { // load settings @@ -155,7 +173,7 @@ SfxModalDialog::SfxModalDialog(Window* pParent, const ResId rResId ) SfxModalDialog::SfxModalDialog(Window *pParent, const OString rID, const OUString rUIXMLDescription ) : ModalDialog(pParent, rID, rUIXMLDescription), -nUniqId(0), //todo +nUniqId(0), //todo: remove this member when the ResId using ctor is removed pInputSet(0), pOutputSet(0) { @@ -669,7 +687,16 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) // Save user data in IniManager. pImpl-m_pSfxPage-FillUserData(); OUString sData( pImpl-m_pSfxPage-GetUserData() ); -SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) ); + +OUString sConfigId = OStringToOUString(pImpl-m_pSfxPage-GetConfigId(), +RTL_TEXTENCODING_UTF8); +if (sConfigId.isEmpty()) +{ +SAL_WARN(sfx.config, Tabpage needs to be converted to .ui format); +sConfigId = OUString::number(GetUniqId()); +} + +SvtViewOptions aPageOpt(E_TABPAGE, sConfigId); aPageOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( sData ) ) ); EndDialog( RET_OK ); } @@ -731,7 +758,15 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage, if ( pImpl-m_pSfxPage ) { // First obtain the user data, only then Reset() -SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( GetUniqId() ) ); +OUString sConfigId = OStringToOUString(pImpl-m_pSfxPage-GetConfigId(), +RTL_TEXTENCODING_UTF8); +if (sConfigId.isEmpty()) +{ +SAL_WARN(sfx.config, Tabpage needs to be converted to .ui format); +sConfigId = OUString::number(GetUniqId()); +} + +SvtViewOptions aPageOpt(E_TABPAGE, sConfigId); Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME ); OUString
[Libreoffice-commits] core.git: chart2/source forms/source include/sal sfx2/source svx/source
chart2/source/tools/NumberFormatterWrapper.cxx |2 +- chart2/source/view/charttypes/VSeriesPlotter.cxx |2 +- forms/source/xforms/datatypes.cxx|2 +- include/sal/log-areas.dox|7 ++- sfx2/source/doc/sfxbasemodel.cxx |2 +- svx/source/form/delayedevent.cxx |3 +-- svx/source/form/fmshimp.cxx |6 -- svx/source/form/fmtextcontrolshell.cxx |2 +- svx/source/form/formcontroller.cxx |4 ++-- 9 files changed, 14 insertions(+), 16 deletions(-) New commits: commit c03c9da8c249c2e2a61bab3d6fad325d5934f5e0 Author: Michaël Lefèvre lefevr...@yahoo.fr Date: Mon Mar 31 23:07:38 2014 +0200 fdo#43157 : clean up OSL_POSTCOND Conflicts: include/sal/log-areas.dox Change-Id: I770b8b9fb82f873ccb88dc26ac05206f703ddf33 Reviewed-on: https://gerrit.libreoffice.org/8805 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 4994215..f543f27 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -62,7 +62,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference util::XNum SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); if( pSupplierObj ) m_pNumberFormatter = pSupplierObj-GetNumberFormatter(); -OSL_POSTCOND(m_pNumberFormatter,need a numberformatter); +SAL_WARN_IF(!m_pNumberFormatter,chart2.tools,need a numberformatter); } NumberFormatterWrapper::~NumberFormatterWrapper() diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 79e1e28..1027192 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -145,7 +145,7 @@ VSeriesPlotter::VSeriesPlotter( const uno::ReferenceXChartType xChartTypeMode , m_pExplicitCategoriesProvider(0) , m_bPointsWereSkipped(false) { -OSL_POSTCOND(m_xChartTypeModel.is(),no XChartType available in view, fallback to default values may be wrong); +SAL_WARN_IF(!m_xChartTypeModel.is(),chart2,no XChartType available in view, fallback to default values may be wrong); } VSeriesPlotter::~VSeriesPlotter() diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 94e8ed5..1aa59d2 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -111,7 +111,7 @@ namespace xforms #define SET_PROPERTY( propertyid, value, member ) \ setFastPropertyValue( PROPERTY_ID_##propertyid, makeAny( value ) ); \ -OSL_POSTCOND( member == value, OXSDDataType::setFoo: inconsistency! ); +SAL_WARN_IF( member != value, forms.misc, OXSDDataType::setFoo: inconsistency! ); OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException, std::exception) diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index f8a2967..0508fb4 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -60,6 +60,7 @@ certain functionality. @li @c chart2 @li @c chart2.areachart @li @c chart2.opengl +@li @c chart2.tools @section connectivity @@ -288,6 +289,7 @@ certain functionality. @section svx +@li @c svx @li @c svx.dialog @li @c svx.fmcomp @li @c svx.form @@ -443,11 +445,6 @@ certain functionality. @li @c dbaccess.ui @li @c dbaccess.ui.OGeneralPage -@section svx - -@li @c svx -@li @c svx.fmcmop - @section avmedia @li @c avmedia diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 8416d55..e12f92d 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -4282,7 +4282,7 @@ Reference frame::XController2 SAL_CALL SfxBaseModel::createViewController( // determine the ViewFrame belonging to the given XFrame SfxViewFrame* pViewFrame = FindOrCreateViewFrame_Impl( i_rFrame, aViewCreationGuard ); -OSL_POSTCOND( pViewFrame, SfxBaseModel::createViewController: no frame? ); +SAL_WARN_IF( !pViewFrame , sfx.doc, SfxBaseModel::createViewController: no frame? ); // delegate to SFX' view factory pViewFrame-GetBindings().ENTERREGISTRATIONS(); diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 1ce2345..0a226d2 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -20,7 +20,6 @@ #include delayedevent.hxx -#include osl/diagnose.h #include vcl/svapp.hxx @@ -35,7 +34,7 @@ namespace svxform void DelayedEvent::Call( void* _pArg ) { CancelPendingCall(); -OSL_POSTCOND( m_nEventId == 0, DelayedEvent::Call: CancelPendingCall did not work! ); +SAL_WARN_IF(
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=43157 --- Comment #19 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michaël Lefèvre committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c03c9da8c249c2e2a61bab3d6fad325d5934f5e0 fdo#43157 : clean up OSL_POSTCOND The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - xmloff/source
xmloff/source/style/bordrhdl.cxx | 51 +-- 1 file changed, 17 insertions(+), 34 deletions(-) New commits: commit c6a53777e6a83ffa89574295cd709b814c2d2a6b Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Sun Feb 2 18:23:48 2014 -0500 fdo#76697: Remove this duplicate and use the UNO constant values instead. (cherry picked from commit 72b2fafebfc44fa90f08cc198e2fa5fc26154c5b) Conflicts: xmloff/source/style/bordrhdl.cxx This fixes the bug because in XMLBorderHdl::importXML() the value none was rejected as invalid because API_LINE_NONE pointlessly had a different value than BorderLineStyle::NONE. Change-Id: Id81aacc6c594ad25d97f6f6dc578ed9ca16549ab Signed-off-by: Michael Stahl mst...@redhat.com (cherry picked from commit 7f3105323f1db11bc0a3ff5c5c71e1dc62338cc4) Reviewed-on: https://gerrit.libreoffice.org/8816 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Jan Holesovsky ke...@collabora.com Tested-by: Jan Holesovsky ke...@collabora.com diff --git a/xmloff/source/style/bordrhdl.cxx b/xmloff/source/style/bordrhdl.cxx index e0c7be5..cecc3b1 100644 --- a/xmloff/source/style/bordrhdl.cxx +++ b/xmloff/source/style/bordrhdl.cxx @@ -29,23 +29,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -const sal_uInt16 API_LINE_SOLID = 0; -const sal_uInt16 API_LINE_DOTTED = 1; -const sal_uInt16 API_LINE_DASHED = 2; -const sal_uInt16 API_LINE_DOUBLE = 3; -const sal_uInt16 API_LINE_THINTHICK_SMALLGAP = 4; -const sal_uInt16 API_LINE_THINTHICK_MEDIUMGAP = 5; -const sal_uInt16 API_LINE_THINTHICK_LARGEGAP = 6; -const sal_uInt16 API_LINE_THICKTHIN_SMALLGAP = 7; -const sal_uInt16 API_LINE_THICKTHIN_MEDIUMGAP = 8; -const sal_uInt16 API_LINE_THICKTHIN_LARGEGAP = 9; -const sal_uInt16 API_LINE_EMBOSSED = 10; -const sal_uInt16 API_LINE_ENGRAVED = 11; -const sal_uInt16 API_LINE_OUTSET = 12; -const sal_uInt16 API_LINE_INSET = 13; -const sal_uInt16 API_LINE_FINE_DASHED = 14; -const sal_uInt16 API_LINE_NONE = USHRT_MAX; - #define DEF_LINE_WIDTH_01 #define DEF_LINE_WIDTH_135 #define DEF_LINE_WIDTH_288 @@ -90,7 +73,7 @@ static sal_uInt16 const aBorderWidths[] = static void lcl_frmitems_setXMLBorderStyle( table::BorderLine2 rBorderLine, sal_uInt16 nStyle ) { sal_Int16 eStyle = -1; // None -if ( nStyle != API_LINE_NONE ) +if (nStyle != table::BorderLineStyle::NONE) eStyle = sal_Int16( nStyle ); rBorderLine.LineStyle = eStyle; @@ -238,7 +221,7 @@ bool XMLBorderHdl::importXML( const OUString rStrImpValue, uno::Any rValue, co // if there is no style or a different style than none but no width, // then the declaration is not valid. -if( !bHasStyle || (API_LINE_NONE != nStyle !bHasWidth) ) +if (!bHasStyle || (table::BorderLineStyle::NONE != nStyle !bHasWidth)) return false; table::BorderLine2 aBorderLine; @@ -252,7 +235,7 @@ bool XMLBorderHdl::importXML( const OUString rStrImpValue, uno::Any rValue, co } // first of all, delete an empty line -if( (bHasStyle API_LINE_NONE == nStyle) || +if ((bHasStyle table::BorderLineStyle::NONE == nStyle) || (bHasWidth USHRT_MAX == nNamedWidth 0 == nWidth) ) { aBorderLine.InnerLineWidth = 0; @@ -312,34 +295,34 @@ bool XMLBorderHdl::exportXML( OUString rStrExpValue, const uno::Any rValue, co XMLTokenEnum eStyleToken = XML_SOLID; switch ( aBorderLine.LineStyle ) { -case API_LINE_DASHED: +case table::BorderLineStyle::DASHED: eStyleToken = XML_DASHED; break; -case API_LINE_DOTTED: +case table::BorderLineStyle::DOTTED: eStyleToken = XML_DOTTED; break; -case API_LINE_DOUBLE: -case API_LINE_THINTHICK_SMALLGAP: -case API_LINE_THINTHICK_MEDIUMGAP: -case API_LINE_THINTHICK_LARGEGAP: -case API_LINE_THICKTHIN_SMALLGAP: -case API_LINE_THICKTHIN_MEDIUMGAP: -case API_LINE_THICKTHIN_LARGEGAP: +case table::BorderLineStyle::DOUBLE: +case table::BorderLineStyle::THINTHICK_SMALLGAP: +case table::BorderLineStyle::THINTHICK_MEDIUMGAP: +case table::BorderLineStyle::THINTHICK_LARGEGAP: +case table::BorderLineStyle::THICKTHIN_SMALLGAP: +case table::BorderLineStyle::THICKTHIN_MEDIUMGAP: +case table::BorderLineStyle::THICKTHIN_LARGEGAP: eStyleToken = XML_DOUBLE; break; -case API_LINE_EMBOSSED: +case table::BorderLineStyle::EMBOSSED: eStyleToken = XML_RIDGE; break; -case API_LINE_ENGRAVED: +case table::BorderLineStyle::ENGRAVED: eStyleToken = XML_GROOVE; break;
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo76979.docx |binary sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 10 ++ sw/source/filter/ww8/docxattributeoutput.cxx |2 +- 3 files changed, 11 insertions(+), 1 deletion(-) New commits: commit 84c04d73e6f80120c2fc7d17dd12e3b68214a63b Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Apr 3 13:35:04 2014 +0200 fdo#76979 DOCX export: a:srgbClr should be always an explicit color The brush color contains both the color itself and transparency as well. In case of DocxAttributeOutput::FormatBackground(), the sColor should contain the color part, and oAlpha the transparency part. In case of drawingML export of Writer TextFrames, an automatic color (0xFFF) shouldn't be recognized as auto, as that's invalid: instead an explicit 0xFF with zero transparency should be written. Fix the problem by calling msfilter::util::ConvertColor() for the RGB color only. Change-Id: I2132375a4dbcac1667aed49c74e581183178b0cc diff --git a/sw/qa/extras/ooxmlexport/data/fdo76979.docx b/sw/qa/extras/ooxmlexport/data/fdo76979.docx new file mode 100644 index 000..f8ee995 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo76979.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx index 417e92c..535ee1a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx @@ -1000,6 +1000,16 @@ DECLARE_OOXMLEXPORT_TEST(testFdo76249, fdo76249.docx) assertXPath(pXmlDoc, //mc:Choice/w:drawing//w:txbxContent//w:drawing//lc:lockedCanvas, 1); } +DECLARE_OOXMLEXPORT_TEST(testFdo76979, fdo76979.docx) +{ +// The problem was that black was exported as auto fill color, resulting in well-formed, but invalid XML. +xmlDocPtr pXmlDoc = parseExport(word/header2.xml); +if (!pXmlDoc) + return; +// This was auto, not FF. +assertXPath(pXmlDoc, //wps:spPr/a:solidFill/a:srgbClr, val, FF); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index caea79e..947cd16 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6528,7 +6528,7 @@ boost::optionalsal_Int32 lcl_getDmlAlpha(const SvxBrushItem rBrush) void DocxAttributeOutput::FormatBackground( const SvxBrushItem rBrush ) { -OString sColor = msfilter::util::ConvertColor( rBrush.GetColor( ) ); +OString sColor = msfilter::util::ConvertColor( rBrush.GetColor().GetRGBColor() ); boost::optionalsal_Int32 oAlpha = lcl_getDmlAlpha(rBrush); if (m_rExport.SdrExporter().getTextFrameSyntax()) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d7cb910ad888401335552835314d689a49351924 Author: Martin Liška mli...@suse.cz Date: Wed Mar 26 13:22:05 2014 +0100 gbuild: enable LTO parallelism for GCC Change-Id: Id0be70056645a5fa5df49aa5186e3187c719e048 diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 93d3fe7..8e96888 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -98,7 +98,7 @@ ifeq ($(ENABLE_LTO),TRUE) ifeq ($(COM_GCC_IS_CLANG),TRUE) gb_LTOFLAGS := -flto else -gb_LTOFLAGS := -flto -fuse-linker-plugin -O2 +gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2 endif endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] LTO parallelism
Hi Martin, On Wed, Mar 26, 2014 at 01:22:05PM +0100, Martin Liška mli...@suse.cz wrote: Sure, there's correct patch. Thanks, pushed as http://cgit.freedesktop.org/libreoffice/core/commit/?id=d7cb910ad888401335552835314d689a49351924. In the future, feel free to submit your patch to gerrit: https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch That makes our life a bit easier. :-) Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] fdo#43157 : clean up OSL_POSTCOND
You're welcome, I expect cleaning OSL_POSTCOND and OSL_PRECOND which are the least used OSL_XXX macros. Then I may have a deeper look at the other OSL_... macros. While submitting https://gerrit.libreoffice.org/8630 Stephen Bergmann accepted to keep OSL_TRACE because I'm patching C file. Is there any rules as of using SAL_... for C++ code, and OSL_... for C code ? Please put me in CC, not subscribed to the list. Michaël 2014-04-03 13:23 GMT+02:00 Caolán McNamara (via Code Review) ger...@gerrit.libreoffice.org: Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/8805 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/8805 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I770b8b9fb82f873ccb88dc26ac05206f703ddf33 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michaël Lefèvre lefevr...@yahoo.fr Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - configure.ac external/serf scp2/InstallModule_ooo.mk scp2/source
configure.ac |1 + external/serf/ExternalProject_serf.mk |4 ++-- scp2/InstallModule_ooo.mk |2 -- scp2/source/ooo/file_library_ooo.scp |7 ++- 4 files changed, 5 insertions(+), 9 deletions(-) New commits: commit a13f4a0a18119e18b01fa7a5d6aa0b0a7c934b02 Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Apr 3 14:02:18 2014 +0200 DISABLE_NEON is not defined anymore Change-Id: I9a16cb47190204a10a80adc1ff9145b4b0dc9c8e diff --git a/configure.ac b/configure.ac index 288d2b6..69036cd 100644 --- a/configure.ac +++ b/configure.ac @@ -9303,6 +9303,7 @@ neon) libo_MINGW_TRY_DLL([libtasn1]) libo_MINGW_TRY_DLL([libgnutls]) else +SCPDEFS=$SCPDEFS -DNEED_NEON NEON_VERSION=0295 fi AC_SUBST(NEON_VERSION) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 23705bf..3654aa7 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -22,7 +22,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ DISABLE_ATL \ - DISABLE_NEON \ ENABLE_CAIRO_CANVAS \ ENABLE_DIRECTX \ ENABLE_EVOAB2 \ @@ -61,7 +60,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_LIBXSLT \ SYSTEM_LUCENE \ SYSTEM_MYTHES \ - SYSTEM_NEON \ SYSTEM_NSS \ SYSTEM_OPENSSL \ SYSTEM_PANGO \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5a54ff8..94b2d56 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -298,11 +298,8 @@ File gid_File_Lib_Sysdtrans End #endif -#ifndef DISABLE_NEON -SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) - #ifndef SYSTEM_NEON - SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) - #endif +#ifdef NEED_NEON +SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) #endif #if !defined(ANDROID) !defined(IOS) //FIXME: get nssxmlsec building commit c54846f81ec270fbbd9ef1dfc5df1075bc5cc58f Author: Matúš Kukan matus.ku...@collabora.com Date: Thu Apr 3 13:53:50 2014 +0200 serf: SYSTEM_FOO is YES/NO here Change-Id: Id310f0f995998562b1217a3081bbfb0b3c545ac7 diff --git a/external/serf/ExternalProject_serf.mk b/external/serf/ExternalProject_serf.mk index afa2018..804d0bd 100644 --- a/external/serf/ExternalProject_serf.mk +++ b/external/serf/ExternalProject_serf.mk @@ -37,8 +37,8 @@ $(call gb_ExternalProject_get_state_target,serf,build): ./configure SERF_LIBS= \ --enable-option-checking=fatal \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ - $(if $(SYSTEM_APR),,--with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config) \ - $(if $(SYSTEM_APR),,--with-apr-util=$(call gb_UnpackedTarball_get_dir,apr_util)/apu-1-config) \ + $(if $(filter YES,$(SYSTEM_APR)),,--with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config) \ + $(if $(filter YES,$(SYSTEM_APR)),,--with-apr-util=$(call gb_UnpackedTarball_get_dir,apr_util)/apu-1-config) \ $(if $(SYSTEM_OPENSSL),,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \ $(MAKE) libserf-1.la \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sccomp/source
sccomp/source/solver/SolverComponent.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a5a6880c5f2edc321ed36c8da8d57ed27ac07ec Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 14:20:56 2014 +0200 loplugin:saloverride Change-Id: I2f818c865345c9396b3292d9bf0f8520556223e1 diff --git a/sccomp/source/solver/SolverComponent.hxx b/sccomp/source/solver/SolverComponent.hxx index 4de8a74..1d2ceed 100644 --- a/sccomp/source/solver/SolverComponent.hxx +++ b/sccomp/source/solver/SolverComponent.hxx @@ -146,7 +146,7 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() -throw(::com::sun::star::uno::RuntimeException, std::exception) = 0; +throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual sal_Bool SAL_CALL supportsService( const OUString ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence OUString SAL_CALL getSupportedServiceNames() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED] fdo#43157 : clean up OSL_POSTCOND
On 04/03/2014 02:16 PM, Michaël Lefèvre wrote: While submitting https://gerrit.libreoffice.org/8630 Stephen Bergmann accepted to keep OSL_TRACE because I'm patching C file. Is there any rules as of using SAL_... for C++ code, and OSL_... for C code ? There's generally no good reason to have C code in our code base at all, so the best approach IMO is to first convert a problematic C file to CXX and then modify it. (Incidentally, I happened to do exactly that to sal/osl/unx/security.c post https://gerrit.libreoffice.org/8630 fdo#56284 : soffice fails to start unless ~/.config exists and is writable with http://cgit.freedesktop.org/libreoffice/core/commit/?id=d37e9645edbdabaaf16ce0f1f904405f3477dc41 sal/osl/unx/security.c - .cxx and http://cgit.freedesktop.org/libreoffice/core/commit/?id=6cd87e5ee27af05cf54ba56d06f519a8f7138e8a coverity#1194930 Avoid TOCTOU between access and mkdir.) Stephan Please put me in CC, not subscribed to the list. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/fmcomp/fmgridcl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f36f17a1bad121f978ce55b635ccf23e00915cb Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 14:41:39 2014 +0200 typo Change-Id: Idb3414291161dc50ac5b291699d7ae8672576532 diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 42e3133..ef2f6c9 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1380,7 +1380,7 @@ void FmGridControl::DeleteSelectedRows() // XCurrentRecordListener void FmGridControl::positioned(const ::com::sun::star::lang::EventObject /*rEvent*/) { -SAL_INFO(svx.fmcmop, FmGridControl::positioned); +SAL_INFO(svx.fmcomp, FmGridControl::positioned); // position on the data source (force it to be done in the main thread) implAdjustInSolarThread(false); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - cppu/qa sal/cppunittester sal/osl svx/source vcl/source vcl/unx
cppu/qa/test_reference.cxx |8 +++ sal/cppunittester/cppunittester.cxx |2 + sal/osl/unx/security.cxx | 39 ++- svx/source/smarttags/SmartTagMgr.cxx | 18 +--- vcl/source/fontsubset/cff.cxx| 19 ++--- vcl/unx/generic/app/i18n_status.cxx | 13 --- 6 files changed, 36 insertions(+), 63 deletions(-) New commits: commit 46cb31f6fdc80d50cbca404a3bc88ecb72ce1b31 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:32:12 2014 +0200 Remove unused getText Change-Id: I13145c4dcdf95d7979dc1887ba08a243f8b5a224 diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index b5a286a..945d858 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -56,7 +56,6 @@ public: virtual void setPosition( SalFrame* ); virtual void setText( const OUString ) = 0; -virtual OUString getText() const = 0; virtual void show( bool bShow, I18NStatus::ShowReason eReason ) = 0; virtual void toggle( bool bOn ) = 0; }; @@ -103,7 +102,6 @@ public: virtual void setPosition( SalFrame* ) SAL_OVERRIDE; virtual void setText( const OUString ) SAL_OVERRIDE; -virtual OUString getText() const SAL_OVERRIDE; virtual void show( bool bShow, I18NStatus::ShowReason eReason ) SAL_OVERRIDE; virtual void toggle( bool bOn ) SAL_OVERRIDE; @@ -293,11 +291,6 @@ void XIMStatusWindow::setText( const OUString rText ) m_aWindowSize.Width() = m_aStatusText.GetTextWidth( rText )+8; } -OUString XIMStatusWindow::getText() const -{ -return m_aStatusText.GetText(); -} - namespace vcl { class IIIMPStatusWindow : public StatusWindow @@ -317,7 +310,6 @@ public: virtual ~IIIMPStatusWindow(); virtual void setText( const OUString ) SAL_OVERRIDE; -virtual OUString getText() const SAL_OVERRIDE; virtual void show( bool bShow, I18NStatus::ShowReason eReason ) SAL_OVERRIDE; virtual void toggle( bool bOn ) SAL_OVERRIDE; void layout(); @@ -398,11 +390,6 @@ void IIIMPStatusWindow::setText( const OUString rText ) m_aStatusBtn.SetText( rText ); } -OUString IIIMPStatusWindow::getText() const -{ -return m_aStatusBtn.GetText(); -} - void IIIMPStatusWindow::show( bool bShow, I18NStatus::ShowReason eReason ) { // hide IIIMPStatusWindow only in presentations commit 3218dca3e98c0f785314fbd1aa3d29c24d641273 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:31:51 2014 +0200 Remove unnecessary SubsetterContext base class Change-Id: Ia000655f3fe49a4c9c1015b37f44c0ba44d7666e diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 8880095..854784e 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -314,21 +314,8 @@ struct CffLocal boolmbForceBold; }; -class SubsetterContext -{ -public: -virtual ~SubsetterContext( void); -virtual bool emitAsType1( class Type1Emitter, -const sal_GlyphId* pGlyphIds, const U8* pEncoding, -GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo ) = 0; -}; - -SubsetterContext::~SubsetterContext( void) -{} - class CffSubsetterContext -: public SubsetterContext -, private CffGlobal +: private CffGlobal { public: static const int NMAXSTACK = 48;// see CFF.appendixB @@ -336,12 +323,12 @@ public: static const int NMAXTRANS = 32;// see CFF.appendixB public: explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen); -virtual ~CffSubsetterContext( void); +~CffSubsetterContext( void); voidinitialCffRead( void); boolemitAsType1( class Type1Emitter, const sal_GlyphId* pGlyphIds, const U8* pEncoding, -GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo ) SAL_OVERRIDE; +GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo ); // used by charstring converter voidsetCharStringType( int); commit 96fe761b7b55f6eaecae8113cca2fd8767ea4b11 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:31:11 2014 +0200 Redundant null checks Change-Id: I8b38d37de6cba2a29c9d785adf17d65835c8a05d diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index b812393..e0befd3 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -69,18 +69,14 @@ SmartTagMgr::~SmartTagMgr() void SmartTagMgr::Init( const OUString rConfigurationGroupName ) { -// get component context to pass to components: -if ( mxContext.is() ) -{ -PrepareConfiguration( rConfigurationGroupName ); -ReadConfiguration( true, true ); -RegisterListener(); -LoadLibraries(); -} +PrepareConfiguration( rConfigurationGroupName ); +ReadConfiguration( true, true ); +
[Libreoffice-commits] core.git: svtools/source
svtools/source/dialogs/addresstemplate.cxx | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) New commits: commit 4a94fc286fb69676a21392aa2cfdb5a813ceeead Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:35:37 2014 +0200 clearFieldAssignment only used in AssigmentTransientData Change-Id: Ic7d11a7ad3c643354e0bb2aaf20bda2c3e41dba6 diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index c59b151..3a1177e 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -116,8 +116,6 @@ namespace svt /// set the assignment for a given logical field virtual voidsetFieldAssignment(const OUString _rLogicalName, const OUString _rAssignment) = 0; -/// clear the assignment for a given logical field -virtual voidclearFieldAssignment(const OUString _rLogicalName) = 0; virtual voidsetDatasourceName(const OUString _rName) = 0; virtual voidsetCommand(const OUString _rCommand) = 0; @@ -155,7 +153,6 @@ public: virtual sal_BoolhasFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual OUString getFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual voidsetFieldAssignment(const OUString _rLogicalName, const OUString _rAssignment) SAL_OVERRIDE; -virtual voidclearFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual voidsetDatasourceName(const OUString _rName) SAL_OVERRIDE; virtual voidsetCommand(const OUString _rCommand) SAL_OVERRIDE; @@ -247,14 +244,6 @@ public: } -void AssigmentTransientData::clearFieldAssignment(const OUString _rLogicalName) -{ -MapString2String::iterator aPos = m_aAliases.find( _rLogicalName ); -if ( m_aAliases.end() != aPos ) -m_aAliases.erase( aPos ); -} - - void AssigmentTransientData::setDatasourceName(const OUString) { OSL_FAIL( AssigmentTransientData::setDatasourceName: cannot be implemented for transient data! ); @@ -301,13 +290,15 @@ public: virtual sal_BoolhasFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual OUString getFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual voidsetFieldAssignment(const OUString _rLogicalName, const OUString _rAssignment) SAL_OVERRIDE; -virtual voidclearFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual voidsetDatasourceName(const OUString _rName) SAL_OVERRIDE; virtual voidsetCommand(const OUString _rCommand) SAL_OVERRIDE; virtual voidNotify( const com::sun::star::uno::SequenceOUString aPropertyNames) SAL_OVERRIDE; virtual voidCommit() SAL_OVERRIDE; + +private: +virtual voidclearFieldAssignment(const OUString _rLogicalName); }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/dialogs/addresstemplate.cxx | 20 1 file changed, 20 deletions(-) New commits: commit 82925f1a2141206864d8a6d490af4adafcaeaed9 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:36:43 2014 +0200 Remove unused getCommandType Change-Id: I76c9ea0740223b601440ca7c7122b814e777fca3 diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 3a1177e..102a5df 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -103,12 +103,6 @@ namespace svt /// the command to use for the address book virtual OUString getCommand() const = 0; -/** the command type to use for the address book -@return -a type scope=com.sun.star.sdbCommandType/type value -*/ -virtual sal_Int32 getCommandType() const = 0; - /// checks whether or not there is an assignment for a given logical field virtual sal_BoolhasFieldAssignment(const OUString _rLogicalName) = 0; /// retrieves the assignment for a given logical field @@ -148,7 +142,6 @@ public: // IAssigmentData overridables virtual OUString getDatasourceName() const SAL_OVERRIDE; virtual OUString getCommand() const SAL_OVERRIDE; -virtual sal_Int32 getCommandType() const SAL_OVERRIDE; virtual sal_BoolhasFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual OUString getFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; @@ -213,12 +206,6 @@ public: } -sal_Int32 AssigmentTransientData::getCommandType() const -{ -return CommandType::TABLE; -} - - sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString _rLogicalName) { MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName ); @@ -285,7 +272,6 @@ public: // IAssigmentData overridables virtual OUString getDatasourceName() const SAL_OVERRIDE; virtual OUString getCommand() const SAL_OVERRIDE; -virtual sal_Int32 getCommandType() const SAL_OVERRIDE; virtual sal_BoolhasFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; virtual OUString getFieldAssignment(const OUString _rLogicalName) SAL_OVERRIDE; @@ -468,12 +454,6 @@ void AssignmentPersistentData::Commit() } -sal_Int32 AssignmentPersistentData::getCommandType() const -{ -return getInt32Property( CommandType ); -} - - // = AddressBookSourceDialogData struct AddressBookSourceDialogData ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uifactory/uicontrollerfactory.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit 0c50756b5eddbb19641321b54e1beb543744a9d9 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:38:23 2014 +0200 Remove redundant pure overrides Change-Id: Ic5e50643d41c08900377a34676c2ff17977643c0 diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index b383e5f..ed52637 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -48,11 +48,6 @@ class UIControllerFactory : private cppu::BaseMutex, public: virtual ~UIControllerFactory(); -// XServiceInfo -virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; -virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString ServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; -virtual css::uno::Sequence ::rtl::OUString SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; - // XMultiComponentFactory virtual css::uno::Reference css::uno::XInterface SAL_CALL createInstanceWithContext( const OUString aServiceSpecifier, const css::uno::Reference css::uno::XComponentContext Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference css::uno::XInterface SAL_CALL createInstanceWithArgumentsAndContext( const OUString ServiceSpecifier, const css::uno::Sequence css::uno::Any Arguments, const css::uno::Reference css::uno::XComponentContext Context ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; ___ 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/commontools/FValue.cxx |6 -- 1 file changed, 6 deletions(-) New commits: commit bb4dd8d947360f73b4eb8dcdcd13b2d18b4c2759 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:40:37 2014 +0200 Remove unused getBinary/CharacterStream Change-Id: I008d4190191ebff1c6c97af120b1db2707597ffe diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 24b97ec..d8bc37f 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -2181,8 +2181,6 @@ namespace detail virtual TimegetTime() const = 0; virtual DateTimegetTimestamp() const = 0; virtual Sequence sal_Int8 getBytes() const = 0; -virtual Reference XInputStreamgetBinaryStream() const = 0; -virtual Reference XInputStreamgetCharacterStream() const = 0; virtual Reference XBlob getBlob() const = 0; virtual Reference XClob getClob() const = 0; virtual Any getObject() const = 0; @@ -2213,8 +2211,6 @@ namespace detail virtual TimegetTime() const SAL_OVERRIDE { return m_xRow-getTime( m_nPos ); }; virtual DateTimegetTimestamp() const SAL_OVERRIDE { return m_xRow-getTimestamp( m_nPos ); }; virtual Sequence sal_Int8 getBytes() const SAL_OVERRIDE { return m_xRow-getBytes( m_nPos ); }; -virtual Reference XInputStreamgetBinaryStream() const SAL_OVERRIDE { return m_xRow-getBinaryStream( m_nPos ); }; -virtual Reference XInputStreamgetCharacterStream() const SAL_OVERRIDE { return m_xRow-getCharacterStream( m_nPos ); }; virtual Reference XBlob getBlob() const SAL_OVERRIDE { return m_xRow-getBlob( m_nPos ); }; virtual Reference XClob getClob() const SAL_OVERRIDE { return m_xRow-getClob( m_nPos ); }; virtual Any getObject() const SAL_OVERRIDE { return m_xRow-getObject( m_nPos ,NULL); }; @@ -2246,8 +2242,6 @@ namespace detail virtual TimegetTime() const SAL_OVERRIDE { return m_xColumn-getTime(); }; virtual DateTimegetTimestamp() const SAL_OVERRIDE { return m_xColumn-getTimestamp(); }; virtual Sequence sal_Int8 getBytes() const SAL_OVERRIDE { return m_xColumn-getBytes(); }; -virtual Reference XInputStreamgetBinaryStream() const SAL_OVERRIDE { return m_xColumn-getBinaryStream(); }; -virtual Reference XInputStreamgetCharacterStream() const SAL_OVERRIDE { return m_xColumn-getCharacterStream(); }; virtual Reference XBlob getBlob() const SAL_OVERRIDE { return m_xColumn-getBlob(); }; virtual Reference XClob getClob() const SAL_OVERRIDE { return m_xColumn-getClob(); }; virtual Any getObject() const SAL_OVERRIDE { return m_xColumn-getObject( NULL ); }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig extras/source sfx2/uiconfig sw/uiconfig
cui/uiconfig/ui/insertplugin.ui|1 extras/source/glade/libreoffice-catalog.xml.in |3 ++ sfx2/uiconfig/ui/password.ui | 25 -- sw/uiconfig/swriter/ui/insertfootnote.ui |1 sw/uiconfig/swriter/ui/inserttable.ui | 33 +++-- sw/uiconfig/swriter/ui/wordcount.ui| 16 ++-- 6 files changed, 37 insertions(+), 42 deletions(-) New commits: commit 2d37dd8d5f79564dbf19546287cb258a1d6aef8c Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 14:35:36 2014 +0100 Resolves: fdo#76486 Uniform Arrangement of the Help Button Change-Id: If59c5c4901aeec404099c810a021eea8b8b3d3ab diff --git a/cui/uiconfig/ui/insertplugin.ui b/cui/uiconfig/ui/insertplugin.ui index c992af4..1c2776c 100644 --- a/cui/uiconfig/ui/insertplugin.ui +++ b/cui/uiconfig/ui/insertplugin.ui @@ -189,7 +189,6 @@ property name=expandFalse/property property name=fillTrue/property property name=position2/property -property name=secondaryTrue/property /packing /child /object diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index e569553..6fae23f 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -39,6 +39,9 @@ glade-widget-class title=Thesaurus Edit name=cuilo-ReplaceEdit generic-name=ReplaceEdit parent=GtkEntry icon-name=widget-gtk-textentry/ +glade-widget-class title=TableName Edit name=swlo-TableNameEdit +generic-name=TableNameEdit parent=GtkEntry +icon-name=widget-gtk-textentry/ glade-widget-class title=Thesaurus Lookup name=cuilo-LookUpComboBox generic-name=LookUpComboBox parent=GtkEntry icon-name=widget-gtk-comboboxtext/ diff --git a/sfx2/uiconfig/ui/password.ui b/sfx2/uiconfig/ui/password.ui index ae9fd22..54263fc 100644 --- a/sfx2/uiconfig/ui/password.ui +++ b/sfx2/uiconfig/ui/password.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkDialog id=PasswordDialog property name=can_focusFalse/property property name=border_width6/property @@ -16,10 +17,12 @@ property name=can_focusFalse/property property name=layout_styleend/property child - object class=GtkButton id=help -property name=labelgtk-help/property + object class=GtkButton id=ok +property name=labelgtk-ok/property property name=visibleTrue/property +property name=sensitiveFalse/property property name=can_focusTrue/property +property name=has_defaultTrue/property property name=receives_defaultTrue/property property name=use_stockTrue/property /object @@ -30,12 +33,10 @@ /packing /child child - object class=GtkButton id=ok -property name=labelgtk-ok/property + object class=GtkButton id=cancel +property name=labelgtk-cancel/property property name=visibleTrue/property -property name=sensitiveFalse/property property name=can_focusTrue/property -property name=has_defaultTrue/property property name=receives_defaultTrue/property property name=use_stockTrue/property /object @@ -46,8 +47,8 @@ /packing /child child - object class=GtkButton id=cancel -property name=labelgtk-cancel/property + object class=GtkButton id=help +property name=labelgtk-help/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property @@ -159,7 +160,6 @@ property name=hexpandTrue/property property name=visibilityFalse/property property name=invisible_charâ/property -property name=invisible_char_setTrue/property /object packing property name=left_attach1/property @@ -175,7 +175,6 @@ property name=hexpandTrue/property property name=visibilityFalse/property property name=invisible_charâ/property -property
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xcl97/XclExpChangeTrack.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 993f4921f7258252d0443243c2ad0e1e44ee394f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:42:52 2014 +0200 Remove redundant pure override Change-Id: I5d41b22ba5b27c278d04a70987812a281dd7dba9 diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 0d316b8..2fb1bc4 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1326,7 +1326,6 @@ public: virtual sal_SizeGetLen() const SAL_OVERRIDE; virtual sal_uInt16 GetNum() const SAL_OVERRIDE; virtual voidSave( XclExpStream rStrm ) SAL_OVERRIDE; -virtual voidSaveXml( XclExpXmlStream rStrm ) SAL_OVERRIDE = 0; }; sal_Size ExcXmlRecord::GetLen() const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/uibase/lingu/olmenu.cxx |4 ++-- sw/source/core/uibase/shells/textsh1.cxx |4 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit e813b9c2593ccfdf39761ed9bf446ef73d881e75 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 14:23:00 2014 +0100 Resolves: fdo#39793 open the 'Font' tab after Set Language ... More ... Change-Id: I23c80a462ef473defe5536f9090167ae734553b7 diff --git a/sw/source/core/uibase/lingu/olmenu.cxx b/sw/source/core/uibase/lingu/olmenu.cxx index 2108ac5..f941792 100644 --- a/sw/source/core/uibase/lingu/olmenu.cxx +++ b/sw/source/core/uibase/lingu/olmenu.cxx @@ -848,7 +848,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) else if (nId == MN_SET_SELECTION_MORE) { //Open Format/Character Dialog -sw_CharDialog( *m_pSh, true, nId, 0, 0 ); +sw_CharDialog( *m_pSh, true, SID_ATTR_CHAR_FONT, 0, 0 ); } else if (MN_SET_LANGUAGE_PARAGRAPH_START = nId nId = MN_SET_LANGUAGE_PARAGRAPH_END) { @@ -880,7 +880,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) m_pSh-Push();// save cursor SwLangHelper::SelectCurrentPara( *m_pSh ); //Open Format/Character Dialog -sw_CharDialog( *m_pSh, true, nId, 0, 0 ); +sw_CharDialog( *m_pSh, true, SID_ATTR_CHAR_FONT, 0, 0 ); m_pSh-Pop( sal_False ); // restore cursor } } diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx index 52efc16..738efd7 100644 --- a/sw/source/core/uibase/shells/textsh1.cxx +++ b/sw/source/core/uibase/shells/textsh1.cxx @@ -181,6 +181,10 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog, sal_uInt16 nSlot,const { pDlg-SetCurPageId(fonteffect); } +else if (pDlg nSlot == SID_ATTR_CHAR_FONT) +{ +pDlg-SetCurPageId(font); +} const SfxItemSet* pSet = NULL; if ( !bUseDialog ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx | 31 +- 1 file changed, 6 insertions(+), 25 deletions(-) New commits: commit 618dc924b4d28a9d50bfcc4d35748cc1363bd92f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 15:48:52 2014 +0200 Remove unused functions Change-Id: Iac147aef89e7f8be2f3d16e434c76d57a950d591 diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx index df4e36f..98c42e3 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBoxBase.hxx @@ -21,6 +21,9 @@ #ifndef ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXBASE_HXX #define ACCESSIBILITY_EXT_ACCESSIBLEBROWSEBOXBASE_HXX +#include sal/config.h + +#include boost/noncopyable.hpp #include svtools/AccessibleBrowseBoxObjType.hxx #include rtl/ustring.hxx #include tools/gen.hxx @@ -78,7 +81,7 @@ class AccessibleBrowseBoxBase : public: /** Constructor sets specified name and description. If the constant of a text is BBTEXT_NONE, the derived class has to set the text via -implSetName() and implSetDescription() (in Ctor) or later via +implSetName() (in Ctor) or later via setAccessibleName() and setAccessibleDescription() (these methods notify the listeners about the change). @param rxParent XAccessible interface of the parent object. @@ -302,15 +305,10 @@ protected: /** @return The ::osl::Mutex member provided by the class OBaseMutex. */ inline ::osl::Mutex getOslMutex(); -/** @return Pointer to the global ::osl::Mutex. */ -static inline ::osl::Mutex* getOslGlobalMutex(); /** Changes the name of the object (flat assignment, no notify). @attention This method requires a locked mutex. */ inline void implSetName( const OUString rName ); -/** Changes the description of the object (flat assignment, no notify). -@attention This method requires a locked mutex. */ -inline void implSetDescription( const OUString rDescription ); /** Locks all mutex's and calculates the bounding box relative to the parent window. @@ -368,11 +366,12 @@ typedef ::cppu::ImplHelper1 ::com::sun::star::accessibility::XAccessible class BrowseBoxAccessibleElement :public AccessibleBrowseBoxBase ,public BrowseBoxAccessibleElement_Base +,private boost::noncopyable { protected: /** Constructor sets specified name and description. If the constant of a text is BBTEXT_NONE, the derived class has to set the text via -implSetName() and implSetDescription() (in Ctor) or later via +implSetName() (in Ctor) or later via setAccessibleName() and setAccessibleDescription() (these methods notify the listeners about the change). @@ -421,11 +420,6 @@ protected: ::com::sun::star::accessibility::XAccessibleContext SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - -private: -BrowseBoxAccessibleElement(); // never implemented -BrowseBoxAccessibleElement( const BrowseBoxAccessibleElement ); // never implemented -BrowseBoxAccessibleElement operator=( const BrowseBoxAccessibleElement ); // never implemented }; @@ -457,25 +451,12 @@ inline ::osl::Mutex AccessibleBrowseBoxBase::getOslMutex() return m_aMutex; } -inline ::osl::Mutex* AccessibleBrowseBoxBase::getOslGlobalMutex() -{ -return ::osl::Mutex::getGlobalMutex(); -} - inline void AccessibleBrowseBoxBase::implSetName( const OUString rName ) { maName = rName; } -inline void AccessibleBrowseBoxBase::implSetDescription( -const OUString rDescription ) -{ -maDescription = rDescription; -} - - - } // namespace accessibility ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/dumpbz
scripts/dumpbz | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 90a2899f2e873be01bffe5a44698cb69cfa9b69d Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Apr 3 15:54:07 2014 +0200 eh, actually use the right bugtracker diff --git a/scripts/dumpbz b/scripts/dumpbz index 9d36ef5..b5bcb91 100755 --- a/scripts/dumpbz +++ b/scripts/dumpbz @@ -157,17 +157,17 @@ class FdoBugzillaWrapper: class AooBugzillaWrapper: AOOBZ='https://issues.apache.org/ooo/' -BATCHQUERY = 'buglist.cgi?query_format=advancedctype=csvf1=bug_idcolumnlist=bug_ido1=greaterthanv1=%dproduct=LibreOfficelimit=%dorder=bug_id' +BATCHQUERY = 'buglist.cgi?query_format=advancedctype=csvf1=bug_idcolumnlist=bug_ido1=greaterthanv1=%dlimit=%dorder=bug_id' CHANGEDQUERY = 'buglist.cgi?query_format=advancedctype=csvf1=bug_idcolumnlist=bug_idchfieldto=Nowchfieldfrom=%sproduct=LibreOffice' UNRESOLVEDONLY='resolution=---' BUGXMLQUERY = 'show_bug.cgi?ctype=xmlid=%d' def __batch_buglist_url(self, offset, limit, unresolved_only): -url = FdoBugzillaWrapper.FDOBZ + FdoBugzillaWrapper.BATCHQUERY % (offset, limit) +url = AooBugzillaWrapper.AOOBZ + AooBugzillaWrapper.BATCHQUERY % (offset, limit) if unresolved_only: -url += FdoBugzillaWrapper.UNRESOLVEDONLY +url += AooBugzillaWrapper.UNRESOLVEDONLY return url def __changed_buglist_url(self, since): -url = FdoBugzillaWrapper.FDOBZ + FdoBugzillaWrapper.CHANGEDQUERY % (since) +url = AooBugzillaWrapper.AOOBZ + AooBugzillaWrapper.CHANGEDQUERY % (since) return url def __query_bug_list(self, query): opener = urllib.request.urlopen(query) @@ -175,13 +175,14 @@ class AooBugzillaWrapper: bug_ids = bug_ids.split('\n')[1:] return bug_ids def get_batch_of_bug_ids(self, offset, batchsize, unresolved): +print('AOO batch url: %s' % self.__batch_buglist_url(int(offset), int(batchsize), unresolved)) return self.__query_bug_list(self.__batch_buglist_url(int(offset), int(batchsize), unresolved)) def get_initial_bug_id(self): return '0' def get_changed_bug_ids(self, since): return self.__query_bug_list(self.__changed_buglist_url(since)) def get_bug_xml(self, bug_id): -opener = urllib.request.urlopen(FdoBugzillaWrapper.FDOBZ + FdoBugzillaWrapper.BUGXMLQUERY % int(bug_id)) +opener = urllib.request.urlopen(AooBugzillaWrapper.AOOBZ + AooBugzillaWrapper.BUGXMLQUERY % int(bug_id)) return str(opener.read(), encoding='utf8') class SyncWorker: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45789] automatic row height in reports
https://bugs.freedesktop.org/show_bug.cgi?id=45789 --- Comment #15 from Lionel Elie Mamane lio...@mamane.lu --- (In reply to comment #14) I am starting work on this bug. Hi. How is the work going? Do you have any draft? Do you need any help / review / pointer? -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-3' - svx/source
svx/source/smarttags/SmartTagMgr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7189601d7f1177e560f9e88dbfe580c8eba5278f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 12:59:21 2014 +0200 Support SmartTagRecognizers again The XContentEnumerationAccess is at the service manager, not the component context. Regression introduced in LO 4.0 with 4381f3dd5ae9e042840a16f69d07267208160420 fdo#46808, Use BreakIterator ::create method. Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d (cherry picked from commit d4c8325ea9cbffeff91de49d5e1f1f026be319de) Reviewed-on: https://gerrit.libreoffice.org/8825 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Jan Holesovsky ke...@collabora.com Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 218406c..6a97d3c 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -345,7 +345,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent rEvent ) throw( Run */ void SmartTagMgr::LoadLibraries() { -Reference container::XContentEnumerationAccess rContent( mxContext , UNO_QUERY ); +Reference container::XContentEnumerationAccess rContent( mxContext-getServiceManager(), UNO_QUERY ); if ( !rContent.is() ) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: scripts/dumpbz
scripts/dumpbz |1 - 1 file changed, 1 deletion(-) New commits: commit 51b683b22d0086492ed43d1efdefb78cd0788dad Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Thu Apr 3 16:24:51 2014 +0200 ups, remove debug print diff --git a/scripts/dumpbz b/scripts/dumpbz index b5bcb91..25bbc93 100755 --- a/scripts/dumpbz +++ b/scripts/dumpbz @@ -175,7 +175,6 @@ class AooBugzillaWrapper: bug_ids = bug_ids.split('\n')[1:] return bug_ids def get_batch_of_bug_ids(self, offset, batchsize, unresolved): -print('AOO batch url: %s' % self.__batch_buglist_url(int(offset), int(batchsize), unresolved)) return self.__query_bug_list(self.__batch_buglist_url(int(offset), int(batchsize), unresolved)) def get_initial_bug_id(self): return '0' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source tools/source
sw/inc/fesh.hxx|3 ++- sw/inc/swundo.hxx |3 ++- sw/source/core/frmedt/fetab.cxx| 11 --- sw/source/core/uibase/shells/tabsh.cxx |2 +- sw/source/core/undo/undo.hrc |3 ++- sw/source/core/undo/undo.src |5 - tools/source/rc/rc.cxx |1 + 7 files changed, 20 insertions(+), 8 deletions(-) New commits: commit ea3277265af9aab9a297151d5e1f3adfb1c823ef Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 15:09:39 2014 +0100 Resolves: fdo#76206 show 'Delete table' instead of 'Delete row' on deleting a full table Change-Id: I03af8bcbae41e78229163a945a74387f53787ca5 diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 0108500..2c4e574 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -588,7 +588,8 @@ public: bool InsertRow( sal_uInt16 nCnt, bool bBehind ); bool InsertCol( sal_uInt16 nCnt, bool bBehind ); // 0 == at the end. sal_Bool DeleteCol(); -sal_Bool DeleteRow(); +sal_Bool DeleteTable(); +sal_Bool DeleteRow(bool bCompleteTable = false); sal_Bool DeleteTblSel();/// Current selection, may be whole table. diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index 5d92ea8..5c5f197 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -167,7 +167,8 @@ enum SwUndoId UNDO_UI_DELETE_INVISIBLECNTNT, UNDO_UI_REPLACE_STYLE, UNDO_UI_DELETE_PAGE_BREAK, -UNDO_UI_TEXT_CORRECTION +UNDO_UI_TEXT_CORRECTION, +UNDO_UI_TABLE_DELETE }; #endif diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 2d0227b..fa3ca95 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -334,7 +334,12 @@ sal_Bool SwFEShell::DeleteCol() return bRet; } -sal_Bool SwFEShell::DeleteRow() +sal_Bool SwFEShell::DeleteTable() +{ +return DeleteRow(true); +} + +sal_Bool SwFEShell::DeleteRow(bool bCompleteTable) { // check if Point/Mark of current cursor are in a table SwFrm *pFrm = GetCurrFrm(); @@ -441,9 +446,9 @@ sal_Bool SwFEShell::DeleteRow() } // now delete the lines -StartUndo(UNDO_ROW_DELETE); +StartUndo(bCompleteTable ? UNDO_UI_TABLE_DELETE : UNDO_ROW_DELETE); bRet = GetDoc()-DeleteRowCol( aBoxes ); -EndUndo(UNDO_ROW_DELETE); +EndUndo(bCompleteTable ? UNDO_UI_TABLE_DELETE : UNDO_ROW_DELETE); } else bRet = sal_False; diff --git a/sw/source/core/uibase/shells/tabsh.cxx b/sw/source/core/uibase/shells/tabsh.cxx index 319f75f..4080e95 100644 --- a/sw/source/core/uibase/shells/tabsh.cxx +++ b/sw/source/core/uibase/shells/tabsh.cxx @@ -1039,7 +1039,7 @@ void SwTableShell::Execute(SfxRequest rReq) rSh.StartAction(); rSh.StartUndo(); rSh.GetView().GetViewFrame()-GetDispatcher()-Execute(FN_TABLE_SELECT_ALL); -rSh.DeleteRow(); +rSh.DeleteTable(); rSh.EndUndo(); rSh.EndAction(); } diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc index 9dcccbf..639409f 100644 --- a/sw/source/core/undo/undo.hrc +++ b/sw/source/core/undo/undo.hrc @@ -162,7 +162,8 @@ #define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 12) #define STR_DELETE_PAGE_BREAK (UI_UNDO_BEGIN + 13) #define STR_TEXT_CORRECTION (UI_UNDO_BEGIN + 14) -#define UI_UNDO_END STR_TEXT_CORRECTION +#define STR_UNDO_TABLE_DELETE (UI_UNDO_BEGIN + 15) +#define UI_UNDO_END STR_UNDO_TABLE_DELETE #define UNDO_MORE_STRINGS_BEGIN (UI_UNDO_END + 1) #define STR_OCCURRENCES_OF (UNDO_MORE_STRINGS_BEGIN) diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src index 8db59db..f2f969b 100644 --- a/sw/source/core/undo/undo.src +++ b/sw/source/core/undo/undo.src @@ -651,5 +651,8 @@ String STR_UNDO_FLYFRMFMT_DESCRITPTION { Text[ en-US ] = Change object description of $1; }; - +String STR_UNDO_TABLE_DELETE +{ +Text [ en-US ] = Delete table ; +}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 5a67883ed4fd63bf0fed2d210fb0777a2008b170 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 15:23:43 2014 +0100 coverity#1079187 Uninitialized pointer read Change-Id: Ie3044bebc7921b0fa98f9a9a01f99ef0f2d05eb8 diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx index f3e966d..5700f15 100644 --- a/tools/source/rc/rc.cxx +++ b/tools/source/rc/rc.cxx @@ -25,6 +25,7 @@ #include tools/rcid.h Resource::Resource( const ResId rResId ) +: m_pResMgr(NULL) { GetRes( rResId.SetRT( RSC_RESOURCE ) ); } ___ 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.0' - icon-themes/galaxy
icon-themes/galaxy/brand_cp/shell/about.svg | 48 +--- 1 file changed, 3 insertions(+), 45 deletions(-) New commits: commit a2c536078832951b8ab75f546fb987c19ffc6b3c Author: Andras Timar andras.ti...@collabora.com Date: Thu Apr 3 07:58:52 2014 -0700 About box background image fix Change-Id: Ie4e47efb95b4e4890507b4cb0aa6cc73fc6757ce diff --git a/icon-themes/galaxy/brand_cp/shell/about.svg b/icon-themes/galaxy/brand_cp/shell/about.svg index c2bf7b9..625e86a 100644 --- a/icon-themes/galaxy/brand_cp/shell/about.svg +++ b/icon-themes/galaxy/brand_cp/shell/about.svg @@ -2,54 +2,12 @@ !-- Created with Inkscape (http://www.inkscape.org/) -- svg - xmlns:dc=http://purl.org/dc/elements/1.1/; - xmlns:cc=http://creativecommons.org/ns#; - xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:svg=http://www.w3.org/2000/svg; - xmlns=http://www.w3.org/2000/svg; - xmlns:xlink=http://www.w3.org/1999/xlink; - xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; version=1.1 - width=1024 + width=1624 height=1024 - id=svg1604 - inkscape:version=0.48.4 r9939 - sodipodi:docname=about.svg - sodipodi:namedview - pagecolor=#ff - bordercolor=#66 - borderopacity=1 - objecttolerance=10 - gridtolerance=10 - guidetolerance=10 - inkscape:pageopacity=0 - inkscape:pageshadow=2 - inkscape:window-width=1419 - inkscape:window-height=957 - id=namedview3040 - showgrid=false - inkscape:zoom=1.6614907 - inkscape:cx=243 - inkscape:cy=161 - inkscape:window-x=0 - inkscape:window-y=0 - inkscape:window-maximized=0 - inkscape:current-layer=svg1604 / - metadata - id=metadata1609 -rdf:RDF - cc:Work - rdf:about= -dc:formatimage/svg+xml/dc:format -dc:type - rdf:resource=http://purl.org/dc/dcmitype/StillImage; / -dc:title/dc:title - /cc:Work -/rdf:RDF - /metadata + id=svg1604 rect - width=1024 + width=1624 height=1024 x=0 y=0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
patch fixing bug 73588
Hello, This is my patch for bug 73588. Currently when working in RTL mode in calc if a user wrote in a language that was written from left to right, calc failed to automatically left align the text as it had in previous versions. To fix this, I've added a statement that checks that the cell begins with a RTL character before right aligning it. I've attached my patch. Let me know if there's anything I need to change. Thank you Hannah From fef47ce123eb8f7b6fe4486e93d6f2a690302ebf Mon Sep 17 00:00:00 2001 From: hannah hdlyh...@gmail.com Date: Tue, 1 Apr 2014 07:55:39 -0400 Subject: [PATCH] Bug fix for 73588; fix default alignment in RTL mode Change-Id: Icb932ee51dbf32d8baf4382aa00e89a680f5a41d --- sc/source/ui/view/output2.cxx | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 54f977c..9005e48 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -1434,7 +1434,10 @@ static SvxCellHorJustify getAlignmentFromContext( SvxCellHorJustify eInHorJust, else if (nDirection == FRMDIR_ENVIRONMENT) { SAL_WARN_IF( !pDoc, sc.ui, getAlignmentFromContext - pDoc==NULL); -eHorJustContext = (pDoc pDoc-IsLayoutRTL(nTab)) ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT; +// fdo#73588: The content of the cell must also +// begin with a RTL character to be right +// aligned; otherwise, it should be left aligned. +eHorJustContext = (pDoc pDoc-IsLayoutRTL(nTab) (beginsWithRTLCharacter( rText))) ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT; } else eHorJustContext = SVX_HOR_JUSTIFY_RIGHT; -- 1.8.1.2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: patch fixing bug 73588
On Thu, 2014-04-03 at 11:45 -0400, Hannah Lyhne wrote: Hello, This is my patch for bug 73588. Currently when working in RTL mode in calc if a user wrote in a language that was written from left to right, calc failed to automatically left align the text as it had in previous versions. To fix this, I've added a statement that checks that the cell begins with a RTL character before right aligning it. I've attached my patch. Let me know if there's anything I need to change. The patch looks fine to me. We just need from you a license statement before we can merge your patch. Please refer to this page https://wiki.documentfoundation.org/Development/Developers#Developers_and_Contributors_list for the details of what kind of statement we look for. Thanks for taking the time to look into this. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 --- Comment #41 from wayne wa...@waynesville.co.uk --- (In reply to comment #36) (In reply to comment #35) ... Really, I'm shocked at the lack of a cropping tool. ... Anyone evaluating a switch from MS office to LO will find this and it will immediately be a shop stopper. in the meantime you can add that missing function using the CropOOo extension which in compatible with LibO too. http://aoo-extensions.sourceforge.net/en/project/cropooo thanks. I tried installing this and did so successfully, but it doesn't seem to have done anything. There is no crop tool visible in the drawing tools, nor by right clicking on the image I need to crop. Am I doing something sill here? -- 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 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 --- Comment #42 from tommy27 ba...@quipo.it --- @Wayne you should see it's icon under Tools/addons -- 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
License statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license Hannah Lyhne___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: patch fixing bug 73588
On Thu, 2014-04-03 at 12:05 -0400, Kohei Yoshida wrote: On Thu, 2014-04-03 at 11:45 -0400, Hannah Lyhne wrote: Hello, This is my patch for bug 73588. Currently when working in RTL mode in calc if a user wrote in a language that was written from left to right, calc failed to automatically left align the text as it had in previous versions. To fix this, I've added a statement that checks that the cell begins with a RTL character before right aligning it. I've attached my patch. Let me know if there's anything I need to change. The patch looks fine to me. We just need from you a license statement before we can merge your patch. Thanks for your license statement. I've pushed your patch with some minor tweak in the commit message (to use your full name and address and adjust reference to the bug number). https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=036b1fccbfb87a1aab36632843deb29e0a70630f;hp=364c989e2e4f1f1897408882b2887a2bfb09a306 Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62957] FILESAVE: Save Last Slide Position in Impress
https://bugs.freedesktop.org/show_bug.cgi?id=62957 --- Comment #11 from Sujay sujaym.suj...@gmail.com --- I am sorry that i haven't been updating my status. I had stopped working for a while, but now i have taken it again.. i have a question, I noticed a function - sd::FrameView::ReadUserDataSequence, in which there is a function call to sd::FrameView::SetSelectedPageOnLoad()? http://docs.libreoffice.org/sd/html/classsd_1_1FrameView.html#aa52d470e1ee409a897dec8d4d7918d9f, here it says that the function stores the page that was selected while last saving this document. But this property is not being used.(if i am right) I ve researched pretty much about the bug, found many pointers, but i didn't find the pointer for saving a property.. I ve tried to find it using the above mentioned properties such as VisibleArea etc.. but haven't had enough luck on that. I think WriteUserDataSequence and ReadUserDataSequence are the places where the read and write is happening, but am not sure whether i am right on that part.. Can somebody please guide me? thank you. -- 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] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.3.3'
Tag 'libreoffice-4.2.3.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-03 18:10 -0700 Tag libreoffice-4.2.3.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTPZXsAAoJEPQ0oe+v7q6jCaUP/Rmqs3PGADO04gRbswTfMu1K UxVWV7/+VKEUYhi2zPGW1wK5CyusfuN1zjLreLpnhA/AvrH2vgVw198A+hfmGUT2 DLgsjkUIULvQSlYXj0jyptDxs6/r6fxZQRZRZ/tZINIbE0byKvjWV9l92hyCJKQM fTbmkKhdj82JqGvb3EMqa7RvS1fk4KEEDYPKAnaJc81wV+JV8dZAq6XfyozZCxw9 GqIf6KuVVwL8M0cxTy3vYUo0Da62VOOvIr9A+exLQQj9KQP8FqLALJ34Ym0OsJkv YYsk/cyv4z4jItiqzRL+arzXTw7C0jKpkShjcY9qRwT4GRTGoBCRaAiboHN8rCvz oKDyiYRRFKhUWdt/VxONpgmNbz7bWsnAUTz7Iz/kwsMcIdQg0/awbOcenzRyu7eV KFkqRv4xLwD9lQEgbmz0IOtNGs/KbBJE+EcgBSU+NAKhya/NGWOCxrqKyArqjFdA 4wqXc/m7FgHjsIqGc2dniWvSaKMeO+8Mr8LxmS96a2HGJ7pe3fpaWD9WA0rSgnwb Q2JrNcSDvPqXvBB5O0sz9RBfaqWWL6dWZNyjT3GzJGEWIRS6H5lKvvhP2w57wcYy z/yDhkUIaK4DCkUKF86dm4euve5BJzTpX3rFrOQsDWToo5vFER0KuSHlBxn2phqL QIfLryKyNu7IHZuu+RG5 =UvWK -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-12: --- 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 'libreoffice-4-1' - svx/source
svx/source/smarttags/SmartTagMgr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e075ecb7111d83b2f7748fd31d1d9ef11e9845e Author: Stephan Bergmann sberg...@redhat.com Date: Thu Apr 3 12:59:21 2014 +0200 Support SmartTagRecognizers again The XContentEnumerationAccess is at the service manager, not the component context. Regression introduced in LO 4.0 with 4381f3dd5ae9e042840a16f69d07267208160420 fdo#46808, Use BreakIterator ::create method. Change-Id: Idb7d38b9c14beea9a9ad347e6cbc8190d7248b2d (cherry picked from commit d4c8325ea9cbffeff91de49d5e1f1f026be319de) Reviewed-on: https://gerrit.libreoffice.org/8826 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index ebd6733..3204ef4 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -309,7 +309,7 @@ void SmartTagMgr::changesOccurred( const util::ChangesEvent rEvent ) throw( Run */ void SmartTagMgr::LoadLibraries() { -Reference container::XContentEnumerationAccess rContent( mxContext , UNO_QUERY ); +Reference container::XContentEnumerationAccess rContent( mxContext-getServiceManager(), UNO_QUERY ); if ( !rContent.is() ) return; ___ 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/libreoffice-4.2.3.3'
Tag 'libreoffice-4.2.3.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-03 18:10 -0700 Tag libreoffice-4.2.3.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTPZX4AAoJEPQ0oe+v7q6jsTQQAIg1gTjEH07tL+x6QTrqSNlY E8mhrkw2HfslTuicIh/Wszrdn0MDtHdfts2OSYExzghQVw5LwwahUXnLlMlDl8Ri +cceKsGSX8OA6XIWrLhY9osf40NhkRg6Pemjfj6Bzf6TBgeuPVqcXkmXcXui62M2 H55W1LzeE3a7Q9OhbPW5gP5x51nTN9zyE5scvK1zOTSbWE2nkYD8eXhXQpAzN2v7 e8Tf0I3/jUBNaR7KP3IPn+A75jdCbH5azuqldv0os7zowMJmtDuoyHIM4YzLNbh6 mlptfsh2kzynNEqYLvSVyi9QBcGEM7YOiNYMicHvrREmw8xx741zVQlkbunm9NgW WC8IXG5uE6jokJ/qovKGesZnZS/4BgH7m9VG590ZDHpLsexn8U4pbk2GTzqzZWFl 0djHh42LyYzT3cqDtfwcJDJa6dK2A4jOMiY1fc6jN7ncrV7EiMDVEhkzBsttxwR6 TVKpk5J+xNxbAcy7hWSeehnn9LDe/VsyDhgHbs9UNyczNQ4bBDkWKa7XvXG9GwF8 cmHZ6e6qqv64nanUj6sWDuJAwpgU8BFUi3n0lexUCtxImGrYehfr2VyTcRL8Iqt1 IkleR8PcQXrDRSp7iyb9y3BVODSQKyYL1gV/V/3U6RcF3/YLp7EzsSX2xu7PtuHg 7wrvsWHjgFWWzfgT69mq =f7XQ -END PGP SIGNATURE- Changes since cp-4.2-branch-point-88: --- 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/libreoffice-4.2.3.3'
Tag 'libreoffice-4.2.3.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-03 18:10 -0700 Tag libreoffice-4.2.3.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTPZXxAAoJEPQ0oe+v7q6jkuwP/AnWZ2Bin0ldoq+F9zRnCXmi 0bcSI7mz4DBYMuASnVA+6qdcY2piEtYSF0hrdYO0Yypy+u+hsAQ8AHw2vo8X9LGF Lu62ca+xUAf33m/VtR98xA+XaElPGeie/fHThkpe2ayvBcIYQf9uqv6IArTGvF/h ZnEyxEnfHLZcKkODfx7t/JoTzAlrsDj7kf9lMLtAXZWK24pkS4PYdepZ5JNZtt2U KooY//Fl3u7kzbXvbRWnSfQ2QzFNzCRuxB3V5wG+CSc/zEb+FXuZn5q2wTpzUIOA u8kthYGDMidObs0Nj19bLME28TWwTnGk+KaNepQSRf+O7IbdHp27yONpasx5B7fU b1jddqMUNCt/CMXd3wjAu0TLI8V6wGPAu6jhkM7wNaE5qLeCXNQITaGSwH2mdWhi CUMNFLr8UrkgAYoFT1iFylBgnp7Zz1TgAt8crUzjRo6GUv+hmzBe3QTii7IspOUv hU0Gjg70mrG8UjcWyjtHVjAtVEpLGH+7Ed9J7Kcw0iN7vvjBPQj58A/nYqN8/GaF XmkU6h7ldlA0OjmA94IGb3Hn24WSsOoBAoGEBW1EM7R+IvHOI/emiEKBD+WmA1af 7NutdaIjQgQNXUvoW/zNlqdLN/nhFJGUdtJmr0Rf5RLYbSv0NNpVJsfiYlYxKovB K8kTutSIKJVqUhmG/+4I =IABF -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-9: --- 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 'libreoffice-4-2-3' - 2 commits - configure.ac translations
configure.ac |2 +- translations |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 77fef6ec1d21abab9cb3d2e99c8d5e22314ae689 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Apr 3 19:11:46 2014 +0200 bump product version to 4.2.3.3.0+ Change-Id: I648e706283dc22600ea5d026251a1510a6374535 diff --git a/configure.ac b/configure.ac index 1d91d04..39f38de 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.3.2.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.3.3.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) commit 164543c30d641c68dd5dd0841cf7c648e669e25c Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Apr 3 16:27:56 2014 +0200 Updated core Project: translations 7f1af62e0f88bff0f8c967aa41b5d322e06d5819 diff --git a/translations b/translations index 21e558d..7f1af62 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 21e558dcc192c8c337a72297356102efdf99910e +Subproject commit 7f1af62e0f88bff0f8c967aa41b5d322e06d5819 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 3 commits - reportdesign/source svtools/source sw/source
reportdesign/source/ui/report/ViewsWindow.cxx | 13 +++- svtools/source/control/ctrlbox.cxx|9 +- sw/source/core/text/inftxt.cxx|5 - sw/source/core/text/inftxt.hxx|2 sw/source/core/text/itrform2.cxx | 48 ++- sw/source/core/text/porfld.cxx|6 + sw/source/core/text/porfld.hxx| 15 sw/source/core/text/portxt.cxx| 82 -- sw/source/core/text/portxt.hxx|9 +- 9 files changed, 104 insertions(+), 85 deletions(-) New commits: commit 9b3ff437132b77de62f25b83e65be67100c610ca Author: Caolán McNamara caol...@redhat.com Date: Wed Apr 2 12:38:36 2014 +0100 coverity#707971 Uninitialized scalar field Change-Id: I5c1045253c082a00397cf0f048baee947232c9b1 (cherry picked from commit 4ab06a576313de973ae96787a19215b208737859) Reviewed-on: https://gerrit.libreoffice.org/8820 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 910f056..7608789 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -958,8 +958,17 @@ namespace sal_Boolm_bCopy; public: -ApplySectionViewAction( sal_Bool _bCopy ) : m_eAction( eEndDragObj ), m_bCopy( _bCopy ) { } -ApplySectionViewAction(SectionViewAction _eAction = eEndAction ) : m_eAction( _eAction ) { } +ApplySectionViewAction(sal_Bool _bCopy) +: m_eAction(eEndDragObj) +, m_bCopy(_bCopy) +{ +} + +ApplySectionViewAction(SectionViewAction _eAction = eEndAction) +: m_eAction(_eAction) +, m_bCopy(false) +{ +} void operator() ( const OViewsWindow::TSectionsMap::value_type _rhs ) { commit 3b39a6e87a7f81f90a0e41924750148d74bed3b9 Author: Caolán McNamara caol...@redhat.com Date: Wed Apr 2 13:47:54 2014 +0100 Resolves: fdo#76905 long delay when changing font size from % to pt (cherry picked from commit aa16ca73260681b19f0be8a58be95ed454580f7f) Conflicts: svtools/source/control/ctrlbox.cxx Change-Id: I33d72b51536ab96653ccda64c6e058c497289327 Reviewed-on: https://gerrit.libreoffice.org/8814 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index fe48970..9250f30 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1879,13 +1879,13 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) if ( bPtRelative ) { +Clear(); //clear early because SetDecimalDigits is a slow recalc + SetDecimalDigits( 1 ); SetMin( nPtRelMin ); SetMax( nPtRelMax ); SetUnit( FUNIT_POINT ); -Clear(); - short i = nPtRelMin, n = 0; // JP 30.06.98: more than 100 values are not useful while ( i = nPtRelMax n++ 100 ) @@ -1896,13 +1896,14 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) } else { +Clear(); //clear early because SetDecimalDigits is a slow recalc + SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); SetCustomUnitText(OUString('%')); SetUnit( FUNIT_CUSTOM ); -Clear(); sal_uInt16 i = nRelMin; while ( i = nRelMax ) { @@ -1913,6 +1914,8 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative ) } else { +if (pFontList) +Clear(); //clear early because SetDecimalDigits is a slow recalc bRelative = bPtRelative = sal_False; SetDecimalDigits( 1 ); SetMin( 20 ); commit 6749b28c53903924d865a9001a9cb28c27284ba2 Author: Caolán McNamara caol...@redhat.com Date: Wed Mar 26 17:08:35 2014 + Resolves: fdo#73936 make FormFieldDropDowns a real fieldportion split the checkbox and list and use a field portion for the list. That way it knows how to line break correctly wrt hardspaces and doesn't hang when the situation arises. (cherry picked from commit a52ee51269a47e52d68405caf8507e1abaa6fd8f) Conflicts: sw/source/core/text/itrform2.cxx sw/source/core/text/portxt.cxx sw/source/core/text/portxt.hxx Change-Id: I46d73f19ef8e51e7c21c8783ce70bb80d98a784c Reviewed-on: https://gerrit.libreoffice.org/8776 Reviewed-by: Miklos Vajna
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.3.3'
Tag 'libreoffice-4.2.3.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-04-03 18:10 -0700 Tag libreoffice-4.2.3.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTPZX1AAoJEPQ0oe+v7q6jr0wP/AoKOYTfkRZ4Ucit38IUTL9I OPs86HR2/iteHLuWFNWfF8cJVN34ak1vXd48RZ2qANXwtTp9cVVkYz2IarNeNVg4 7FcSh2SJ6wYP8PZ1HVVFwKGFsQVNsDzSR1LM+RK6kJk7Tc+ICPqDyKcOuH4XEuWF 7qpI98FzsGLVROvcMzGDX3eqRiZucVxyraih/BOh/pLlO5Plg2TG2MWRlEnQBBSe IVBMzARH6gAIgv4meds6V/Ah2WTB85JS/aWvz745LkKwfxWfU+IScVSxNVpZnGkr jnHw/Sq7mweuXC/VU1mkc9Z40DOZDBdoWsPgveanV6lbnAN/HZ4k/zoAfQ41LVAS t7XiJcS4pZuNCxzv+YrHOQS7qs1vfhtmxbz4thWbEzSauCVenD1vJ1Y1cB4FBZwJ Enf96+ntA0iXpuolUaeVxcosF0GRPw9ZPWsvAv7CrhJ07Li/dp2EN7Me85A1Gmj5 6t9BfImdXsjtpAvs5KdfDwqKlb2qncu6O4UYjHZPmWZ9afDtBC2gu1WS7syX81jq UtwuEhd+2eskP4eTJi0JPRhmjH8yIYumyj+vBMEQIafl2uVitllr3rvnAT7o+JAb Armx2nwUe85F2y2zNqRmnq4GrBhim0WBwGZsqs2wX3hJEf9bV1k85qD5l4rJr7UI zCB98auR3XBOhE+IiY2g =7adT -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-20: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 62957] FILESAVE: Save Last Slide Position in Impress
https://bugs.freedesktop.org/show_bug.cgi?id=62957 --- Comment #12 from Joel Madero jmadero@gmail.com --- You should go to the IRC channel or the dev mailing list - not many people will follow the bug tracker so you might get faster/better feedback going to the list/chat -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Jan Holesovsky ke...@collabora.com changed: What|Removed |Added Depends on||64722 -- 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: 2 commits - writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |1 writerfilter/inc/WriterFilterDllApi.hxx|6 writerfilter/inc/dmapper/DomainMapper.hxx |2 writerfilter/inc/ooxml/OOXMLDocument.hxx |6 writerfilter/inc/resourcemodel/Protocol.hxx| 93 --- writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |8 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 11 writerfilter/source/resourcemodel/Protocol.cxx | 209 - 8 files changed, 4 insertions(+), 332 deletions(-) New commits: commit 0695236cd7347134e53c81cf15f38b61ffe13255 Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Apr 3 20:28:13 2014 +0200 writerfilter: DEBUG_PROTOCOL is never defined Change-Id: I0f6de2041237282c770bd3926140836008d7d12b diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 7003132..7da82fe 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -142,7 +142,6 @@ $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/ooxml/OOXMLStreamImpl \ writerfilter/source/resourcemodel/Fraction \ writerfilter/source/resourcemodel/LoggedResources \ -writerfilter/source/resourcemodel/Protocol \ writerfilter/source/resourcemodel/ResourceModelHelper \ writerfilter/source/resourcemodel/TagLogger \ writerfilter/source/resourcemodel/XPathLogger \ diff --git a/writerfilter/inc/resourcemodel/Protocol.hxx b/writerfilter/inc/resourcemodel/Protocol.hxx deleted file mode 100644 index a4fa4f7..000 --- a/writerfilter/inc/resourcemodel/Protocol.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDE_WRITERFILTER_PROTOCOL_HXX -#define INCLUDE_WRITERFILTER_PROTOCOL_HXX - -#ifdef DEBUG_PROTOCOL - -#include boost/shared_ptr.hpp -#include WW8ResourceModel.hxx -#include TagLogger.hxx -namespace writerfilter -{ - -class StreamProtocol : public Stream -{ -Stream * m_pStream; -TagLogger::Pointer_t m_pTagLogger; - -public: -typedef boost::shared_ptrStreamProtocol Pointer_t; - -StreamProtocol(Stream * pStream, TagLogger::Pointer_t pTagLogger); -virtual ~StreamProtocol(); - -virtual void startSectionGroup(); -virtual void endSectionGroup(); -virtual void startParagraphGroup(); -virtual void endParagraphGroup(); -virtual void startCharacterGroup(); -virtual void endCharacterGroup(); -virtual void text(const sal_uInt8 * data, size_t len); -virtual void utext(const sal_uInt8 * data, size_t len); -virtual void props(writerfilter::ReferenceProperties::Pointer_t ref); -virtual void table(Id name, - writerfilter::ReferenceTable::Pointer_t ref); -virtual void substream(Id name, - writerfilter::ReferenceStream::Pointer_t ref); -virtual void info(const string rInfo); -virtual void startShape( ::com::sun::star::uno::Reference ::com::sun::star::drawing::XShape xShape ); -virtual void endShape(); -}; - -class PropertiesProtocol : public Properties -{ -Properties * m_pProperties; -TagLogger::Pointer_t m_pTagLogger; - -public: -typedef boost::shared_ptrPropertiesProtocol Pointer_t; - -PropertiesProtocol(Properties * pProperties, TagLogger::Pointer_t pTagLogger); -virtual ~PropertiesProtocol(); - -virtual void attribute(Id name, Value val); -virtual void sprm(Sprm sprm); -}; - -class TableProtocol : public Table -{ -Table * m_pTable; -TagLogger::Pointer_t m_pTagLogger; - -public: -typedef boost::shared_ptrTableProtocol Pointer_t; - -TableProtocol(Table * pTable, TagLogger::Pointer_t pTagLogger); -virtual ~TableProtocol(); - -virtual void entry(int pos, writerfilter::ReferenceProperties::Pointer_t ref); -}; - -} - -#endif // DEBUG_PROTOCOL -#endif // INCLUDE_WRITERFILTER_PROTOCOL_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/langbox.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit cc658066aec0a0f9589e7f9522c4431b3a3d5e96 Author: Eike Rathke er...@redhat.com Date: Thu Apr 3 20:57:54 2014 +0200 fixed display of available dictionaries strings Since commit 9dc57be59d1a8dc17e77f21cbce04e2bb7247dca under Tools-Options-LanguageSettings-WritingAids User-defined dictionaries the language strings are displayed as '[' Language (Country) ']' that before was and instead should be [Language (Country)] Change-Id: Id7e7ef6ab86112c46707f1451a072dfc196aec44 diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 8ca4172..4e206af 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -58,9 +58,9 @@ OUString GetDicInfoStr( const OUString rName, const sal_uInt16 nLang, bool bNeg aTmp += SVX_RESSTR(RID_SVXSTR_LANGUAGE_ALL); else { -aTmp += '[' ; +aTmp += [; aTmp += SvtLanguageTable::GetLanguageString( (LanguageType)nLang ); -aTmp += ']' ; +aTmp += ]; } return aTmp; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source
svx/source/dialog/langbox.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7e6a5ff988ebfc3e6753b19cfa172d758f5b51c8 Author: Eike Rathke er...@redhat.com Date: Thu Apr 3 20:57:54 2014 +0200 fixed display of available dictionaries strings Since commit 9dc57be59d1a8dc17e77f21cbce04e2bb7247dca under Tools-Options-LanguageSettings-WritingAids User-defined dictionaries the language strings are displayed as '[' Language (Country) ']' that before was and instead should be [Language (Country)] Change-Id: Id7e7ef6ab86112c46707f1451a072dfc196aec44 (cherry picked from commit cc658066aec0a0f9589e7f9522c4431b3a3d5e96) Reviewed-on: https://gerrit.libreoffice.org/8829 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 3b3eca6..33bc845 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -58,9 +58,9 @@ OUString GetDicInfoStr( const OUString rName, const sal_uInt16 nLang, bool bNeg aTmp += SVX_RESSTR(RID_SVXSTR_LANGUAGE_ALL); else { -aTmp += '[' ; +aTmp += [; aTmp += SvtLanguageTable::GetLanguageString( (LanguageType)nLang ); -aTmp += ']' ; +aTmp += ]; } return aTmp; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source forms/source vcl/osx
connectivity/source/drivers/dbase/DTable.cxx |2 +- forms/source/richtext/rtattributehandler.cxx |2 +- vcl/osx/salnativewidgets.cxx |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 786b31696bd7227d4921e13df02a16912776c166 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Apr 3 21:15:54 2014 +0200 Typo: corect-correct Change-Id: I31267af8aae35d647b8c4b0a0c5f926ad4779919 diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index c19a466..6e25e83 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -488,7 +488,7 @@ void ODbaseTable::construct() OSL_ENSURE( m_pConnection-matchesExtension( aURL.getExtension() ), ODbaseTable::ODbaseTable: invalid extension!); -// getEntry is expected to ensure the corect file name +// getEntry is expected to ensure the correct file name m_pFileStream = createStream_simpleError( sFileName, STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE); m_bWriteable = ( m_pFileStream != NULL ); diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 22d0b67..486a5bb 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -407,7 +407,7 @@ namespace frm if ( pFontHeightItem ) { -// corect measurement units +// correct measurement units SfxMapUnit eItemMapUnit = pFontHeightItem-GetPropUnit(); (void)eItemMapUnit; sal_uLong nHeight = pFontHeightItem-GetHeight(); if ( _rNewAttribs.GetPool()-GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP ) diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index d73ced9..1b86448 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -642,7 +642,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, case CTRL_PUSHBUTTON: { -// [ FIXME] : instead of use a value, vcl can retrieve corect values on the fly (to be implemented) +// [ FIXME] : instead of use a value, vcl can retrieve correct values on the fly (to be implemented) const int PB_Mini_Height = 15; const int PB_Norm_Height = 21; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a38047ff8ffafcf2b4ed4f37ab78f2cd98a0598 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Apr 3 21:21:32 2014 +0200 Typos Change-Id: Ia406e2efb1eb2685eeffdf07dcc5fad4fc2b6e94 diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index fa84053..126cec0 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -136,7 +136,7 @@ bool DomainMapperTableManager::sprm(Sprm rSprm) /* This attribute specifies the width type of table. This is used as part of the table layout algorithm specified by the tblLayout element.(See 17.4.64 and 17.4.65 of the ISO/IEC 29500-1:2011.) -If this valus is 'auto', the table layout has to uses the preferred widths on the table items to generate +If this value is 'auto', the table layout has to use the preferred widths on the table items to generate the final sizing of the table, but then must use the contents of each cell to determine final column widths. (See 17.18.87 of the ISO/IEC 29500-1:2011.) */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools
include/svtools/brwbox.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bed63f8f09634f4b71e1f9d8ade67d34c8d5142d Author: Julien Nabet serval2...@yahoo.fr Date: Thu Apr 3 21:23:44 2014 +0200 Typo: colum-column Change-Id: If667bd38563879a28e9ed7765582ce0fb7e8de04 diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index ce23bf6..8983424 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -743,7 +743,7 @@ public: @param eObjType The type to ask for @param _nPosition -The position of a tablecell (index position), header bar colum/row cell +The position of a tablecell (index position), header bar column/row cell @return The name of the specified object. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/mmpreparepage.ui | 22 ++ 1 file changed, 22 insertions(+) New commits: commit 49a96a4d38ed144f6d05a0d2d8a83c2cee52b304 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 20:24:30 2014 +0100 deploy cunning hack to center arrow block Change-Id: I372e373844169f216fb856107cc10b063d99e31d diff --git a/sw/uiconfig/swriter/ui/mmpreparepage.ui b/sw/uiconfig/swriter/ui/mmpreparepage.ui index d6a7cf5..bd2ee42 100644 --- a/sw/uiconfig/swriter/ui/mmpreparepage.ui +++ b/sw/uiconfig/swriter/ui/mmpreparepage.ui @@ -193,6 +193,22 @@ property name=height1/property /packing /child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + placeholder/ +/child + /object + packing +property name=left_attach2/property +property name=top_attach0/property +property name=width1/property +property name=height1/property + /packing +/child /object packing property name=left_attach0/property @@ -325,4 +341,10 @@ Clicking 'Edit Document...' will temporarily reduce the wizard to a small window /packing /child /object + object class=GtkSizeGroup id=sizegroup1 +widgets + widget name=label4/ + widget name=box1/ +/widgets + /object /interface ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d2356918b0cd7652964f5b93aa231495bde0f3e8 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 20:32:39 2014 +0100 Updated core Project: help c719458fbdafdb833a17874de420876a54e6ded3 diff --git a/helpcontent2 b/helpcontent2 index ada2b43..c719458 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ada2b43cf78b9cd4e69bd4d6bc4a5185def85295 +Subproject commit c719458fbdafdb833a17874de420876a54e6ded3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 24 source/text/swriter/01/mailmerge08.xhp | 47 - 2 files changed, 24 insertions(+), 47 deletions(-) New commits: commit c719458fbdafdb833a17874de420876a54e6ded3 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 3 20:32:39 2014 +0100 update help ids for mail merge output page .ui conversion Change-Id: I840fc424c2e04bda2b2f54effa3c95b7692cd1ba diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 1f3f951..5444c95 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2305,7 +2305,6 @@ HID_MM_HEADER_9,55044, HID_MM_MAILBODY,54982, HID_MM_MAILSTATUS_TLB,54988, HID_MM_NEXT_PAGE,55016, -HID_MM_OUTPUTPAGE,54961, HID_MM_PREV_PAGE,55017, HID_MM_SELECTDBTABLEDDIALOG,54963, HID_MM_SELECTDBTABLEDDIALOG_LISTBOX,54964, @@ -6341,8 +6340,6 @@ sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698, sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977, sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969, sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960, -sw_Edit_DLG_MM_OUTPUT_PAGE_ED_ATTACHMENT,898304052, -sw_Edit_DLG_MM_OUTPUT_PAGE_ED_SUBJECT,898304035, sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319, sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975, sw_FT_BODY_DLG_MM_MAILBODY,1435402240, @@ -6356,9 +6353,6 @@ sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494, sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510, sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524, sw_ListBox_DLG_MM_ASSIGNFIELDS_CT_FIELDS_LB_FIELDS,1074908678, -sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_MAILTO,898305568, -sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_PRINT,898305558, -sw_ListBox_DLG_MM_OUTPUT_PAGE_LB_SENDAS,898305573, sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631, sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629, sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796, @@ -6409,8 +6403,6 @@ sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395, sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045, sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047, sw_NumericField_DLG_MM_CREATEADDRESSLIST_NF_SETNO,1435244554, -sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_FROM,898308112, -sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_TO,898308114, sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141, sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139, sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073, @@ -6440,13 +6432,6 @@ sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEW,1435243011, sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_NEXT,1435243019, sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_PREV,1435243017, sw_PushButton_DLG_MM_CREATEADDRESSLIST_PB_START,1435243016, -sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_COPYTO,898306593, -sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTERSETTINGS,898306583, -sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_PRINTNOW,898306586, -sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVENOW,898306579, -sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SAVESTARTDOC,898306568, -sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDAS,898306598, -sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDDOCUMENTS,898306600, sw_PushButton_DLG_MM_SELECTDBTABLEDDIALOG_PB_PREVIEW,1435210243, sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624, sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820, @@ -6460,15 +6445,6 @@ sw_RadioButton_DLG_MAILMERGE_RB_MARKED,1446609411, sw_RadioButton_DLG_MAILMERGE_RB_PRINTER,1446609419, sw_RadioButton_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL,1446609448, sw_RadioButton_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC,1446609447, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_FROM,898302479, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINT,898302469, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_PRINTALL,898302488, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEASONE,898302476, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEINDIVIDUAL,898302477, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEMERGEDDOC,898302468, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVESTARTDOC,898302467, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDALL,898302503, -sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDMAIL,898302470, sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528, sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529, sw_RadioButton_TP_FOOTNOTE_PAGE_RB_MAXHEIGHT,877953538, diff --git a/source/text/swriter/01/mailmerge08.xhp b/source/text/swriter/01/mailmerge08.xhp index 41e6ec9..6f89b62 100644 --- a/source/text/swriter/01/mailmerge08.xhp +++ b/source/text/swriter/01/mailmerge08.xhp @@ -32,78 +32,79 @@ /meta body section id=saveprintsend +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/mmoutputpage/MMOutputPage id=bm_id3743096 localize=false/ paragraph role=heading id=par_idN1054C xml-lang=en-US level=1 l10n=NEWlink href=text/swriter/01/mailmerge08.xhpMail Merge Wizard - Save, Print or Send/link/paragraph paragraph role=paragraph id=par_idN1055C xml-lang=en-US l10n=NEWSpecifies the output options for mail merge documents./paragraph /section paragraph role=paragraph id=par_idN1055F xml-lang=en-US l10n=NEWThe appearance
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 57 - sc/source/ui/inc/PivotLayoutTreeListData.hxx |2 2 files changed, 48 insertions(+), 11 deletions(-) New commits: commit f9636d50e6543302f236164aeebadab2733e849b Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Thu Apr 3 21:38:48 2014 +0200 pivot: duplicate data field handling Change-Id: I3d367b8b638217f18143118df00324f21a0470f2 diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index 012781a..e8f4805 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -88,15 +88,15 @@ bool ScPivotLayoutTreeListData::DoubleClickHdl() if (pDialog-Execute() == RET_OK) { -if (rCurrentFunctionData.mnFuncMask != pDialog-GetFuncMask()) -{ -rCurrentFunctionData.mnDupCount = rCurrentFunctionData.mnDupCount + 1; -} -rCurrentFunctionData.mnFuncMask = pCurrentLabelData-mnFuncMask = pDialog-GetFuncMask(); +rCurrentFunctionData.mnFuncMask = pDialog-GetFuncMask(); +pCurrentLabelData-mnFuncMask = pDialog-GetFuncMask(); + rCurrentFunctionData.maFieldRef = pDialog-GetFieldRef(); ScDPLabelData* pDFData = mpParent-GetLabelData(rCurrentFunctionData.mnCol); +AdjustDuplicateCount(pCurrentItemValue); + OUString sDataItemName = lclCreateDataItemName( rCurrentFunctionData.mnFuncMask, pDFData-maName, @@ -132,15 +132,15 @@ void ScPivotLayoutTreeListData::FillDataField(ScPivotFieldVector rDataFields) pItemValue-mpOriginalItemValue = pOriginalItemValue; pItemValue-maFunctionData.mnOriginalDim = rField.mnOriginalDim; -pItemValue-maFunctionData.mnDupCount = rField.mnDupCount; pItemValue-maFunctionData.maFieldRef = rField.maFieldRef; -maDataItemValues.push_back(pItemValue); - -OUString sDataItemName = lclCreateDataItemName(rField.nFuncMask, pItemValue-maName, rField.mnDupCount); +AdjustDuplicateCount(pItemValue); +OUString sDataItemName = lclCreateDataItemName(pItemValue-maFunctionData.mnFuncMask, + pItemValue-maName, + pItemValue-maFunctionData.mnDupCount); -SvTreeListEntry* pEntry = InsertEntry(sDataItemName); -pEntry-SetUserData(pItemValue); +maDataItemValues.push_back(pItemValue); +InsertEntry(sDataItemName, NULL, false, TREELIST_APPEND, pItemValue); } } @@ -205,6 +205,8 @@ void ScPivotLayoutTreeListData::InsertEntryForItem(ScItemValue* pItemValue, sal_ rFunctionData.mnFuncMask = PIVOT_FUNC_SUM; } +AdjustDuplicateCount(pDataItemValue); + OUString sDataName = lclCreateDataItemName( rFunctionData.mnFuncMask, pDataItemValue-maName, @@ -213,6 +215,39 @@ void ScPivotLayoutTreeListData::InsertEntryForItem(ScItemValue* pItemValue, sal_ InsertEntry(sDataName, NULL, false, nPosition, pDataItemValue); } +void ScPivotLayoutTreeListData::AdjustDuplicateCount(ScItemValue* pInputItemValue) +{ +ScPivotFuncData rInputFunctionData = pInputItemValue-maFunctionData; + +bool bFoundDuplicate = false; + +rInputFunctionData.mnDupCount = 0; +sal_uInt8 nMaxDuplicateCount = 0; + +SvTreeListEntry* pEachEntry; +for (pEachEntry = First(); pEachEntry != NULL; pEachEntry = Next(pEachEntry)) +{ +ScItemValue* pItemValue = (ScItemValue*) pEachEntry-GetUserData(); +if (pItemValue == pInputItemValue) +continue; + +ScPivotFuncData rFunctionData = pItemValue-maFunctionData; + +if (rFunctionData.mnCol == rInputFunctionData.mnCol +rFunctionData.mnFuncMask == rInputFunctionData.mnFuncMask) +{ +bFoundDuplicate = true; +if(rFunctionData.mnDupCount nMaxDuplicateCount) +nMaxDuplicateCount = rFunctionData.mnDupCount; +} +} + +if(bFoundDuplicate) +{ +rInputFunctionData.mnDupCount = nMaxDuplicateCount + 1; +} +} + void ScPivotLayoutTreeListData::KeyInput(const KeyEvent rKeyEvent) { KeyCode aCode = rKeyEvent.GetKeyCode(); diff --git a/sc/source/ui/inc/PivotLayoutTreeListData.hxx b/sc/source/ui/inc/PivotLayoutTreeListData.hxx index d58b077..f7d9f5c 100644 --- a/sc/source/ui/inc/PivotLayoutTreeListData.hxx +++ b/sc/source/ui/inc/PivotLayoutTreeListData.hxx @@ -31,6 +31,8 @@ protected: virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) SAL_OVERRIDE; virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition) SAL_OVERRIDE; +void AdjustDuplicateCount(ScItemValue* pInputItemValue); + virtual void KeyInput(const
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added Depends on||77027 --- Comment #124 from Laurent BP jumbo4...@yahoo.fr --- Add bug 77027 regression in 4.2.3 RC2 against 4.2.3 RC1 Math formula lost their Area settings -- 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: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/table-theme-preservation.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx|5 sw/source/filter/ww8/docxattributeoutput.cxx| 97 sw/source/filter/ww8/docxattributeoutput.hxx|4 writerfilter/source/dmapper/DomainMapperTableHandler.cxx| 30 +++ 5 files changed, 105 insertions(+), 31 deletions(-) New commits: commit 42ced106ff6ed5688385a5d2b40d4b5caea68406 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Thu Apr 3 16:49:33 2014 +0200 oox: use HasItem instead of GetItemState Code looks cleaner like this. Change-Id: I43bd8d2ac40960347d60e687dcae4c17357991b0 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 1f4c301..a37282a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2703,10 +2703,8 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t FSEND ); // Look for the table style property in the table grab bag -const SfxPoolItem *pI = NULL; -std::mapOUString, com::sun::star::uno::Any aGrabBag; -if ( SFX_ITEM_ON == pTblFmt-GetAttrSet().GetItemState( RES_FRMATR_GRABBAG, false, pI ) ) -aGrabBag = dynamic_castconst SfxGrabBagItem *(pI)-GetGrabBag(); +std::mapOUString, com::sun::star::uno::Any aGrabBag = +sw::util::HasItemSfxGrabBagItem( pTblFmt-GetAttrSet(), RES_FRMATR_GRABBAG )-GetGrabBag(); // Extract properties from grab bag std::mapOUString, com::sun::star::uno::Any::iterator aGrabBagElement; @@ -2829,19 +2827,13 @@ void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_ { const SwTableBox *pTblBox = pTableTextNodeInfoInner-getTableBox( ); const SwFrmFmt *pFmt = pTblBox-GetFrmFmt( ); -const SfxPoolItem *pI = NULL; - -Color aColor; -if ( SFX_ITEM_ON == pFmt-GetAttrSet().GetItemState( RES_BACKGROUND, false, pI ) ) -aColor = dynamic_castconst SvxBrushItem *(pI)-GetColor(); -else -aColor = COL_AUTO; +const SvxBrushItem *aColorProp = sw::util::HasItemSvxBrushItem( pFmt-GetAttrSet(), RES_BACKGROUND ); +Color aColor = aColorProp ? aColorProp-GetColor() : COL_AUTO; OString sColor = msfilter::util::ConvertColor( aColor ); -std::mapOUString, com::sun::star::uno::Any aGrabBag; -if ( SFX_ITEM_ON == pFmt-GetAttrSet().GetItemState( RES_FRMATR_GRABBAG, false, pI ) ) -aGrabBag = dynamic_castconst SfxGrabBagItem *(pI)-GetGrabBag(); +std::mapOUString, com::sun::star::uno::Any aGrabBag = +sw::util::HasItemSfxGrabBagItem( pFmt-GetAttrSet(), RES_FRMATR_GRABBAG )-GetGrabBag(); OString sOriginalColor; std::mapOUString, com::sun::star::uno::Any::iterator aGrabBagElement = aGrabBag.find(fill); commit ae61569eea0719a882010cfbb260a1a0d690d974 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Thu Apr 3 16:27:37 2014 +0200 oox: Do not overwrite table style properties Some table properties can be defined by the table style but cells can overwrite them in their cell properties section. Our exporter was writing all the cell properties in all cases, regardless of them being defined by the theme or not, and we shouldn't do that if we want the document to work properly in Word. To fix the issue I store the style-defined cell properties (the format of all four borders) in the table grab bag. The exporter recovers them and compares with the cell properties before writing them; if the cell property matches the stlye-defined one, we don't write it to the document. An existing unit test was slightly modified to check that the actual cell properties are not being skipped. Change-Id: I3aa12d76fb8f73d3fd300f254d19e1683fb6146c diff --git a/sw/qa/extras/ooxmlexport/data/table-theme-preservation.docx b/sw/qa/extras/ooxmlexport/data/table-theme-preservation.docx index fe6b953..522dac8 100644 Binary files a/sw/qa/extras/ooxmlexport/data/table-theme-preservation.docx and b/sw/qa/extras/ooxmlexport/data/table-theme-preservation.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index b68b872..1e1fd6d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1956,6 +1956,11 @@ DECLARE_OOXMLEXPORT_TEST(testTableThemePreservation, table-theme-preservation.d // check table style has been preserved assertXPath(pXmlDocument, /w:document/w:body/w:tbl/w:tblPr/w:tblStyle, val, Sombreadoclaro-nfasis1); +// check table style is not overwritten by other properties +assertXPath(pXmlDocument, /w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/*, 0); +assertXPath(pXmlDocument, /w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/*, 0);
Re: Fixing Bug 46200 [Easy Hack]
On 01/04/14 06:50, Tharindu Amila Perera wrote: Hi all, Using the reply I found out that the events coming from the keyboard has this behavior. Using the argument KeyEvent coming to function in file tabvwsh4.cxx bool ScTabViewShell::TabKeyInput(const KeyEvent rKEvt) I can get codes of all keys except of Caps-Lock, NumLock and Scroll(Which is the needed input). I noticed that when any of the above keys are pressed this function is called twice. But in both events the keycodes are not accessible. hmm... indeed the keycode is 0 there... it looks like the lock keys are not mapped to a keycode in VCL... perhaps intentionally. When CapsLock is on pressing key 'A' in keyboard will give the same keycode as when it is not on. So there must be a place where it is handled to differentiate a and A inputs. It would be appreciated if I can get a code pointer for this. if i read the bug correctly you don't actually need the key events, you just need to know if the lock key is active when some other input happens. vcl/unx/generic/app/saldisp.cxx: sal_uInt16 SalDisplay::GetIndicatorState() const { unsigned int _state = 0; sal_uInt16 nState = 0; XkbGetIndicatorState(pDisp_, XkbUseCoreKbd, _state); if ((_state 0x0001)) nState |= INDICATOR_CAPSLOCK; if ((_state 0x0002)) nState |= INDICATOR_NUMLOCK; if ((_state 0x0004)) nState |= INDICATOR_SCROLLLOCK; return nState; } there is an example for requesting the caps-lock key state in editeng/source/misc/svxacorr.cxx: bool bLockKeyOn = pFrameWin (pFrameWin-GetIndicatorState() INDICATOR_CAPSLOCK); so you need a VCL Window to get the state; a SfxViewShell like the ScTabVierwShell has a pointer to its Window. (since i read the bug too late i've already got a patch to assign a keycode for the scroll-lock key (see attachment), but i now think that is actually useless) diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index d96fd20..4960931 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1251,6 +1251,9 @@ sal_uInt16 SalDisplay::GetKeyCode( KeySym keysym, char*pcPrintable ) const nKey = KEY_SEMICOLON; *pcPrintable = ';'; break; +case XK_Scroll_Lock: +nKey = KEY_SCROLLLOCK; +break; // - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000 case 0x1000FF02: // apXK_Copy nKey = KEY_COPY; diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index f22b54e..baa94f2 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -255,6 +255,7 @@ static sal_uInt16 GetKeyCode( guint keyval ) case GDK_bracketleft: nCode = KEY_BRACKETLEFT; break; case GDK_bracketright: nCode = KEY_BRACKETRIGHT; break; case GDK_semicolon:nCode = KEY_SEMICOLON; break; +case GDK_Scroll_Lock: nCode = KEY_SCROLLLOCK; break; // some special cases, also see saldisp.cxx // - - - - - - - - - - - - - Apollo - - - - - - - - - - - - - 0x1000 case 0x1000FF02: // apXK_Copy diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 90b36e0..227b6ae 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -666,7 +666,7 @@ static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] = 0,// 142 0,// 143 0,// NUMLOCK 144 -0 // SCROLLLOCK 145 +KEY_SCROLLLOCK// SCROLLLOCK 145 }; static UINT ImplSalGetWheelScrollLines() ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
About parts in ODatabaseMetaData.cxx (connectivy module/odbc part)
Hello, Taking a look at connectivity/source/drivers/odbc/ODatabaseMetaData.cxx without particular reason, I noticed this: 1044 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) 1045 { 1046 OUString aValue; 1047 OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ORDER_BY_COLUMNS_IN_SELECT,aValue,*this,m_pConnection-getTextEncoding()); 1048 return aValue.toChar() == 'N'; 1049 } See http://opengrok.libreoffice.org/xref/core/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx#1044 Whereas all the other blocks compare to 'Y', I don't understand why it should be compared to 'N' and not to 'Y' like the other blocks. Also, I noticed in this same file: 1252 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) 1253 { 1254 SQLUINTEGER nValue; 1255 OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); 1256 return nValue; 1257 } Searching about getDefaultTransactionIsolation, I found SQL_DEFAULT_TXN_ISOLATION. But this attribute isn't in sqlext.h but in isqlext.h (see http://sourcecodebrowser.com/unixodbc/2.2.11/nn_2isqlext_8h.html) Nevertheless, looking the number of locations where sqlext.h is used in LO, I wonder what impact would be including isqlext.h Still, the above code with SQL_SUBQUERIES seems weird. Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/About-parts-in-ODatabaseMetaData-cxx-connectivy-module-odbc-part-tp4104005.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: About parts in ODatabaseMetaData.cxx (connectivy module/odbc part)
Re reading part 1), i was obviously wrong. SQL_ORDER_BY_COLUMNS_IN_SELECT indicates if columns contained in order by clause must be in Select part. So it's normal supportsOrderByUnrelated must test this value equal to 'N' I found another part however: 1622 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) ... 1641 return (nValue SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS; 1642 } whereas we have: 1644 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) ... 1663 return (nValue SQL_CA2_SENSITIVITY_ADDITIONS) == SQL_CA2_SENSITIVITY_ADDITIONS; 1664 } (See http://opengrok.libreoffice.org/xref/core/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx#1622) One of them must be wrong. Julien -- View this message in context: http://nabble.documentfoundation.org/About-parts-in-ODatabaseMetaData-cxx-connectivy-module-odbc-part-tp4104005p4104014.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 240b8c63ff67510a0694cee9ebec310157e24307 Author: Jacobo Aragunde Pérez jaragu...@igalia.com Date: Fri Apr 4 00:06:28 2014 +0200 Fix -Werror=sign-compare Change-Id: I3c6ff1750d3e6aa6b3b19c957847289067fc5a54 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index a37282a..c2f8819 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2153,7 +2153,7 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co if( rStyleProps != NULL pBorderLine !pBorderLine-isEmpty() pBorderLine-GetBorderLineStyle() == rStyleProps-LineStyle pBorderLine-GetColor() == rStyleProps-Color -pBorderLine-GetWidth() == MM100_TO_TWIP_UNSIGNED( rStyleProps-LineWidth ) ) +pBorderLine-GetWidth() == MM100_TO_TWIP( rStyleProps-LineWidth ) ) return; pAttr-add( FSNS( XML_w, XML_val ), OString( pVal ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRCollector.cpp | 10 ++ src/lib/CDRParser.cpp| 23 ++- 2 files changed, 28 insertions(+), 5 deletions(-) New commits: commit f06333217ad55e841c4bd5b20b4eebbf7a9ce2f6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Fri Apr 4 01:48:47 2014 +0200 Working around a CorelDraw x7 bug + fixing palettes Change-Id: I56ce7bfd3a49923cbf6e989687f02cdcf287eecb diff --git a/src/lib/CDRCollector.cpp b/src/lib/CDRCollector.cpp index 40456cf..01d318b 100644 --- a/src/lib/CDRCollector.cpp +++ b/src/lib/CDRCollector.cpp @@ -477,6 +477,16 @@ unsigned libcdr::CDRParserState::_getRGBColor(const CDRColor color) blue = col0; break; } + // YIQ + case 0x0a: + { +break; + } + // YIQ255 + case 0x0b: + { +break; + } // Lab case 0x0c: { diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp index 2c5d231..853c5e0 100644 --- a/src/lib/CDRParser.cpp +++ b/src/lib/CDRParser.cpp @@ -688,7 +688,9 @@ libcdr::CDRColor libcdr::CDRParser::readColor(librevenge::RVNGInputStream *input if (m_version = 500) { colorModel = readU16(input); -if (colorModel == 0x19) +if (colorModel == 0x01 m_version = 1300) + colorModel = 0x19; +if (colorModel == 0x19 || colorModel == 0x1e) { unsigned char r = 0; unsigned char g = 0; @@ -697,8 +699,19 @@ libcdr::CDRColor libcdr::CDRParser::readColor(librevenge::RVNGInputStream *input unsigned char m = 0; unsigned char y = 0; unsigned char k = 100; - unsigned short paletteID = readU16(input); - input-seek(4, librevenge::RVNG_SEEK_CUR); + unsigned short paletteID = 0; + /* A bug in CorelDraw x7 creates a corrupted file. If we meet colorModel of 0x1e, + * it is actually colorModel 0x19 and paletteId 0x1e */ + if (colorModel == 0x1e) + { +colorModel = 0x19; +paletteID = 0x1e; + } + else + { +paletteID = readU16(input); +input-seek(4, librevenge::RVNG_SEEK_CUR); + } unsigned short ix = readU16(input); unsigned short tint = readU16(input); switch (paletteID) @@ -1018,11 +1031,11 @@ libcdr::CDRColor libcdr::CDRParser::readColor(librevenge::RVNGInputStream *input red /= 100; green /= 100; blue /= 100; -colorValue = (blue 0xff); +colorValue = (red 0xff); colorValue = 8; colorValue |= (green 0xff); colorValue = 8; -colorValue |= (red 0xff); +colorValue |= (blue 0xff); break; } case 0x09: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
What does contact mean in svx?
Hi all, What does contact mean in ObjectContact? Class definition is here: http://opengrok.libreoffice.org/xref/core/include/svx/sdr/contact/objectcontact.hxx#56 Chris___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 46200] [RFE] Use the Scroll Lock key as a toggling lock key like Excel
https://bugs.freedesktop.org/show_bug.cgi?id=46200 tommy27 ba...@quipo.it changed: What|Removed |Added CC||ba...@quipo.it See Also||https://issues.apache.org/o ||oo/show_bug.cgi?id=7179 -- 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-qa] Who is currently testing Android/iOS remotes?
Hi all, As a part of our testing of LibreOffice, it's important that make sure that our Android and iOS remotes are held to the same standards as our primary application. Right now, I don't see anyone in the QA Team listed as being available to test the iOS remote, and see just a couple of names available for Android: https://wiki.documentfoundation.org/QA/Team I think that Steve Bell and Florian R. may have previously indicated that they both could both help out with testing on iOS yes? :-) Testing the remote shouldn't take too long -- in fact, this seems like an ideal use-case for MozTrap, where one could just walk through a list of manual tests to perform and complete the process in under half an hour. Sophie -- could you help us set up a list of tests to perform with each remote? Thanks, --R P.S. Cloph mentioned that if you subscribe to the LibreOffice community on G+, you can get early access to Android remote testing builds via https://play.google.com/apps/testing/org.libreoffice.impressremote (old versions are here: http://downloadarchive.documentfoundation.org/libreoffice/old/ Build instructions are here: https://wiki.documentfoundation.org/Development/Impress/Remote) ___ 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 39312] Writer improvement: Reorder buttons in “Paragraph Style” dialog for better usability
https://bugs.freedesktop.org/show_bug.cgi?id=39312 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=76486 -- 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 76486] Uniform Arrangement of the Help Button
https://bugs.freedesktop.org/show_bug.cgi?id=76486 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=39312 -- 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 59818] VIEWING: Bad Font Rendering in KDE
https://bugs.freedesktop.org/show_bug.cgi?id=59818 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- 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 39793] UI · FORMATTING: 'Set Language for Paragraph/Selection More...' should always open the 'Font' tab (dialog 'Character')
https://bugs.freedesktop.org/show_bug.cgi?id=39793 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added CC||caol...@redhat.com, ||f...@libreoffice.org --- Comment #14 from Adolfo Jayme f...@libreoffice.org --- CCing Caolán, he may know how to fix this. -- 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 65584] Elements Dock windows flickers on mouse over
https://bugs.freedesktop.org/show_bug.cgi?id=65584 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=71087 -- 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 71087] StartCenter document list is flickering (win only)
https://bugs.freedesktop.org/show_bug.cgi?id=71087 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=65584 -- 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 76964] MinGW: Automatic capitalising of i in a non-english language
https://bugs.freedesktop.org/show_bug.cgi?id=76964 Owen Genat owen.ge...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from Owen Genat owen.ge...@gmail.com --- For clarity, the comments (by oweng i.e., me) quoted in the report were made in this thread: http://en.libreofficeforum.org/node/7785 I could not initially reproduce the behaviour using en-US installers (in en-AU locale): - v4.1.4.2 Build ID: 0a0440ccc0227ad9829de5f46be37cfb6edcf72 - v4.2.2.1 Build ID: 3be8cda0bddd8e430d8cda1ebfd581265cca5a0f ... under Debian 7 / Crunchbang 11 (both x86_64), with pl language pack. Now I am somewhat confused, as the problem does appear using v4.2.2.1 with pl langpack installed, but not using v4.1.4.2 with pl langpack installed. I have reset the user profiles and un/re-installed the pl langpack (and even the en-GB langpack as reported) a few times and the problem remains (under v4.2.2.1). Confirmed. Status set to NEW. -- 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 76975] LibreOffice hangs when you apply Check for updates two times
https://bugs.freedesktop.org/show_bug.cgi?id=76975 Foss f...@openmailbox.org changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Foss f...@openmailbox.org --- Are you on windows? Is this bug still valid / reproducible with the latest LO release? Currently 4.2.2: http://www.libreoffice.org/download/libreoffice-fresh/ Please also try resetting your user profile and let us know if that helps: https://wiki.documentfoundation.org/UserProfile Should this be still reproducible for you with the latest LO release please set this bug back to UNCONFIRMED. Should this issue be solved set it to WORKSFORME. Setting to NEEDINFO until more detail is provided. -- 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 59818] VIEWING: Bad Font Rendering in KDE
https://bugs.freedesktop.org/show_bug.cgi?id=59818 Zeki Bildirici kobz...@gmail.com changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|WORKSFORME |--- CC||f...@libreoffice.org --- Comment #16 from Zeki Bildirici kobz...@gmail.com --- Hi Adolfo, Please do not mark bugs resolved worksforme without any info like in his case; distrubution, platform, DE, DE version etc. I'm reverting the bug status to Reopened. Regards, Zeki -- 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 76842] LibreOffice hanging
https://bugs.freedesktop.org/show_bug.cgi?id=76842 James james.willi...@bristol.gov.uk changed: What|Removed |Added Priority|medium |highest -- 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 76842] LibreOffice hanging
https://bugs.freedesktop.org/show_bug.cgi?id=76842 James james.willi...@bristol.gov.uk changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #8 from James james.willi...@bristol.gov.uk --- This is becoming a MASSIVE problem for us as the Java update gathers pace. Our service desk has taken over 90 calls since Monday and we've had to issue an emergency (hopefully) short-term botch which allows users to easily delete the file via a shortcut. We really need a fix for this. Can anyone help? -- 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 76943] UI: Add option to set default for Paste to as text without formatting
https://bugs.freedesktop.org/show_bug.cgi?id=76943 --- Comment #4 from Heiko Tietze heiko.tie...@user-prompt.com --- One of the features that I really miss when I have to work with Microsoft Office is Paste Special via short-cut. Libreoffice has this feature: Ctrl+Shift+V opens the dialog and you just have to press enter to get the clipboard content without formatting. Therefore an option makes not much sense (despite the fact that this function is a killer features for me). -- 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 76984] New: crash with vector::_M_range_check
https://bugs.freedesktop.org/show_bug.cgi?id=76984 Priority: medium Bug ID: 76984 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: crash with vector::_M_range_check Severity: normal Classification: Unclassified OS: Linux (All) Reporter: hsuship...@gmail.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 96826 -- https://bugs.freedesktop.org/attachment.cgi?id=96826action=edit A screenshot of the crash Hi I'm using impress. The crash happened when I'm tring to duplicate the slide. It showed vector::_M_range_check (as the pic in attachment )and then Impress was closed! -- 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 76985] New: Moving graphic frame always freezes Writer
https://bugs.freedesktop.org/show_bug.cgi?id=76985 Priority: medium Bug ID: 76985 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Moving graphic frame always freezes Writer Severity: critical Classification: Unclassified OS: All Reporter: gerry.trep...@googlemail.com Hardware: Other Status: UNCONFIRMED Version: 4.1.4.2 release Component: Writer Product: LibreOffice Created attachment 96827 -- https://bugs.freedesktop.org/attachment.cgi?id=96827action=edit Moving-inner-graphics-frame-to-bottom-freezes-Writer.odt I encounter reproducible freezes of LibreOffice Writer when moving a frame which includes a graphic. Following action always freezes Writer on my computer: * Please open attached .odt file * Go to page number 3, there you see a graphic of Africa. (Details: The graphic you see sits in a graphic frame (inner-frame) which also includes the caption. Both sit in another frame (outer-frame) with includes the source declaration at the bottom of the graphic.) * Now click on the border of the inner-frame and move the inner-frame with Alt and the cursor-down key to the bottom of the outer-frame. As soon as it reaches the outer-frame, LibreOffice Writer freezes and one CPU core goes up to 100% until you kill LO. Please find here a screencast of the freeze (39sec): At second 10 LO Writer freezes: http://ubuntuone.com/6h4OX47cbTFbPgGsMdCmG3 LibreOffice Version: 4.1.4.2, Build ID: 410m0(Build:2) System: Ubuntu 13.04 64-bit Intel, Gnome 3. I don't know whether it helps, but when starting LO from the command line, following error messages are given: ~$ libreoffice error: line 117725: bad flag alias index: 0 error: line 117725: bad flag vector alias error: line 129422: bad flag alias index: 0 error: line 129422: bad flag vector alias error: line 247820: bad flag alias index: 0 error: line 247820: bad flag vector alias error: line 627245: bad flag alias index: 0 error: line 627245: bad flag vector alias error: line 667594: bad flag alias index: 0 error: line 667594: bad flag vector alias error: line 685788: bad flag alias index: 0 error: line 685788: bad flag vector alias -- 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 76985] Moving graphic frame always freezes Writer
https://bugs.freedesktop.org/show_bug.cgi?id=76985 Gerry gerry.trep...@googlemail.com changed: What|Removed |Added Attachment #96827|text/plain |application/vnd.oasis.opend mime type||ocument.text -- 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 76979] FILESAVE: Files are getting corrupted due to srgbClr value changes to auto
https://bugs.freedesktop.org/show_bug.cgi?id=76979 Adam CloudOn rattles2...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76941] EDITING: .docx file not equal to original
https://bugs.freedesktop.org/show_bug.cgi?id=76941 --- Comment #2 from josé faria be...@sapo.pt --- Created attachment 96828 -- https://bugs.freedesktop.org/attachment.cgi?id=96828action=edit it an internal file from the school i work. the top logos are in the original in black and white (or grey shaded). when i open the file in libreoffice's write the ACIB (top left) logo turns blue and the IEFP (top right) turns green. -- 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 76947] libvisio: numbers are not at the correct position
https://bugs.freedesktop.org/show_bug.cgi?id=76947 --- Comment #2 from Dennis Roczek dennisroc...@gmail.com --- Created attachment 96829 -- https://bugs.freedesktop.org/attachment.cgi?id=96829action=edit another file attaching another file from the example documents which has the same problem. -- 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 76829] libvisio: Page number is calculated incorrectly (formatting)
https://bugs.freedesktop.org/show_bug.cgi?id=76829 Dennis Roczek dennisroc...@gmail.com changed: What|Removed |Added CC||dennisroc...@gmail.com --- Comment #3 from Dennis Roczek dennisroc...@gmail.com --- The file https://bugs.freedesktop.org/attachment.cgi?id=96829 contains two times the problem: a) page 1 of 1 and b) direct left of that MASSSTAB 1.000:1.000 -- should be MASSSTAB 1:1 -- 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 76937] In Style Formatting dialog, the layout of Position controls is haphazard and confusing
https://bugs.freedesktop.org/show_bug.cgi?id=76937 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|normal |major CC||f...@libreoffice.org Ever confirmed|0 |1 --- Comment #1 from Adolfo Jayme f...@libreoffice.org --- Impressive job with the analysis and the video ;-) Adding Caolán to this bug’s CC list. -- 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 76986] New: Provide context menu inside the Group Outline area
https://bugs.freedesktop.org/show_bug.cgi?id=76986 Priority: medium Bug ID: 76986 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Provide context menu inside the Group Outline area Severity: enhancement Classification: Unclassified OS: All Reporter: narayana...@outlook.com Hardware: Other Status: UNCONFIRMED Version: 4.2.0.2 rc Component: Spreadsheet Product: LibreOffice There are no context menus inside the Group Outline area (the gray areas at the top or left of the worksheet, where the group outlines are displayed.) A context menu will make it much faster to work with the groups, as compared to selecting a command from the menu system. -- 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 76962] LibreOffice Impress. Floating frame not displayed
https://bugs.freedesktop.org/show_bug.cgi?id=76962 --- Comment #2 from maurice.cl...@writeme.com --- Same problem with LibreOffice 4.2.2.1 -- 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 76988] New: Exporting Visio 2013 to SVG results in corrupt file in Libre Office 4.2.2.1
https://bugs.freedesktop.org/show_bug.cgi?id=76988 Priority: medium Bug ID: 76988 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Exporting Visio 2013 to SVG results in corrupt file in Libre Office 4.2.2.1 Severity: normal Classification: Unclassified OS: Windows (All) Reporter: lbalba...@gmail.com Hardware: All Status: UNCONFIRMED Version: 4.2.2.1 release Component: Drawing Product: LibreOffice Created attachment 96831 -- https://bugs.freedesktop.org/attachment.cgi?id=96831action=edit Visio 2013 file Exporting a Visio 2013 vsdx file to SVG format in Libre Office 4.2.2.1 results in a corrupt/incorrectly displayed file. Steps to reproduce: 1.) Open Visio 2013 file 'zones.vsdx_visio2013.vsdx' in Libre Office 4.2.2.1 2.) Export Visio 2013 file to 'zones.svg_lo4-2-2-1.svg' in Libre Office 4.2.2.1 3.) Open file 'zones.svg_lo4-2-2-1.svg' in Libre Office 4.2.2.1 Results: Corrupted/wrong displayed file Expected results: correctly displayed file -- 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 76988] Exporting Visio 2013 to SVG results in corrupt file in Libre Office 4.2.2.1
https://bugs.freedesktop.org/show_bug.cgi?id=76988 --- Comment #3 from John Smith lbalba...@gmail.com --- Created attachment 96834 -- https://bugs.freedesktop.org/attachment.cgi?id=96834action=edit Exported to SVG file screenshot in LibreOffice -- 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