LibreOffice Gerrit News for core on 2014-04-11
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#35064 PDF Import: Add support for simple text scaling in https://gerrit.libreoffice.org/8916 from Vort about module sdext End of freshness + move inettype.{hc}xx from svl to tools in https://gerrit.libreoffice.org/8926 from Christina Roßmanith about module dbaccess, desktop, forms, fpicker, framework, include, sfx2, svl, svtools, tools + fdo#65277: Export text run strikeout property in https://gerrit.libreoffice.org/8925 from Katarina Behrens about module oox + fdo#77282 Replace Edit Group with Enter Group in https://gerrit.libreoffice.org/8923 from Laurent BP about module svx * Merged changes on master for project core changed in the last 25 hours: + fdo#74697 Add Bluez 5 support for impress remote. in https://gerrit.libreoffice.org/8924 from Andrzej Hunt + fdo#74697 Add Bluez 5 support for impress remote. in https://gerrit.libreoffice.org/8821 from Andrzej Hunt + build liblangtag with updated IANA language-subtag-registry in https://gerrit.libreoffice.org/8919 from Eike Rathke + Kill the ImplSVGDIData::mbNoXORClipping flag in https://gerrit.libreoffice.org/8901 from Tor Lillqvist + fdo#77051: Preservation of Index field flag '\f'. in https://gerrit.libreoffice.org/8839 from Yogesh Bharate * Abandoned changes on master for project core changed in the last 25 hours: + fdo#74697 Add dbus policy file for Bluez 5 support to installation. in https://gerrit.libreoffice.org/8913 from Andrzej Hunt * 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: 5 commits - i18npool/source offapi/com sc/source sd/source sfx2/source svl/source svx/source sw/source unoidl/source unotools/source xmlsecurity/source
i18npool/source/transliteration/transliterationImpl.cxx |4 offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl |2 offapi/com/sun/star/frame/status/ItemState.idl| 12 offapi/com/sun/star/i18n/TransliterationModulesExtra.idl |4 offapi/com/sun/star/xml/csax/XCompressedDocumentHandler.idl | 16 sc/source/ui/Accessibility/AccessibleDocument.cxx |2 sc/source/ui/inc/AccessibleDocument.hxx |2 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |2 sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |2 sd/source/ui/inc/AccessibleDocumentViewBase.hxx |2 sd/source/ui/inc/AccessibleDrawDocumentView.hxx |2 sfx2/source/control/unoctitm.cxx |4 svl/source/items/srchitem.cxx |4 svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx |2 svx/source/dialog/srchdlg.cxx |8 svx/source/tbxctrls/tbunosearchcontrollers.cxx|2 sw/source/core/access/accdoc.cxx |2 sw/source/core/access/accdoc.hxx |2 unoidl/source/unoidl-check.cxx| 270 ++ unotools/source/config/searchopt.cxx |4 xmlsecurity/source/framework/saxeventkeeperimpl.cxx |8 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 18 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 16 23 files changed, 330 insertions(+), 60 deletions(-) New commits: commit a3be37674609adf68e533f31f120bbdc1abe5f7a Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 08:36:21 2014 +0200 unoidl-check: Also check for invalid UNOIDL identifiers ...but only in those parts of registry B that are not also in registry A. That way, we can detect newly introduced violations while ignoring the old (published) violations for backwards compatibility. Change-Id: Ifb8ea98fffca29647aa6677a5ade86e5b194ddee diff --git a/unoidl/source/unoidl-check.cxx b/unoidl/source/unoidl-check.cxx index 33487f5..3a0dd36 100644 --- a/unoidl/source/unoidl-check.cxx +++ b/unoidl/source/unoidl-check.cxx @@ -17,6 +17,7 @@ #include osl/file.hxx #include osl/process.h +#include rtl/character.hxx #include rtl/process.h #include rtl/ref.hxx #include rtl/ustring.hxx @@ -890,6 +891,274 @@ void checkMap( } } +bool valid(OUString const identifier) { +for (sal_Int32 i = 0;; ++i) { +i = identifier.indexOf('_', i); +if (i == -1) { +return true; +} +if (!rtl::isAsciiUpperCase(identifier[0]) || identifier[i - 1] == '_') { +return false; +} +} +} + +void checkIds( +rtl::Referenceunoidl::Provider const providerA, OUString const prefix, +rtl::Referenceunoidl::MapCursor const cursor) +{ +assert(cursor.is()); +for (;;) { +OUString id; +rtl::Referenceunoidl::Entity entB(cursor-getNext(id)); +if (!entB.is()) { +break; +} +OUString name(prefix + id); +rtl::Referenceunoidl::Entity entA(providerA-findEntity(name)); +if (!(entA.is() || valid(id))) { +std::cerr + entity name name uses an invalid identifier + std::endl; +std::exit(EXIT_FAILURE); +} +switch (entB-getSort()) { +case unoidl::Entity::SORT_MODULE: +checkIds( +providerA, name + ., +(static_castunoidl::ModuleEntity *(entB.get()) + -createCursor())); +break; +case unoidl::Entity::SORT_ENUM_TYPE: +if (!entA.is()) { +rtl::Referenceunoidl::EnumTypeEntity ent2B( +static_castunoidl::EnumTypeEntity *(entB.get())); +for (std::vectorunoidl::EnumTypeEntity::Member::const_iterator + i(ent2B-getMembers().begin()); + i != ent2B-getMembers().end(); ++i) +{ +if (!valid(i-name)) { +std::cerr + enum type name member i-name + uses an invalid identifier std::endl; +std::exit(EXIT_FAILURE); +} +} +} +break; +case unoidl::Entity::SORT_PLAIN_STRUCT_TYPE: +if (!entA.is()) { +rtl::Referenceunoidl::PlainStructTypeEntity ent2B( +static_castunoidl::PlainStructTypeEntity *( +entB.get())); +for (std::vectorunoidl::PlainStructTypeEntity::Member::const_iterator + i(ent2B-getDirectMembers().begin()); +
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo76597.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 + sw/source/filter/ww8/docxattributeoutput.cxx | 14 ++ writerfilter/source/dmapper/DomainMapper.cxx | 14 -- 4 files changed, 35 insertions(+), 2 deletions(-) New commits: commit 05c5da4c376d676ff89cd40dd0dea9eeb4bc1e75 Author: Rohit Deshmukh rohit.deshm...@synerzip.com Date: Fri Apr 4 17:47:21 2014 +0530 fdo#76597: Fix preservation issue of Spacing between paragraph Change-Id: I458bed111893a8d2fef79b11e28263a5bd2ed9cf Reviewed-on: https://gerrit.libreoffice.org/8842 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/qa/extras/ooxmlexport/data/fdo76597.docx b/sw/qa/extras/ooxmlexport/data/fdo76597.docx new file mode 100644 index 000..a970136 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo76597.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 2d18453..2722075 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -3068,6 +3068,15 @@ DECLARE_OOXMLEXPORT_TEST(test76734_2K7, test76734_2K7.docx) assertXPath(pXmlDoc, /w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1], Requires, wps); } +DECLARE_OOXMLEXPORT_TEST(testFDO76597, fdo76597.docx) +{ +// check XML +xmlDocPtr pXmlDoc = parseExport(word/document.xml); +if (!pXmlDoc) +return; +assertXPath(pXmlDoc, /w:document/w:body/w:p[4]/w:pPr/w:spacing, before, 96); +assertXPath(pXmlDoc, /w:document/w:body/w:p[4]/w:pPr/w:spacing, after, 120); +} #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 04f5d37..d2e932e 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6335,6 +6335,13 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem rULSpace ) AddToAttrList( m_pParagraphSpacingAttrList, FSNS( XML_w, XML_beforeAutospacing ), 1 ); } +else if (m_bParaBeforeAutoSpacing m_nParaBeforeSpacing == -1) +{ +AddToAttrList( m_pParagraphSpacingAttrList, +FSNS( XML_w, XML_beforeAutospacing ), 0 ); +AddToAttrList( m_pParagraphSpacingAttrList, +FSNS( XML_w, XML_before ), OString::number( rULSpace.GetUpper() ).getStr() ); +} else { AddToAttrList( m_pParagraphSpacingAttrList, @@ -6348,6 +6355,13 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem rULSpace ) AddToAttrList( m_pParagraphSpacingAttrList, FSNS( XML_w, XML_afterAutospacing ), 1 ); } +else if (m_bParaAfterAutoSpacing m_nParaAfterSpacing == -1) +{ +AddToAttrList( m_pParagraphSpacingAttrList, +FSNS( XML_w, XML_afterAutospacing ), 0 ); +AddToAttrList( m_pParagraphSpacingAttrList, +FSNS( XML_w, XML_after ), OString::number( rULSpace.GetLower()).getStr() ); +} else { AddToAttrList( m_pParagraphSpacingAttrList, diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index f48e654..b9df3b3 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -559,9 +559,14 @@ void DomainMapper::lcl_attribute(Id nName, Value val) else default_spacing = 280; } -m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) ); if (nIntValue) // If auto spacing is set, then only store set value in InteropGrabBag { +m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) ); +m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); +} +else +{ +default_spacing = -1; m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } } @@ -577,9 +582,14 @@ void DomainMapper::lcl_attribute(Id nName, Value val) else default_spacing = 280; } -m_pImpl-GetTopContext()-Insert( PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) ); if
Re: [Libreoffice-commits] core.git: fdo#77123: Add option ignore kashida to the search
On 04/08/2014 12:16 PM, Stephan Bergmann wrote: On 04/08/2014 09:59 AM, Faisal M. Al-Otaibi wrote: commit d2771b63b94a8aae3c25c83e9dae9f83242f46c1 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Tue Apr 8 09:42:20 2014 +0300 fdo#77123: Add option ignore kashida to the search This patch will add new checkbox to ignore kashida in the search and replace dialog. Change-Id: I9e7179242751103b8418d922ade5b9145170ad15 diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl index 45f7ccb..d1f675f 100644 --- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl +++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl @@ -52,6 +52,8 @@ constants TransliterationModulesExtra /// because we cannot extend TransliterationModule we used TranslationModuleExtra and it will act the same way const long ignoreDiacritics_CTL = 0x4000; +const long ignoreKashida_CTL = 0x0800; + const long END_OF_MODULE= 0; }; There is a restriction on UNOIDL entity names that a name must not contain both underscores and lower case letters at the same time (see http://www.openoffice.org/udk/common/man/typesystem.html for details). We unfortunately cannot enforce that at build time due to many legacy violations that cannot be fixed for compatibility reasons. But please fix this newly introduced name to follow the rules, best by making it use all uppercase and underscores, like IGNORE_KASHIDA_CTL. The similar case of ignoreDiacritics_CTL introduced with http://cgit.freedesktop.org/libreoffice/core/commit/?id=448fa131b2dafac305d88480e469cc4bc0515d68 Fix fdo#52204 add new feature ignore diacritics in search for CTL unfortunately slipped through into LO 4.2. But if chances are low that it is used by third party code, it would still be possible to change that now, esp. given com.sun.star.i18n.TransliterationModulesExtra is not published. I changed both those identifiers now in http://cgit.freedesktop.org/libreoffice/core/commit/?id=f699e7b9b22961cc401868e22eeb90c215a8832f Use valid UNOIDL identifiers in TransliterationModulesExtra, before putting http://cgit.freedesktop.org/libreoffice/core/commit/?id=a3be37674609adf68e533f31f120bbdc1abe5f7a unoidl-check: Also check for invalid UNOIDL identifiers in place to prevent this from happening in the future. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 518bdcce5c397ac2e79b1964b1300d3ea9b9a0e4 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 11 09:53:42 2014 +0200 writerfilter: clean up duplicated PROP_PARA_*_MARGIN_*_AUTO_SPACING insertions Change-Id: If3f7a54a48541935295515bae47233e53c228fe5 diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index b9df3b3..d4e3ab8 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -562,13 +562,12 @@ void DomainMapper::lcl_attribute(Id nName, Value val) if (nIntValue) // If auto spacing is set, then only store set value in InteropGrabBag { m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) ); -m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } else { default_spacing = -1; -m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } +m_pImpl-GetTopContext()-Insert( PROP_PARA_TOP_MARGIN_BEFORE_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } break; case NS_ooxml::LN_CT_Spacing_afterAutospacing: @@ -585,13 +584,12 @@ void DomainMapper::lcl_attribute(Id nName, Value val) if (nIntValue) // If auto spacing is set, then only store set value in InteropGrabBag { m_pImpl-GetTopContext()-Insert( PROP_PARA_BOTTOM_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ) ); -m_pImpl-GetTopContext()-Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } else { default_spacing = -1; -m_pImpl-GetTopContext()-Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } +m_pImpl-GetTopContext()-Insert( PROP_PARA_BOTTOM_MARGIN_AFTER_AUTO_SPACING, uno::makeAny( ConversionHelper::convertTwipToMM100(default_spacing) ),true, PARA_GRAB_BAG ); } break; case NS_ooxml::LN_CT_SmartTagRun_uri: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/coinmp
external/coinmp/ExternalProject_coinmp.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cce49ccd002af788a7b025be6dc8bded933cf3a3 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 10:00:40 2014 +0200 Don't even dare check for Fortran ...which can lead to problems when e.g. building against a local trunk GCC (requiring LD_LIBRARY_PATH) that was configured to build only C/C++ compilers, so CoinMP's configuration would try to blend that with the system's gfortran. Change-Id: I9f237df0887e06e50b9e76f3a09cfebb6f22dc20 diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index c18f2d5..422cc94 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -27,7 +27,7 @@ else $(call gb_ExternalProject_get_state_target,coinmp,build) : +$(call gb_ExternalProject_run,build,\ ./configure COIN_SKIP_PROJECTS=Data/Sample \ - --enable-dependency-linking \ + --enable-dependency-linking F77=unavailable \ $(MAKE) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua
vcl/aqua/source/gdi/ctlayout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8db10217765f523bcc317b76c7f2ded31555bae7 Author: Herbert Dürr h...@apache.org Date: Fri Apr 11 06:44:58 2014 + #i124657# #i124617# restore lost comment markers diff --git a/vcl/aqua/source/gdi/ctlayout.cxx b/vcl/aqua/source/gdi/ctlayout.cxx index 6005b15..8f57ca1 100644 --- a/vcl/aqua/source/gdi/ctlayout.cxx +++ b/vcl/aqua/source/gdi/ctlayout.cxx @@ -67,7 +67,7 @@ private: float mfFontScale; // TODO: does CoreText have a font size limit? CGFloat mfFontRotation; // text direction angle (in radians) -CGFloat mfFontStretch; 1.0: font is squeezed, 1.0 font is stretched +CGFloat mfFontStretch; // 1.0: font gets squeezed, 1.0: font gets stretched // cached details about the resulting layout // mutable members since these details are all lazy initialized ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - i18npool/Library_localedata_euro.mk i18npool/source
i18npool/Library_localedata_euro.mk |1 i18npool/source/localedata/data/tt_RU.xml | 358 ++ i18npool/source/localedata/localedata.cxx |1 3 files changed, 360 insertions(+) New commits: commit 339b33dc02ad49892fd04bd0955def1dc3f27db9 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 09:23:20 2014 +0100 have a stab at fixing Tatar locale to pass build tests Change-Id: I15b57365b0ecf4b6bdd7c521b7e05a954f01a0b8 diff --git a/i18npool/source/localedata/data/tt_RU.xml b/i18npool/source/localedata/data/tt_RU.xml index 938bfd7..ecd666c 100644 --- a/i18npool/source/localedata/data/tt_RU.xml +++ b/i18npool/source/localedata/data/tt_RU.xml @@ -321,13 +321,20 @@ /Calendar /LC_CALENDAR LC_CURRENCY -Currency default=true usedInCompatibleFormatCodes=true +Currency default=true usedInCompatibleFormatCodes=false CurrencyIDRUB/CurrencyID CurrencySymbolÑÑб./CurrencySymbol BankSymbolRUB/BankSymbol CurrencyNameÐ ÓÑÓй ÑÑмÑ/CurrencyName DecimalPlaces2/DecimalPlaces /Currency +Currency default=false usedInCompatibleFormatCodes=true +CurrencyIDRUR/CurrencyID +CurrencySymbolÑ./CurrencySymbol +BankSymbolRUR/BankSymbol +CurrencyNameÐ ÓÑÓй ÑÑÐ¼Ñ (1991-1998)/CurrencyName +DecimalPlaces2/DecimalPlaces +/Currency /LC_CURRENCY LC_TRANSLITERATION ref=en_US/ LC_MISC commit 7c372901771a7d3ffc1cb827818e2a09e474eed6 Author: Ariel Constenla-Haile arie...@apache.org Date: Thu Apr 10 14:17:55 2014 + Resolves: #i124631# Add locale data for Tatar (tt-RU) Locale data contributed by Irek Khaziev khazi...@mail.ru (cherry picked from commit f5d13ffd92a71451be33f96a56a3bd75156a5901) Change-Id: Ie360e8b8ad534394e0c265a63b70fbe4e91c1b6d diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index a551ace..8d2efe4 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_sv_FI \ CustomTarget/i18npool/localedata/localedata_sv_SE \ CustomTarget/i18npool/localedata/localedata_tr_TR \ + CustomTarget/i18npool/localedata/localedata_tt_RU \ CustomTarget/i18npool/localedata/localedata_uk_UA \ CustomTarget/i18npool/localedata/localedata_wa_BE \ )) diff --git a/i18npool/source/localedata/data/tt_RU.xml b/i18npool/source/localedata/data/tt_RU.xml new file mode 100644 index 000..938bfd7 --- /dev/null +++ b/i18npool/source/localedata/data/tt_RU.xml @@ -0,0 +1,351 @@ +?xml version=1.0 encoding=UTF-8 ? +!DOCTYPE Locale SYSTEM 'locale.dtd' +!-- + * 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 . + -- +Locale versionDTD=2.0.3 allowUpdateFromCLDR=no version=1.2 +LC_INFO +Language +LangIDtt/LangID +DefaultNameTatar/DefaultName +/Language +Country +CountryIDRU/CountryID +DefaultNameRussia/DefaultName +/Country +/LC_INFO +LC_CTYPE +Separators +DateSeparator./DateSeparator +ThousandSeparator /ThousandSeparator +DecimalSeparator,/DecimalSeparator +TimeSeparator:/TimeSeparator +Time100SecSeparator,/Time100SecSeparator +ListSeparator;/ListSeparator +LongDateDayOfWeekSeparator /LongDateDayOfWeekSeparator +LongDateDaySeparator /LongDateDaySeparator +LongDateMonthSeparator /LongDateMonthSeparator +LongDateYearSeparator е./LongDateYearSeparator +/Separators +Markers +QuotationStartâ/QuotationStart +QuotationEndâ/QuotationEnd +DoubleQuotationStart«/DoubleQuotationStart +DoubleQuotationEnd»/DoubleQuotationEnd +/Markers +TimeAMкөндез/TimeAM +TimePMкиÑ/TimePM +MeasurementSystemmetric/MeasurementSystem +/LC_CTYPE +
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f5/d13ffd92a71451be33f96a56a3bd75156a5901
f5/d13ffd92a71451be33f96a56a3bd75156a5901 |1 + 1 file changed, 1 insertion(+) New commits: commit 01f5e58e3fa2694026e116ec6a0ad95764156916 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 09:24:25 2014 +0100 Notes added by 'git notes add' diff --git a/f5/d13ffd92a71451be33f96a56a3bd75156a5901 b/f5/d13ffd92a71451be33f96a56a3bd75156a5901 new file mode 100644 index 000..dc4c4da --- /dev/null +++ b/f5/d13ffd92a71451be33f96a56a3bd75156a5901 @@ -0,0 +1 @@ +merged as: 339b33dc02ad49892fd04bd0955def1dc3f27db9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 40/19978dd2a8fd57e8d007a24b3c47e74317c57a 79/3c53c25399b810d70697cba4af9169a042bb08
40/19978dd2a8fd57e8d007a24b3c47e74317c57a |1 + 79/3c53c25399b810d70697cba4af9169a042bb08 |1 + 2 files changed, 2 insertions(+) New commits: commit fd020db5ef115acb157f9ac2ebde66da32787cc2 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 09:24:57 2014 +0100 Notes added by 'git notes add' diff --git a/40/19978dd2a8fd57e8d007a24b3c47e74317c57a b/40/19978dd2a8fd57e8d007a24b3c47e74317c57a new file mode 100644 index 000..dc4c4da --- /dev/null +++ b/40/19978dd2a8fd57e8d007a24b3c47e74317c57a @@ -0,0 +1 @@ +merged as: 339b33dc02ad49892fd04bd0955def1dc3f27db9 commit 52d7f518436488e931bed44b71fd65d22da5f5a1 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 09:24:42 2014 +0100 Notes added by 'git notes add' diff --git a/79/3c53c25399b810d70697cba4af9169a042bb08 b/79/3c53c25399b810d70697cba4af9169a042bb08 new file mode 100644 index 000..dc4c4da --- /dev/null +++ b/79/3c53c25399b810d70697cba4af9169a042bb08 @@ -0,0 +1 @@ +merged as: 339b33dc02ad49892fd04bd0955def1dc3f27db9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: GSOC 2014
Hi Megha, On Thu, Apr 10, 2014 at 11:30:52PM +0530, Megha Gupta mgme...@gmail.com wrote: I have also applied for GSOC. I have submitted the code from the given topics of Easy Hacks. but since I am new to this, i dont know what should be my next steps. Can you tell me about the next steps that I should take to get attached to your organisation for GSOC participation? Check the timeline, please: 21 April: 19:00 UTC Accepted student proposals announced on the Google Summer of Code 2014 site. Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdotext.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 46f0dd562ce6fc22b311649c170398cf8dee4829 Author: Caolán McNamara caol...@redhat.com Date: Thu Apr 10 21:09:19 2014 +0100 coverity#708383 Uninitialized scalar field Change-Id: I58f092c121a6456e004e310fbb63eba6ef0c25cd diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index d3e0330..acfbe91 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -91,6 +91,7 @@ SdrTextObj::SdrTextObj() { bTextSizeDirty=false; bTextFrame=false; +bPortionInfoChecked=false; bNoShear=false; bNoRotate=false; bNoMirror=false; @@ -116,6 +117,7 @@ SdrTextObj::SdrTextObj(const Rectangle rNewRect) { bTextSizeDirty=false; bTextFrame=false; +bPortionInfoChecked=false; bNoShear=false; bNoRotate=false; bNoMirror=false; ___ 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/uno/wizard/unowizard.cxx |2 +- svtools/source/uno/wizard/wizardshell.cxx |7 ++- svtools/source/uno/wizard/wizardshell.hxx |6 -- 3 files changed, 3 insertions(+), 12 deletions(-) New commits: commit 78d015849cda869e1ed5411a9cc1db912eab2f57 Author: Ariel Constenla-Haile arie...@apache.org Date: Thu Apr 10 15:33:21 2014 + Resolves: #i124629# UNO Wizard - avoid crash by removing unneeded reference (cherry picked from commit 6a820f13a5cadc3d6d8c7bac1e4042adcee379ac) Conflicts: svtools/source/uno/wizard/wizardshell.cxx Change-Id: I2d67451c6fb536149603777a84d9b73494b6ed84 diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index e337261..3e3e851 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -270,7 +270,7 @@ namespace { Dialog* Wizard::createDialog( Window* i_pParent ) { -WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) ); +WizardShell* pDialog( new WizardShell( i_pParent, m_xController, m_aWizardSteps ) ); pDialog-SetHelpId( lcl_getHelpId( m_sHelpURL ) ); pDialog-setTitleBase( m_sTitle ); return pDialog; diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index e25f27f..35b00e6 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -62,16 +62,13 @@ namespace svt { namespace uno //= WizardShell - - -WizardShell::WizardShell( Window* i_pParent, const Reference XWizard i_rWizard, const Reference XWizardController i_rController, +WizardShell::WizardShell( Window* i_pParent, const Reference XWizardController i_rController, const Sequence Sequence sal_Int16 i_rPaths ) :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE ) -,m_xWizard( i_rWizard ) ,m_xController( i_rController ) ,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) ) { -ENSURE_OR_THROW( m_xWizard.is() m_xController.is(), invalid wizard/controller ); +ENSURE_OR_THROW( m_xController.is(), invalid controller ); // declare the paths for ( sal_Int32 i=0; ii_rPaths.getLength(); ++i ) diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index b882cdf..07a33ae 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -45,7 +45,6 @@ namespace svt { namespace uno public: WizardShell( Window* _pParent, -const ::com::sun::star::uno::Reference ::com::sun::star::ui::dialogs::XWizard i_rWizard, const ::com::sun::star::uno::Reference ::com::sun::star::ui::dialogs::XWizardController i_rController, const ::com::sun::star::uno::Sequence ::com::sun::star::uno::Sequence sal_Int16 i_rPaths ); @@ -64,10 +63,6 @@ namespace svt { namespace uno virtual IWizardPageController* getPageController( TabPage* _pCurrentPage ) const SAL_OVERRIDE; -// attribute access -const ::com::sun::star::uno::Reference ::com::sun::star::ui::dialogs::XWizard -getWizard() const { return m_xWizard; } - static sal_Int16 convertCommitReasonToTravelType( const CommitPageReason i_eReason ); // operations @@ -125,7 +120,6 @@ namespace svt { namespace uno private: typedef ::std::map TabPage*, PWizardPageController Page2ControllerMap; -const ::com::sun::star::uno::Reference ::com::sun::star::ui::dialogs::XWizard m_xWizard; const ::com::sun::star::uno::Reference ::com::sun::star::ui::dialogs::XWizardController m_xController; const sal_Int16 m_nFirstPageID; Page2ControllerMap m_aPageControllers; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/820f13a5cadc3d6d8c7bac1e4042adcee379ac
6a/820f13a5cadc3d6d8c7bac1e4042adcee379ac |1 + 1 file changed, 1 insertion(+) New commits: commit 84efc673e3c6234a208f83c3463f6f2f97ed3295 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 09:45:37 2014 +0100 Notes added by 'git notes add' diff --git a/6a/820f13a5cadc3d6d8c7bac1e4042adcee379ac b/6a/820f13a5cadc3d6d8c7bac1e4042adcee379ac new file mode 100644 index 000..4ffd7b6 --- /dev/null +++ b/6a/820f13a5cadc3d6d8c7bac1e4042adcee379ac @@ -0,0 +1 @@ +merged as: 78d015849cda869e1ed5411a9cc1db912eab2f57 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |2 -- include/vcl/print.hxx |1 - vcl/source/gdi/outdev4.cxx |7 +-- vcl/source/gdi/print.cxx |5 - 4 files changed, 1 insertion(+), 14 deletions(-) New commits: commit 4f8d667c7075cab08b4a1918bfba2c42811a436d Author: Chris Sherlock chris.sherloc...@gmail.com Date: Fri Apr 11 18:43:10 2014 +1000 ClipAndDrawGradientToBounds no longer required Now that we have removed XORClipAndDrawGradient, there is no need for the function ClipAndDrawGradientToBounds because the sole purpose of that function was to work out whether the system should use XOR clipping or not for gradients! Change-Id: Id29b804054dfc30a9cc350bf4958ea3b2420e272 diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index be31840..596f6b3 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -841,9 +841,7 @@ protected: virtual voidEmulateDrawTransparent( const PolyPolygon rPolyPoly, sal_uInt16 nTransparencePercent ); voidDrawInvisiblePolygon( const PolyPolygon rPolyPoly ); -virtual voidClipAndDrawGradientToBounds( Gradient rGradient, const PolyPolygon rPolyPoly ); voidClipAndDrawGradient( Gradient rGradient, const PolyPolygon rPolyPoly ); - virtual voidClipAndDrawGradientMetafile ( const Gradient rGradient, const PolyPolygon rPolyPoly ); private: diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 1f9b6fd..b08e27b 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -274,7 +274,6 @@ public: protected: longImplGetGradientStepCount( long nMinRect ) SAL_OVERRIDE; -virtual voidClipAndDrawGradientToBounds( Gradient rGradient, const PolyPolygon rPolyPoly ) SAL_OVERRIDE; virtual voidClipAndDrawGradientMetafile ( const Gradient rGradient, const PolyPolygon rPolyPoly ) SAL_OVERRIDE; virtual boolUsePolyPolygonForComplexGradient() SAL_OVERRIDE; diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx index a371384..ed149c6 100644 --- a/vcl/source/gdi/outdev4.cxx +++ b/vcl/source/gdi/outdev4.cxx @@ -720,11 +720,6 @@ void OutputDevice::ClipAndDrawGradientMetafile ( const Gradient rGradient, cons EnableOutput( bOldOutput ); } -void OutputDevice::ClipAndDrawGradientToBounds ( Gradient rGradient, const PolyPolygon rPolyPoly ) -{ -ClipAndDrawGradient ( rGradient, rPolyPoly ); -} - void OutputDevice::ClipAndDrawGradient ( Gradient rGradient, const PolyPolygon rPolyPoly ) { const Rectangle aBoundRect( rPolyPoly.GetBoundRect() ); @@ -824,7 +819,7 @@ void OutputDevice::DrawGradient( const PolyPolygon rPolyPoly, if( !IsDeviceOutputNecessary() || ImplIsRecordLayout() ) return; -ClipAndDrawGradientToBounds ( aGradient, rPolyPoly ); +ClipAndDrawGradient ( aGradient, rPolyPoly ); } if( mpAlphaVDev ) diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index cb8d903..95fb0f1 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -1812,11 +1812,6 @@ bool Printer::UsePolyPolygonForComplexGradient() return true; } -void Printer::ClipAndDrawGradientToBounds ( Gradient rGradient, const PolyPolygon rPolyPoly ) -{ -ClipAndDrawGradient ( rGradient, rPolyPoly ); -} - void Printer::ClipAndDrawGradientMetafile ( const Gradient rGradient, const PolyPolygon rPolyPoly ) { const Rectangle aBoundRect( rPolyPoly.GetBoundRect() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 87/a8aa9a79874c759631548545c63fe13d695f68
87/a8aa9a79874c759631548545c63fe13d695f68 |1 + 1 file changed, 1 insertion(+) New commits: commit 4919f922a3ae8a841c04f1e66084b17ccb14638a Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 09:47:47 2014 +0100 Notes added by 'git notes add' diff --git a/87/a8aa9a79874c759631548545c63fe13d695f68 b/87/a8aa9a79874c759631548545c63fe13d695f68 new file mode 100644 index 000..a79a59d --- /dev/null +++ b/87/a8aa9a79874c759631548545c63fe13d695f68 @@ -0,0 +1 @@ +prefer: a4fb4f90ec11664ceb0b0348aa8b01671dd6ac2d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/svg/svgexport.cxx | 72 filter/source/svg/svgfilter.cxx |9 - filter/source/svg/svgfilter.hxx |1 3 files changed, 75 insertions(+), 7 deletions(-) New commits: commit f864c09a9d6bc2c28b30b32c6a0825b5628826b2 Author: Armin Le Grand a...@apache.org Date: Thu Apr 10 15:02:30 2014 + Resolves: i124608 when exporting selection... use selection boundrect as svg canvas (cherry picked from commit bfc1aa46b9ee9ad37728389eb636fc9fb5b9827f) Conflicts: filter/source/svg/svgexport.cxx filter/source/svg/svgfilter.cxx filter/source/svg/svgfilter.hxx Change-Id: Ib10e785ebb611f0e33ea3ae799dfea20b05d250a diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 5402ad4..0c1db7a 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -23,6 +23,7 @@ #include svgscript.hxx #include impsvgdialog.hxx +#include com/sun/star/graphic/PrimitiveFactory2D.hpp #include com/sun/star/drawing/GraphicExportFilter.hpp #include com/sun/star/text/textfield/Type.hpp #include com/sun/star/util/MeasureUnit.hpp @@ -46,6 +47,8 @@ #include boost/preprocessor/repetition/repeat.hpp +using namespace ::com::sun::star::graphic; +using namespace ::com::sun::star::geometry; using namespace ::com::sun::star; @@ -694,6 +697,7 @@ sal_Bool SVGFilter::implLookForFirstVisiblePage() sal_Bool SVGFilter::implExportDocument() { OUString aAttr; +sal_Int32nDocX = 0, nDocY = 0; // #i124608# sal_Int32nDocWidth = 0, nDocHeight = 0; sal_Bool bRet = sal_False; sal_Int32nLastPage = mSelectedPages.getLength() - 1; @@ -707,12 +711,60 @@ sal_Bool SVGFilter::implExportDocument() const Reference XPropertySet xDefaultPagePropertySet( mxDefaultPage, UNO_QUERY ); const Reference XExtendedDocumentHandler xExtDocHandler( mpSVGExport-GetDocHandler(), UNO_QUERY ); -if( xDefaultPagePropertySet.is() ) +// #i124608# +mbExportSelection = mbSinglePage maShapeSelection.is() maShapeSelection-getCount(); + +if(xDefaultPagePropertySet.is()) { xDefaultPagePropertySet-getPropertyValue( Width ) = nDocWidth; xDefaultPagePropertySet-getPropertyValue( Height ) = nDocHeight; } +if(mbExportSelection) +{ +// #i124608# create BoundRange and set nDocX, nDocY, nDocWidth and nDocHeight +basegfx::B2DRange aShapeRange; + +uno::Reference XPrimitiveFactory2D xPrimitiveFactory = PrimitiveFactory2D::create( mxContext ); + +// use XPrimitiveFactory2D and go the way over getting the primitives; this +// will give better precision (doubles) and be based on the true object +// geometry. If needed aViewInformation may be expanded to carry a view +// resolution for which to prepare the geometry. +if(xPrimitiveFactory.is()) +{ +Reference XShape xShapeCandidate; +const Sequence PropertyValue aViewInformation; +const Sequence PropertyValue aParams; + +for(sal_Int32 a(0); a maShapeSelection-getCount(); a++) +{ +if((maShapeSelection-getByIndex(a) = xShapeCandidate) xShapeCandidate.is()) +{ +const Sequence Reference XPrimitive2D aPrimitiveSequence( +xPrimitiveFactory-createPrimitivesFromXShape( xShapeCandidate, aParams )); +const sal_Int32 nCount(aPrimitiveSequence.getLength()); + +for(sal_Int32 nIndex = 0; nIndex nCount; nIndex++) +{ +const RealRectangle2D aRect(aPrimitiveSequence[nIndex]-getRange(aViewInformation)); + +aShapeRange.expand(basegfx::B2DTuple(aRect.X1, aRect.Y1)); +aShapeRange.expand(basegfx::B2DTuple(aRect.X2, aRect.Y2)); +} +} +} +} + +if(!aShapeRange.isEmpty()) +{ +nDocX = basegfx::fround(aShapeRange.getMinX()); +nDocY = basegfx::fround(aShapeRange.getMinY()); +nDocWidth = basegfx::fround(aShapeRange.getWidth()); +nDocHeight = basegfx::fround(aShapeRange.getHeight()); +} +} + if( xExtDocHandler.is() !mpSVGExport-IsUseTinyProfile() ) { xExtDocHandler-unknown( SVG_DTD_STRING ); @@ -738,8 +790,17 @@ sal_Bool SVGFilter::implExportDocument() } #endif +// #i124608# set viewBox explicitely to the exported content +if (mbExportSelection) +{ +aAttr = OUString::number(nDocX) + + OUString::number(nDocY) + ; +} +else +{ +aAttr = 0 0 ; +} -aAttr = 0 0 + OUString::number( nDocWidth ) + + OUString::number( nDocHeight ); +aAttr += OUString::number(nDocWidth) + +
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bf/c1aa46b9ee9ad37728389eb636fc9fb5b9827f
bf/c1aa46b9ee9ad37728389eb636fc9fb5b9827f |1 + 1 file changed, 1 insertion(+) New commits: commit 8100167cd6412b8da66512137e3c44331d4a2f64 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 10:20:14 2014 +0100 Notes added by 'git notes add' diff --git a/bf/c1aa46b9ee9ad37728389eb636fc9fb5b9827f b/bf/c1aa46b9ee9ad37728389eb636fc9fb5b9827f new file mode 100644 index 000..7408222 --- /dev/null +++ b/bf/c1aa46b9ee9ad37728389eb636fc9fb5b9827f @@ -0,0 +1 @@ +merged as: f864c09a9d6bc2c28b30b32c6a0825b5628826b2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Core dump while building for the first time
On 04/10/2014 05:43 PM, Ganesh Pagade wrote: terminate called without an active exception Aborted (core dumped) make[1]: *** [/home/user/Hacking/libreoffice/core/workdir/CustomTarget/testtools/uno_test.done] The testtools module does basic checking of the UNO bridges, and terminate called without an active exception makes it look like something is broken for you in the C++ UNO bridge regarding exception synthesizing, for whatever reason. Do you use recent LO master sources? Do you have any odd configure parameters? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8568fec3b942e725a0114ff137a61b3292e079ed Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 12:09:10 2014 +0200 Fix bounds Change-Id: I61ce5563d90bb2cf8d186586f15ef4318acdc963 diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index fdce46e..4aef7a1 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -341,7 +341,7 @@ static ImplUniToDBCSHighTab const aKSC5601DBCSHighTab[256] = {1,0, NULL }, /* 0x2E */ {1,0, NULL }, /* 0x2F */ { 0x00, 0xF6, aImplUniToDBCSTab_KSC5601_30 }, /* 0x30 */ -{ 0x31, 0xFE, aImplUniToDBCSTab_KSC5601_31 }, /* 0x31 */ +{ 0x31, 0x8E, aImplUniToDBCSTab_KSC5601_31 }, /* 0x31 */ { 0x00, 0x7F, aImplUniToDBCSTab_KSC5601_32 }, /* 0x32 */ { 0x80, 0xDD, aImplUniToDBCSTab_KSC5601_33 }, /* 0x33 */ {1,0, NULL }, /* 0x34 */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source writerfilter/source
vcl/source/gdi/pdfwriter_impl.cxx |7 +++ writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ++- 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 2cb2fc5612531eb5e0205909da3d491e14a15e63 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 10:58:22 2014 +0100 coverity#708628 Uninitialized pointer field Change-Id: I340eb9e7550083818874fed90d0a94e15fd597fd diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index cb8b0b3..4f054a6 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1714,16 +1714,23 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal m_nInheritedPageHeight( 842 ), // default A4 m_eInheritedOrientation( PDFWriter::Portrait ), m_nCurrentPage( -1 ), +m_nCatalogObject(0), m_nSignatureObject( -1 ), m_nSignatureContentOffset( 0 ), m_nSignatureLastByteRangeNoOffset( 0 ), m_nResourceDict( -1 ), m_nFontDictObject( -1 ), +m_aFile(0), +m_bOpen(false), m_pCodec( NULL ), +m_pMemStream(NULL), m_aDocDigest( rtl_digest_createMD5() ), m_aCipher( (rtlCipher)NULL ), m_aDigest( NULL ), +m_nKeyLength(0), +m_nRC4KeyLength(0), m_bEncryptThisStream( false ), +m_nAccessPermissions(0), m_pEncryptionBuffer( NULL ), m_nEncryptionBufferSize( 0 ), m_bIsPDF_A1( false ), commit a1ea3838adee634ccf725bc5f2be7805c6294a16 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 11:10:14 2014 +0100 check that stacks are not empty before top() Change-Id: Iad5b3381b8201c5ac32a5bdf99bd3d5872ea3afc diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 539eb51..51810b3 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1212,6 +1212,9 @@ void DomainMapper_Impl::appendTextContent( const uno::Sequence beans::PropertyValue xPropertyValues ) { +SAL_WARN_IF(m_aTextAppendStack.empty(), writerfilter.dmapper, no text append stack); +if (m_aTextAppendStack.empty()) +return; uno::Reference text::XTextAppendAndConvert xTextAppendAndConvert( m_aTextAppendStack.top().xTextAppend, uno::UNO_QUERY ); OSL_ENSURE( xTextAppendAndConvert.is(), trying to append a text content without XTextAppendAndConvert ); if(xTextAppendAndConvert.is() ! getTableManager( ).isIgnore()) @@ -1276,7 +1279,9 @@ void DomainMapper_Impl::appendOLE( const OUString rStreamName, OLEHandlerPtr pO // gives a better ( visually ) result xOLEProperties-setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_ANCHOR_TYPE ), uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) ); // remove ( if valid ) associated shape ( used for graphic replacement ) -m_aAnchoredStack.top( ).bToRemove = true; +SAL_WARN_IF(m_aAnchoredStack.empty(), writerfilter.dmapper, no anchor stack); +if (!m_aAnchoredStack.empty()) +m_aAnchoredStack.top( ).bToRemove = true; RemoveLastParagraph(); m_aTextAppendStack.pop(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - drawinglayer/source include/drawinglayer ios/experimental vcl/quartz
drawinglayer/source/primitive2d/baseprimitive2d.cxx | 80 ++ drawinglayer/source/processor2d/vclhelperbufferdevice.cxx| 17 ++ drawinglayer/source/processor2d/vclpixelprocessor2d.cxx | 4 include/drawinglayer/primitive2d/baseprimitive2d.hxx | 2 include/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx | 4 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 8 + vcl/quartz/salbmp.cxx| 3 7 files changed, 116 insertions(+), 2 deletions(-) New commits: commit e6b3ec87afa298fa425909398c5dae308f330a41 Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 11 13:19:36 2014 +0300 Add MobileCoreServices and ImageIO frameworks for some debugging code in vcl Change-Id: I6eb0091d22ee5776e9be1bfde76860abc51a69b2 diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj index 61974d9..4d9ce0c 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj @@ -19,6 +19,8 @@ BE82BDAC182190E400A447B5 /* TiledView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE82BDAB182190E400A447B5 /* TiledView.m */; }; BE82BDAF1821A1D000A447B5 /* View.m in Sources */ = {isa = PBXBuildFile; fileRef = BE82BDAE1821A1D000A447B5 /* View.m */; }; BECAB372186054DE00F814F9 /* lo.mm in Sources */ = {isa = PBXBuildFile; fileRef = BECAB371186054DE00F814F9 /* lo.mm */; }; + BED2593F18F6B87900C94C72 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BED2593E18F6B87900C94C72 /* ImageIO.framework */; }; + BED2594118F6B89000C94C72 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BED2594018F6B89000C94C72 /* MobileCoreServices.framework */; }; BEEE02D11860ABDB00FBDE67 /* program in Resources */ = {isa = PBXBuildFile; fileRef = BEEE02CE1860ABB700FBDE67 /* program */; }; BEEE02D21860ABDB00FBDE67 /* share in Resources */ = {isa = PBXBuildFile; fileRef = BEEE02CF1860ABB700FBDE67 /* share */; }; BEEE02D31860ABDB00FBDE67 /* ure in Resources */ = {isa = PBXBuildFile; fileRef = BEEE02D01860ABB700FBDE67 /* ure */; }; @@ -692,6 +694,8 @@ BE9F460A186839C100B8BE69 /* vtablefactory.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vtablefactory.cxx; path = ../../../bridges/source/cpp_uno/shared/vtablefactory.cxx; sourceTree = group; }; BE9F460B186839C100B8BE69 /* vtables.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = vtables.cxx; path = ../../../bridges/source/cpp_uno/shared/vtables.cxx; sourceTree = group; }; BECAB371186054DE00F814F9 /* lo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = lo.mm; sourceTree = group; }; + BED2593E18F6B87900C94C72 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; }; + BED2594018F6B89000C94C72 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; }; BEDB0F08185B7537009A6F26 /* lo.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = lo.xcconfig; path = ../../../lo.xcconfig; sourceTree = group; }; BEEE02CE1860ABB700FBDE67 /* program */ = {isa = PBXFileReference; lastKnownFileType = folder; name = program; path = Resources/program; sourceTree = SOURCE_ROOT; }; BEEE02CF1860ABB700FBDE67 /* share */ = {isa = PBXFileReference; lastKnownFileType = folder; name = share; path = Resources/share; sourceTree = SOURCE_ROOT; }; @@ -713,6 +717,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + BED2594118F6B89000C94C72 /* MobileCoreServices.framework in Frameworks */, + BED2593F18F6B87900C94C72 /* ImageIO.framework in Frameworks */, BEEEF9661860741400FBDE67 /* libz.dylib in Frameworks */, BEEEF9641860740400FBDE67 /* libiconv.dylib in Frameworks */, BE82BD7818218E2E00A447B5 /* CoreGraphics.framework in Frameworks */, @@ -1286,6 +1292,8 @@
[Libreoffice-commits] core.git: 7 commits - include/svx sfx2/source svx/source
include/svx/EnhancedCustomShape2d.hxx | 13 +-- sfx2/source/appl/appdata.cxx |8 ++ sfx2/source/control/shell.cxx | 26 ++ svx/source/customshapes/EnhancedCustomShape3d.cxx | 10 +--- svx/source/dialog/frmdirlbox.cxx |5 ++-- svx/source/engine3d/camera3d.cxx |5 6 files changed, 45 insertions(+), 22 deletions(-) New commits: commit 7692b91939ea7a816e1dfaa10c36d8fd5cd7a759 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 11:17:47 2014 +0100 coverity#708353 Uninitialized scalar field Change-Id: Ic38ed3feacecb36083dfc29898292434cdbb4fe7 diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index c8f2f22..d131d87 100644 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -36,6 +36,11 @@ Camera3D::Camera3D(const basegfx::B3DPoint rPos, const basegfx::B3DPoint rLook } Camera3D::Camera3D() +: fResetFocalLength(0.0) +, fResetBankAngle(0.0) +, fFocalLength(0.0) +, fBankAngle(0.0) +, bAutoAdjustProjection(false) { basegfx::B3DPoint aVector3D(0.0 ,0.0 ,1.0); Camera3D(aVector3D, basegfx::B3DPoint()); commit 8b219e181ad8453ace3aa712d6e525e5b0bd2819 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 11:15:06 2014 +0100 coverity#708349 Uninitialized scalar field Change-Id: I38d3d441d3582915d5baeed249c8874aef27439e diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 04a8454..f4b9dc5 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -38,8 +38,9 @@ inline SvxFrameDirection lclVoidToEnum( void* pDirection ) } // namespace -FrameDirectionListBox::FrameDirectionListBox( Window* pParent, WinBits nBits ) : -ListBox( pParent, nBits ) +FrameDirectionListBox::FrameDirectionListBox( Window* pParent, WinBits nBits ) +: ListBox(pParent, nBits) +, meSaveValue(FRMDIR_HORI_LEFT_TOP) { } commit 4a35fed86357eaf83141ae0048d265ea75c47392 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 11:13:28 2014 +0100 coverity#708341 Uninitialized scalar field Change-Id: If053235eea2d8f003021de733ea73783cf34ed6d diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 692bec4..1e3622f 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -186,9 +186,12 @@ drawing::Direction3D GetDirection3D( SdrCustomShapeGeometryItem rItem, const OU } EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCustomShape, const Rectangle /*rBoundRect*/, const double *pM ) -: aCenter( pCustomShape-GetSnapRect().Center() ) -, eProjectionMode( drawing::ProjectionMode_PARALLEL ) -, pMap( pM ) +: aCenter( pCustomShape-GetSnapRect().Center() ) +, eProjectionMode( drawing::ProjectionMode_PARALLEL ) +, fZScreen(0.0) +, fOriginX(0.0) +, fOriginY(0.0) +, pMap( pM ) { SdrCustomShapeGeometryItem rGeometryItem = (SdrCustomShapeGeometryItem)pCustomShape-GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); const OUString sProjectionMode( ProjectionMode ); @@ -200,7 +203,6 @@ EnhancedCustomShape3d::Transformation2D::Transformation2D( const SdrObject* pCus GetSkew( rGeometryItem, fSkew, fSkewAngle ); else { -fZScreen = 0.0; GetOrigin( rGeometryItem, fOriginX, fOriginY ); fOriginX = fOriginX * pCustomShape-GetLogicRect().GetWidth(); fOriginY = fOriginY * pCustomShape-GetLogicRect().GetHeight(); commit 4355ac8c31cf65988ae806097eeb2f5df63c1e8a Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 11:08:26 2014 +0100 coverity#708338 Uninitialized scalar field Change-Id: I2c4eb18e6bf140d37a10c8105922e13583dcde41 diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 692455a..02c4900 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -166,8 +166,17 @@ class EnhancedCustomShape2d : public SfxItemSet com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMinimum; com::sun::star::drawing::EnhancedCustomShapeParameter aYRangeMaximum; -Handle() : bMirroredX ( false ), bMirroredY ( false ), bSwitched( false ), -nRefX( -1 ), nRefY( -1 ), nRefAngle( -1 ), nRefR( -1 ) {}; +Handle() +: nFlags(0) +, bMirroredX ( false ) +, bMirroredY ( false ) +, bSwitched( false ) +, nRefX( -1 ) +, nRefY( -1 ) +, nRefAngle( -1 ) +, nRefR( -1 ) +{ +} }; boolIsFlipVert() {
[Libreoffice-commits] core.git: l10ntools/source
l10ntools/source/treemerge.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 931043ab318ddb977e6943ad0b69443a2757ae7f Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 12:23:30 2014 +0200 Memory released through xmlFreeDoc should be acquired with xmlMalloc Change-Id: I70db57257fa8226d9f18b7d970d85cc1769252ad diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx index 06e93d7..f2e959f 100644 --- a/l10ntools/source/treemerge.cxx +++ b/l10ntools/source/treemerge.cxx @@ -213,7 +213,7 @@ TreeParser::TreeParser( } if( !m_pSource-name ) { -m_pSource-name = new char[strlen(rInputFile.getStr())+1]; +m_pSource-name = static_castchar *(xmlMalloc(strlen(rInputFile.getStr())+1)); strcpy( m_pSource-name, rInputFile.getStr() ); } m_bIsInitialized = true; ___ 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/Extension.mk | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit a899383ff7c571cd7bd8a9cdef6be6ba77191de9 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 12:38:14 2014 +0200 gbuild: More crude hacking to fix over-evalutation of gb_Extension_*COMMANDs ...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 gbuild: fix over- evaluation in gb_ExternalExecutable__set_internal Change-Id: Ica0f8a029e18f66c470afb6a038a4746c919a8d6 diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index bf0ce74..a908006 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -308,12 +308,12 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \ $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) \ $(if $(filter qtz,$(4)), \ - $(gb_Extension_PROPMERGECOMMAND) -i $$ -o $$@ -m -l $(4) \ + $(subst $$,,$(gb_Extension_PROPMERGECOMMAND)) -i $$ -o $$@ -m -l $(4) \ , \ $(if $(filter-out en-US,$(4)), \ MERGEINPUT=`$(gb_MKTEMP)` \ echo $$(POFILE) {MERGEINPUT} \ - $(gb_Extension_PROPMERGECOMMAND) -i $$ -o $$@ -m {MERGEINPUT} -l $(4) \ + $(subst $$,,$(gb_Extension_PROPMERGECOMMAND)) -i $$ -o $$@ -m {MERGEINPUT} -l $(4) \ rm -rf {MERGEINPUT} \ , \ cp -f $$ $$@ \ @@ -409,18 +409,18 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \ $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) \ $(if $(filter qtz,$(5)), \ - $(gb_Extension_TREEXCOMMAND) -i $$ -o $$@ -l $(5) -m \ + $(subst $$,,$(gb_Extension_TREEXCOMMAND)) -i $$ -o $$@ -l $(5) -m \ -r $$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(6) \ , \ $(if $(filter-out en-US,$(5)), \ MERGEINPUT=`$(gb_MKTEMP)` \ echo $$(POFILE) {MERGEINPUT} \ - $(gb_Extension_TREEXCOMMAND) -i $$ -o $$@ -l $(5) \ + $(subst $$,,$(gb_Extension_TREEXCOMMAND)) -i $$ -o $$@ -l $(5) \ -m {MERGEINPUT} \ -r $$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(6) \ rm -rf {MERGEINPUT} \ , \ - $(gb_Extension_TREEXCOMMAND) -i $$ -o $$@ -l $(5) \ + $(subst $$,,$(gb_Extension_TREEXCOMMAND)) -i $$ -o $$@ -l $(5) \ -r $$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(6) \ ) \ ) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/clucene
external/clucene/UnpackedTarball_clucene.mk |1 external/clucene/patches/clucene-ub.patch | 33 2 files changed, 34 insertions(+) New commits: commit 213e95bb5bfd91e7946a540034cb6e2769c096cc Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 12:40:24 2014 +0200 CLucene: Some trivial GCC -fsanitize=undefined fixes Change-Id: I40132f735eabbead0a1f16d44dbd8878b03902ce diff --git a/external/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk index cda5b3a..5148fb7 100644 --- a/external/clucene/UnpackedTarball_clucene.mk +++ b/external/clucene/UnpackedTarball_clucene.mk @@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\ external/clucene/patches/clucene-warnings.patch \ external/clucene/patches/clucene-aix.patch \ external/clucene/patches/clucene-git1-win64.patch \ + external/clucene/patches/clucene-ub.patch \ )) ifneq ($(OS),WNT) diff --git a/external/clucene/patches/clucene-ub.patch b/external/clucene/patches/clucene-ub.patch new file mode 100644 index 000..e1ca313 --- /dev/null +++ b/external/clucene/patches/clucene-ub.patch @@ -0,0 +1,33 @@ +--- src/core/CLucene/index/DocumentsWriterThreadState.cpp src/core/CLucene/index/DocumentsWriterThreadState.cpp +@@ -994,7 +994,7 @@ + const TCHAR* tokenText = token-termBuffer(); + const int32_t tokenTextLen = token-termLength(); + +- int32_t code = 0; ++ uint32_t code = 0; + + // Compute hashcode + int32_t downto = tokenTextLen; +@@ -1203,7 +1203,7 @@ + const int32_t newMask = newSize-1; + + ValueArrayPosting* newHash(newSize); +- int32_t hashPos, code; ++ int32_t hashPos; uint32_t code; + const TCHAR* pos = NULL; + const TCHAR* start = NULL; + Posting* p0; +--- src/core/CLucene/store/IndexInput.cpp src/core/CLucene/store/IndexInput.cpp +@@ -41,8 +41,8 @@ + } + + int64_t IndexInput::readLong() { +-int64_t i = ((int64_t)readInt() 32); +-return (i | ((int64_t)readInt() 0xL)); ++uint64_t i = ((uint64_t)readInt() 32); ++return (i | ((uint64_t)readInt() 0xL)); + } + + int64_t IndexInput::readVLong() { ___ 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' - sc/source
sc/source/core/data/column4.cxx | 54 ++-- 1 file changed, 30 insertions(+), 24 deletions(-) New commits: commit bb14c069cc58a9a4359299b4ad865f49eb495799 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 00:43:18 2014 -0400 fdo#77300: Don't re-compile formulas when the hybrid formula is not there. Change-Id: I9b0f8d031fec08bb8d92333ff67074fdc739e034 (cherry picked from commit 66c6a3bfc9cd89c562107d3d369b3d82bae94d68) (cherry picked from commit 0e63ca4fde4e446f346e35849c756a30ca294aab) Reviewed-on: https://gerrit.libreoffice.org/8928 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index e25de16..aca38b7 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -213,23 +213,26 @@ public: ScFormulaCell* pTop = *rEntry.mpCells; OUString aFormula = pTop-GetHybridFormula(); -// Create a new token array from the hybrid formula string, and -// set it to the group. -ScCompiler aComp(mrCompileFormulaCxt, pTop-aPos); -ScTokenArray* pNewCode = aComp.CompileString(aFormula); -ScFormulaCellGroupRef xGroup = pTop-GetCellGroup(); -assert(xGroup); -xGroup-setCode(pNewCode); -xGroup-compileCode(*mpDoc, pTop-aPos, mpDoc-GetGrammar()); - -// Propagate the new token array to all formula cells in the group. -ScFormulaCell** pp = rEntry.mpCells; -ScFormulaCell** ppEnd = pp + rEntry.mnLength; -for (; pp != ppEnd; ++pp) +if (!aFormula.isEmpty()) { -ScFormulaCell* p = *pp; -p-SyncSharedCode(); -p-SetDirty(); +// Create a new token array from the hybrid formula string, and +// set it to the group. +ScCompiler aComp(mrCompileFormulaCxt, pTop-aPos); +ScTokenArray* pNewCode = aComp.CompileString(aFormula); +ScFormulaCellGroupRef xGroup = pTop-GetCellGroup(); +assert(xGroup); +xGroup-setCode(pNewCode); +xGroup-compileCode(*mpDoc, pTop-aPos, mpDoc-GetGrammar()); + +// Propagate the new token array to all formula cells in the group. +ScFormulaCell** pp = rEntry.mpCells; +ScFormulaCell** ppEnd = pp + rEntry.mnLength; +for (; pp != ppEnd; ++pp) +{ +ScFormulaCell* p = *pp; +p-SyncSharedCode(); +p-SetDirty(); +} } } else @@ -237,16 +240,19 @@ public: ScFormulaCell* pCell = rEntry.mpCell; OUString aFormula = pCell-GetHybridFormula(); -// Create token array from formula string. -ScCompiler aComp(mrCompileFormulaCxt, pCell-aPos); -ScTokenArray* pNewCode = aComp.CompileString(aFormula); +if (!aFormula.isEmpty()) +{ +// Create token array from formula string. +ScCompiler aComp(mrCompileFormulaCxt, pCell-aPos); +ScTokenArray* pNewCode = aComp.CompileString(aFormula); -// Generate RPN tokens. -ScCompiler aComp2(mpDoc, pCell-aPos, *pNewCode); -aComp2.CompileTokenArray(); +// Generate RPN tokens. +ScCompiler aComp2(mpDoc, pCell-aPos, *pNewCode); +aComp2.CompileTokenArray(); -pCell-SetCode(pNewCode); -pCell-SetDirty(); +pCell-SetCode(pNewCode); +pCell-SetDirty(); +} } } }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/source
sdext/source/pdfimport/tree/drawtreevisiting.cxx | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit 54b8eb252a3380d9d6e3cec26463e7a257790651 Author: Vort vv...@yandex.ru Date: Thu Apr 10 10:48:05 2014 +0300 fdo#35064 PDF Import: Add support for simple text scaling Change-Id: I81ff611f5f326c7ef97a75011cec4f4144d2cca4 Reviewed-on: https://gerrit.libreoffice.org/8916 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 98a677e..723d091 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -908,9 +908,23 @@ void DrawXmlFinalizer::visit( TextElement elem, const std::list Element* ::co aFontProps[ fo:font-size ]= aFSize; aFontProps[ style:font-size-asian ] = aFSize; aFontProps[ style:font-size-complex ] = aFSize; + // color const GraphicsContext rGC = m_rProcessor.getGraphicsContext( elem.GCId ); -aFontProps[ fo:color ] = getColorString( rFont.isOutline ? rGC.LineColor : rGC.FillColor ); +aFontProps[ fo:color ] = getColorString( rFont.isOutline ? rGC.LineColor : rGC.FillColor ); + +// scale +double fRotate, fShearX; +basegfx::B2DTuple aScale, aTranslation; +rGC.Transformation.decompose(aScale, aTranslation, fRotate, fShearX); +double textScale = -100 * aScale.getX() / aScale.getY(); +if (((textScale = 1) (textScale = 99)) || +((textScale = 101) (textScale = 999))) +{ +aBuf.append(textScale); +aBuf.appendAscii(%); +aFontProps[ style:text-scale ] = aBuf.makeStringAndClear(); +} StyleContainer::Style aStyle( style:style, aProps ); StyleContainer::Style aSubStyle( style:text-properties, aFontProps ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Patch for the bug 69195: Crash when delete a style in use
On Thu, 2014-04-10 at 07:50 -0700, Dali wrote: Hi, I submitted a patch to fix the issue in 4.1.4.2 version: https://gerrit.libreoffice.org/#/c/8917/ Thank you for reviewing it. I don't see this in gerrit anywhere. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/form/fmscriptingenv.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit d045378cfec7a8a175b02a1833b673c90f731081 Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 11 14:09:43 2014 +0300 WaE: private field 'm_rFormModel' is not used (in the DISABLE_SCRIPTING case) Change-Id: I14efdc4cdb0cb7b8517c8dc0a06c3f0f95259287 diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 624a4d1..8a70907 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -939,6 +939,7 @@ namespace svxform #ifdef DISABLE_SCRIPTING (void) _rEvent; (void) _pSyncronousResult; +(void) m_rFormModel; #else SolarMutexClearableGuard aSolarGuard; ::osl::ClearableMutexGuard aGuard( m_aMutex ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck reports 'else if' condition matches previous condition (svx)
On Tue, 2014-04-08 at 20:58 +0200, Julien Nabet wrote: I've just pushed the fix on master. make check on top level was ok. Searching in git history during make check, I found this commit from 2008: http://cgit.freedesktop.org/libreoffice/core/commit/?id=5d20a47c3d50d0a88543b2355ec7340fc7455984 which references OBJ_TABLE whereas OBJ_OLE2 was in 2001 (see http://cgit.freedesktop.org/libreoffice/core/commit/?id=e24bc241b69da6789351d9bf82eab5119f09c16c) I submitted a gerrit review 4.2: https://gerrit.libreoffice.org/8897 I'm rather reluctant to change this in 4.2 without a specific known problem that it fixes. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/liblangtag Makefile.fetch
Makefile.fetch |1 + download.lst |2 ++ external/liblangtag/ExternalProject_langtag.mk |2 +- external/liblangtag/UnpackedTarball_langtag.mk |4 4 files changed, 8 insertions(+), 1 deletion(-) New commits: commit a33662bb67dc14f0283f7b11e0846858fa07fb10 Author: Eike Rathke er...@redhat.com Date: Thu Apr 10 14:16:25 2014 +0200 build liblangtag with updated IANA language-subtag-registry ... as downloaded from https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry Reviewed-on: https://gerrit.libreoffice.org/8919 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Eike Rathke er...@redhat.com (cherry picked from commit 39d29be28b92328149430045f1e10e1ebeb6a0eb) Conflicts: download.lst Change-Id: I7aee9c6e42aabc9e023ab9a2ec3880dbde940396 Reviewed-on: https://gerrit.libreoffice.org/8920 Tested-by: David Tardon dtar...@redhat.com Reviewed-by: David Tardon dtar...@redhat.com diff --git a/Makefile.fetch b/Makefile.fetch index 530ee0f..ce6d71b 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -83,6 +83,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ + $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ diff --git a/download.lst b/download.lst index 24639dc..6ce3dfc 100644 --- a/download.lst +++ b/download.lst @@ -26,6 +26,8 @@ LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 +LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 +export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index b4f17ce..b87b37d 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -23,7 +23,6 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\ $(call gb_ExternalProject_get_state_target,langtag,build): $(call gb_ExternalProject_run,build,\ ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ - $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),lt_cv_has_atomic=yes,lt_cv_has_atomic=no) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) ac_cv_va_copy=no) \ $(if $(filter NO,$(SYSTEM_LIBXML)),\ @@ -36,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS=-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2) \ $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC=$(shell cygpath -w $(lastword $(CC \ $(if $(VERBOSE)$(verbose),V=1) \ + $(gb_Helper_set_ld_path) \ $(MAKE) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 88f7f16..7637ee9 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag)) $(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag)) +$(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\ + $(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \ +)) + $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \ external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \ ___ 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' - external/liblangtag i18nlangtag/qa
external/liblangtag/UnpackedTarball_langtag.mk |1 external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch | 49 ++ i18nlangtag/qa/cppunit/test_languagetag.cxx | 11 ++ 3 files changed, 60 insertions(+), 1 deletion(-) New commits: commit 726c6146981ea6411b84dc3e9c13ad42a0baab06 Author: Eike Rathke er...@redhat.com Date: Sat Apr 5 20:04:37 2014 +0200 include last record in language-subtag-registry.xml (cherry picked from commit f854b05013a587a6ea568b32180f5c81de26eeeb) disable test and document why disable build breaker test (cherry picked from commit 73c70f28ba41c7a602d7befde84c5b54187694d7) document why the test fails and is disabled (cherry picked from commit 2803e5c1e7112882003c3e2301f8e28f3dc2b6b7) Change-Id: Iaca0fc9ca12ee672f640be9c639b7b0d0dd3bc10 Reviewed-on: https://gerrit.libreoffice.org/8921 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 7637ee9..90068cb 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \ external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \ external/liblangtag/liblangtag-0.5.1-unistd.patch \ + external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch \ )) ifeq ($(OS),WNT) diff --git a/external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch b/external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch new file mode 100644 index 000..c28727c3b --- /dev/null +++ b/external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch @@ -0,0 +1,49 @@ +Upstream 6564b87c2f6dac2482e530bc43b038a3e93a0e07 +resolves #6, include last record in language-subtag-registry.xml + +The '%%' in language-subtag-registry is a record delimiter, not record +end marker, it is not present on the last record at file end. + +(cherry picked from commit 4fff73a834f94a7ca256c086d99ea0a654a6c287) + +diff --git a/data/reg2xml.c b/data/reg2xml.c +--- UnpackedTarball/langtag.orig/data/reg2xml.c UnpackedTarball/langtag/data/reg2xml.c +@@ -48,6 +48,7 @@ _parse(const char *filename, + FILE *fp; + char buffer[1024], *range = NULL, *begin = NULL, *end = NULL; + lt_bool_t in_entry = FALSE; ++ lt_bool_t file_end = FALSE; + xmlNodePtr ent = NULL; + + if ((fp = fopen(filename, rb)) == NULL) { +@@ -56,10 +57,13 @@ _parse(const char *filename, + } + while (1) { + fgets(buffer, 1024, fp); +- if (feof(fp)) +- break; ++ if (feof(fp)) { ++if (!in_entry) ++break; ++file_end = TRUE; ++} + _drop_crlf(buffer); +- if (lt_strcmp0(buffer, %%) == 0) { ++ if (lt_strcmp0(buffer, %%) == 0 || file_end) { + if (in_entry) { + if (ent) { + if (range) { +@@ -102,7 +106,7 @@ _parse(const char *filename, + ent = NULL; + range = NULL; + } +- in_entry = TRUE; ++ in_entry = !file_end; + } else { + if (!in_entry) { + /* ignore it */ + +--erAck-patch-parts-- + + diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 8946969..065a9d9 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -444,7 +444,15 @@ void TestLanguageTag::testAllTags() } #if USE_LIBLANGTAG -// 'zh-yue-HK' uses extlang and should be preferred 'yue-HK' +// 'zh-yue-HK' uses redundant 'zh-yue' and should be preferred 'yue-HK' +#if 0 +/* XXX Disabled because liblangtag in lt_tag_canonicalize() after replacing + * 'zh-yue' with the preferred 'yue' does: + * If the language tag starts with a primary language subtag that is also + * an extlang subtag, then the language tag is prepended with the extlang's + * 'Prefix'. + * Primary language 'yue' is also extlang 'yue' for which the prefix + * happens to be 'zh' ... so the result is 'zh-yue-HK' again. */ { OUString s_zh_yue_HK( zh-yue-HK ); LanguageTag zh_yue_HK( s_zh_yue_HK ); @@ -465,6 +473,7 @@
[Libreoffice-commits] core.git: writerfilter/qa
writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-1.rtf |binary writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf |binary 2 files changed New commits: commit ef52dd9f94851da829b9f6c33931b13728f84691 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 12:34:27 2014 +0100 test cases for CVE-2014-1761 Change-Id: I8fa160818e5981090aadea7d4691b8acc61f0b40 diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-1.rtf new file mode 100644 index 000..44d28ad Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-1.rtf differ diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf new file mode 100644 index 000..64109fb Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2014-1761-2.rtf differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Patch for the bug 69195: Crash when delete a style in use
It is actually published as a draft here: https://gerrit.libreoffice.org/#/c/8917/ Dali -- View this message in context: http://nabble.documentfoundation.org/Patch-for-the-bug-69195-Crash-when-delete-a-style-in-use-tp4104801p4104923.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
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 a07cd040897db54e1...@spambog.com changed: What|Removed |Added Depends on||76324 --- Comment #126 from a07cd040897db54e1...@spambog.com --- Added #76324 (https://bugs.freedesktop.org/show_bug.cgi?id=76324) Calc becomes daamn sloow and even crashes when comments are used intensively. -- 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 'refs/notes/commits' - 47/2884c5fd8f6008ca98f88d8a7b14eec5518117
47/2884c5fd8f6008ca98f88d8a7b14eec5518117 |1 + 1 file changed, 1 insertion(+) New commits: commit 16da7bf63b558e634fc8abef70a99097900859a8 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 13:00:13 2014 +0100 Notes added by 'git notes add' diff --git a/47/2884c5fd8f6008ca98f88d8a7b14eec5518117 b/47/2884c5fd8f6008ca98f88d8a7b14eec5518117 new file mode 100644 index 000..9ef0222 --- /dev/null +++ b/47/2884c5fd8f6008ca98f88d8a7b14eec5518117 @@ -0,0 +1 @@ +prefer: a321be22907c47e2e378c494f0de9f3f68af5167 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/b10217765f523bcc317b76c7f2ded31555bae7
8d/b10217765f523bcc317b76c7f2ded31555bae7 |1 + 1 file changed, 1 insertion(+) New commits: commit 51007529d5a70f00169c0e2bc2c67ef7e11bbab2 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 13:00:33 2014 +0100 Notes added by 'git notes add' diff --git a/8d/b10217765f523bcc317b76c7f2ded31555bae7 b/8d/b10217765f523bcc317b76c7f2ded31555bae7 new file mode 100644 index 000..9ef0222 --- /dev/null +++ b/8d/b10217765f523bcc317b76c7f2ded31555bae7 @@ -0,0 +1 @@ +prefer: a321be22907c47e2e378c494f0de9f3f68af5167 ___ 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' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 35a6da942ec48fcbf60e06eae76952d0e56e59d0 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 11:10:14 2014 +0100 check that stacks are not empty before top() Change-Id: Iad5b3381b8201c5ac32a5bdf99bd3d5872ea3afc (cherry picked from commit a1ea3838adee634ccf725bc5f2be7805c6294a16) Reviewed-on: https://gerrit.libreoffice.org/8932 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index fb688da..7fe53ae8 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1235,6 +1235,9 @@ void DomainMapper_Impl::appendTextContent( const uno::Sequence beans::PropertyValue xPropertyValues ) { +SAL_WARN_IF(m_aTextAppendStack.empty(), writerfilter.dmapper, no text append stack); +if (m_aTextAppendStack.empty()) +return; uno::Reference text::XTextAppendAndConvert xTextAppendAndConvert( m_aTextAppendStack.top().xTextAppend, uno::UNO_QUERY ); OSL_ENSURE( xTextAppendAndConvert.is(), trying to append a text content without XTextAppendAndConvert ); if(xTextAppendAndConvert.is() ! getTableManager( ).isIgnore()) @@ -1284,7 +1287,9 @@ void DomainMapper_Impl::appendOLE( const OUString rStreamName, OLEHandlerPtr pO // gives a better ( visually ) result xOLEProperties-setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_ANCHOR_TYPE ), uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) ); // remove ( if valid ) associated shape ( used for graphic replacement ) -m_aAnchoredStack.top( ).bToRemove = true; +SAL_WARN_IF(m_aAnchoredStack.empty(), writerfilter.dmapper, no anchor stack); +if (!m_aAnchoredStack.empty()) +m_aAnchoredStack.top( ).bToRemove = true; RemoveLastParagraph(); m_aTextAppendStack.pop(); ___ 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' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 1a8d06881ee7ba679da8b7cc37b53a20a04ee3e8 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 11:10:14 2014 +0100 check that stacks are not empty before top() Change-Id: Iad5b3381b8201c5ac32a5bdf99bd3d5872ea3afc (cherry picked from commit a1ea3838adee634ccf725bc5f2be7805c6294a16) Reviewed-on: https://gerrit.libreoffice.org/8933 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b0cde8d..21416e2 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1242,6 +1242,9 @@ void DomainMapper_Impl::appendTextContent( const uno::Sequence beans::PropertyValue xPropertyValues ) { +SAL_WARN_IF(m_aTextAppendStack.empty(), writerfilter.dmapper, no text append stack); +if (m_aTextAppendStack.empty()) +return; uno::Reference text::XTextAppendAndConvert xTextAppendAndConvert( m_aTextAppendStack.top().xTextAppend, uno::UNO_QUERY ); OSL_ENSURE( xTextAppendAndConvert.is(), trying to append a text content without XTextAppendAndConvert ); if(xTextAppendAndConvert.is() ! getTableManager( ).isIgnore()) @@ -1291,7 +1294,9 @@ void DomainMapper_Impl::appendOLE( const OUString rStreamName, OLEHandlerPtr pO // gives a better ( visually ) result xOLEProperties-setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_ANCHOR_TYPE ), uno::makeAny( text::TextContentAnchorType_AS_CHARACTER ) ); // remove ( if valid ) associated shape ( used for graphic replacement ) -m_aAnchoredStack.top( ).bToRemove = true; +SAL_WARN_IF(m_aAnchoredStack.empty(), writerfilter.dmapper, no anchor stack); +if (!m_aAnchoredStack.empty()) +m_aAnchoredStack.top( ).bToRemove = true; RemoveLastParagraph(); m_aTextAppendStack.pop(); ___ 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' - sw/source
sw/source/ui/docvw/edtwin.cxx | 19 +++ 1 file changed, 11 insertions(+), 8 deletions(-) New commits: commit c7cec7bb9ea7ef0aaa18a5c39eca13c446f974c5 Author: Lennard Wasserthal wassert...@nefkom.net Date: Sat Apr 5 11:55:24 2014 +0200 fdo#69157 Apply object-in front selection on mouseUp Before, all selection was recklessly replaced when you clicked something else than a scaling handle (or the like). It caused bug 69157. But now, you can still drag the frame by gripping the interior one. Btw, that the timer did not correctly start was because of the return statement in the prior state. Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6 Signed-off-by: Lennard Wasserthal wassert...@nefkom.net Signed-off-by: Michael Stahl mst...@redhat.com (cherry picked from commit 351ab7b879a1e5bf879600bf47909181029a4d11) Reviewed-on: https://gerrit.libreoffice.org/8907 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 3dd87c0..cd838c0 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -2618,8 +2618,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) { SwWrtShell rSh = m_rView.GetWrtShell(); -SdrObject* pObj; -SdrPageView* pPV; // We have to check if a context menu is shown and we have an UI // active inplace client. In that case we have to ignore the mouse // button down event. Otherwise we would crash (context menu has been @@ -2936,12 +2934,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt) // only if no position to size was hit. if (!bHitHandle) { -if (pSdrView-PickObj(aDocPos, pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER | SDRSEARCH_BEFOREMARK)) -{ -pSdrView-UnmarkAllObj(); - pSdrView-MarkObj(pObj,pPV,false,false); -return; -} StartDDTimer(); SwEditWin::m_nDDStartPosY = aDocPos.Y(); SwEditWin::m_nDDStartPosX = aDocPos.X(); @@ -4029,6 +4021,8 @@ void SwEditWin::MouseMove(const MouseEvent _rMEvt) */ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt) { +SdrObject* pObj; +SdrPageView* pPV; bool bCallBase = true; sal_Bool bCallShadowCrsr = m_bWasShdwCrsr; @@ -4080,6 +4074,15 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt) bFrmDrag = false; } bNoInterrupt = false; +const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) ); +if ((PixelToLogic(m_aStartPos).Y() == (aDocPos.Y())) (PixelToLogic(m_aStartPos).X() == (aDocPos.X(//To make sure it was not moved +{ +if (pSdrView-PickObj(aDocPos, pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER )) +{ +pSdrView-UnmarkAllObj(); +pSdrView-MarkObj(pObj,pPV,false,false); +} +} ReleaseMouse(); return; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: autogen.sh solenv/gbuild
autogen.sh |7 --- solenv/gbuild/partial_build.mk |2 +- 2 files changed, 1 insertion(+), 8 deletions(-) New commits: commit 11545b91d539b5c354c1423755be2a3809794bb6 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 14:24:15 2014 +0200 Revert make it possible to do 'make -C sw/' even with builddir!=srcdir This reverts commit 11e881a63821ea209bda509d1e502d9ba270782d, which assumed that all the Makefile's using it are in builddir/module/, which is not the case for the external/ sub-modules. diff --git a/autogen.sh b/autogen.sh index da967a4..f15dd91a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -135,13 +135,6 @@ if ($src_path ne $build_path) { system (ln -sf $src_path/configure.ac configure.ac); system (ln -sf $src_path/g g); -my @modules = $src_path/*/Makefile; -foreach my $module (@modules) -{ -my $dir = basename (dirname ($module)); -mkdir ($dir); -system (ln -sf $src_path/$dir/Makefile $dir/Makefile); -} } system ($aclocal $aclocal_flags) die Failed to run aclocal; unlink (configure); diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk index eb2b5cc..68e807b 100644 --- a/solenv/gbuild/partial_build.mk +++ b/solenv/gbuild/partial_build.mk @@ -22,7 +22,7 @@ gb_Side:=host endif ifeq (,$(BUILDDIR)) -BUILDDIR := $(dir $(abspath $(firstword $(MAKEFILE_LIST.. +BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST../.. endif ifeq ($(BUILD_TYPE),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/testTcBorders.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 19 +++ writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 14 +++ 3 files changed, 28 insertions(+), 5 deletions(-) New commits: commit 07f90c89ef78484a422ca4536ba587217147e80a Author: Rajashri rajashri.udh...@synerzip.com Date: Fri Apr 4 09:00:27 2014 +0530 fdo#76635 : Table borders not preserved after RT The document containing a custom table is getting crashed. In the document the user has created his own costume table styles and in the created custom table style the user has set repeat first row as header property. The corresponding tag for this property is 'tblHeader' LO was adding this property as a part of cellProperties in DomainMapperTableHandler.cxx. But it is a part of a Row Property. That is why there was a crash @ open. In DomainMapperTableHandler.cxx : 'endTableGetCellProperties' tblHeader property is removed from style as it is not allowed for a cell. Change-Id: I83cd369aa4497ec3f4b567174f23ddee9be2864e Reviewed-on: https://gerrit.libreoffice.org/8848 Tested-by: David Tardon dtar...@redhat.com Reviewed-by: David Tardon dtar...@redhat.com diff --git a/sw/qa/extras/ooxmlexport/data/testTcBorders.docx b/sw/qa/extras/ooxmlexport/data/testTcBorders.docx new file mode 100644 index 000..b7fb81a Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testTcBorders.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index cafd9ea..d13bb70 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1344,6 +1344,21 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar2, calendar2.docx) assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Calendar2']/w:tblPr/w:tblBorders/w:insideV, themeTint, 99); } +DECLARE_OOXMLEXPORT_TEST(testTcBorders, testTcBorders.docx) +{ +//fdo#76635 : Table borders are not getting preserved. + +xmlDocPtr pXmlDocument = parseExport(word/document.xml); +if (!pXmlDocument) +return; + + assertXPath(pXmlDocument, /w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:val = 'single'],1); + assertXPath(pXmlDocument, /w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:sz = 4], 1); + assertXPath(pXmlDocument, /w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:space = 0], 1); + assertXPath(pXmlDocument, /w:document[1]/w:body[1]/w:tbl[1]/w:tr[1]/w:tc[1]/w:tcPr[1]/w:tcBorders[1]/w:bottom[1][@w:color = 808080], 1); + +} + DECLARE_OOXMLEXPORT_TEST(testQuicktables, quicktables.docx) { xmlDocPtr pXmlStyles = parseExport(word/styles.xml); @@ -1384,6 +1399,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71302, fdo71302.docx) assertXPath(pXmlStyles, /w:styles/w:style[@w:styleId='Strong'], 1); } + + + + DECLARE_OOXMLEXPORT_TEST(testSmartart, smartart.docx) { uno::Referencetext::XTextDocument xTextDocument(mxComponent, uno::UNO_QUERY); diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 08d1919..336514b 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -545,7 +545,6 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo sal_Int32 nHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH; m_aTableProperties-getValue( TablePropertyMap::HORI_ORIENT, nHoriOrient ) ; m_aTableProperties-Insert( PROP_HORI_ORIENT, uno::makeAny( sal_Int16(nHoriOrient) ) ); - //fill default value - if not available const PropertyMap::const_iterator aRepeatIter = m_aTableProperties-find(PROP_HEADER_ROW_COUNT); @@ -695,12 +694,17 @@ CellPropertyValuesSeq_t DomainMapperTableHandler::endTableGetCellProperties(Tabl } // Remove properties from style/row that aren't allowed in cells -const PropertyMap::iterator aDefaultRepeatIt = pAllCellProps-find(PROP_HEADER_ROW_COUNT); +PropertyMap::iterator aDefaultRepeatIt = pAllCellProps-find(PROP_HEADER_ROW_COUNT); +if ( aDefaultRepeatIt != pAllCellProps-end( ) ) +pAllCellProps-erase( aDefaultRepeatIt ); + +aDefaultRepeatIt = pAllCellProps-find(PROP_PARA_LINE_SPACING); if ( aDefaultRepeatIt != pAllCellProps-end( ) ) pAllCellProps-erase( aDefaultRepeatIt ); -const PropertyMap::iterator aDefaultRepeatIt2 = pAllCellProps-find(PROP_PARA_LINE_SPACING); -if ( aDefaultRepeatIt2 != pAllCellProps-end( ) ) -pAllCellProps-erase(
[Libreoffice-commits] core.git: bin/module-deps.pl
bin/module-deps.pl | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) New commits: commit 68242e8c299b721f6e8e25608fab1fba4d011c96 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 15:09:31 2014 +0200 Do not mishandle further libs without dependencies ...besides sal/Library_sal.mk, like i18npool/Library_collator_data.mk. Change-Id: I2d86540bd8123410972496047fdb59ebcf35968f diff --git a/bin/module-deps.pl b/bin/module-deps.pl index 0520eca..edf597d 100755 --- a/bin/module-deps.pl +++ b/bin/module-deps.pl @@ -218,14 +218,18 @@ sub collapse_lib_to_module($) my %unknown_libs; for my $name (sort keys %{$tree}) { my $result = $tree-{$name}; +$unknown_libs{$name} = 1 next if (!grep {/$name/} keys $l2m); +$name = $l2m-{$name}; # sal has no dependencies, take care of it # otherwise it doesn't have target key if (!@{$result-{deps}}) { -$digraph{$name}{target} = $result-{target}; +if (!exists($digraph{$name})) { +my @empty; +$digraph{$name}{deps} = \@empty; +$digraph{$name}{target} = $result-{target}; +} } for my $dep (@{$result-{deps}}) { -$unknown_libs{$name} = 1 next if (!grep {/$name/} keys $l2m); -$name = $l2m-{$name}; $dep = $l2m-{$dep}; # ignore: two libraries from the same module depend on each other next if ($name eq $dep); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 19 commits - filter/source lotuswordpro/source svx/source sw/source tools/source
filter/source/graphicfilter/iras/iras.cxx | 10 +++ lotuswordpro/source/filter/localtime.hxx| 12 lotuswordpro/source/filter/lwpbasetype.hxx | 14 lotuswordpro/source/filter/lwpsdwdrawheader.hxx | 71 ++-- svx/source/gallery2/galtheme.cxx| 17 +++-- svx/source/inc/fmexpl.hxx |5 + svx/source/svdraw/svddrgmt.cxx |6 +- svx/source/svdraw/svdotext.cxx |2 svx/source/svdraw/svdundo.cxx |7 +- sw/source/core/tox/tox.cxx |2 sw/source/core/undo/unnum.cxx |9 ++- sw/source/core/view/vprint.cxx |1 tools/source/generic/bigint.cxx |1 13 files changed, 134 insertions(+), 23 deletions(-) New commits: commit 999377f113fc8f4af4f08b7285658c8c081f6c0b Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 13:54:01 2014 +0100 coverity#738639 Uninitialized scalar field Change-Id: Ib7c75d87237113641fd80e5a87dc08cbf1910a55 diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 0d26b51..705381a 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -69,7 +69,17 @@ RASReader::RASReader(SvStream rRAS) : m_rRAS(rRAS) , mbStatus(sal_True) , mpAcc(NULL) +, mnWidth(0) +, mnHeight(0) +, mnDstBitsPerPix(0) +, mnDstColors(0) +, mnDepth(0) +, mnImageDatSize(0) +, mnType(0) +, mnColorMapType(0) +, mnColorMapSize(0) , mnRepCount(0) +, mnRepVal(0) , mbPalette(sal_False) { } commit 01dca77a77118bf95f0948d38b26088e9b2357b3 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 13:48:59 2014 +0100 coverity#738684 Uninitialized scalar field Change-Id: I07b698a72ada7a56fb8b63232f25ee5a5edfc185 diff --git a/lotuswordpro/source/filter/lwpbasetype.hxx b/lotuswordpro/source/filter/lwpbasetype.hxx index 9f83d51..7ca08e1 100644 --- a/lotuswordpro/source/filter/lwpbasetype.hxx +++ b/lotuswordpro/source/filter/lwpbasetype.hxx @@ -75,7 +75,19 @@ class LwpPanoseNumber { public: -LwpPanoseNumber(){} +LwpPanoseNumber() +: m_nFamilyType(0) +, m_nSerifStyle(0) +, m_nWeight(0) +, m_nProportion(0) +, m_nContrast(0) +, m_nStrokeVariation(0) +, m_nArmStyle(0) +, m_nLetterform(0) +, m_nMidline(0) +, m_nXHeight(0) +{ +} ~LwpPanoseNumber(){} public: void Read(LwpObjectStream *pStrm); commit 46575addc41f13d92f1320a819e8c7ef766974d4 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 13:45:22 2014 +0100 coverity#738695 Uninitialized scalar field Change-Id: I5a96a726d956f0eac0a7e5441e6fcbb2fd0ae204 diff --git a/lotuswordpro/source/filter/localtime.hxx b/lotuswordpro/source/filter/localtime.hxx index 85b000c..e392029 100644 --- a/lotuswordpro/source/filter/localtime.hxx +++ b/lotuswordpro/source/filter/localtime.hxx @@ -67,6 +67,18 @@ struct LtTm long tm_wday;/* days since Sunday - [0,6] */ long tm_yday;/* days since January 1 - [0,365] */ long tm_isdst; /* daylight savings time flag */ +LtTm() +: tm_sec(0) +, tm_min(0) +, tm_hour(0) +, tm_mday(0) +, tm_mon(0) +, tm_year(0) +, tm_wday(0) +, tm_yday(0) +, tm_isdst(0) +{ +} }; bool LtgGmTime(long rtime,LtTm rtm); bool LtgLocalTime(long rtime,LtTm rtm); commit 2e87d4241f36b66a1628b0f8c7bb610c63b8c450 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 13:41:35 2014 +0100 coverity#738696 Uninitialized scalar field Change-Id: I96fd8829d8854e3d3412ef4a0ba9fadf838e0f48 diff --git a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx index a755dfa..af6ae5f 100644 --- a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx +++ b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx @@ -257,6 +257,12 @@ struct SdwArcRecord sal_uInt8 nLineEnd; sal_uInt8 nLineStyle; SdwColor aPenColor; +SdwArcRecord() +: nLineWidth(0) +, nLineEnd(0) +, nLineStyle(0) +{ +} }; struct SdwTextBoxRecord commit 711470cdee4019180150dccbdb7b826f678ad025 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 13:38:46 2014 +0100 coverity#738697 Uninitialized scalar field Change-Id: I5edf11a51b4d32a1a7257857b03ce7814af442e3 diff --git a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx index 5194113..a755dfa 100644 --- a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx +++ b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx @@ -187,19 +187,30 @@ struct SdwClosedObjStyleRec SdwColor aBackColor; sal_uInt16 nFillType; sal_uInt8 pFillPattern[8]; +
[Libreoffice-commits] core.git: Branch 'private/kohei/chart-controller-study' - 5 commits - chart2/source sc/qa sc/source
chart2/source/controller/main/ChartController.cxx| 13 +++ chart2/source/controller/main/ChartController.hxx|4 + chart2/source/controller/main/ChartController_Window.cxx | 16 sc/qa/unit/ucalc_sharedformula.cxx | 26 +++ sc/source/core/data/column4.cxx | 54 --- 5 files changed, 88 insertions(+), 25 deletions(-) New commits: commit a5120eb4a2f14ee59222ada0b46144a6b80986b7 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 09:27:59 2014 -0400 Several more Window events to intercept for the GL3D chart. But not painting or resizing events. Those are generic enough that no branching is needed. Change-Id: I0fb186da61c583c5326d2608b2153aced3fab77b diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 8786b3f..9c8c490 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1410,6 +1410,19 @@ void ChartController::queryGL3DChart() m_bGL3DChart = GL3DHelper::isGL3DDiagram(xDiagram); } +void ChartController::executeGL3D_Tracking( const TrackingEvent /*rTEvt*/ ) +{ +} + +void ChartController::executeGL3D_Command( const CommandEvent /*rCEvt*/ ) +{ +} + +bool ChartController::executeGL3D_KeyInput( const KeyEvent /*rKEvt*/ ) +{ +return false; +} + void ChartController::executeGL3D_MouseButtonUp( const MouseEvent /*rMEvt*/ ) { } diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index e62904a..0698d56 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -433,6 +433,10 @@ private: void queryGL3DChart(); +void executeGL3D_Tracking( const TrackingEvent rTEvt ); +void executeGL3D_Command( const CommandEvent rCEvt ); +bool executeGL3D_KeyInput( const KeyEvent rKEvt ); + void executeGL3D_MouseButtonUp( const MouseEvent rMEvt ); void executeGL3D_MouseButtonDown( const MouseEvent rMEvt ); void executeGL3D_MouseMove( const MouseEvent rMEvt ); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index e420b3b..66ea74f 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -746,8 +746,13 @@ void ChartController::execute_MouseMove( const MouseEvent rMEvt ) impl_SetMousePointer( rMEvt ); } -void ChartController::execute_Tracking( const TrackingEvent /* rTEvt */ ) +void ChartController::execute_Tracking( const TrackingEvent rTEvt ) { +if (m_bGL3DChart) +{ +executeGL3D_Tracking(rTEvt); +return; +} } void ChartController::execute_MouseButtonUp( const MouseEvent rMEvt ) @@ -988,6 +993,12 @@ void ChartController::execute_LoseFocus() void ChartController::execute_Command( const CommandEvent rCEvt ) { +if (m_bGL3DChart) +{ +executeGL3D_Command(rCEvt); +return; +} + bool bIsAction = false; { SolarMutexGuard aGuard; @@ -1303,6 +1314,9 @@ void ChartController::execute_Command( const CommandEvent rCEvt ) bool ChartController::execute_KeyInput( const KeyEvent rKEvt ) { +if (m_bGL3DChart) +return executeGL3D_KeyInput(rKEvt); + bool bReturn=false; DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper; commit 4fc780b4d861e0ea0fece5f5e4ff11dc73153470 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 00:55:10 2014 -0400 fdo#77300: Do the same for the shared formula case as well. Change-Id: I560b0beabe81907e3f85d8845041a9df25d2200d diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index 7d87177..ec938d8 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -637,23 +637,26 @@ public: ScFormulaCell* pTop = *rEntry.mpCells; OUString aFormula = pTop-GetHybridFormula(); -// Create a new token array from the hybrid formula string, and -// set it to the group. -ScCompiler aComp(mrCompileFormulaCxt, pTop-aPos); -ScTokenArray* pNewCode = aComp.CompileString(aFormula); -ScFormulaCellGroupRef xGroup = pTop-GetCellGroup(); -assert(xGroup); -xGroup-setCode(pNewCode); -xGroup-compileCode(*mpDoc, pTop-aPos, mpDoc-GetGrammar()); - -// Propagate the new token array to all formula cells in the group. -ScFormulaCell** pp = rEntry.mpCells; -ScFormulaCell** ppEnd = pp + rEntry.mnLength; -for (; pp != ppEnd; ++pp) +if (!aFormula.isEmpty()) { -ScFormulaCell* p = *pp; -p-SyncSharedCode(); -p-SetDirty(); +
[Libreoffice-commits] core.git: 2 commits - chart2/Library_chartcore.mk chart2/source
chart2/Library_chartcore.mk |1 chart2/source/controller/main/ChartController.cxx| 47 + chart2/source/controller/main/ChartController.hxx| 12 +++ chart2/source/controller/main/ChartController_Window.cxx | 34 + chart2/source/inc/GL3DHelper.hxx | 29 chart2/source/tools/GL3DHelper.cxx | 54 +++ chart2/source/view/main/ChartView.cxx| 27 --- 7 files changed, 178 insertions(+), 26 deletions(-) New commits: commit ba1452c2615604fd1d446dd0f1f55b5501f1b76d Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 09:27:59 2014 -0400 Several more Window events to intercept for the GL3D chart. But not painting or resizing events. Those are generic enough that no branching is needed. Change-Id: I0fb186da61c583c5326d2608b2153aced3fab77b diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 8786b3f..9c8c490 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1410,6 +1410,19 @@ void ChartController::queryGL3DChart() m_bGL3DChart = GL3DHelper::isGL3DDiagram(xDiagram); } +void ChartController::executeGL3D_Tracking( const TrackingEvent /*rTEvt*/ ) +{ +} + +void ChartController::executeGL3D_Command( const CommandEvent /*rCEvt*/ ) +{ +} + +bool ChartController::executeGL3D_KeyInput( const KeyEvent /*rKEvt*/ ) +{ +return false; +} + void ChartController::executeGL3D_MouseButtonUp( const MouseEvent /*rMEvt*/ ) { } diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index e62904a..0698d56 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -433,6 +433,10 @@ private: void queryGL3DChart(); +void executeGL3D_Tracking( const TrackingEvent rTEvt ); +void executeGL3D_Command( const CommandEvent rCEvt ); +bool executeGL3D_KeyInput( const KeyEvent rKEvt ); + void executeGL3D_MouseButtonUp( const MouseEvent rMEvt ); void executeGL3D_MouseButtonDown( const MouseEvent rMEvt ); void executeGL3D_MouseMove( const MouseEvent rMEvt ); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index e420b3b..66ea74f 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -746,8 +746,13 @@ void ChartController::execute_MouseMove( const MouseEvent rMEvt ) impl_SetMousePointer( rMEvt ); } -void ChartController::execute_Tracking( const TrackingEvent /* rTEvt */ ) +void ChartController::execute_Tracking( const TrackingEvent rTEvt ) { +if (m_bGL3DChart) +{ +executeGL3D_Tracking(rTEvt); +return; +} } void ChartController::execute_MouseButtonUp( const MouseEvent rMEvt ) @@ -988,6 +993,12 @@ void ChartController::execute_LoseFocus() void ChartController::execute_Command( const CommandEvent rCEvt ) { +if (m_bGL3DChart) +{ +executeGL3D_Command(rCEvt); +return; +} + bool bIsAction = false; { SolarMutexGuard aGuard; @@ -1303,6 +1314,9 @@ void ChartController::execute_Command( const CommandEvent rCEvt ) bool ChartController::execute_KeyInput( const KeyEvent rKEvt ) { +if (m_bGL3DChart) +return executeGL3D_KeyInput(rKEvt); + bool bReturn=false; DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper; commit a3354ecf4fe32e3ec14b40f0c6db17e84392e42f Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Apr 10 23:05:54 2014 -0400 Separate mouse event handlers for GL3D bar chart. They are just skeletons for now. Change-Id: I7e5e95ad8a2809125cbcf3affd17e663aafa99b0 diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk index af3b6f3..8de07e2 100644 --- a/chart2/Library_chartcore.mk +++ b/chart2/Library_chartcore.mk @@ -199,6 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\ chart2/source/tools/ExponentialRegressionCurveCalculator \ chart2/source/tools/FillProperties \ chart2/source/tools/FormattedStringHelper \ +chart2/source/tools/GL3DHelper \ chart2/source/tools/ImplOPropertySet \ chart2/source/tools/InternalData \ chart2/source/tools/InternalDataProvider \ diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 8b45213..8786b3f 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -43,6 +43,7 @@ #include DrawCommandDispatch.hxx #include ShapeController.hxx #include UndoActions.hxx +#include GL3DHelper.hxx #include
[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/qa sc/source
formula/source/core/resource/core_resource.src | 14 +++ include/formula/compiler.hrc |4 +- include/formula/opcode.hxx |2 + sc/inc/helpids.h |2 + sc/qa/unit/subsequent_filters-test.cxx |4 +- sc/qa/unit/ucalc.cxx |2 + sc/source/core/inc/interpre.hxx|2 + sc/source/core/tool/interpr4.cxx |2 + sc/source/core/tool/interpr7.cxx | 20 ++ sc/source/filter/excel/xlformula.cxx |2 + sc/source/filter/oox/formulabase.cxx |2 + sc/source/ui/src/scfuncs.src | 46 + 12 files changed, 99 insertions(+), 3 deletions(-) New commits: commit 56deaabb32346e0cc9c6946d7d53ba251f4450b2 Author: Winfried Donkers winfrieddonk...@libreoffice.org Date: Fri Apr 11 09:46:51 2014 +0200 fdo#73149 add Excel 2010 functions ERF.PRECISE and ERFC.PRECISE Change-Id: I3199470ec92923e8cc12156f21dd397d870cc1e0 Reviewed-on: https://gerrit.libreoffice.org/8930 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src index 4f5b91d..90544a4 100644 --- a/formula/source/core/resource/core_resource.src +++ b/formula/source/core/resource/core_resource.src @@ -422,6 +422,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF /* END defined ERROR.TYPE() values. */ String SC_OPCODE_FILTERXML { Text = COM.MICROSOFT.FILTERXML;}; String SC_OPCODE_WEBSERVICE{ Text = COM.MICROSOFT.WEBSERVICE; }; +String SC_OPCODE_ERF_MS { Text = COM.MICROSOFT.ERF.PRECISE ; }; +String SC_OPCODE_ERFC_MS { Text = COM.MICROSOFT.ERFC.PRECISE ; }; }; /** These function names are used only in the XLSX import. */ @@ -825,6 +827,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML /* END defined ERROR.TYPE() values. */ String SC_OPCODE_FILTERXML { Text = _xlfn.FILTERXML;}; String SC_OPCODE_WEBSERVICE{ Text = _xlfn.WEBSERVICE; }; +String SC_OPCODE_ERF_MS { Text = _xlfn.ERF.PRECISE ; }; +String SC_OPCODE_ERFC_MS { Text = _xlfn.ERFC.PRECISE ; }; }; // DO NOT CHANGE NAMES! Only add functions. @@ -1230,6 +1234,8 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH /* END defined ERROR.TYPE() values. */ String SC_OPCODE_FILTERXML { Text = FILTERXML;}; String SC_OPCODE_WEBSERVICE{ Text = WEBSERVICE; }; +String SC_OPCODE_ERF_MS { Text = ERF.PRECISE ; }; +String SC_OPCODE_ERFC_MS { Text = ERFC.PRECISE ; }; }; Resource RID_STRLIST_FUNCTION_NAMES @@ -2758,6 +2764,14 @@ Resource RID_STRLIST_FUNCTION_NAMES { Text [ en-US ] = WEBSERVICE; }; +String SC_OPCODE_ERF_MS +{ +Text [en-US ] = ERF.PRECISE ; +}; +String SC_OPCODE_ERFC_MS +{ +Text [en-US ] = ERFC.PRECISE ; +}; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 47d22aa..96ea885 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -192,7 +192,9 @@ #define SC_OPCODE_UNICHAR 160 #define SC_OPCODE_GAMMA 161 #define SC_OPCODE_GAMMA_LN_MS 162 -#define SC_OPCODE_STOP_1_PAR163 +#define SC_OPCODE_ERF_MS163 +#define SC_OPCODE_ERFC_MS 164 +#define SC_OPCODE_STOP_1_PAR165 /*** Functions with more than one parameters ***/ #define SC_OPCODE_START_2_PAR 201 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 4239c53..f5afa19 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -460,6 +460,8 @@ enum OpCodeEnum ocEuroConvert = SC_OPCODE_EUROCONVERT, ocFilterXML = SC_OPCODE_FILTERXML, ocWebservice= SC_OPCODE_WEBSERVICE, +ocErf_MS= SC_OPCODE_ERF_MS, +ocErfc_MS = SC_OPCODE_ERFC_MS, // internal stuff ocInternalBegin = SC_OPCODE_INTERNAL_BEGIN, ocTTT = SC_OPCODE_TTT, diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 2aa8e60..2f73f3f 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -704,5 +704,7 @@ #define HID_FUNC_FLOOR_MS SC_HID_FUNC_FLOOR_MS #define HID_FUNC_NETWORKDAYS_MS SC_HID_FUNC_NETWORKDAYS_MS #define HID_FUNC_WORKDAY_MS SC_HID_FUNC_WORKDAY_MS +#define HID_FUNC_ERF_MS SC_HID_FUNC_EFR_MS +#define HID_FUNC_ERFC_MS SC_HID_FUNC_ERFC_MS /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 86699888..4411d32 100644 ---
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/doc.cxx | 40 +++- 1 file changed, 39 insertions(+), 1 deletion(-) New commits: commit e12184393f0591b5c5d9218062cc0a4bced6d4e6 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 14:45:39 2014 +0100 Resolves: rhbz#1081176: don't jump to cursor pos when... launching a new window view of a document. This was happening because of (temporary) activation of the modified flag (from updating the document stats in the bottom bar) triggering a scrolll to the current cursor position of the old document Change-Id: I6e1a3c07b66ff6373345850d1449f17c1f0baa17 diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index ed1e6ac..cd046df 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1653,6 +1653,41 @@ void SwDoc::CalculatePagePairsForProspectPrinting( // thus we are done here. } +namespace +{ +class LockAllViews +{ +std::stackbool m_aViewWasLocked; +SwViewShell* m_pViewShell; +public: +LockAllViews(SwViewShell *pViewShell) +: m_pViewShell(pViewShell) +{ +if (!m_pViewShell) +return; +SwViewShell *pSh = m_pViewShell; +do +{ +m_aViewWasLocked.push(pSh-IsViewLocked()); +pSh-LockView(true); +pSh = (SwViewShell*)pSh-GetNext(); +} while (pSh != m_pViewShell); +} +~LockAllViews() +{ +if (!m_pViewShell) +return; +SwViewShell *pSh = m_pViewShell; +do +{ +pSh-LockView(m_aViewWasLocked.top()); +m_aViewWasLocked.pop(); +pSh = (SwViewShell*)pSh-GetNext(); +} while (pSh != m_pViewShell); +} +}; +} + // returns true while there is more to do bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields) { @@ -1723,7 +1758,7 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields) aStat[n++].Value = (sal_Int32)mpDocStat-nCharExcludingSpaces; // For e.g. autotext documents there is no pSwgInfo (#i79945) -SfxObjectShell * const pObjShell( GetDocShell() ); +SwDocShell* pObjShell(GetDocShell()); if (pObjShell) { const uno::Referencedocument::XDocumentPropertiesSupplier xDPS( @@ -1733,6 +1768,9 @@ bool SwDoc::IncrementalDocStatCalculate(long nChars, bool bFields) // #i96786#: do not set modified flag when updating statistics const bool bDocWasModified( IsModified() ); const ModifyBlocker_Impl b(pObjShell); +// rhbz#1081176: don't jump to cursor pos because of (temporary) +// activation of modified flag triggering move to input position +LockAllViews aViewGuard((SwViewShell*)pObjShell-GetWrtShell()); xDocProps-setDocumentStatistics(aStat); if (!bDocWasModified) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Cppcheck reports 'else if' condition matches previous condition (vcl)
On Sat, 2014-04-05 at 16:06 -0700, julien2412 wrote: Indeed we have: 296 else 297 { 298 if( aTmpBmpEx.IsAlpha() ) 299 aTmpBmpEx = BitmapEx( aTmpBmp, aTmpBmpEx.GetAlpha() ); 300 else if( aTmpBmpEx.IsAlpha() ) 301 aTmpBmpEx = BitmapEx( aTmpBmp, aTmpBmpEx.GetMask() ); 302 } see http://opengrok.libreoffice.org/xref/core/vcl/source/gdi/impimage.cxx#298 Should the else if be: else if( aTmpBmpEx.IsTransparent()) grep -r IsAlpha -C 5 vcl|grep else definitely strongly suggests that was the intent. I reckon its worth making that change and see if anything falls over. Not the kind of thing I'd backport to 4-2 unless we get compelling evidence to do that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xlformula.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit cf9a100021dee449e55e86d828450fa9f9e74b69 Author: Eike Rathke er...@redhat.com Date: Fri Apr 11 15:50:29 2014 +0200 corrected copypaste error WORKDAY.INTL was erroneously saved as NETWORKDAYS.INTL in .xls BIFF Change-Id: I23d7b4fb7382cfd640d1a0a19a81c4839488c1ce diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 9e20985..822c379 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -400,8 +400,8 @@ static const XclFunctionInfo saFuncTable_Oox[] = { ocIfError,255,3, 3, V, { RO_E, VO, RO }, EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( IFERROR ) }, { ocNetWorkdays_MS, NOID, 2, 4, V, { VR, VR, VR, RO }, EXC_FUNCFLAG_IMPORTONLY, EXC_FUNCNAME( NETWORKDAYS.INTL ) }, { ocNetWorkdays_MS, 255,3, 5, V, { RO_E, VR, VR, VR, RO }, EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( NETWORKDAYS.INTL ) }, -{ ocWorkday_MS, NOID, 2, 4, V, { VR, VR, VR, RO }, EXC_FUNCFLAG_IMPORTONLY, EXC_FUNCNAME( NETWORKDAYS.INTL ) }, -{ ocWorkday_MS, 255,3, 5, V, { RO_E, VR, VR, VR, RO }, EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( NETWORKDAYS.INTL ) }, +{ ocWorkday_MS, NOID, 2, 4, V, { VR, VR, VR, RO }, EXC_FUNCFLAG_IMPORTONLY, EXC_FUNCNAME( WORKDAY.INTL ) }, +{ ocWorkday_MS, 255,3, 5, V, { RO_E, VR, VR, VR, RO }, EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( WORKDAY.INTL ) }, EXC_FUNCENTRY_V_VR( ocCeil_ISO, 2, 2, 0, ISO.CEILING ) }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/new-chart-type-skeleton' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/ipcx/ipcx.cxx | 12 1 file changed, 12 insertions(+) New commits: commit 60a0a093ca53a758c11ba88db0f057fceb96fe90 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 15:25:13 2014 +0100 coverity#738637 Uninitialized scalar field Change-Id: I9e8abf725c348c4d779d779e24e411609df64986 diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 5984987..23f5ee2 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -64,6 +64,18 @@ public: PCXReader::PCXReader(SvStream rStream) : m_rPCX(rStream) , pAcc(NULL) +, nVersion(0) +, nEncoding(0) +, nBitsPerPlanePix(0) +, nPlanes(0) +, nBytesPerPlaneLin(0) +, nPaletteInfo(0) +, nWidth(0) +, nHeight(0) +, nResX(0) +, nResY(0) +, nDestBitsPerPixel(0) +, nStatus(false) { pPalette = new sal_uInt8[ 768 ]; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source
filter/source/graphicfilter/expm/expm.cxx |3 +++ filter/source/graphicfilter/ipbm/ipbm.cxx | 15 ++- 2 files changed, 13 insertions(+), 5 deletions(-) New commits: commit 66bafdd56f901fac5673f958e394a88f8ccddc2a Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 15:38:05 2014 +0100 coverity#738634 Uninitialized scalar field Change-Id: Ie83aa769b1737692a0e518b9c21371c92ec6382c diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 57a37da..dc19f67 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -60,6 +60,9 @@ XPMWriter::XPMWriter(SvStream rOStm) , mbStatus(sal_True) , mbTrans(sal_False) , mpAcc(NULL) +, mnWidth(0) +, mnHeight(0) +, mnColors(0) { } commit ea957cc01dbf951849a7002a00fc4e156d527153 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 15:30:20 2014 +0100 coverity#738635 Uninitialized scalar field Change-Id: I033b3e2420edcc8a7529cd60c2ef372f2abfed23 diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index f091ff9..12e091e 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -53,11 +53,16 @@ public: //=== Methods of PBMReader == PBMReader::PBMReader(SvStream rPBM) -: mrPBM( rPBM ) -, mbStatus( sal_True ) -, mbRemark( sal_False ) -, mbRaw( sal_True ) -, mpAcc( NULL ) +: mrPBM(rPBM) +, mbStatus(true) +, mbRemark(false) +, mbRaw(true) +, mnMode(0) +, mpAcc(NULL) +, mnWidth(0) +, mnHeight(0) +, mnCol(0) +, mnMaxVal(0) { } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/sheet/xsheetannotation.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8755eb0274dc71acfc4d589e1fe5cefd34b77cec Author: Michael Stahl mst...@redhat.com Date: Fri Apr 11 16:46:04 2014 +0200 adapt XSheetAnnotation::testGetDate() to locale change ... in c0a4de1ede27c5911fea0829deabee0b599d5d40. Change-Id: Ic93b6febe719a465d768338faa3e222e8fca2e97 diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx index e59f94a..3a24c31 100644 --- a/test/source/sheet/xsheetannotation.cxx +++ b/test/source/sheet/xsheetannotation.cxx @@ -47,7 +47,7 @@ void XSheetAnnotation::testGetDate() uno::Reference sheet::XSheetAnnotation aSheetAnnotation (init(), UNO_QUERY_THROW); OUString aDate = aSheetAnnotation-getDate(); -CPPUNIT_ASSERT_MESSAGE(Wrong date, aDate.equals(01/17/2013)); +CPPUNIT_ASSERT_MESSAGE(Wrong date, aDate.equals(01/17/13)); } void XSheetAnnotation::testGetIsVisible() { ___ 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/TTableHelper.cxx |8 ++-- connectivity/source/drivers/evoab2/NConnection.cxx | 25 connectivity/source/drivers/firebird/Services.cxx | 23 --- connectivity/source/drivers/hsqldb/HConnection.cxx | 27 - connectivity/source/drivers/mysql/Yservices.cxx| 41 - connectivity/source/drivers/odbc/ORealDriver.cxx |1 connectivity/source/inc/odbc/OFunctions.hxx|2 - 7 files changed, 6 insertions(+), 121 deletions(-) New commits: commit d4b8fe32f5763cd3c768aa939178c099b0bf7a19 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 17:16:52 2014 +0200 Clean up function declarations and some unused functions Change-Id: I4c63cd304908ce0e8ae3f9938d7323225dd314a5 diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 14454ab..be7e9a1 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include sal/config.h + +#include boost/noncopyable.hpp #include connectivity/TTableHelper.hxx #include com/sun/star/sdbc/XRow.hpp #include com/sun/star/sdbc/XResultSet.hpp @@ -50,13 +53,12 @@ namespace { /// helper class for column property change events which holds the OComponentDefinition weak typedef ::cppu::WeakImplHelper1 XContainerListener OTableContainerListener_BASE; -class OTableContainerListener : public OTableContainerListener_BASE +class OTableContainerListener: +public OTableContainerListener_BASE, private boost::noncopyable { OTableHelper* m_pComponent; ::std::map OUString,bool m_aRefNames; -OTableContainerListener(const OTableContainerListener); -void operator =(const OTableContainerListener); protected: virtual ~OTableContainerListener(){} public: diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index fd522c0..67204db 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -40,31 +40,6 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::lang; -OUString implGetExceptionMsg( Exception e, const OUString aExceptionType_ ) -{ - OUString aExceptionType = aExceptionType_; - if( aExceptionType.isEmpty() ) - aExceptionType = Unknown; - - OUString aTypeLine( \nType: ); - aTypeLine += aExceptionType; - - OUString aMessageLine( \nMessage: ); - aMessageLine += e.Message; - - OUString aMsg(aTypeLine); - aMsg += aMessageLine; - return aMsg; -} - - // Exception type unknown -OUString implGetExceptionMsg( Exception e ) -{ - OUString aMsg = implGetExceptionMsg( e, OUString() ); - return aMsg; -} - - OEvoabConnection::OEvoabConnection( OEvoabDriver _rDriver ) :OSubComponentOEvoabConnection, OConnection_BASE( (::cppu::OWeakObject*)(_rDriver), this ) ,m_rDriver(_rDriver) diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx index 883ff7b..25fb67e 100644 --- a/connectivity/source/drivers/firebird/Services.cxx +++ b/connectivity/source/drivers/firebird/Services.cxx @@ -40,29 +40,6 @@ typedef Reference XSingleServiceFactory (SAL_CALL *createFactoryFunc) rtl_ModuleCount* _pTemp ); - - -// The required C-Api must be provided! -// It contains of 3 special functions that have to be exported. - - - -void REGISTER_PROVIDER( -const OUString aServiceImplName, -const Sequence OUString Services, -const Reference ::com::sun::star::registry::XRegistryKey xKey) -{ -OUString aMainKeyName = / + aServiceImplName + /UNO/SERVICES; - -Reference ::com::sun::star::registry::XRegistryKey xNewKey( xKey-createKey(aMainKeyName) ); -OSL_ENSURE(xNewKey.is(), FIREBIRD::component_writeInfo : could not create a registry key !); - -for (sal_Int32 i=0; iServices.getLength(); ++i) -xNewKey-createKey(Services[i]); -} - - - struct ProviderRequest { Reference XSingleServiceFactory xRet; diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index aa2bc4a..70fc252 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -83,33 +83,6 @@ namespace GraphicColorMode = ::com::sun::star::graphic::GraphicColorMode; namespace connectivity { namespace hsqldb { - -// = FlushListeners - -typedef ::comphelper::OListenerContainerBase XFlushListener, EventObject FlushListeners_Base; -class FlushListeners : public FlushListeners_Base -{ -public: -FlushListeners( ::osl::Mutex _rMutex )
Re: Patch for the bug 69195: Crash when delete a style in use
I thought it was visible by everyone ^^ . It is now effectively published : https://gerrit.libreoffice.org/#/c/8917/ -- View this message in context: http://nabble.documentfoundation.org/Patch-for-the-bug-69195-Crash-when-delete-a-style-in-use-tp4104801p4104959.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
Appel d’offre pour améliorer LibO et AOO
Bonjour à tous, Appel d’offre pour améliorer LibO et AOO, lancé par un groupement d’administrations : https://forum.openoffice.org/fr/forum/viewtopic.php?p=234588#p234588 Olivier -- View this message in context: http://nabble.documentfoundation.org/Appel-d-offre-pour-ameliorer-LibO-et-AOO-tp4104961.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: Appel d’offre pour améliorer LibO et AOO
Oops, sorry. Wrong mailing-list. -- View this message in context: http://nabble.documentfoundation.org/Appel-d-offre-pour-ameliorer-LibO-et-AOO-tp4104961p4104963.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: cui/source
cui/source/dialogs/SpellDialog.cxx |6 --- cui/source/dialogs/colorpicker.cxx |1 cui/source/dialogs/insdlg.cxx |2 - cui/source/dialogs/plfilter.cxx|2 + cui/source/dialogs/plfilter.hxx| 34 ++ cui/source/inc/colorpicker.hxx | 51 + cui/source/options/connpooloptions.cxx | 15 - cui/source/options/optcolor.cxx|3 - cui/source/options/optlingu.cxx| 28 -- cui/source/uno/services.cxx|8 + 10 files changed, 91 insertions(+), 59 deletions(-) New commits: commit 6bb60dab6f901797dd062bd9e61a17ee0ca5ae92 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 18:00:18 2014 +0200 Clean up function declarations and some unused functions Change-Id: I45ea22c86ea66c49fd86af2b5d0df060138f7e9a diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 94e5f20..659cb10 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -138,8 +138,6 @@ public: m_nOldErrorStart = nOldStart; m_nOldErrorEnd = nOldEnd; } -longGetNewErrorStart() { return m_nNewErrorStart;} -longGetNewErrorEnd() { return m_nNewErrorEnd;} longGetOldErrorStart() { return m_nOldErrorStart;} longGetOldErrorEnd() { return m_nOldErrorEnd;} @@ -153,10 +151,6 @@ public: voidSetOffset(long nSet) {m_nOffset = nSet;} longGetOffset() const {return m_nOffset;} - -voidSetErrorType( const OUString rId ) { m_sRuleId = rId; } -const OUString GetErrorType() const { return m_sRuleId; } - }; }//namespace svx using namespace ::svx; diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index a86c92b..a44c4c0 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -43,6 +43,7 @@ #include basegfx/color/bcolortools.hxx #include dialmgr.hxx #include colorpicker.hrc +#include colorpicker.hxx #include cmath #include limits diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index b188210..ac0645e 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -33,6 +33,7 @@ #include comphelper/processfactory.hxx #include insdlg.hxx +#include plfilter.hxx #include dialmgr.hxx #include svtools/sores.hxx @@ -353,7 +354,6 @@ uno::Reference io::XInputStream SvInsertOleDlg::GetIconIfIconified( OUString* IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl) { Sequence OUString aFilterNames, aFilterTypes; -void fillNetscapePluginFilters( Sequence OUString rNames, Sequence OUString rTypes ); fillNetscapePluginFilters( aFilterNames, aFilterTypes ); Reference XComponentContext xContext( ::comphelper::getProcessComponentContext() ); diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx index 4c0b7c3..386ff69 100644 --- a/cui/source/dialogs/plfilter.cxx +++ b/cui/source/dialogs/plfilter.cxx @@ -29,6 +29,8 @@ #include com/sun/star/plugin/PluginManager.hpp #include com/sun/star/plugin/XPluginManager.hpp +#include plfilter.hxx + using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/cui/source/dialogs/plfilter.hxx b/cui/source/dialogs/plfilter.hxx new file mode 100644 index 000..f982fe0 --- /dev/null +++ b/cui/source/dialogs/plfilter.hxx @@ -0,0 +1,34 @@ +/* -*- 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 INCLUDED_CUI_SOURCE_DIALOGS_PLFILTER_HXX +#define INCLUDED_CUI_SOURCE_DIALOGS_PLFILTER_HXX + +#include sal/config.h + +#include com/sun/star/uno/Sequence.hxx +#include rtl/ustring.hxx + +void fillNetscapePluginFilters( +css::uno::SequenceOUString rNames, +css::uno::SequenceOUString rTypes); + +#endif + +/* vim:set shiftwidth=4
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx | 17 -- 1 file changed, 17 deletions(-) New commits: commit 1808330a85329a739dbd9196aeb3e10a06521f64 Author: Tor Lillqvist t...@collabora.com Date: Fri Apr 11 19:02:37 2014 +0300 Revert Fix for some SmartArt rendering artefacts on iOS Nah, the fix is largely accidental. Must. Try. Harder. This reverts commit c03986e084e8806f66f7490f2aeeb33db5748e4b. diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx index d1045cc..e94f581 100644 --- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx +++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx @@ -332,26 +332,9 @@ namespace drawinglayer } else if(0.0 != fTrans) { -#ifndef IOS -// For some reason using this normal code path on -// iOS with tiled rendering causes horrible artefacts: -// The mask ends up being drawn too, ending up looking -// as translucent milky rectangles covering the -// SmartArt (which is what this typically (?) ends up -// being used for) ... Why this doesn't cause any -// artefacts on OS X, which uses largely the very same -// code in vcl/quartz, I don't know. sal_uInt8 nMaskValue((sal_uInt8)basegfx::fround(fTrans * 255.0)); const AlphaMask aAlphaMask(aSizePixel, nMaskValue); mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aAlphaMask)); -#else -// Not sure at all why this works, but it does. The -// result is not beautiful (jaggies), but better than -// blocking out rectangles of the image. -Bitmap aMask(aContent); -aMask.Convert(BMP_CONVERSION_8BIT_GREYS); -mrOutDev.DrawBitmapEx(maDestPixel.TopLeft(), BitmapEx(aContent, aMask)); -#endif } else { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: test/source
test/source/bootstrapfixture.cxx |4 test/source/sheet/xsheetannotation.cxx |2 +- 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit e6e4474aae78cb5ab76a4d80642e32c02afd5133 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 17:03:58 2014 +0100 set what system locale should resolve to for languagetag normally this happens in desktop/source/app/langselect.cxx for the fat app case Change-Id: I4772172aa6f071ac03d74e2abe7a9e197f0dc964 diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index dc7c7b0..c76995a 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -19,6 +19,7 @@ #include com/sun/star/ucb/XContentProvider.hpp #include com/sun/star/ucb/XUniversalContentBroker.hpp +#include i18nlangtag/mslangid.hxx #include vcl/svapp.hxx #include tools/resmgr.hxx #include vcl/graphicfilter.hxx @@ -64,6 +65,9 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB, aLocalOptions.SetLocaleConfigString( aLangISO ); aLocalOptions.SetUILocaleConfigString( aLangISO ); +MsLangId::setConfiguredSystemUILanguage(LANGUAGE_ENGLISH_US); +LanguageTag::setConfiguredSystemLanguage(LANGUAGE_ENGLISH_US); + InitVCL(); if (Application::IsHeadlessModeRequested()) Application::EnableHeadlessMode(true); diff --git a/test/source/sheet/xsheetannotation.cxx b/test/source/sheet/xsheetannotation.cxx index 3a24c31..e59f94a 100644 --- a/test/source/sheet/xsheetannotation.cxx +++ b/test/source/sheet/xsheetannotation.cxx @@ -47,7 +47,7 @@ void XSheetAnnotation::testGetDate() uno::Reference sheet::XSheetAnnotation aSheetAnnotation (init(), UNO_QUERY_THROW); OUString aDate = aSheetAnnotation-getDate(); -CPPUNIT_ASSERT_MESSAGE(Wrong date, aDate.equals(01/17/13)); +CPPUNIT_ASSERT_MESSAGE(Wrong date, aDate.equals(01/17/2013)); } void XSheetAnnotation::testGetIsVisible() { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source
filter/source/msfilter/escherex.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit c9cdd9751d45b5b8b0288e9dc477e6d272ba0a0d Author: Armin Le Grand a...@apache.org Date: Fri Apr 11 15:29:35 2014 + i124661 secure possible out of bound access to stl vector content diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 28932a0..3df2193 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2604,7 +2604,18 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, if ( aIter-nOperation nMask ) { aIter-nOperation ^= nMask; -aIter-nPara[ i ] = rEquationOrder[ aIter-nPara[ i ] 0x3ff ] | 0x400; +const sal_Int32 nIndex(aIter-nPara[ i ] 0x3ff); + +// #124661# check index access, there are cases where this is out of bound leading +// to errors up to crashes when executed +if(nIndex rEquationOrder.size()) +{ +aIter-nPara[ i ] = rEquationOrder[ nIndex ] | 0x400; +} +else +{ +OSL_ENSURE(false, Attempted out of bound access to rEquationOrder of CustomShape (!)); +} } nMask = 1; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/eras/eras.cxx | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit cbe71fb3d4c4cf688e5e5d89d3fcddf64a2e98e5 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 16:04:46 2014 +0100 coverity#738632 Uninitialized scalar field Change-Id: Ic5ca12b6e18890fbc289063fc7518b44abf90e2c diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index a7827ee..ef73de3 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -56,17 +56,19 @@ public: }; //=== Methoden von RASWriter == - RASWriter::RASWriter(SvStream rStream) : m_rOStm(rStream) , mbStatus(sal_True) , mpAcc(NULL) -, mnRepCount( 0x ) +, mnWidth(0) +, mnHeight(0) +, mnColors(0) +, mnDepth(0) +, mnRepCount(0x) +, mnRepVal(0) { } - - RASWriter::~RASWriter() { } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/eppm/eppm.cxx | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 5d60ae3fc16836a6119fa01ec32ac35b188eca17 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 17:09:27 2014 +0100 coverity#738631 Uninitialized scalar field Change-Id: I931e819da93ef952d9ad3a755471302472b4d580 diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index 015d5b1..a4343a4 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -54,16 +54,17 @@ public: }; //=== Methods of PPMWriter == - PPMWriter::PPMWriter(SvStream rStrm) : m_rOStm(rStrm) -, mbStatus ( sal_True ) -, mpAcc ( NULL ) +, mpOStmOldModus(0) +, mbStatus(true) +, mnMode(0) +, mpAcc(NULL) +, mnWidth(0) +, mnHeight(0) { } - - PPMWriter::~PPMWriter() { } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/escherex.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit af2a70abc089e3280f458c9f0942c6b7971cee81 Author: Armin Le Grand a...@apache.org Date: Fri Apr 11 15:29:35 2014 + Resolves: #i124661# secure possible out of bound access to vector (cherry picked from commit c9cdd9751d45b5b8b0288e9dc477e6d272ba0a0d) Change-Id: I1c0637029fd7b4ab493956538c6e9fdf33307cbe diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 92c4b59..7e495db 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2628,7 +2628,18 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, if ( aIter-nOperation nMask ) { aIter-nOperation ^= nMask; -aIter-nPara[ i ] = rEquationOrder[ aIter-nPara[ i ] 0x3ff ] | 0x400; +const size_t nIndex(aIter-nPara[ i ] 0x3ff); + +// #i124661# check index access, there are cases where this is out of bound leading +// to errors up to crashes when executed +if(nIndex rEquationOrder.size()) +{ +aIter-nPara[ i ] = rEquationOrder[ nIndex ] | 0x400; +} +else +{ +OSL_ENSURE(false, Attempted out of bound access to rEquationOrder of CustomShape (!)); +} } nMask = 1; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c9/cdd9751d45b5b8b0288e9dc477e6d272ba0a0d
c9/cdd9751d45b5b8b0288e9dc477e6d272ba0a0d |1 + 1 file changed, 1 insertion(+) New commits: commit 44480cc04a9d893a28624ef165baa937a72d083d Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 17:27:07 2014 +0100 Notes added by 'git notes add' diff --git a/c9/cdd9751d45b5b8b0288e9dc477e6d272ba0a0d b/c9/cdd9751d45b5b8b0288e9dc477e6d272ba0a0d new file mode 100644 index 000..66935ce --- /dev/null +++ b/c9/cdd9751d45b5b8b0288e9dc477e6d272ba0a0d @@ -0,0 +1 @@ +merged as: af2a70abc089e3280f458c9f0942c6b7971cee81 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: Cppcheck reports 'else if' condition matches previous condition (svx)
On 11/04/2014 13:20, Caolán McNamara wrote: On Tue, 2014-04-08 at 20:58 +0200, Julien Nabet wrote: ... I submitted a gerrit review 4.2: https://gerrit.libreoffice.org/8897 I'm rather reluctant to change this in 4.2 without a specific known problem that it fixes. Ok then, I abandonned it. Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewfun2.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0ffe4358c755504bc2754ef88edadde33b5f395a Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 12:31:29 2014 -0400 fdo#75970: Let's do it in a straightforward fashion. No idea what the intent of this weird static heap instantiation, but apparently it's not helping us. Change-Id: If6cccf649958b6cf01ede992c286af68eaeb31f6 diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index a6d5420..6bfb61c 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1583,8 +1583,8 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, if (nCommand == SVX_SEARCHCMD_FIND_ALL || nCommand == SVX_SEARCHCMD_REPLACE_ALL) { -static SearchResults *aSearchResults = new SearchResults(pDoc); -aSearchResults-Show(aMatchedRanges); +SearchResults aSearchResults(pDoc); +aSearchResults.Show(aMatchedRanges); rMark.ResetMark(); for (size_t i = 0, n = aMatchedRanges.size(); i n; ++i) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/svdfppt.cxx | 21 - filter/source/msfilter/util.cxx|5 +++-- filter/source/pdf/pdfexport.cxx| 14 +- filter/source/pdf/pdffilter.cxx|5 ++--- filter/source/svg/svgexport.cxx|7 +++ filter/source/svg/svgwriter.cxx|3 +-- 6 files changed, 22 insertions(+), 33 deletions(-) New commits: commit 4e939b959911b94cc3feea57fa6f3f4a63c8ddac Author: Takeshi Abe t...@fixedpoint.jp Date: Sat Apr 12 01:28:10 2014 +0900 Avoid possible memory leaks in case of exceptions Change-Id: I4f1e00dd275976cdba8490f35ccbb491914829b7 diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index c176c6d..0a875ff 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -120,6 +120,7 @@ #include rtl/strbuf.hxx #include tools/time.hxx #include boost/scoped_array.hpp +#include boost/scoped_ptr.hpp // PPT ColorScheme Slots #define PPT_COLSCHEME (0x0800) @@ -1802,14 +1803,13 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, if ( aTmpFile.IsValid() ) { -SvStream* pDest = ::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), STREAM_TRUNC | STREAM_WRITE ); +boost::scoped_ptrSvStream pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), STREAM_TRUNC | STREAM_WRITE )); if ( pDest ) bSuccess = SdrPowerPointOLEDecompress( *pDest, rStCtrl, nLen ); -delete pDest; } if ( bSuccess ) { -SvStream* pDest = ::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), STREAM_READ ); +boost::scoped_ptrSvStream pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), STREAM_READ )); Storage* pObjStor = pDest ? new Storage( *pDest, true ) : NULL; if ( pObjStor ) { @@ -1915,7 +1915,6 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, } } } -delete pDest; } } } @@ -2056,11 +2055,10 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt pHd = aDocRecManager.GetRecordHeader( PPT_PST_ExObjList, SEEK_FROM_BEGINNING ); if ( pHd ) { -DffRecordManager* pExObjListManager = NULL; DffRecordHeader*pExEmbed = NULL; pHd-SeekToBegOfRecord( rStCtrl ); -pExObjListManager = new DffRecordManager( rStCtrl ); +boost::scoped_ptrDffRecordManager pExObjListManager(new DffRecordManager( rStCtrl )); sal_uInt16 i, nRecType(PPT_PST_ExEmbed); for ( i = 0; i 2; i++ ) @@ -2097,7 +2095,6 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt } } } -delete pExObjListManager; } rStCtrl.Seek( nOldPos ); } @@ -2254,12 +2251,11 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* for ( pPortion = pPara-First(); pPortion; pPortion = pPara-Next() ) { SfxItemSet aPortionAttribs( rOutliner.GetEmptyItemSet() ); -SvxFieldItem* pFieldItem = pPortion-GetTextField(); +boost::scoped_ptrSvxFieldItem pFieldItem(pPortion-GetTextField()); if ( pFieldItem ) { rOutliner.QuickInsertField( *pFieldItem, ESelection( nParaIndex, aSelection.nEndPos, nParaIndex, aSelection.nEndPos + 1 ) ); aSelection.nEndPos++; -delete pFieldItem; } else { @@ -2931,7 +2927,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage rPage { SdrObject* pRet = NULL; sal_Bool bCreateObj = bForce; -SfxItemSet* pSet = NULL; +boost::scoped_ptrSfxItemSet pSet; sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later DffRecordHeader aPageHd; if ( SeekToAktPage( aPageHd ) ) @@ -2956,7 +2952,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage rPage ReadDffPropSet( rStCtrl, (DffPropertyReader)*this ); mnFix16Angle = Fix16ToAngle( GetPropertyValue( DFF_Prop_Rotation, 0 ) ); sal_uInt32 nColor = GetPropertyValue( DFF_Prop_fillColor, 0xff ); -pSet = new SfxItemSet( pSdrModel-GetItemPool() ); +pSet.reset(new SfxItemSet( pSdrModel-GetItemPool() )); DffObjData aObjData( aEscherObjectHd, Rectangle( 0, 0, 28000, 21000 ), 0 );
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/viewmediashape.cxx | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) New commits: commit 539017f1d96b0ca2c062ed7ffd2f48166f831493 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Apr 11 16:33:55 2014 +0200 fdo#72400: slideshow: display a snapshot of movie until its not started Change-Id: Ibd81f2aada458dd7437053b59882d3200f78747e diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 2487396..7f3c2e7 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -31,6 +31,7 @@ #include vcl/canvastools.hxx #include vcl/syschild.hxx #include vcl/window.hxx +#include vcl/graph.hxx #include basegfx/tools/canvastools.hxx #include basegfx/matrix/b2dhommatrixtools.hxx @@ -186,14 +187,16 @@ namespace slideshow if( !mpMediaWindow.get() !mxPlayerWindow.is() ) { -// draw placeholder for no-video (no window) case -// no window and player == audio icon -// no window and no player == broken icon -BitmapEx aAudioLogo(mxPlayer.is() ? -avmedia::MediaWindow::getAudioLogo() : avmedia::MediaWindow::getEmptyLogo() ); +OUString sURL; +uno::Reference beans::XPropertySet xPropSet( mxShape, uno::UNO_QUERY ); +if (xPropSet.is()) +xPropSet-getPropertyValue(PrivateTempFileURL) = sURL; + +const Graphic aGraphic(avmedia::MediaWindow::grabFrame(sURL,, true)); +const BitmapEx aBmp = aGraphic.GetBitmapEx(); uno::Reference rendering::XBitmap xBitmap(vcl::unotools::xBitmapFromBitmapEx( -pCanvas-getUNOCanvas()-getDevice(), aAudioLogo)); +pCanvas-getUNOCanvas()-getDevice(), aBmp)); rendering::ViewState aViewState; aViewState.AffineTransform = pCanvas-getViewState().AffineTransform; @@ -201,7 +204,7 @@ namespace slideshow rendering::RenderState aRenderState; ::canvas::tools::initRenderState( aRenderState ); -const ::Size aBmpSize( aAudioLogo.GetSizePixel() ); +const ::Size aBmpSize( aBmp.GetSizePixel() ); const ::basegfx::B2DVector aScale( rBounds.getWidth() / aBmpSize.Width(), rBounds.getHeight() / aBmpSize.Height() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
YouCompleteMe support in VIM
Has anyone been able to set up semantic analysis for YouCompleteMe in Vim? So far, YCM gives me auto-completion for whatever local file I'm working on, but lacking a .ycm_extra_conf.py file, it cannot offer suggestions for included files. My guess is that it would be difficult to configure YCM for a project as large as LibreOffice, but I thought I'd ask anyway. Refs: https://wiki.documentfoundation.org/Development/Vim#YouCompleteMe https://github.com/Valloric/YouCompleteMe/blob/master/README.md#c-family-semantic-completion-engine-usage Thanks, Chris -- View this message in context: http://nabble.documentfoundation.org/YouCompleteMe-support-in-VIM-tp4104984.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: filter/source
filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c9c4148f00f60a9bb986e9431e76ab7cf8b4c547 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 15:18:53 2014 -0400 Add this back. Change-Id: Ia342671c460d07fae4764712b2c814616ff427ba diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu index 2c869c5..2f60ca6 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu @@ -1,4 +1,4 @@ -!-- +!-- * This file is part of the LibreOffice project. * * This Source Code Form is subject to the terms of the Mozilla Public ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/qa writerfilter/source
writerfilter/inc/WriterFilterDllApi.hxx| 33 - writerfilter/inc/dmapper/DomainMapper.hxx |1 writerfilter/inc/resourcemodel/Fraction.hxx|1 writerfilter/inc/resourcemodel/LoggedResources.hxx |1 writerfilter/inc/resourcemodel/QNameToString.hxx |1 writerfilter/inc/resourcemodel/TagLogger.hxx |1 writerfilter/inc/resourcemodel/WW8ResourceModel.hxx|1 writerfilter/inc/resourcemodel/XPathLogger.hxx |1 writerfilter/inc/resourcemodel/util.hxx|1 writerfilter/qa/cppunittests/misc/misc.cxx |1 writerfilter/source/dmapper/BorderHandler.hxx |1 writerfilter/source/dmapper/CellColorHandler.hxx |1 writerfilter/source/dmapper/CellMarginHandler.hxx |1 writerfilter/source/dmapper/FontTable.hxx |1 writerfilter/source/dmapper/GraphicHelpers.hxx |1 writerfilter/source/dmapper/MeasureHandler.hxx |1 writerfilter/source/dmapper/ModelEventListener.hxx |1 writerfilter/source/dmapper/NumberingManager.hxx |1 writerfilter/source/dmapper/OLEHandler.hxx |1 writerfilter/source/dmapper/PageBordersHandler.hxx |1 writerfilter/source/dmapper/SdtHelper.hxx |1 writerfilter/source/dmapper/SectionColumnHandler.hxx |1 writerfilter/source/dmapper/SettingsTable.hxx |1 writerfilter/source/dmapper/StyleSheetTable.hxx|1 writerfilter/source/dmapper/TDefTableHandler.hxx |1 writerfilter/source/dmapper/TablePositionHandler.hxx |1 writerfilter/source/dmapper/TablePropertiesHandler.hxx |1 writerfilter/source/dmapper/TblStylePrHandler.hxx |1 writerfilter/source/dmapper/TextEffectsHandler.hxx |1 writerfilter/source/dmapper/ThemeTable.hxx |1 writerfilter/source/dmapper/TrackChangesHandler.hxx|1 writerfilter/source/filter/RtfFilter.hxx |3 - writerfilter/source/filter/WriterFilter.hxx|5 +- writerfilter/source/filter/WriterFilterDetection.hxx |3 - 34 files changed, 4 insertions(+), 70 deletions(-) New commits: commit 8f2c47739f05c422c9c9c242f1adad0865c232de Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 11 18:30:52 2014 +0200 writerfilter: remove no longer needed WRITERFILTER_WRITERFILTER_DLLPUBLIC Change-Id: Idedee38be19bc770518b85af62c9fc2b5b64e822 diff --git a/writerfilter/inc/WriterFilterDllApi.hxx b/writerfilter/inc/WriterFilterDllApi.hxx deleted file mode 100644 index a02d47a..000 --- a/writerfilter/inc/WriterFilterDllApi.hxx +++ /dev/null @@ -1,33 +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 INCLUDED_WRITERFILTERDLLAPI_H -#define INCLUDED_WRITERFILTERDLLAPI_H - -#include sal/types.h - -#if defined(WRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION) -#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define WRITERFILTER_WRITERFILTER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif - -#endif /* INCLUDED_WRITERFILTERDLLAPI_H */ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx b/writerfilter/inc/dmapper/DomainMapper.hxx index c820d16..edbec28 100644 --- a/writerfilter/inc/dmapper/DomainMapper.hxx +++ b/writerfilter/inc/dmapper/DomainMapper.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DOMAINMAPPER_HXX #define INCLUDED_DOMAINMAPPER_HXX -#include WriterFilterDllApi.hxx #include resourcemodel/LoggedResources.hxx #include com/sun/star/lang/XComponent.hpp #include com/sun/star/text/FontEmphasis.hpp diff --git a/writerfilter/inc/resourcemodel/Fraction.hxx b/writerfilter/inc/resourcemodel/Fraction.hxx index 0693a6a..855b7bb 100644 --- a/writerfilter/inc/resourcemodel/Fraction.hxx +++ b/writerfilter/inc/resourcemodel/Fraction.hxx @@ -21,7 +21,6 @@ #include sal/types.h -#include WriterFilterDllApi.hxx namespace writerfilter { namespace resourcemodel { diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx
[Libreoffice-commits] core.git: 2 commits - filter/source sw/source
filter/source/graphicfilter/epgm/epgm.cxx |6 +++--- sw/source/core/doc/doc.cxx| 21 ++--- 2 files changed, 13 insertions(+), 14 deletions(-) New commits: commit 36c84fa3fbd03e5f651ba9d81e321566c8fcdbd0 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 20:21:53 2014 +0100 restore original lock status of SwViewShell in correct order in e12184393f0591b5c5d9218062cc0a4bced6d4e6 Resolves: rhbz#1081176: don't jump to cursor pos for some reason I collect the old state of the various SwViewShells and then restore them in the opposite order. Change-Id: Ibb7bcfb07cf5038dd2e9acbac26b3246ff483a92 diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index cd046df..ff9c320 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1657,7 +1657,7 @@ namespace { class LockAllViews { -std::stackbool m_aViewWasLocked; +std::vectorSwViewShell* m_aViewWasUnLocked; SwViewShell* m_pViewShell; public: LockAllViews(SwViewShell *pViewShell) @@ -1668,22 +1668,21 @@ namespace SwViewShell *pSh = m_pViewShell; do { -m_aViewWasLocked.push(pSh-IsViewLocked()); -pSh-LockView(true); +if (!pSh-IsViewLocked()) +{ +m_aViewWasUnLocked.push_back(pSh); +pSh-LockView(true); +} pSh = (SwViewShell*)pSh-GetNext(); } while (pSh != m_pViewShell); } ~LockAllViews() { -if (!m_pViewShell) -return; -SwViewShell *pSh = m_pViewShell; -do +for (std::vectorSwViewShell*::iterator aI = m_aViewWasUnLocked.begin(); aI != m_aViewWasUnLocked.end(); ++aI) { -pSh-LockView(m_aViewWasLocked.top()); -m_aViewWasLocked.pop(); -pSh = (SwViewShell*)pSh-GetNext(); -} while (pSh != m_pViewShell); +SwViewShell *pSh = *aI; +pSh-LockView(false); +} } }; } commit ffa82c4d148bb01a418d271b3265a35d26df1580 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 17:11:53 2014 +0100 coverity#738630 Uninitialized scalar field Change-Id: Ie6b6347a8cdddfcf6b1aada2aa5c34b94cc73490 diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 47c20d9..65c4145 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -54,16 +54,16 @@ public: }; //=== Methoden von PGMWriter == - PGMWriter::PGMWriter(SvStream rStream) : m_rOStm(rStream) , mbStatus(sal_True) +, mnMode(0) , mpAcc(NULL) +, mnWidth(0) +, mnHeight(0) { } - - PGMWriter::~PGMWriter() { } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] mso-dumper.git: 4 commits - msodumper/emfrecord.py msodumper/wmfrecord.py
msodumper/emfrecord.py | 236 - msodumper/wmfrecord.py | 17 +++ 2 files changed, 251 insertions(+), 2 deletions(-) New commits: commit 66573c524e0608be988417e1c4fe3651e14bc4db Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 11 21:57:58 2014 +0200 dump EmrSetviewportorgex diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py index 945b070..01a9353 100644 --- a/msodumper/emfrecord.py +++ b/msodumper/emfrecord.py @@ -22,6 +22,7 @@ RegionMode = { 0x05: RGN_COPY } + class EMFStream(DOCDirStream): def __init__(self, bytes): DOCDirStream.__init__(self, bytes) @@ -80,6 +81,19 @@ class EmrRestoredc(EMFRecord): assert self.pos - posOrig == self.Size +class EmrSetviewportorgex(EMFRecord): +Defines the viewport origin. +def __init__(self, parent): +EMFRecord.__init__(self, parent) + +def dump(self): +posOrig = self.pos +self.printAndSet(Type, self.readuInt32()) +self.printAndSet(Size, self.readuInt32(), hexdump=False) +wmfrecord.PointL(self, Origin).dump() +assert self.pos - posOrig == self.Size + + class EmrExtselectcliprgn(EMFRecord): Combines the specified region with the current clip region using the specified mode. def __init__(self, parent): @@ -111,6 +125,7 @@ class RegionData(EMFRecord): print '/%s' % self.name self.parent.pos = self.pos + class RegionDataHeader(EMFRecord): The RegionDataHeader object describes the properties of a RegionData object. def __init__(self, parent): @@ -124,6 +139,7 @@ class RegionDataHeader(EMFRecord): wmfrecord.RectL(self, Bounds).dump() self.parent.pos = self.pos + class EmrHeader(EMFRecord): The EMR_HEADER record types define the starting points of EMF metafiles. def __init__(self, parent): @@ -211,7 +227,7 @@ RecordType = { 0x0009: ['EMR_SETWINDOWEXTEX'], 0x000A: ['EMR_SETWINDOWORGEX'], 0x000B: ['EMR_SETVIEWPORTEXTEX'], -0x000C: ['EMR_SETVIEWPORTORGEX'], +0x000C: ['EMR_SETVIEWPORTORGEX', EmrSetviewportorgex], 0x000D: ['EMR_SETBRUSHORGEX'], 0x000E: ['EMR_EOF'], 0x000F: ['EMR_SETPIXELV'], diff --git a/msodumper/wmfrecord.py b/msodumper/wmfrecord.py index cd64e7f..cd0b353 100644 --- a/msodumper/wmfrecord.py +++ b/msodumper/wmfrecord.py @@ -50,4 +50,21 @@ class SizeL(WMFRecord): print '/%s' % self.name self.parent.pos = self.pos + +class PointL(WMFRecord): +The PointL Object defines the coordinates of a point. +def __init__(self, parent, name=None): +WMFRecord.__init__(self, parent) +if name: +self.name = name +else: +self.name = pointL + +def dump(self): +print '%s type=PointL' % self.name +self.printAndSet(x, self.readInt32(), hexdump=False) +self.printAndSet(y, self.readInt32(), hexdump=False) +print '/%s' % self.name +self.parent.pos = self.pos + # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab: commit 5f363ead06d0e75abba9e790dfd1799156ab85c1 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Apr 11 21:50:21 2014 +0200 dump EmrExtselectcliprgn diff --git a/msodumper/emfrecord.py b/msodumper/emfrecord.py index 78f4fbc..945b070 100644 --- a/msodumper/emfrecord.py +++ b/msodumper/emfrecord.py @@ -14,6 +14,13 @@ FormatSignature = { 0x46535045: EPS_SIGNATURE } +RegionMode = { +0x01: RGN_AND, +0x02: RGN_OR, +0x03: RGN_XOR, +0x04: RGN_DIFF, +0x05: RGN_COPY +} class EMFStream(DOCDirStream): def __init__(self, bytes): @@ -73,6 +80,50 @@ class EmrRestoredc(EMFRecord): assert self.pos - posOrig == self.Size +class EmrExtselectcliprgn(EMFRecord): +Combines the specified region with the current clip region using the specified mode. +def __init__(self, parent): +EMFRecord.__init__(self, parent) + +def dump(self): +posOrig = self.pos +self.printAndSet(Type, self.readuInt32()) +self.printAndSet(Size, self.readuInt32(), hexdump=False) +self.printAndSet(RgnDataSize, self.readuInt32()) +self.printAndSet(RegionMode, self.readuInt32(), dict=RegionMode) +RegionData(self, RgnData, self.RgnDataSize).dump() +assert self.pos - posOrig == self.Size + + +class RegionData(EMFRecord): +The RegionData object specifies data that defines a region, which is made of non-overlapping rectangles. +def __init__(self, parent, name, size): +EMFRecord.__init__(self, parent) +self.name = name +self.size = size + +def dump(self): +print '%s' % self.name +header = RegionDataHeader(self) +header.dump() +for i in range(header.CountRects): +wmfrecord.RectL(self, Data).dump() +print '/%s' % self.name +self.parent.pos = self.pos + +class
[Libreoffice-commits] core.git: 3 commits - filter/source
filter/source/graphicfilter/icgm/chart.hxx | 50 + filter/source/graphicfilter/itiff/lzwdecom.cxx | 14 +-- filter/source/msfilter/eschesdo.cxx| 30 --- 3 files changed, 70 insertions(+), 24 deletions(-) New commits: commit dfc39fcdbf2ded137d4c40869a5c4473a45a1a6c Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 20:49:57 2014 +0100 coverity#707837 Uninitialized scalar field Change-Id: Icce1d2cd9abfebcf26e916c4c79341b617e97b2e diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index 6c1d7ef..5e0cb08 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -61,22 +61,26 @@ using namespace ::com::sun::star::style; #define EES_MAP_FRACTION 1440 // 1440 dpi ImplEESdrWriter::ImplEESdrWriter( EscherEx rEx ) -: -mpEscherEx ( rEx ), -maMapModeSrc( MAP_100TH_MM ), -// PowerPoint: 576 dpi, WinWord: 1440 dpi, Excel: 1440 dpi -maMapModeDest( MAP_INCH, Point(), Fraction( 1, EES_MAP_FRACTION ), Fraction( 1, EES_MAP_FRACTION ) ), -mpPicStrm ( NULL ), -mpHostAppData ( NULL ), -mnPagesWritten ( 0 ), -mnShapeMasterTitle ( 0 ), -mnShapeMasterBody ( 0 ), -mbStatusIndicator ( sal_False ), -mbStatus( sal_False ) +: mpEscherEx(rEx) +, maMapModeSrc(MAP_100TH_MM) +// PowerPoint: 576 dpi, WinWord: 1440 dpi, Excel: 1440 dpi +, maMapModeDest( MAP_INCH, Point(), Fraction( 1, EES_MAP_FRACTION ), Fraction( 1, EES_MAP_FRACTION ) ) +, mpPicStrm(NULL) +, mpHostAppData(NULL) +, mnPagesWritten(0) +, mnShapeMasterTitle(0) +, mnShapeMasterBody(0) +, mnIndices(0) +, mnOutlinerCount(0) +, mnPrevTextStyle(0) +, mnStatMaxValue(0) +, mnEffectCount(0) +, mbIsTitlePossible(false) +, mbStatusIndicator(false) +, mbStatus(false) { } - Point ImplEESdrWriter::ImplMapPoint( const Point rPoint ) { return OutputDevice::LogicToLogic( rPoint, maMapModeSrc, maMapModeDest ); commit 2c2b3a16bd34408000a8c623a2de764c698a7291 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 20:45:09 2014 +0100 coverity#707834 Uninitialized scalar field Change-Id: I405b981c9234a662cf1d305ad437482d10cbf432 diff --git a/filter/source/graphicfilter/itiff/lzwdecom.cxx b/filter/source/graphicfilter/itiff/lzwdecom.cxx index 0d7970d..cb8abaa 100644 --- a/filter/source/graphicfilter/itiff/lzwdecom.cxx +++ b/filter/source/graphicfilter/itiff/lzwdecom.cxx @@ -23,7 +23,16 @@ #define MAX_TABLE_SIZE 4096 LZWDecompressor::LZWDecompressor() -: pOutBufData(NULL) +: pIStream(NULL) +, nTableSize(0) +, bEOIFound(false) +, bInvert(false) +, bFirst(true) +, nOldCode(0) +, pOutBufData(NULL) +, nOutBufDataLen(0) +, nInputBitsBuf(0) +, nInputBitsBufSize(0) { sal_uInt16 i; @@ -35,9 +44,6 @@ LZWDecompressor::LZWDecompressor() pTable[i].nDataCount=1; pTable[i].nData=(sal_uInt8)i; } -pIStream=NULL; -bFirst = sal_True; -nOldCode = 0; } commit d30ee7f7cefdefd9eb6b5c7763482d4fbcdb6b7c Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 20:37:10 2014 +0100 coverity#707812 Uninitialized scalar field Change-Id: I04e65d6c0124a2f370ae006bbaa991d5e7753e12 diff --git a/filter/source/graphicfilter/icgm/chart.hxx b/filter/source/graphicfilter/icgm/chart.hxx index ca8c190..e91660e 100644 --- a/filter/source/graphicfilter/icgm/chart.hxx +++ b/filter/source/graphicfilter/icgm/chart.hxx @@ -91,7 +91,7 @@ typedef struct TextEntry TextAttribute* pAttribute; } TextEntry; -typedef struct ZoneOption +struct ZoneOption { charnOverTitle; charnOverBody; @@ -105,18 +105,43 @@ typedef struct ZoneOption charnFFillc_Title; charnFFillc_Body; charnFFillc_Foot; -} ZoneOption; +ZoneOption() +: nOverTitle(0) +, nOverBody(0) +, nOverFoot(0) +, nFStyle_Title(0) +, nFStyle_Body(0) +, nFStyle_Foot(0) +, nFOutc_Title(0) +, nFOutc_Body(0) +, nFOutc_Foot(0) +, nFFillc_Title(0) +, nFFillc_Body(0) +, nFFillc_Foot(0) +{ +} +}; -typedef struct BulletOption +struct BulletOption { charnBType; charnBSize; charnBColor; -sal_Int16 nBStart; +sal_Int16 nBStart; double nTMargin; double nBSpace; charnCPlace; -} BulletOption; +BulletOption() +: nBType(0) +, nBSize(0) +, nBColor(0) +, nBStart(0) +, nTMargin(0) +, nBSpace(0) +, nCPlace(0) +{ +} +}; typedef struct BulDef { @@ -131,7 +156,7 @@
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit eacfa6367074fd139a97ce77d6bcbd2d3872467f Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 21:16:23 2014 +0100 coverity#707839 Uninitialized scalar field Change-Id: Ib9cf1d3da0cf03b6aa0aaa7b5206803730115cc8 diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 2323f8b..ff8a9b3 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -199,10 +199,11 @@ void Impl_OlePres::Write( SvStream rStm ) rStm.Seek( nEndPos ); } -DffPropertyReader::DffPropertyReader( const SvxMSDffManager rMan ) : -rManager( rMan ), -pDefaultPropSet( NULL ), -mbRotateGranientFillWithAngle ( false ) +DffPropertyReader::DffPropertyReader( const SvxMSDffManager rMan ) +: rManager(rMan) +, pDefaultPropSet(NULL) +, mnFix16Angle(0) +, mbRotateGranientFillWithAngle(false) { InitializePropSet( DFF_msofbtOPT ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/DataFlavorMapping.cxx |7 --- 1 file changed, 7 deletions(-) New commits: commit 11a210c25f975a28d62b3ea915fa47627df8fb64 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 22:43:55 2014 +0200 Remove unused function Change-Id: I150cbe9ca96f0fb9a6b1116f79a0711d78252ba5 diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index 1f8fd70..f86500e 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -281,8 +281,6 @@ Any ByteSequenceDataProvider::getOOoData() class HTMLFormatDataProvider : public DataProviderBaseImpl { public: - HTMLFormatDataProvider(const Any data); - HTMLFormatDataProvider(NSData* data); virtual NSData* getSystemData() SAL_OVERRIDE; @@ -290,11 +288,6 @@ public: virtual Any getOOoData() SAL_OVERRIDE; }; -HTMLFormatDataProvider::HTMLFormatDataProvider(const Any data) : - DataProviderBaseImpl(data) -{ -} - HTMLFormatDataProvider::HTMLFormatDataProvider(NSData* data) : DataProviderBaseImpl(data) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/CppunitTest_filter_ras_test.mk filter/Module_filter.mk filter/qa
filter/CppunitTest_filter_ras_test.mk | 41 +++ filter/Module_filter.mk |1 filter/qa/cppunit/data/ras/indeterminate/.gitignore |1 filter/qa/cppunit/data/ras/pass/marbles.ras |binary filter/qa/cppunit/filters-ras-test.cxx | 71 5 files changed, 114 insertions(+) New commits: commit e02a6cb2c3e2b23b203b422e4e0680877f232636 Author: Caolán McNamara caol...@redhat.com Date: Fri Apr 11 21:47:01 2014 +0100 add a ras import test Change-Id: Idc9267a2bb1bca13c40c746ab3b1974d7e4258ab diff --git a/filter/CppunitTest_filter_ras_test.mk b/filter/CppunitTest_filter_ras_test.mk new file mode 100644 index 000..feead9d --- /dev/null +++ b/filter/CppunitTest_filter_ras_test.mk @@ -0,0 +1,41 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,filter_ras_test)) + +$(eval $(call gb_CppunitTest_use_external,filter_ras_test,boost_headers)) + +$(eval $(call gb_CppunitTest_add_exception_objects,filter_ras_test, \ +filter/qa/cppunit/filters-ras-test \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,filter_ras_test, \ +ira \ + sal \ + test \ + tl \ + unotest \ + vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_api,filter_ras_test,\ +udkapi \ +offapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,filter_ras_test)) + +$(eval $(call gb_CppunitTest_use_components,filter_ras_test,\ +configmgr/source/configmgr \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,filter_ras_test)) + +# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index e5d67e7..6571242 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -84,6 +84,7 @@ $(eval $(call gb_Module_add_check_targets,filter,\ ifneq ($(DISABLE_CVE_TESTS),TRUE) $(eval $(call gb_Module_add_check_targets,filter,\ CppunitTest_filter_pict_test \ +CppunitTest_filter_ras_test \ CppunitTest_filter_tga_test \ CppunitTest_filter_tiff_test \ )) diff --git a/filter/qa/cppunit/data/ras/fail/.gitignore b/filter/qa/cppunit/data/ras/fail/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/ras/indeterminate/.gitignore b/filter/qa/cppunit/data/ras/indeterminate/.gitignore new file mode 100644 index 000..583b009c --- /dev/null +++ b/filter/qa/cppunit/data/ras/indeterminate/.gitignore @@ -0,0 +1 @@ +*.wmf-* diff --git a/filter/qa/cppunit/data/ras/pass/.gitignore b/filter/qa/cppunit/data/ras/pass/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/ras/pass/marbles.ras b/filter/qa/cppunit/data/ras/pass/marbles.ras new file mode 100644 index 000..9b3fb0d Binary files /dev/null and b/filter/qa/cppunit/data/ras/pass/marbles.ras differ diff --git a/filter/qa/cppunit/filters-ras-test.cxx b/filter/qa/cppunit/filters-ras-test.cxx new file mode 100644 index 000..a4862e6 --- /dev/null +++ b/filter/qa/cppunit/filters-ras-test.cxx @@ -0,0 +1,71 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include unotest/filters-test.hxx +#include test/bootstrapfixture.hxx +#include vcl/FilterConfigItem.hxx +#include tools/stream.hxx +#include vcl/graph.hxx + +#include osl/file.hxx +#include osl/process.h + +extern C +{ +SAL_DLLPUBLIC_EXPORT bool SAL_CALL +GraphicImport(SvStream rStream, Graphic rGraphic, +FilterConfigItem*); +} + +using namespace ::com::sun::star; + +/* Implementation of Filters test */ + +class RasFilterTest +: public test::FiltersTest +, public test::BootstrapFixture +{ +public: +RasFilterTest() : BootstrapFixture(true, false) {} + +virtual bool load(const OUString , +const OUString rURL, const OUString , +unsigned int, unsigned int, unsigned int) SAL_OVERRIDE; + +/** + * Ensure CVEs remain unbroken + */ +void testCVEs(); + +CPPUNIT_TEST_SUITE(RasFilterTest); +CPPUNIT_TEST(testCVEs); +CPPUNIT_TEST_SUITE_END(); +}; + +bool RasFilterTest::load(const OUString , +const OUString rURL, const OUString , +unsigned int, unsigned int, unsigned int) +{ +SvFileStream aFileStream(rURL, STREAM_READ); +Graphic aGraphic; +return GraphicImport(aFileStream, aGraphic, NULL); +} + +void RasFilterTest::testCVEs() +{ +testDir(OUString(), +
[Libreoffice-commits] core.git: chart2/qa connectivity/source extensions/source filter/source forms/source sc/source sd/source sw/source tools/source unotools/source vcl/source
chart2/qa/extras/chart2export.cxx |4 +--- connectivity/source/drivers/flat/ETable.cxx |4 +--- extensions/source/plugin/base/context.cxx |6 ++ filter/source/graphicfilter/icgm/cgm.cxx|3 +-- filter/source/graphicfilter/ios2met/ios2met.cxx | 15 +-- filter/source/graphicfilter/ipict/ipict.cxx | 10 +- forms/source/component/ImageControl.cxx |3 +-- sc/source/ui/docshell/impex.cxx |7 +++ sd/source/filter/eppt/epptso.cxx|4 +--- sw/source/filter/ww8/wrtw8esh.cxx |7 +-- tools/source/zcodec/zcodec.cxx |7 ++- unotools/source/ucbhelper/xtempfile.cxx | 10 ++ vcl/source/gdi/dibtools.cxx |6 +- vcl/source/gdi/svgdata.cxx |4 +--- 14 files changed, 27 insertions(+), 63 deletions(-) New commits: commit e98e738a82885b6e7fb643bf407e504fe095803e Author: Michael Stahl mst...@redhat.com Date: Fri Apr 11 20:00:14 2014 +0200 replace some SvStream seeking with calls to remainingSize() Change-Id: I2905e98425b9991d6138ab0adc15083d313ca445 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index fa1c90c..b0cda22 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -167,9 +167,7 @@ xmlDocPtr Chart2ExportTest::parseExport(const OUString rDir, const OUString rF uno::Referenceio::XInputStream xInputStream(xNameAccess-getByName(findChartFile(rDir, xNameAccess)), uno::UNO_QUERY); CPPUNIT_ASSERT(xInputStream.is()); boost::shared_ptrSvStream pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); -pStream-Seek(STREAM_SEEK_TO_END); -sal_Size nSize = pStream-Tell(); -pStream-Seek(0); +sal_uInt64 const nSize = pStream-remainingSize(); OStringBuffer aDocument(nSize); char ch; for (sal_Size i = 0; i nSize; ++i) diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index e156b1d..c58376a 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -455,9 +455,7 @@ void OFlatTable::construct() if(m_pFileStream) { -m_pFileStream-Seek(STREAM_SEEK_TO_END); -sal_Size nSize = m_pFileStream-Tell(); -m_pFileStream-Seek(STREAM_SEEK_TO_BEGIN); +sal_uInt64 const nSize = m_pFileStream-remainingSize(); // Buffersize is dependent on the file-size m_pFileStream-SetBufferSize(nSize 100 ? 32768 : diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index f795dc2..91214b7 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -209,10 +209,8 @@ void XPluginContext_Impl::postURL(const Reference ::com::sun::star::plugin::XPl SvFileStream aStream( aFileName, STREAM_READ ); if( aStream.IsOpen() ) { -int nBytes = 0; -aStream.Seek( STREAM_SEEK_TO_END ); -aBuf = Sequencesal_Int8( nBytes = aStream.Tell() ); -aStream.Seek( STREAM_SEEK_TO_BEGIN ); +sal_Int64 const nBytes = aStream.remainingSize(); +aBuf = Sequencesal_Int8( nBytes ); aStream.Read( aBuf.getArray(), nBytes ); aStream.Close(); osl::FileBase::getFileURLFromSystemPath( aFileName, aFileName ); diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index cc3205c..0b1882f 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -719,8 +719,7 @@ ImportCGM( OUString rFileName, uno::Reference frame::XModel rXModel, sal_u if ( pIn ) { pIn-SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN ); -pIn-Seek( STREAM_SEEK_TO_END ); -sal_uInt32 nInSize = pIn-Tell(); +sal_uInt64 const nInSize = pIn-remainingSize(); pIn-Seek( 0 ); #ifdef CGM_EXPORT_IMPRESS diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index e0acde9..2fcfdea 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2521,7 +2521,7 @@ void OS2METReader::ReadOS2MET( SvStream rStreamOS2MET, GDIMetaFile rGDIMetaF { sal_uInt16 nFieldSize; sal_uInt16 nFieldType; -sal_uLong nPos, nStartPos, nEndPos, nPercent, nLastPercent; +sal_uLong nPercent, nLastPercent; sal_uInt8 nMagicByte; ErrorCode=0; @@ -2586,20 +2586,15 @@ void OS2METReader::ReadOS2MET( SvStream rStreamOS2MET, GDIMetaFile rGDIMetaF pOS2MET-SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
[Libreoffice-commits] core.git: xmlscript/source
xmlscript/source/inc/unoservices.hxx | 86 +++ xmlscript/source/misc/unoservices.cxx| 32 xmlscript/source/xml_helper/xml_impctx.cxx |3 xmlscript/source/xmlflat_imexp/xmlbas_export.cxx |3 xmlscript/source/xmlflat_imexp/xmlbas_import.cxx |3 5 files changed, 97 insertions(+), 30 deletions(-) New commits: commit 115b2958125cf71d1d9283bbf411827348105fdb Author: Stephan Bergmann sberg...@redhat.com Date: Fri Apr 11 23:29:01 2014 +0200 Clean up function declarations Change-Id: If482545f87a9b0c066f91639c55b73bee4d01b5c diff --git a/xmlscript/source/inc/unoservices.hxx b/xmlscript/source/inc/unoservices.hxx new file mode 100644 index 000..a146a0c --- /dev/null +++ b/xmlscript/source/inc/unoservices.hxx @@ -0,0 +1,86 @@ +/* -*- 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 INCLUDED_XMLSCRIPT_SOURCE_INC_UNOSERVICES_HXX +#define INCLUDED_XMLSCRIPT_SOURCE_INC_UNOSERVICES_HXX + +#include sal/config.h + +#include com/sun/star/uno/Exception.hpp +#include com/sun/star/uno/Sequence.hxx +#include rtl/ustring.hxx +#include sal/types.h + +namespace com { namespace sun { namespace star { namespace uno { +class XComponentContext; +class XInterface; +} } } } + +namespace xmlscript { + +css::uno::SequenceOUString SAL_CALL +getSupportedServiceNames_DocumentHandlerImpl(); + +OUString SAL_CALL getImplementationName_DocumentHandlerImpl(); + +css::uno::Referencecss::uno::XInterface SAL_CALL create_DocumentHandlerImpl( +css::uno::Referencecss::uno::XComponentContext const xContext) +SAL_THROW((css::uno::Exception)); + +css::uno::SequenceOUString SAL_CALL +getSupportedServiceNames_XMLBasicExporter(); + +OUString SAL_CALL getImplementationName_XMLBasicExporter(); + +css::uno::Referencecss::uno::XInterface SAL_CALL create_XMLBasicExporter( +css::uno::Referencecss::uno::XComponentContext const xContext) +SAL_THROW((css::uno::Exception)); + +css::uno::SequenceOUString SAL_CALL +getSupportedServiceNames_XMLOasisBasicExporter(); + +OUString SAL_CALL getImplementationName_XMLOasisBasicExporter(); + +css::uno::Referencecss::uno::XInterface SAL_CALL create_XMLOasisBasicExporter( +css::uno::Referencecss::uno::XComponentContext const xContext) +SAL_THROW((css::uno::Exception)); + +css::uno::SequenceOUString SAL_CALL +getSupportedServiceNames_XMLBasicImporter(); + +OUString SAL_CALL getImplementationName_XMLBasicImporter(); + +css::uno::Referencecss::uno::XInterface SAL_CALL create_XMLBasicImporter( +css::uno::Referencecss::uno::XComponentContext const xContext) +SAL_THROW((css::uno::Exception)); + +css::uno::SequenceOUString SAL_CALL +getSupportedServiceNames_XMLOasisBasicImporter(); + +OUString SAL_CALL getImplementationName_XMLOasisBasicImporter(); + +css::uno::Referencecss::uno::XInterface SAL_CALL create_XMLOasisBasicImporter( +css::uno::Referencecss::uno::XComponentContext const xContext) +SAL_THROW((css::uno::Exception)); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlscript/source/misc/unoservices.cxx b/xmlscript/source/misc/unoservices.cxx index 78f1654..2b9e43c 100644 --- a/xmlscript/source/misc/unoservices.cxx +++ b/xmlscript/source/misc/unoservices.cxx @@ -19,41 +19,13 @@ #include cppuhelper/implementationentry.hxx +#include unoservices.hxx + using namespace ::rtl; using namespace ::com::sun::star::uno; namespace xmlscript { -Sequence OUString SAL_CALL getSupportedServiceNames_DocumentHandlerImpl(); -OUString SAL_CALL getImplementationName_DocumentHandlerImpl(); -Reference XInterface SAL_CALL create_DocumentHandlerImpl( -Reference XComponentContext const xContext ) -SAL_THROW( (Exception) ); - -Sequence OUString SAL_CALL getSupportedServiceNames_XMLBasicExporter(); -OUString SAL_CALL getImplementationName_XMLBasicExporter(); -Reference XInterface SAL_CALL create_XMLBasicExporter( -Reference XComponentContext const xContext ) -SAL_THROW( (Exception) ); - -Sequence OUString SAL_CALL
[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_ucalc.mk sc/qa sc/source
sc/CppunitTest_sc_ucalc.mk |3 +++ sc/qa/unit/ucalc.cxx| 12 sc/source/core/data/formulacell.cxx |9 + 3 files changed, 24 insertions(+) New commits: commit f9cc0daec26016722bf5260e4e2634e6dcfe25a2 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 21:37:54 2014 -0400 fdo#77307: Compare external formula tokens correctly. To avoid different external (add-in) tokens from being evaluated equal. Change-Id: If78187901bdca7fe0da50442b0bb66e0650dc70f diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 9a21066..363edb0 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3641,6 +3641,15 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell r return NotEqual; } break; +case formula::svExternal: +{ +if (pThisTok-GetExternal() != pOtherTok-GetExternal()) +return NotEqual; + +if (pThisTok-GetByte() != pOtherTok-GetByte()) +return NotEqual; +} +break; default: ; } commit d5d43b2d8d3b8d547c8fd7553d101c31f3bfdff8 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 20:35:48 2014 -0400 Enable scaddins for ucalc test session. This adds several worksheet functions to the list. Change-Id: Ib1a72c4401a4bd5e09ec98dfa1bd6175234005e0 diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index c4d48d8..b4bf31d 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -99,6 +99,9 @@ $(eval $(call gb_CppunitTest_use_components,sc_ucalc,\ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ uui/util/uui \ +scaddins/source/analysis/analysis \ +scaddins/source/datefunc/date \ +scaddins/source/pricing/pricing \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_ucalc)) diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 09b3880..06ef566 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -2374,10 +2374,14 @@ void Test::testFunctionLists() DAY, DAYS, DAYS360, +DAYSINMONTH, +DAYSINYEAR, EASTERSUNDAY, HOUR, +ISLEAPYEAR, MINUTE, MONTH, +MONTHS, NETWORKDAYS.INTL, NOW, SECOND, @@ -2386,8 +2390,11 @@ void Test::testFunctionLists() TODAY, WEEKDAY, WEEKNUM, +WEEKS, +WEEKSINYEAR, WORKDAY.INTL, YEAR, +YEARS, 0 }; @@ -2406,6 +2413,10 @@ void Test::testFunctionLists() NOMINAL, NPER, NPV, +OPT_BARRIER, +OPT_PROB_HIT, +OPT_PROB_INMONEY, +OPT_TOUCH, PMT, PPMT, PV, @@ -2739,6 +2750,7 @@ void Test::testFunctionLists() RIGHT, RIGHTB, ROMAN, +ROT13, SEARCH, SUBSTITUTE, T, ___ 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/filter/xml/xmlexprt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cf1d4c02c14772824a7149957fa119c6e290640b Author: Niklas Johansson sleeping.pil...@gmail.com Date: Fri Apr 11 13:07:09 2014 +0200 fdo#76961 - Calc link auto-update interval is changed on file save The commit fa0fe19e89ba68a6b02cbdd5eff6bc161024c53d accidentaly made the external links auto-update interval save seconds as milliseconds. This patch fixes the problem at least on Mac and Windows where I tested it. I also did a successful build on Fedora 20 with this patch that works as expected. Change-Id: Ia10d12fb678004a686a4eaa65e9e12f09378a440 Reviewed-on: https://gerrit.libreoffice.org/8934 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index bce3c190..a928a08 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -840,7 +840,7 @@ void ScXMLExport::GetAreaLinks( ScMyAreaLinksContainer rAreaLinks ) aAreaLink.sFilter = pLink-GetFilter(); aAreaLink.sFilterOptions = pLink-GetOptions(); aAreaLink.sURL = pLink-GetFile(); -aAreaLink.nRefresh = pLink-GetTimeout(); +aAreaLink.nRefresh = pLink-GetRefreshDelay(); rAreaLinks.AddNewAreaLink( aAreaLink ); } } ___ 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' - sc/source
sc/source/filter/xml/xmlexprt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c070fe636d75b74874c5e93f5cd5d19bd7af7e6d Author: Niklas Johansson sleeping.pil...@gmail.com Date: Fri Apr 11 13:07:09 2014 +0200 fdo#76961 - Calc link auto-update interval is changed on file save The commit fa0fe19e89ba68a6b02cbdd5eff6bc161024c53d accidentaly made the external links auto-update interval save seconds as milliseconds. This patch fixes the problem at least on Mac and Windows where I tested it. I also did a successful build on Fedora 20 with this patch that works as expected. Change-Id: Ia10d12fb678004a686a4eaa65e9e12f09378a440 Reviewed-on: https://gerrit.libreoffice.org/8934 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us (cherry picked from commit cf1d4c02c14772824a7149957fa119c6e290640b) Signed-off-by: Kohei Yoshida kohei.yosh...@collabora.com diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index d5c025d..c2ab4b2 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -836,7 +836,7 @@ void ScXMLExport::GetAreaLinks( ScMyAreaLinksContainer rAreaLinks ) aAreaLink.sFilter = pLink-GetFilter(); aAreaLink.sFilterOptions = pLink-GetOptions(); aAreaLink.sURL = pLink-GetFile(); -aAreaLink.nRefresh = pLink-GetTimeout(); +aAreaLink.nRefresh = pLink-GetRefreshDelay(); rAreaLinks.AddNewAreaLink( aAreaLink ); } } ___ 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/inc/gridwin.hxx |2 sc/source/ui/view/gridwin.cxx | 180 +- 2 files changed, 146 insertions(+), 36 deletions(-) New commits: commit cd22c3442389f69fc1cc14dd07b17f5a59498e5e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Apr 11 23:07:49 2014 -0400 fdo#74087: Inspect if a mis-spelled word is at cursor position... then decide whether to launch a spell candidate menu or a regular context menu. Change-Id: Ib121e9c6729e068c70ff216391f863639aa01951 diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 9274303..59cb57b 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -271,6 +271,8 @@ class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHe boolGetEditUrl( const Point rPos, OUString* pName=0, OUString* pUrl=0, OUString* pTarget=0 ); +bool IsSpellErrorAtPos( const Point rPos, SCCOL nCol1, SCCOL nCol2, SCROW nRow ); + boolHitRangeFinder( const Point rMouse, RfCorner rCorner, sal_uInt16* pIndex = NULL, SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 5f3764e..8a47818 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -136,6 +136,7 @@ #include vector #include boost/scoped_ptr.hpp +#include boost/shared_ptr.hpp using namespace com::sun::star; using ::com::sun::star::uno::Sequence; @@ -2940,6 +2941,10 @@ void ScGridWindow::Command( const CommandEvent rCEvt ) SCsROW nCellY = -1; pViewData-GetPosFromPixel(aPosPixel.X(), aPosPixel.Y(), eWhich, nCellX, nCellY); +bool bSpellError = false; +SCCOL nColSpellError = nCellX; +ScRefCellValue aSpellCheckCell; + if ( bMouse ) { ScDocument* pDoc = pViewData-GetDocument(); @@ -2962,14 +2967,39 @@ void ScGridWindow::Command( const CommandEvent rCEvt ) // Selecting this cell is not allowed, neither is context menu. return; +if (mpSpellCheckCxt) +{ +// Find the first string to the left for spell checking in case the current cell is empty. +ScAddress aPos(nCellX, nCellY, nTab); +aSpellCheckCell.assign(*pDoc, aPos); +while (aSpellCheckCell.meType == CELLTYPE_NONE) +{ +// Loop until we get the first non-empty cell in the row. +aPos.IncCol(-1); +if (aPos.Col() 0) +break; + +aSpellCheckCell.assign(*pDoc, aPos); +} + +if (aPos.Col() = 0 (aSpellCheckCell.meType == CELLTYPE_STRING || aSpellCheckCell.meType == CELLTYPE_EDIT)) +nColSpellError = aPos.Col(); + +bSpellError = (mpSpellCheckCxt-isMisspelled(nColSpellError, nCellY)); +if (bSpellError) +{ +// Check and see if a misspelled word is under the mouse pointer. +bSpellError = IsSpellErrorAtPos(aPosPixel, nColSpellError, nCellX, nCellY); +} +} + // #i18735# First select the item under the mouse pointer. // This can change the selection, and the view state (edit mode, etc). -SelectForContextMenu( aPosPixel, nCellX, nCellY ); +SelectForContextMenu(aPosPixel, bSpellError ? nColSpellError : nCellX, nCellY); } -sal_Bool bDone = false; -sal_Bool bEdit = pViewData-HasEditView(eWhich); -bool bSpellError = (mpSpellCheckCxt mpSpellCheckCxt-isMisspelled(nCellX, nCellY)); +bool bDone = false; +bool bEdit = pViewData-HasEditView(eWhich); if ( !bEdit ) { @@ -5091,6 +5121,54 @@ void ScGridWindow::RFMouseMove( const MouseEvent rMEvt, bool bUp ) pViewData-GetView()-ResetTimer(); } +namespace { + +SvxAdjust toSvxAdjust( const ScPatternAttr rPat ) +{ +SvxCellHorJustify eHorJust = +static_castSvxCellHorJustify( +static_castconst SvxHorJustifyItem(rPat.GetItem(ATTR_HOR_JUSTIFY)).GetValue()); + +SvxAdjust eSvxAdjust = SVX_ADJUST_LEFT; +switch (eHorJust) +{ +case SVX_HOR_JUSTIFY_LEFT: +case SVX_HOR_JUSTIFY_REPEAT:// nicht implementiert +case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell type +eSvxAdjust = SVX_ADJUST_LEFT; +break; +case SVX_HOR_JUSTIFY_RIGHT: +eSvxAdjust = SVX_ADJUST_RIGHT; +break; +case SVX_HOR_JUSTIFY_CENTER: +eSvxAdjust = SVX_ADJUST_CENTER; +break; +case SVX_HOR_JUSTIFY_BLOCK: +eSvxAdjust =
[Libreoffice-bugs] [Bug 77301] New: 4.2.3 Release stops editing
https://bugs.freedesktop.org/show_bug.cgi?id=77301 Priority: medium Bug ID: 77301 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: 4.2.3 Release stops editing Severity: major Classification: Unclassified OS: Mac OS X (All) Reporter: petershar...@pastoralsystems.co.nz Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: unspecified Component: Writer Product: LibreOffice Installed release 4.2.3 today and three times during the day's work editing in Writer suddenly stopped. That is, one could no longer edit a document. Exiting LO and re-loading the document enabled editing. This hadn't happened with 4.2.3 RCs 2 and 3. I eventually reverted to 4.2.3 RC 3 and the fault hasn't happened. Thank you for LibreOffice. Regards -- 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 77165] BASIC: Difference of days (function days) not longer calculated in Calc
https://bugs.freedesktop.org/show_bug.cgi?id=77165 --- Comment #4 from ADR p...@ayps.de --- Created attachment 97211 -- https://bugs.freedesktop.org/attachment.cgi?id=97211action=edit the complete file with many days function uses for testing -- 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 75363] FILEOPEN: .doc file not viewed correctly
https://bugs.freedesktop.org/show_bug.cgi?id=75363 --- Comment #5 from jean-marc.dre...@wanadoo.fr --- The bug is still present in version 4.2.3.3. -- 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 75376] Documents with fields have weird characters
https://bugs.freedesktop.org/show_bug.cgi?id=75376 --- Comment #26 from V Stuart Foote vstuart.fo...@utsa.edu --- On Windows 7 sp1, 64-bit For testing Michael S's patches, kind of need for Cloph's TB-47 to spin up a build of 4.2.4 branch in release configuration using MSVC 2010. Working with master and MSVC 2010 from Cloph's TB-47 build from the 9th, Version: 4.3.0.0.alpha0+ Build ID: 20fb1bfc72e626251b435bcff2339e1e425c7130 TinderBox: Win-x86@47-TDF, Branch:MASTER, Time: 2014-04-09_12:09:54 the malformed field shading exists, and can still be worked around with CTRL+F8 to turn off field shading. And now Cloph's TB-47 build from the 10th is rendering field shading correctly with the http://cgit.freedesktop.org/libreoffice/core/commit/?id=0d8e3a145901ab0124d40d33a50e2de28dc0c8ab patch in place. Version: 4.3.0.0.alpha0+ Build ID: 83c888bdb0a6c9795cebfc53fa74d6da8bb692b2 TinderBox: Win-x86@47-TDF, Branch:MASTER, Time: 2014-04-10_20:33:35 Issue as described was present in the RC3 and is in the Final release for 4.2.3 built with MSVC 2010. I have not seen it in TB-42 builds of 4.2 that use MSVC 2012. Re-verified that against a couple of recent TB-42 builds. -- 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 77282] Edit Group command should be Enter Group like in Draw
https://bugs.freedesktop.org/show_bug.cgi?id=77282 Laurent BP jumbo4...@yahoo.fr changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |jumbo4...@yahoo.fr |desktop.org | --- Comment #2 from Laurent BP jumbo4...@yahoo.fr --- Proposed commit https://gerrit.libreoffice.org/#/c/8923/ -- 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 77303] New: LibreOffice starts frozen when creating untitled document from commandline
https://bugs.freedesktop.org/show_bug.cgi?id=77303 Priority: medium Bug ID: 77303 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: LibreOffice starts frozen when creating untitled document from commandline Severity: normal Classification: Unclassified OS: Linux (All) Reporter: m...@nightrealms.com Hardware: x86-64 (AMD64) Status: NEW Version: 4.2.3.2 rc Component: Libreoffice Product: LibreOffice If I try to create a new, untitled writer document or web document from the command line with libreoffice --writer or libreoffice --web the splash screen works fine, and the window menu bar and window decorations come up, but nothing else does, and it gets frozen that way. Editing an existing file works just fine, as does simply doing libreoffice and using the mouse to select a document type (though using libreoffice and trying to use a keyboard shortcut causes the document chooser UI to freeze up). I'm using Fedora 20. -- 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 77304] New: PDF: Garbled fonts
https://bugs.freedesktop.org/show_bug.cgi?id=77304 Priority: medium Bug ID: 77304 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: PDF: Garbled fonts Severity: normal Classification: Unclassified OS: Mac OS X (All) Reporter: unix.n...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.3.1 rc Component: Presentation Product: LibreOffice Hi :) Some page in my presentation have a problem: 1) Fonts squeezed and seem ugly. https://www.dropbox.com/s/k0k2l5kz713ypoa/Screen%20Shot%202014-04-10%20at%209.30.43%20PM.png 2) After exporting to PDF fonts will become garbled. https://www.dropbox.com/s/k0k2l5kz713ypoa/Screen%20Shot%202014-04-10%20at%209.30.43%20PM.png The created file : https://www.dropbox.com/s/1tgxunq3eafsezh/Untitled%201.odp The font is BBCnassim. Best regards, Nima Operating System: Mac OS X Version: 4.2.3.1 rc -- 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 77303] LibreOffice starts frozen when creating untitled document from commandline
https://bugs.freedesktop.org/show_bug.cgi?id=77303 --- Comment #1 from Matthew Cline m...@nightrealms.com --- Slight correction: when using libreoffice in the command line to get the document selector, the UI always completely draws, but sometimes it starts out frozen, while sometimes it doesn't start out frozen and can become frozen if a keyboard shortcut is used. -- 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 76790] EDITING: Tables Not Expanding on Copy and Paste of Lines
https://bugs.freedesktop.org/show_bug.cgi?id=76790 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG CC||gautier.sop...@gmail.com --- Comment #1 from sophie gautier.sop...@gmail.com --- Hi, this is not a bug. To join the two tables, just delete the paragraph mark between the two tables using the del key (not backspace). Set as not a bug - Sophie -- 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 77219] FILESAVE: File Save : Image property Z-index [behindDoc] not preserved after RT
https://bugs.freedesktop.org/show_bug.cgi?id=77219 Ravindra Vidhate ravindra.vidh...@synerzip.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |Ravindra.Vidhate@synerzip.c |desktop.org |om -- 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 77306] New: PDF: Export as PDF messes up the page.
https://bugs.freedesktop.org/show_bug.cgi?id=77306 Priority: medium Bug ID: 77306 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: PDF: Export as PDF messes up the page. Severity: normal Classification: Unclassified OS: Linux (All) Reporter: cbel...@cfl.rr.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.3.1 rc Component: Writer Product: LibreOffice Problem description: Steps to reproduce: 1. Write more than one page of text 2. Select to Export as PDF 3. Save as PDF Current behavior: Half of the first page is unreachable. It shows the full page in the left panel but you cannot read below the first half of the page. NOTHING below the middle can be viewed. Expected behavior: The full page of text should be legible and available to view. Also in the print section Print to PDF is no no longer available. Operating System: Ubuntu Version: 4.2.3.1 rc -- 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 76793] EDITING: Table Can't be Moved Back to Previous Page
https://bugs.freedesktop.org/show_bug.cgi?id=76793 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |NOTABUG CC||gautier.sop...@gmail.com --- Comment #1 from sophie gautier.sop...@gmail.com --- Hi, this is not a bug. To bring the content of the next page (text, table, object) to the previous one, click on the blue line between the pages and select Delete page break. Set as not a bug - Sophie -- 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 77138] FILEOPEN - Calc link auto-update interval is changed after reopen
https://bugs.freedesktop.org/show_bug.cgi?id=77138 Niklas Johansson sleeping.pil...@gmail.com changed: What|Removed |Added OS|Windows (All) |All Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |sleeping.pil...@gmail.com |desktop.org | Ever confirmed|0 |1 --- Comment #1 from Niklas Johansson sleeping.pil...@gmail.com --- I can confirm this on Windows and Mac OS X as well. Therefore I'm changing the platform to all. I'm working on fixing this at the moment so I assign it to myself. -- 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 77307] function ERFC() gets overwritten with ERF() when ERF() is used in cell above
https://bugs.freedesktop.org/show_bug.cgi?id=77307 Winfried Donkers winfrieddonk...@libreoffice.org changed: What|Removed |Added CC||er...@redhat.com Keywords||regression --- Comment #1 from Winfried Donkers winfrieddonk...@libreoffice.org --- @Eike: any clues? -- 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