LibreOffice Gerrit News for core on 2014-10-14
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Sane configure GStreamer handling in https://gerrit.libreoffice.org/11912 from Jan-Marek Glogowski about module build + vcl/source: get rid of redundant svsys.h includes in https://gerrit.libreoffice.org/11814 from Douglas Mencken about module vcl + runner: finally block to ensure that a resource is closed (Prior to Java in https://gerrit.libreoffice.org/11950 from Robert Antoni Buj i Gelonch about module qadevOOo + fdo#35862 De-/Increase font when multi-sized text in https://gerrit.libreoffice.org/11857 from Daniel Sikeler about module sw End of freshness + kill OUTPATH in https://gerrit.libreoffice.org/11908 from Norbert Thiebaud about module build, instsetoo_native, solenv + fdo#84938 - replace LIST_ACTION constants with enum in https://gerrit.libreoffice.org/11959 from Noel Grandin about module include, svtools + Resolves fdo#84961: zh_CN date separator should be / rather than / in https://gerrit.libreoffice.org/11958 from Julien Nabet about module i18npool + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11954 from Michaël Lefèvre about module vcl + fdo#60689: replace SUPD variable in https://gerrit.libreoffice.org/11937 from Marcos Paulo de Souza about module basic, desktop, sfx2, solenv + fdo#75757: remove inheritance to std::map in https://gerrit.libreoffice.org/11951 from Takeshi Abe about module include, tools + unit test performance for big calc file in https://gerrit.libreoffice.org/11949 from Laurent Godard about module include, sc, test + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/11947 from Michaël Lefèvre about module sw + [FORMAT CHANGE] basic: use 32-bit integers for array indices in https://gerrit.libreoffice.org/11944 from Noel Grandin about module basctl, basic, include, sc + Trying to make the Find Replace dialog a bit more compact… in https://gerrit.libreoffice.org/11942 from Adolfo Jayme Barrientos about module svx * Merged changes on master for project core changed in the last 25 hours: + scripting: Null pointer dereference in https://gerrit.libreoffice.org/11923 from Robert Antoni Buj i Gelonch + create a macro library for implementing bit-flags types in https://gerrit.libreoffice.org/11835 from Noel Grandin + coverity#1066164 Resource leak in https://gerrit.libreoffice.org/11946 from Caolán McNamara + Register flat file mime types on OS X in https://gerrit.libreoffice.org/11957 from Matthew Francis + java: Collections.addAll for adding an array of elements to a Collection in https://gerrit.libreoffice.org/11953 from Robert Antoni Buj i Gelonch + java: import from the same package in https://gerrit.libreoffice.org/11955 from Robert Antoni Buj i Gelonch + reportbuilder: import from java.lang package in https://gerrit.libreoffice.org/11956 from Robert Antoni Buj i Gelonch + enhance perfcheck failing message in https://gerrit.libreoffice.org/11948 from Laurent Godard + runner: Object comparison in https://gerrit.libreoffice.org/11921 from Robert Antoni Buj i Gelonch + vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap in https://gerrit.libreoffice.org/11823 from Chris Sherlock + nlpsolver: ensure that the stream is cleaned up before the method returns in https://gerrit.libreoffice.org/11940 from Robert Antoni Buj i Gelonch + xmerge: ensure that the stream is cleaned up before the method returns in https://gerrit.libreoffice.org/11939 from Robert Antoni Buj i Gelonch + accessibility: ensure that the stream is cleaned up before the method ret in https://gerrit.libreoffice.org/11938 from Robert Antoni Buj i Gelonch + convert SW_TAB #defines to enum in https://gerrit.libreoffice.org/11936 from Noel Grandin * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/10425 from Joren De Cuyper + WIP (do not merge): remove custom impl of bidirectional list in https://gerrit.libreoffice.org/11001 from Chris Laplante + fdo#83003 Startcenter: No method for returnin Recent Docs in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + Perftest for loading autocorrect dictionaries (fdo#79761) in https://gerrit.libreoffice.org/11296 from Matúš Kukan + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#81426 : Data from header
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/view.hxx|6 +- starmath/source/view.cxx |1 - 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit b80c468e35ee321b5580b42642064f74f9241fb6 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 09:02:12 2014 +0200 SmViewShell: pImpl must outlive aGraphic member ...as at least during CppunitTest_starmath_qa_cppunit, during ~SmViewShell, aGraphic's code calls back into SmViewShell's code calls into pImpl: SmViewShell::IsInlineEditEnabled() const starmath/source/view.cxx:2057:12 SmGraphicWindow::IsInlineEditEnabled() const starmath/source/view.cxx:227:12 SmGraphicWindow::CaretBlinkStop() starmath/source/view.cxx:297:10 SmGraphicWindow::~SmGraphicWindow() starmath/source/view.cxx:126:5 SmViewShell::~SmViewShell() starmath/source/view.cxx:1976:1 [...] This is somewhat symmetric to 0e263d61811480f3a9dbc6ad7c752f6cfae4e3fc order pImpl before aGraphic because aGraphic deferences pImpl in ctor. Change-Id: I97494bebaf5747205a690e6d65fd05ba8fb61cab diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 215ac54..b23572e 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_STARMATH_INC_VIEW_HXX #define INCLUDED_STARMATH_INC_VIEW_HXX +#include sal/config.h + +#include memory + #include sfx2/dockwin.hxx #include sfx2/viewsh.hxx #include svtools/scrwin.hxx @@ -224,7 +228,7 @@ class SmViewShell: public SfxViewShell // for handling the PasteClipboardState friend class SmClipboardChangeListener; -SmViewShell_Impl* pImpl; +std::unique_ptrSmViewShell_Impl pImpl; SmGraphicWindow aGraphic; SmGraphicController aGraphicController; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 075941d..5587479 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1972,7 +1972,6 @@ SmViewShell::~SmViewShell() SmEditWindow *pEditWin = GetEditWindow(); if (pEditWin) pEditWin-DeleteEditView( *this ); -delete pImpl; } void SmViewShell::Deactivate( bool bIsMDIActivate ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/treelist.hxx | 47 +++-- include/svtools/treelistbox.hxx |2 - svtools/source/contnr/treelist.cxx| 54 +- svtools/source/contnr/treelistbox.cxx | 14 +--- 4 files changed, 61 insertions(+), 56 deletions(-) New commits: commit fa6ac05beaaf1160c205e40099b99f0ed0efb131 Author: Noel Grandin n...@peralex.com Date: Mon Oct 13 20:42:24 2014 +0200 fdo#84938 - replace LIST_ACTION constants with enum Change-Id: I21c05ada0a793b1e3ddf87481e66b60b83529767 diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index e0984d7..cf20872 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -32,17 +32,20 @@ #include vector #include boost/ptr_container/ptr_map.hpp -#define LISTACTION_INSERTED 1 -#define LISTACTION_REMOVING 2 -#define LISTACTION_REMOVED 3 -#define LISTACTION_MOVING 4 -#define LISTACTION_MOVED5 -#define LISTACTION_CLEARING 6 -#define LISTACTION_INSERTED_TREE7 -#define LISTACTION_INVALIDATE_ENTRY 8 -#define LISTACTION_RESORTING9 -#define LISTACTION_RESORTED 10 -#define LISTACTION_CLEARED 11 +enum class SvListAction +{ +INSERTED = 1, +REMOVING = 2, +REMOVED = 3, +MOVING = 4, +MOVED= 5, +CLEARING = 6, +INSERTED_TREE= 7, +INVALIDATE_ENTRY = 8, +RESORTING= 9, +RESORTED = 10, +CLEARED = 11 +}; class SvTreeListEntry; class SvListView; @@ -142,27 +145,27 @@ public: { return ( nPos aViewList.size() ) ? aViewList[ nPos ] : NULL; } voidBroadcast( -sal_uInt16 nActionId, +SvListAction nActionId, SvTreeListEntry* pEntry1=0, SvTreeListEntry* pEntry2=0, sal_uLong nPos=0 ); -void EnableInvalidate( bool bEnable ); +voidEnableInvalidate( bool bEnable ); // Notify all Listeners voidInvalidateEntry( SvTreeListEntry* ); sal_uLong GetEntryCount() const { return nEntryCount; } -SvTreeListEntry*First() const; -SvTreeListEntry*Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; -SvTreeListEntry*Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; -SvTreeListEntry*Last() const; +SvTreeListEntry*First() const; +SvTreeListEntry*Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; +SvTreeListEntry*Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; +SvTreeListEntry*Last() const; -SvTreeListEntry*FirstChild( SvTreeListEntry* pParent ) const; -SvTreeListEntry*NextSibling( SvTreeListEntry* pEntry ) const; -SvTreeListEntry*PrevSibling( SvTreeListEntry* pEntry ) const; -SvTreeListEntry*LastSibling( SvTreeListEntry* pEntry ) const; +SvTreeListEntry*FirstChild( SvTreeListEntry* pParent ) const; +SvTreeListEntry*NextSibling( SvTreeListEntry* pEntry ) const; +SvTreeListEntry*PrevSibling( SvTreeListEntry* pEntry ) const; +SvTreeListEntry*LastSibling( SvTreeListEntry* pEntry ) const; sal_uLong Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pPar,sal_uLong nPos = TREELIST_APPEND); sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = TREELIST_APPEND ) @@ -273,7 +276,7 @@ public: voidClear(); virtual voidSetModel( SvTreeList* ); virtual voidModelNotification( -sal_uInt16 nActionId, +SvListAction nActionId, SvTreeListEntry* pEntry1, SvTreeListEntry* pEntry2, sal_uLong nPos diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index fb69656..733d4a2 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -752,7 +752,7 @@ public: voidRemoveParentKeepChildren( SvTreeListEntry* pParent ); DECL_LINK( DefaultCompare, SvSortData* ); -virtual voidModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1, +virtual voidModelNotification( SvListAction nActionId, SvTreeListEntry* pEntry1, SvTreeListEntry* pEntry2, sal_uLong nPos ) SAL_OVERRIDE; voidEndSelection(); diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 087496c..27eebd4 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -44,7 +44,7 @@ SvTreeList::~SvTreeList() } void SvTreeList::Broadcast( -
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/convwatch/DB.java| 78 - qadevOOo/runner/convwatch/DBHelper.java | 18 qadevOOo/runner/convwatch/FileHelper.java| 30 qadevOOo/runner/convwatch/MSOfficePrint.java | 710 +++ qadevOOo/runner/convwatch/OfficePrint.java | 66 - qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 476 +- qadevOOo/runner/helper/FileTools.java| 28 qadevOOo/runner/stats/FileLogWriter.java | 13 qadevOOo/runner/stats/SQLExecution.java | 86 - qadevOOo/runner/stats/SimpleFileOutProducer.java | 64 - qadevOOo/runner/util/DBTools.java| 32 11 files changed, 873 insertions(+), 728 deletions(-) New commits: commit a2c481457cd2d03263054a5fefe80da316e09a44 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Mon Oct 13 13:20:47 2014 +0200 runner: finally block to ensure that a resource is closed (Prior to Java SE 7) http://docs.oracle.com/javase/tutorial/essential/exceptions/tryResourceClose.html Change-Id: I5ecefd3e5bf84fea2a8735a44236ed4c86b440c4 Reviewed-on: https://gerrit.libreoffice.org/11950 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/qadevOOo/runner/convwatch/DB.java b/qadevOOo/runner/convwatch/DB.java index 70a2559..8b4c4ff 100644 --- a/qadevOOo/runner/convwatch/DB.java +++ b/qadevOOo/runner/convwatch/DB.java @@ -215,49 +215,65 @@ public class DB extends DBHelper ArrayListString aResultList = new ArrayListString(); try { -oStmt = _aCon.createStatement(); - -java.sql.ResultSet aResultSet = oStmt.executeQuery(_sSQL); -java.sql.ResultSetMetaData aResultSetMetaData = aResultSet.getMetaData(); - -int nColumnCount = aResultSetMetaData.getColumnCount(); // java sql starts with '1' - -while( aResultSet.next() ) +try { -StringBuffer aResult = new StringBuffer(); +oStmt = _aCon.createStatement(); +java.sql.ResultSet aResultSet = null; try { -aResult.append(sqlresult: ); -for (int i=1;i=nColumnCount;i++) +aResultSet = oStmt.executeQuery(_sSQL); +java.sql.ResultSetMetaData aResultSetMetaData = aResultSet.getMetaData(); + +int nColumnCount = aResultSetMetaData.getColumnCount(); // java sql starts with '1' + +while( aResultSet.next() ) { -String sColumnName = aResultSetMetaData.getColumnName(i); -aResult.append(sColumnName).append(=); -String sValue; -int nSQLType = aResultSetMetaData.getColumnType(i); -switch(nSQLType) +StringBuffer aResult = new StringBuffer(); +try { -case java.sql.Types.VARCHAR: -sValue = ' + aResultSet.getString(i) + '; -break; -case java.sql.Types.INTEGER: -{ -int nValue = aResultSet.getInt(i); -sValue = String.valueOf(nValue); -break; +aResult.append(sqlresult: ); +for (int i=1;i=nColumnCount;i++) +{ +String sColumnName = aResultSetMetaData.getColumnName(i); +aResult.append(sColumnName).append(=); +String sValue; +int nSQLType = aResultSetMetaData.getColumnType(i); +switch(nSQLType) +{ +case java.sql.Types.VARCHAR: +sValue = ' + aResultSet.getString(i) + '; +break; +case java.sql.Types.INTEGER: +{ +int nValue = aResultSet.getInt(i); +sValue = String.valueOf(nValue); +break; +} + +default: +sValue = UNSUPPORTED TYPE; +
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |3 ++- sw/source/filter/ww8/docxattributeoutput.hxx |7 --- 2 files changed, 2 insertions(+), 8 deletions(-) New commits: commit dea7cb8a4fc926c4a399dc28f9fb868da231986c Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Oct 14 09:16:03 2014 +0200 Remove confusing TableReference::operator=() Confusing, because the class has 4 members, and only 2 was set in that method. Change-Id: I797872be8c60fa564cece66d8dd20e33248d4a0f diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 8843331..2ad4a32 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2969,7 +2969,8 @@ void DocxAttributeOutput::switchHeaderFooter(bool isHeaderFooter, sal_Int32 inde { if (m_oldTableReference-m_pOldTablepInner) { - *m_tableReference = *m_oldTableReference; + m_tableReference-m_bTableCellOpen = m_oldTableReference-m_bTableCellOpen; + m_tableReference-m_nTableDepth = m_oldTableReference-m_nTableDepth; //Reset the oldReference, after copying it back to the original. m_oldTableReference-m_bTableCellOpen = false ; diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index eebee0e..9fd636b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -143,13 +143,6 @@ struct TableReference m_nTableDepth(0) { } - -TableReference operator= (const TableReference rhs) -{ -m_bTableCellOpen = rhs.m_bTableCellOpen ; -m_nTableDepth= rhs.m_nTableDepth ; -return *this ; -} }; /// The class that has handlers for various resource types when exporting as DOCX. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/util/AccessibilityTools.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 23e4eb6aeb77c74f5ff8a6a70f7adbe52e1c34e7 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Sat Oct 11 20:27:09 2014 +0200 runner: Null pointer dereference Change-Id: Id38a9e0bddbf3c9038abbc5de7137ee5d3f39db6 Reviewed-on: https://gerrit.libreoffice.org/11924 Reviewed-by: Matthew Francis mjay.fran...@gmail.com Tested-by: Matthew Francis mjay.fran...@gmail.com diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java index 76136e6..a0f1612 100644 --- a/qadevOOo/runner/util/AccessibilityTools.java +++ b/qadevOOo/runner/util/AccessibilityTools.java @@ -65,13 +65,13 @@ public class AccessibilityTools { if (xFrame == null) { System.out.println(can't get frame from controller); +} else { +if (containerWindow) +xWindow = xFrame.getContainerWindow(); +else +xWindow = xFrame.getComponentWindow(); } -if (containerWindow) -xWindow = xFrame.getContainerWindow(); -else -xWindow = xFrame.getComponentWindow(); - if (xWindow == null) { System.out.println(can't get window from frame); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/o3tl
include/o3tl/typed_flags_set.hxx | 85 +-- 1 file changed, 47 insertions(+), 38 deletions(-) New commits: commit 572f164173404074716da51bf143a13332a28792 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 09:31:57 2014 +0200 Work around missing std::underlying_type in GCC 4.6 Change-Id: Ic641fe2f1771fe979423c58d285a96399ea16fe2 diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx index baa6793..b9b40d8 100644 --- a/include/o3tl/typed_flags_set.hxx +++ b/include/o3tl/typed_flags_set.hxx @@ -29,6 +29,13 @@ namespace o3tl { templatetypename T struct typed_flags {}; +#if defined __GNUC__ __GNUC__ == 4 __GNUC_MINOR__ = 6 \ +!defined __clang__ +#define O3TL_STD_UNDERLYING_TYPE_E unsigned int +#else +#define O3TL_STD_UNDERLYING_TYPE_E typename std::underlying_typeE::type +#endif + /// Mark a (scoped) enumeration as a set of bit flags, with accompanying /// operations. /// @@ -42,14 +49,14 @@ templatetypename T struct typed_flags {}; /// /// \param E the enumeration type. /// \param M the all-bits-set value for the bit flags. -templatetypename E, typename std::underlying_typeE::type M +templatetypename E, O3TL_STD_UNDERLYING_TYPE_E M struct is_typed_flags { static_assert( M = 0, is_typed_flags expects only non-negative bit values); class Self { public: -explicit Self(typename std::underlying_typeE::type value): +explicit Self(O3TL_STD_UNDERLYING_TYPE_E value): value_(value) { assert(value = 0); } @@ -58,7 +65,7 @@ struct is_typed_flags { #if !defined _MSC_VER || _MSC_VER 1700 explicit #endif -operator typename std::underlying_typeE::type() { return value_; } +operator O3TL_STD_UNDERLYING_TYPE_E() { return value_; } #if !defined _MSC_VER || _MSC_VER 1700 explicit @@ -66,20 +73,20 @@ struct is_typed_flags { operator bool() { return value_ != 0; } private: -typename std::underlying_typeE::type value_; +O3TL_STD_UNDERLYING_TYPE_E value_; }; -static typename std::underlying_typeE::type const mask = M; +static O3TL_STD_UNDERLYING_TYPE_E const mask = M; }; } templatetypename E inline typename o3tl::typed_flagsE::Self operator ~(E rhs) { -assert(static_casttypename std::underlying_typeE::type(rhs) = 0); +assert(static_castO3TL_STD_UNDERLYING_TYPE_E(rhs) = 0); return static_casttypename o3tl::typed_flagsE::Self( o3tl::typed_flagsE::mask - ~static_casttypename std::underlying_typeE::type(rhs)); + ~static_castO3TL_STD_UNDERLYING_TYPE_E(rhs)); } templatetypename E @@ -88,36 +95,36 @@ inline typename o3tl::typed_flagsE::Self operator ~( { return static_casttypename o3tl::typed_flagsE::Self( o3tl::typed_flagsE::mask - ~static_casttypename std::underlying_typeE::type(rhs)); + ~static_castO3TL_STD_UNDERLYING_TYPE_E(rhs)); } templatetypename E inline typename o3tl::typed_flagsE::Self operator (E lhs, E rhs) { -assert(static_casttypename std::underlying_typeE::type(lhs) = 0); -assert(static_casttypename std::underlying_typeE::type(rhs) = 0); +assert(static_castO3TL_STD_UNDERLYING_TYPE_E(lhs) = 0); +assert(static_castO3TL_STD_UNDERLYING_TYPE_E(rhs) = 0); return static_casttypename o3tl::typed_flagsE::Self( -static_casttypename std::underlying_typeE::type(lhs) - static_casttypename std::underlying_typeE::type(rhs)); +static_castO3TL_STD_UNDERLYING_TYPE_E(lhs) + static_castO3TL_STD_UNDERLYING_TYPE_E(rhs)); } templatetypename E inline typename o3tl::typed_flagsE::Self operator ( E lhs, typename o3tl::typed_flagsE::Self rhs) { -assert(static_casttypename std::underlying_typeE::type(lhs) = 0); +assert(static_castO3TL_STD_UNDERLYING_TYPE_E(lhs) = 0); return static_casttypename o3tl::typed_flagsE::Self( -static_casttypename std::underlying_typeE::type(lhs) - static_casttypename std::underlying_typeE::type(rhs)); +static_castO3TL_STD_UNDERLYING_TYPE_E(lhs) + static_castO3TL_STD_UNDERLYING_TYPE_E(rhs)); } templatetypename E inline typename o3tl::typed_flagsE::Self operator ( typename o3tl::typed_flagsE::Self lhs, E rhs) { -assert(static_casttypename std::underlying_typeE::type(rhs) = 0); +assert(static_castO3TL_STD_UNDERLYING_TYPE_E(rhs) = 0); return static_casttypename o3tl::typed_flagsE::Self( -static_casttypename std::underlying_typeE::type(lhs) - static_casttypename std::underlying_typeE::type(rhs)); +static_castO3TL_STD_UNDERLYING_TYPE_E(lhs) + static_castO3TL_STD_UNDERLYING_TYPE_E(rhs)); } templatetypename E @@ -126,37 +133,37 @@ inline typename o3tl::typed_flagsE::Self operator ( typename o3tl::typed_flagsE::Self rhs) { return static_casttypename o3tl::typed_flagsE::Self( -static_casttypename
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
On 10/13/2014 10:07 PM, nicholas ferguson wrote: Suggest adding --enable-assert-dbg-never-abort prevent assert() aborts in debug mode. I see no good reason for that. (If your are so desperate that you need that for whatever reason, you should be able to add an ad-hoc patch locally, without a need for a permanent switch.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/opencl-test.cxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit c60eac8db02fa6bd9097dfd387251bf85d9a7616 Author: Noel Grandin n...@peralex.com Date: Tue Oct 14 09:32:45 2014 +0200 don't execute ScOpenCLTest::testFinacialIRRFormula on OSX it has intermittent failures which causes the tinderboxes to unnecessarily spam my inbox Change-Id: I689b9d8c5da169dc6572250afe686b79039fba34 diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index aab8fda..9b05518 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -76,7 +76,10 @@ public: void testStatisticalFormulaFisherInv(); void testStatisticalFormulaGamma(); void testFinacialFvscheduleFormula(); +// this test has intermittent failures on OSX +#if !defined MACOSX void testFinacialIRRFormula(); +#endif void testFinacialMIRRFormula(); void testFinacialRateFormula(); void testFinancialAccrintmFormula(); @@ -301,7 +304,10 @@ public: CPPUNIT_TEST(testStatisticalFormulaFisherInv); CPPUNIT_TEST(testStatisticalFormulaGamma); CPPUNIT_TEST(testFinacialFvscheduleFormula); +// this test has intermittent failures on OSX +#if !defined MACOSX CPPUNIT_TEST(testFinacialIRRFormula); +#endif CPPUNIT_TEST(testFinacialMIRRFormula); CPPUNIT_TEST(testFinacialRateFormula); CPPUNIT_TEST(testCompilerHorizontal); @@ -1209,6 +1215,8 @@ void ScOpenCLTest::testFinacialSYDFormula() xDocShRes-DoClose(); } +// this test has intermittent failures on OSX +#if !defined MACOSX void ScOpenCLTest::testFinacialIRRFormula() { if (!detectOpenCLDevice()) @@ -1228,6 +1236,8 @@ void ScOpenCLTest::testFinacialIRRFormula() xDocSh-DoClose(); xDocShRes-DoClose(); } +#endif + //[AMLOEXT-49] void ScOpenCLTest::testStatisticalFormulaGammaLn() { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - connectivity/source
connectivity/source/drivers/jdbc/InputStream.cxx |3 - connectivity/source/drivers/jdbc/JConnection.cxx |8 +- connectivity/source/drivers/jdbc/JStatement.cxx|8 +- connectivity/source/drivers/jdbc/Object.cxx| 15 - connectivity/source/drivers/jdbc/PreparedStatement.cxx | 30 +- connectivity/source/drivers/jdbc/Reader.cxx|2 connectivity/source/drivers/jdbc/ResultSet.cxx | 50 +++-- connectivity/source/drivers/jdbc/Throwable.cxx |2 connectivity/source/inc/java/lang/Object.hxx |5 + 9 files changed, 66 insertions(+), 57 deletions(-) New commits: commit 899e472598e7c03ac05edd27343054306e49aee8 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 13 10:12:06 2014 +0100 coverity#706319 Uncaught exception Change-Id: I582bc15b8065c9262c0933f1afa0bda6e1f5d94e diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 5990be4..5edeaef 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -70,10 +70,11 @@ sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(::com::sun::star::io static jmethodID mID(NULL); return callIntMethod_Throw(available, mID); } + void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); -callVoidMethod_Throw(close,mID); +callVoidMethod_Nothrow(close,mID); } sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence sal_Int8 aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) commit 9ab3abd290fda1282d789365dd1cf61f7411c0f1 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 13 10:11:04 2014 +0100 coverity#706332 Uncaught exception Change-Id: I847cea7329a0c9cf370406afe8a7511f58c89901 diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 6ab7327c..279f944 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -491,21 +491,18 @@ sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeExcept return callBooleanMethod( next, mID ); } - sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) { static jmethodID mID(NULL); return callBooleanMethod( wasNull, mID ); } - void SAL_CALL java_sql_ResultSet::cancel( ) throw(::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); -callVoidMethod_Throw(cancel, mID); +callVoidMethod_Nothrow(cancel, mID); } - void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); commit cc70cff83af25574909b19112b3e67136cffb817 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 13 10:09:46 2014 +0100 coverity#706327 Uncaught exception Change-Id: I3a84a212abfcf0668b7040c8fa537ad62aaf5224 diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index b88e3b9..3907da7 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -75,7 +75,7 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(::com::sun::star::io::Not void SAL_CALL java_io_Reader::closeInput( ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) { static jmethodID mID(NULL); -callVoidMethod_Throw(close, mID); +callVoidMethod_Nothrow(close, mID); } sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence sal_Int8 aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) commit ada3817a3334a1e8694f54bb813eee7ffb8b36d7 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 13 10:09:07 2014 +0100 coverity#706326 Uncaught exception Change-Id: I922ce18051eefb4507cc84870ce18ae0a49f4608 diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 16341a1..5990be4 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -73,7 +73,7 @@ sal_Int32 SAL_CALL
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
Hi, On Tue, Oct 14, 2014 at 09:35:25AM +0200, Stephan Bergmann wrote: On 10/13/2014 10:07 PM, nicholas ferguson wrote: Suggest adding --enable-assert-dbg-never-abort prevent assert() aborts in debug mode. I see no good reason for that. (If your are so desperate that you need that for whatever reason, you should be able to add an ad-hoc patch locally, without a need for a permanent switch.) Well, I see a good reason for that. I recently saw some bibisects being done with Mikloss dbgutils bibisect repo[1] and they seem to contain more git bisect skips than everything else leading to less than optimal results. Now the fact that the branch apparently has so many asserts that fail regulary is unhealthy a topic of its own. But restricting our triaging here by failing too early is to be avoided IMHO -- and building bibisects with local patches is certainly a lot worse than yet-another-configure-switch. BTW, it seems to me that Mikloss repo does have the source-hash-deadcodedeadcodedeadcodedeadcode tag that my repos have[2] and thus make it impossible to identify what a bibisect means without downloading/updating that whole bibisect repo from the stuff that people copy-paste to bugzilla. Is that so, and if so, can it be changed? Best, Bjoern [1] https://wiki.documentfoundation.org/Bibisect#Versions [2] as done by http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/bibisect/Makefile#n59 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: package/source
package/source/xstor/xstorage.cxx | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) New commits: commit 58a96d3ccedbade4f1a8bfbbc4b7d8f1615cfc69 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 14 10:03:17 2014 +0100 bff: terminate on SAXException on malformed input SAXException thrown and not caught Change-Id: I874ffbcd457e102b572f398f4e531f4be30ca3d3 diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 3ac32e9..cb1e4f4 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -5186,7 +5186,28 @@ uno::Sequence uno::Sequence beans::StringPair SAL_CALL OStorage::getAllRel if ( m_pData-m_nStorageType != embed::StorageFormats::OFOPXML ) throw uno::RuntimeException( THROW_WHERE ); -return m_pImpl-GetAllRelationshipsIfAny(); +uno::Sequence uno::Sequence beans::StringPair aRet; +try +{ +aRet = m_pImpl-GetAllRelationshipsIfAny(); +} +catch (const io::IOException) +{ +throw; +} +catch (const uno::RuntimeException) +{ +throw; +} +catch (const uno::Exception ) +{ +uno::Any aCaught( ::cppu::getCaughtException() ); +throw lang::WrappedTargetRuntimeException(THROW_WHERE Can't getAllRelationships!, + uno::Reference uno::XInterface (), + aCaught); +} + +return aRet; } void SAL_CALL OStorage::insertRelationshipByID( const OUString sID, const uno::Sequence beans::StringPair aEntry, sal_Bool bReplace ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter.cxx |4 ++-- sw/source/core/frmedt/feshview.cxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 7c7958ef455d09a0c02683519fb766696904a103 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 11:07:09 2014 +0200 Wrong unnecessarily deep downcasts ...to SwDrawContact instead of SwContact, ingoring that some objects involved in e.g. CppunitTest_sw_uiwriter are of type SwFlyDrawContact. Change-Id: Ie3b7726b3d47106db00b8aa11b702d505c369e00 diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 6f99e9b..3165de7 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -313,7 +313,7 @@ void SwUiWriterTest::testShapeTextboxSelect() SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell(); SdrPage* pPage = pDoc-getIDocumentDrawModelAccess().GetDrawModel()-GetPage(0); SdrObject* pObject = pPage-GetObj(1); -SwDrawContact* pTextBox = static_castSwDrawContact*(pObject-GetUserCall()); +SwContact* pTextBox = static_castSwContact*(pObject-GetUserCall()); // First, make sure that pTextBox is a fly frame (textbox of a shape). CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, static_castRES_FMT(pTextBox-GetFmt()-Which())); @@ -386,7 +386,7 @@ void SwUiWriterTest::testShapeTextboxVertadjust() SwDoc* pDoc = createDoc(shape-textbox-vertadjust.odt); SdrPage* pPage = pDoc-getIDocumentDrawModelAccess().GetDrawModel()-GetPage(0); SdrObject* pObject = pPage-GetObj(1); -SwFrmFmt* pFmt = static_castSwDrawContact*(pObject-GetUserCall())-GetFmt(); +SwFrmFmt* pFmt = static_castSwContact*(pObject-GetUserCall())-GetFmt(); // This was SDRTEXTVERTADJUST_TOP. CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, pFmt-GetTextVertAdjust().GetValue()); } diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index bf88617..4505d3a 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -230,7 +230,7 @@ bool SwFEShell::SelectObj( const Point rPt, sal_uInt8 nFlag, SdrObject *pObj ) for (size_t i = 0; i rMrkList.GetMarkCount(); ++i) { SdrObject* pObject = rMrkList.GetMark(i)-GetMarkedSdrObj(); -SwDrawContact* pDrawContact = static_castSwDrawContact*(GetUserCall(pObject)); +SwContact* pDrawContact = static_castSwContact*(GetUserCall(pObject)); SwFrmFmt* pFmt = pDrawContact-GetFmt(); if (aTextBoxShapes.find(pFmt) != aTextBoxShapes.end()) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
On 10/14/2014 10:51 AM, Bjoern Michaelsen wrote: Well, I see a good reason for that. I recently saw some bibisects being done with Mikloss dbgutils bibisect repo[1] and they seem to contain more git bisect skips than everything else leading to less than optimal results. Now the fact that the branch apparently has so many asserts that fail regulary is unhealthy a topic of its own. But restricting our triaging here by failing too early is to be avoided IMHO -- and building bibisects with local patches is certainly a lot worse than yet-another-configure-switch. If I understand you correctly, you mean using that bibisect repo like $ git bisect start ... $ instdir/program/soffice # do something specific in LO, leads to SIGABRT $ git bisect skip $ instdir/program/soffice # do something specific in LO, leads to SIGABRT $ git bisect skip ... That sounds somewhat odd, given that at least make check apparently does not generally trigger failing asserts, so I would not assume that some random do something specific in LO would routinely do. Do you have an example? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
Hi Bjoern, On Tue, Oct 14, 2014 at 10:51:32AM +0200, Bjoern Michaelsen bjoern.michael...@canonical.com wrote: Well, I see a good reason for that. I recently saw some bibisects being done with Mikloss dbgutils bibisect repo[1] and they seem to contain more git bisect skips than everything else leading to less than optimal results. As explained in the wiki page, for me, a dbgutil bibisect repo is more useful than a product one (it's ~zero effort to build it, as I'm just populating it with builds I already have), but in other scenarios the normal one (i.e. what you produce) is more useful. It's just an accident that nobody currently maintains a bibisect repo that hosts product builds. Even if such a configure option would be added, I would not use it for my builds, as it does not help me, as a developer. ;-) BTW, it seems to me that Mikloss repo does have the source-hash-deadcodedeadcodedeadcodedeadcode tag that my repos have[2] and thus make it impossible to identify what a bibisect means without downloading/updating that whole bibisect repo from the stuff that people copy-paste to bugzilla. Is that so, and if so, can it be changed? Quoting its README: 'Exact git source hash of the current build is the SHA1 in the first line of build-info.txt.' So it's the same as yours, just you need to do 'git show $sha1:build-info.txt', not 'git show $sha1' if you want to get core.git hashes. The reason is that in the past it happened that after a 'git pull -r' I did have an accidental not-yet-pushed commit, and this way if such an error occurs, then the build is not completely useless: if the sha1 is not valid, you can just jump to the next one, and so on. This trick is not necessary in your situation when you have a build farm, producing builds after the fact. :-) Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
On 14.10.2014 11:19, Stephan Bergmann wrote: On 10/14/2014 10:51 AM, Bjoern Michaelsen wrote: Well, I see a good reason for that. I recently saw some bibisects being done with Mikloss dbgutils bibisect repo[1] and they seem to contain more git bisect skips than everything else leading to less than optimal results. Now the fact that the branch apparently has so many asserts that fail regulary is unhealthy a topic of its own. But restricting our triaging here by failing too early is to be avoided IMHO -- and building bibisects with local patches is certainly a lot worse than yet-another-configure-switch. this is a silly argument: asserts get added for a good reason, and if assert fails then that's a bug that needs to be fixed, and you can use a bibisect with debug enabled to track down when the bug was introduced. if you don't want asserts in your bibisect then please build a bibisect repo with debug disabled; that is certainly useful. also this problem is definitely not limited to asserts, i've seen it numerous times that i couldn't bibisect a particular bug in the repos you built because there happened to be another bug that made things crash at an earlier point. If I understand you correctly, you mean using that bibisect repo like $ git bisect start ... $ instdir/program/soffice # do something specific in LO, leads to SIGABRT $ git bisect skip $ instdir/program/soffice # do something specific in LO, leads to SIGABRT $ git bisect skip ... That sounds somewhat odd, given that at least make check apparently does not generally trigger failing asserts, so I would not assume that some random do something specific in LO would routinely do. Do you have an example? it tends to happen in UI and framework code, which is hardly exercised by current tests... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |3 +++ sw/qa/extras/odfimport/odfimport.cxx |2 -- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit f7b86315078f4fcdf7b6a6295abdfba2378f3601 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Oct 14 11:31:36 2014 +0200 CppunitTest_sw_odfimport: allow running a single test only Change-Id: I6dac6c98cd60955cf54e9e8554691566d29a34f1 diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx index ace74f6..8048b8c 100644 --- a/sw/qa/extras/inc/swmodeltestbase.hxx +++ b/sw/qa/extras/inc/swmodeltestbase.hxx @@ -91,6 +91,7 @@ using namespace css; #define DECLARE_OOXMLEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) #define DECLARE_RTFIMPORT_TEST(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) #define DECLARE_RTFEXPORT_TEST(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) +#define DECLARE_ODFIMPORT_TEST(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) // For testing during development of a test, you want to use // DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0 @@ -100,12 +101,14 @@ using namespace css; #define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) #define DECLARE_RTFIMPORT_TEST_ONLY(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) #define DECLARE_RTFEXPORT_TEST_ONLY(TestName, filename) DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test) +#define DECLARE_ODFIMPORT_TEST_ONLY(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) #undef DECLARE_OOXMLEXPORT_TEST #define DECLARE_OOXMLIMPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #define DECLARE_RTFIMPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #define DECLARE_RTFEXPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() +#define DECLARE_ODFIMPORT_TEST(TestName, filename) class disabled##TestName : public Test { void disabled(); }; void disabled##TestName::disabled() #endif #define DECLARE_SW_IMPORT_TEST(TestName, filename, BaseClass) \ diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index bb6ee13..18de668 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -33,8 +33,6 @@ class Test : public SwModelTestBase Test() : SwModelTestBase(/sw/qa/extras/odfimport/data/, writer8) {} }; -#define DECLARE_ODFIMPORT_TEST(TestName, filename) DECLARE_SW_IMPORT_TEST(TestName, filename, Test) - DECLARE_ODFIMPORT_TEST(testEmptySvgFamilyName, empty-svg-family-name.odt) { // .odt import did crash on the empty font list (which I think is valid according SVG spec) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
Hi, On Tue, Oct 14, 2014 at 11:19:12AM +0200, Stephan Bergmann wrote: That sounds somewhat odd, given that at least make check apparently does not generally trigger failing asserts, so I would not assume that some random do something specific in LO would routinely do. Do you have an example? I havent bibisected with that repo myself yet, just saw that e.g.: https://bugs.freedesktop.org/show_bug.cgi?id=84733#c1 has a lot of skipped commits. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
Hi Miklos, On Tue, Oct 14, 2014 at 11:49:24AM +0200, Miklos Vajna wrote: So it's the same as yours, just you need to do 'git show $sha1:build-info.txt', not 'git show $sha1' if you want to get core.git hashes. Not quite (unless Im missing something). Compare e.g.: https://bugs.freedesktop.org/show_bug.cgi?id=84733#c1 with: https://bugs.freedesktop.org/show_bug.cgi?id=81008#c2 Because the bisect log shows the tag names in the latter (source-hash-d6cde02dbce8c28c6af836e2dc1120f8a6ef9932 etc.), I can see from the bugzilla commit what the bisect range is, while I cannot do that with the former (I think) without downloading the whole dbgutil bibisect repo. Since you have the source hash in the build-info.txt file, it might be helpful to have some script tagging the commit accordingly so that 'git bisect log' shows the source hashes too. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - chart2/source include/o3tl include/vcl o3tl/CppunitTest_o3tl_tests.mk o3tl/qa
chart2/source/view/axes/Tickmarks.cxx|6 - chart2/source/view/axes/VAxisProperties.cxx | 48 ++-- chart2/source/view/axes/VAxisProperties.hxx | 17 +--- chart2/source/view/axes/VCartesianAxis.cxx | 102 --- chart2/source/view/axes/VCartesianAxis.hxx |4 - chart2/source/view/axes/VPolarRadiusAxis.cxx |6 - include/o3tl/typed_flags_set.hxx | 12 +-- include/vcl/outdevstate.hxx |4 - o3tl/CppunitTest_o3tl_tests.mk |1 o3tl/qa/test-typed_flags.cxx | 63 10 files changed, 152 insertions(+), 111 deletions(-) New commits: commit bf302000ea8849ac7ecd9162f3014bac9da4406e Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 12:48:42 2014 +0200 Revert Make VCartesianAxis::get2DAxisMainLine() truly const method. This reverts commit 410c5bd58c36d9064a79520d5bc31cb32ead1326, it causes CppunitTest_chart2_xshape to fail. diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index a8cd9a5..9942753 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -237,7 +237,7 @@ B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties rAxisP || ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos ) bFarAwayLabels = true; -double fInnerDirectionSign = rAxisProperties.maLabelAlignment.mfInnerTickDirection; +double fInnerDirectionSign = rAxisProperties.m_fInnerDirectionSign; if( fInnerDirectionSign==0.0 ) fInnerDirectionSign = 1.0; @@ -269,11 +269,11 @@ B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties rAxisP } B2DVector aLabelDirection(aStart); -if (rAxisProperties.maLabelAlignment.mfInnerTickDirection != rAxisProperties.maLabelAlignment.mfLabelDirection) +if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign ) aLabelDirection = aEnd; B2DVector aOrthoLabelDirection(aOrthoDirection); -if (rAxisProperties.maLabelAlignment.mfInnerTickDirection != rAxisProperties.maLabelAlignment.mfLabelDirection) +if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign ) aOrthoLabelDirection*=-1.0; aOrthoLabelDirection.normalize(); if( bIncludeSpaceBetweenTickAndText ) diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 9b449d5..80c2261 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -30,16 +30,11 @@ #include com/sun/star/drawing/LineStyle.hpp #include com/sun/star/text/WritingMode2.hpp +namespace chart +{ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -namespace chart { - -AxisLabelAlignment::AxisLabelAlignment() : -mfLabelDirection(1.0), -mfInnerTickDirection(1.0), -meAlignment(LABEL_ALIGN_RIGHT_TOP) {} - sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle) { sal_Int32 nWidth = AXIS2D_TICKLENGTH; //@maybefuturetodo this length could be offered by the model @@ -117,7 +112,7 @@ TickmarkProperties AxisProperties::makeTickmarkProperties( nTickmarkStyle = m_nMinorTickmarks; } -if (maLabelAlignment.mfInnerTickDirection == 0.0) +if( m_fInnerDirectionSign == 0.0 ) { if( nTickmarkStyle != 0 ) nTickmarkStyle = 3; //inner and outer tickmarks @@ -133,7 +128,7 @@ TickmarkProperties AxisProperties::makeTickmarkProperties( TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 /*nTextLevel*/ ) const { -sal_Int32 nTickmarkStyle = (maLabelAlignment.mfLabelDirection == maLabelAlignment.mfInnerTickDirection) ? 2/*outside*/ : 1/*inside*/; +sal_Int32 nTickmarkStyle = (m_fLabelDirectionSign==m_fInnerDirectionSign) ? 2/*outside*/ : 1/*inside*/; TickmarkProperties aTickmarkProperties; aTickmarkProperties.Length = nTickLength;// + nTextLevel*( lcl_calcTickLengthForDepth(0,nTickmarkStyle) ); @@ -163,6 +158,9 @@ AxisProperties::AxisProperties( const uno::Reference XAxis xAxisModel , m_eTickmarkPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ) , m_bCrossingAxisHasReverseDirection(false) , m_bCrossingAxisIsCategoryAxes(false) +, m_fLabelDirectionSign(1.0) +, m_fInnerDirectionSign(1.0) +, m_aLabelAlignment(LABEL_ALIGN_RIGHT_TOP) , m_bDisplayLabels( true ) , m_nNumberFormatKey(0) , m_nMajorTickmarks(1) @@ -187,7 +185,9 @@ AxisProperties::AxisProperties( const AxisProperties rAxisProperties ) , m_eTickmarkPos( rAxisProperties.m_eTickmarkPos ) , m_bCrossingAxisHasReverseDirection( rAxisProperties.m_bCrossingAxisHasReverseDirection
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/salinst.hxx | 21 - 1 file changed, 8 insertions(+), 13 deletions(-) New commits: commit 474d267efdcbc8cd069989f8b111566b2343c39e Author: Chris Sherlock chris.sherloc...@gmail.com Date: Tue Oct 14 22:25:27 2014 +1100 vcl: change to css alias namespace Change-Id: I4af1bd5cd1d614ca92cf843ad7fa5bb518829f89 diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 3713c7f..fb2adda 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -28,6 +28,7 @@ #include tools/solar.h #include displayconnectiondispatch.hxx #include vcl/dllapi.h +#include sal/types.h #include rtl/ref.hxx @@ -155,24 +156,18 @@ public: virtual voidFillFontPathList( std::list OString o_rFontPaths ); // dtrans implementation -virtual com::sun::star::uno::Reference com::sun::star::uno::XInterface -CreateClipboard( const com::sun::star::uno::Sequence com::sun::star::uno::Any i_rArguments ); -virtual com::sun::star::uno::Reference com::sun::star::uno::XInterface -CreateDragSource(); -virtual com::sun::star::uno::Reference com::sun::star::uno::XInterface -CreateDropTarget(); +virtual css::uno::Reference css::uno::XInterface CreateClipboard( const css::uno::Sequence css::uno::Any i_rArguments ); +virtual css::uno::Reference css::uno::XInterface CreateDragSource(); +virtual css::uno::Reference css::uno::XInterface CreateDropTarget(); virtual voidAddToRecentDocumentList(const OUString rFileUrl, const OUString rMimeType, const OUString rDocumentService) = 0; virtual boolhasNativeFileSelection() const { return false; } -virtual com::sun::star::uno::Reference com::sun::star::ui::dialogs::XFilePicker2 -createFilePicker( const com::sun::star::uno::Reference - com::sun::star::uno::XComponentContext ) -{ return com::sun::star::uno::Reference com::sun::star::ui::dialogs::XFilePicker2 (); } +virtual css::uno::Reference css::ui::dialogs::XFilePicker2 createFilePicker( const css::uno::Reference css::uno::XComponentContext ) +{ return css::uno::Reference css::ui::dialogs::XFilePicker2 (); } -virtual com::sun::star::uno::Reference com::sun::star::ui::dialogs::XFolderPicker2 -createFolderPicker( const com::sun::star::uno::Reference com::sun::star::uno::XComponentContext ) -{ return com::sun::star::uno::Reference com::sun::star::ui::dialogs::XFolderPicker2 (); } +virtual css::uno::Reference css::ui::dialogs::XFolderPicker2 createFolderPicker( const css::uno::Reference css::uno::XComponentContext ) +{ return css::uno::Reference css::ui::dialogs::XFolderPicker2 (); } // callbacks for printer updates virtual voidupdatePrinterUpdate() {} ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 45168] Add Option to crop (reduce size of) Images in PDF Export
https://bugs.freedesktop.org/show_bug.cgi?id=45168 --- Comment #11 from Samuel Mehrbrodt s.mehrbr...@gmail.com --- @Daniel: You could start by adding support for cropping. I would turn it on by default and add an option to toggle it off under the Image options in the pdf export dialog. Please ask if you need code pointers - you can also join IRC and ask there! -- 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: sd/source
sd/source/filter/eppt/eppt.cxx |4 +- sd/source/filter/eppt/epptbase.hxx | 43 ++ sd/source/filter/eppt/pptx-epptbase.cxx | 52 3 files changed, 51 insertions(+), 48 deletions(-) New commits: commit ba39577890ea64e272ae98d70aa33cbc9757a550 Author: Noel Grandin n...@peralex.com Date: Mon Oct 13 10:28:43 2014 +0200 fdo#84938: convert EPP_LAYOUT constants to enum Change-Id: Ibf43bf9ca241c6286659a16906a45bbafa798748 Reviewed-on: https://gerrit.libreoffice.org/11961 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Noel Grandin noelgran...@gmail.com diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index d05ed11..427f884 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -175,7 +175,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ mpPptEscherEx-PtReplaceOrInsert( EPP_Persist_Slide | nPageNum, mpStrm-Tell() ); mpPptEscherEx-OpenContainer( EPP_Slide ); mpPptEscherEx-AddAtom( 24, EPP_SlideAtom, 2 ); -mpStrm-WriteInt32( rLayout.nLayout ); +mpStrm-WriteInt32( static_castsal_Int32(rLayout.nLayout) ); mpStrm-Write( rLayout.nPlaceHolder, 8 ); // placeholderIDs (8 parts) mpStrm-WriteUInt32( (nMasterNum | 0x8000) )// master ID (equals 0x8000 on a master page) .WriteUInt32( nPageNum + 0x100 ) // notes ID (equals null if no notes are present) @@ -362,7 +362,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference XPropertyS mpPptEscherEx-PtReplaceOrInsert( EPP_Persist_MainMaster | nPageNum, mpStrm-Tell() ); mpPptEscherEx-OpenContainer( EPP_MainMaster ); mpPptEscherEx-AddAtom( 24, EPP_SlideAtom, 2 ); -mpStrm-WriteInt32( EPP_LAYOUT_TITLEANDBODYSLIDE ) // slide layout - title and body slide +mpStrm-WriteInt32( static_castsal_Int32(EppLayout::TITLEANDBODYSLIDE) ) // slide layout - title and body slide .WriteUChar( 1 ).WriteUChar( 2 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ).WriteUChar( 0 ) // placeholderID .WriteUInt32( 0 )// master ID (equals null at a master page) .WriteUInt32( 0 )// notes ID (equals null if no notes are present) diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 9529d58..b3e6abd 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -38,25 +38,28 @@ #include grouptable.hxx // PLACEMENT_ID -#define EPP_LAYOUT_TITLESLIDE 0 /* The slide is a title slide */ -#define EPP_LAYOUT_TITLEANDBODYSLIDE 1 /* Title and body slide */ -#define EPP_LAYOUT_TITLEMASTERSLIDE 2 /* Title master slide */ -#define EPP_LAYOUT_MASTERSLIDE3 /* Master slide layout */ -#define EPP_LAYOUT_MASTERNOTES4 /* Master notes layout */ -#define EPP_LAYOUT_NOTESTITLEBODY 5 /* Notes title/body layout */ -#define EPP_LAYOUT_HANDOUTLAYOUT 6 /* Handout layout, therefore it doesn't have placeholders except header, footer, and date */ -#define EPP_LAYOUT_ONLYTITLE 7 /* Only title placeholder */ -#define EPP_LAYOUT_2COLUMNSANDTITLE 8 /* Body of the slide has 2 columns and a title*/ -#define EPP_LAYOUT_2ROWSANDTITLE 9 /* Slide's body has 2 rows and a title*/ -#define EPP_LAYOUT_RIGHTCOLUMN2ROWS 10 /* Body contains 2 columns, right column has 2 rows */ -#define EPP_LAYOUT_LEFTCOLUMN2ROWS 11 /* Body contains 2 columns, left column has 2 rows*/ -#define EPP_LAYOUT_BOTTOMROW2COLUMNS 12 /* Body contains 2 rows, bottom row has 2 columns */ -#define EPP_LAYOUT_TOPROW2COLUMN 13 /* Body contains 2 rows, top row has 2 columns*/ -#define EPP_LAYOUT_4OBJECTS 14 /* 4 objects */ -#define EPP_LAYOUT_BIGOBJECT 15 /* Big object */ -#define EPP_LAYOUT_BLANCSLIDE16 /* Blank slide
[Libreoffice-commits] core.git: jurt/com
jurt/com/sun/star/lib/connections/socket/SocketConnection.java |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 530f060e41aa28634c133dab2e606907010d3cc3 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Tue Oct 14 11:25:26 2014 +0200 jurt: print an array with java.util.Arrays.toString Change-Id: I76431b67f9f6fdde2906d6d8082457ef0847108e Reviewed-on: https://gerrit.libreoffice.org/11964 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java index f7ad911..6f2a548 100644 --- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java +++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java @@ -23,8 +23,11 @@ import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import java.net.Socket; + import java.util.ArrayList; +import java.util.Arrays; import com.sun.star.connection.XConnection; import com.sun.star.connection.XConnectionBroadcaster; @@ -154,7 +157,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster { throw unoIOException; } -if (DEBUG) System.err.println(# + getClass().getName() + - read byte: + read_bytes + + bytes[0]); +if (DEBUG) System.err.println(# + getClass().getName() + - read byte: + read_bytes + + Arrays.toString(bytes[0])); return read_bytes; } @@ -176,7 +179,7 @@ public class SocketConnection implements XConnection, XConnectionBroadcaster { throw unoIOException; } -if (DEBUG) System.err.println(# + getClass().getName() + - written bytes: + aData + + aData.length); +if (DEBUG) System.err.println(# + getClass().getName() + - written bytes: + Arrays.toString(aData) + + aData.length); } /** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/container/ParcelContainer.java |5 + scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |4 ++-- scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java |3 ++- scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java |6 ++ scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java |6 ++ 5 files changed, 9 insertions(+), 15 deletions(-) New commits: commit 791ed2c654509c8e20af473d5413e8031bceddc0 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Tue Oct 14 11:57:25 2014 +0200 scripting: use new exception constructors Change-Id: I7eeece85d4e462bf2df010ee29c062941a677759 Reviewed-on: https://gerrit.libreoffice.org/11966 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java index be72d78..b641cd0 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelContainer.java @@ -193,10 +193,7 @@ public class ParcelContainer implements XNameAccess { name = decodedUrl.substring(indexOfSlash + 1); } } catch (UnsupportedEncodingException e) { -com.sun.star.uno.RuntimeException e2 = -new com.sun.star.uno.RuntimeException(); -e2.initCause(e); -throw e2; +throw new com.sun.star.uno.RuntimeException(e); } } else { name = document; diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index db30afb..cc4094d 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -218,9 +218,9 @@ public class ScriptMetaData extends ScriptEntry { if (url != null) { classPathVec.add(url); } - } +} - return classPathVec.toArray(new URL[classPathVec.size()]); +return classPathVec.toArray(new URL[classPathVec.size()]); } catch (Exception e) { LogUtils.DEBUG(Failed to build class path + e.toString()); LogUtils.DEBUG(LogUtils.getTrace(e)); diff --git a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java index 05384a7..79f933c 100644 --- a/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java +++ b/scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java @@ -117,7 +117,8 @@ public class UCBStreamHandler extends URLStreamHandler { try { String sUrl = url.toString(); -if ( sUrl.lastIndexOf(separator) != -1 ) { + +if (sUrl.lastIndexOf(separator) != -1) { String path = sUrl.substring(0, sUrl.lastIndexOf(separator)); if (m_xSimpleFileAccess.isReadOnly(path)) { diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java index 8daf836..497b073 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -131,10 +131,8 @@ public abstract class ScriptProvider implements } catch (Exception e) { LogUtils.DEBUG(LogUtils.getTrace(e)); -com.sun.star.uno.RuntimeException e2 = new com.sun.star.uno.RuntimeException( -Error constructing ScriptProvider: + e); -e2.initCause(e); -throw e2; +throw new com.sun.star.uno.RuntimeException( +e, Error constructing ScriptProvider: + e); } LogUtils.DEBUG(ScriptProvider: constructor - finished.); diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java index bc896cb..881ae81 100644 --- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java +++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java @@ -147,10 +147,8 @@ class ScriptImpl implements XScript { this.m_xMultiComponentFactory = m_xContext.getServiceManager(); } catch (Exception e) {
[Libreoffice-commits] core.git: scripting/java
scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 2 +- scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 0fdba36ab6aa1eef3e147371153b7c5d12c11cae Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Tue Oct 14 12:32:15 2014 +0200 scripting: replace '.size() == 0' with '.isEmpty()' (collections) http://docs.oracle.com/javase/1.5.0/docs/api/java/util/Map.html#isEmpty() http://docs.oracle.com/javase/1.5.0/docs/api/java/util/ArrayList.html#isEmpty() Change-Id: I76d8d8be2794655cb27ab121759494d7084b4744 Reviewed-on: https://gerrit.libreoffice.org/11967 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java index 14ebb24..f8b5d0d 100644 --- a/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java +++ b/scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java @@ -352,7 +352,7 @@ public class ParcelDescriptor { item.setAttribute(value, script.getLanguageName()); root.appendChild(item); -if (languagedepprops != null languagedepprops.size() != 0) { +if (languagedepprops != null !languagedepprops.isEmpty()) { String key; item = document.createElement(languagedepprops); diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java index cc4094d..d19928f 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -212,7 +212,7 @@ public class ScriptMetaData extends ScriptEntry { } -if (classPathVec.size() == 0) { +if (classPathVec.isEmpty()) { URL url = createURL(parcelPath); if (url != null) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a933f440a86ee20ba85898ac114dbe92f24cf9c Author: Andras Timar andras.ti...@collabora.com Date: Fri Oct 10 15:35:51 2014 +0200 Updated core Project: dictionaries 1a7b24c01ee7cdca23797878cf283f8e78ad4ebb diff --git a/dictionaries b/dictionaries index 263a052..1a7b24c 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 263a052f82c085b480a1518ab4e6ef0c4c566044 +Subproject commit 1a7b24c01ee7cdca23797878cf283f8e78ad4ebb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-4.3' - 2 commits - fr_FR/description.xml fr_FR/fr.aff fr_FR/fr.dic fr_FR/README_fr.txt pt_PT/description.xml pt_PT/pt_PT.dic
fr_FR/README_fr.txt | 13 fr_FR/description.xml |2 fr_FR/fr.aff |14658 +++--- fr_FR/fr.dic |15695 ++ pt_PT/description.xml |2 pt_PT/pt_PT.dic | 49 6 files changed, 15672 insertions(+), 14747 deletions(-) New commits: commit 1a7b24c01ee7cdca23797878cf283f8e78ad4ebb Author: Andras Timar andras.ti...@collabora.com Date: Fri Oct 10 15:35:51 2014 +0200 updated pt_PT dictionary to version 14.10.2.1 Change-Id: I9fa84bf75361a08d6141bae7ce74d407014c57ef Reviewed-on: https://gerrit.libreoffice.org/11905 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/pt_PT/description.xml b/pt_PT/description.xml index e6b0ae2..1a3149b 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=14.7.8.2 / +version value=14.10.2.1 / identifier value=Natura.OOo3.pt-PT-dictionary / display-name name lang=en-USEuropean Portuguese spelling dictionary, hyphenation rules, and thesaurus/name diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 20934c9..097ea87 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 44078 + 44083 , [CAT=punct1a] ; [CAT=punct1b] : [CAT=punct1c] @@ -1047,7 +1047,7 @@ alarmante/p [CAT=adj,N=s,G=_] alarmar/XYPLn [CAT=v,T=inf,TR=t] alarme/tip [CAT=nc,G=m,N=s] alarvado [CAT=adj,N=s,G=m] -alarve/G [CAT=a_nc,G=2,N=s] +alarve/Gp [CAT=a_nc,G=2,N=s] alar/XYPL [CAT=v,T=inf,TR=t] alastradeira [CAT=a_nc,G=f,N=s] alastrar/XYPLMD[CAT=v,T=inf,TR=t] @@ -1956,7 +1956,7 @@ anorexia [CAT=nc,G=f,N=s] anormal/pmd[CAT=adj,N=s,G=_] anormalidade/p [CAT=nc,G=f,N=s] anortear/ZYPL [CAT=v,T=inf,TR=t] -anos-luz [$ano-luz$N=p] +anos-luz [$ano-luz$CAT=nc,G=m,N=s$N=p] anoso/fp [CAT=adj,N=s,G=m] anotação/p [CAT=nc,G=f,N=s] anotador/p [CAT=nc,G=m,N=s] @@ -2993,7 +2993,7 @@ arribanceirado[CAT=adj,N=s,G=m] arriba/p [CAT=nc,G=f,N=s] arribar/XYLc [CAT=v,T=inf,TR=i] arribas[CAT=nc,G=f,N=s,N=p] -arriscar/XYPLB [CAT=v,T=inf,TR=t] +arriscar/XYPLBN[CAT=v,T=inf,TR=t] arritmia/p [CAT=nc,G=f,N=s] arrÃtmico [CAT=adj,N=s,G=m] arritmo[CAT=adj,N=s,G=m] @@ -7442,14 +7442,15 @@ chispar/XY [CAT=v,T=inf,TR=i] chispe/p [CAT=nc,G=m,N=s] chiste/p [CAT=nc,G=m,N=s] chita/p[CAT=nc,G=f,N=s] +choca/p[CAT=nc,G=f,N=s] +choça/p [CAT=nc,G=f,N=s] chocadeira/p [CAT=nc,G=f,N=s] chocalhada [CAT=nc,G=f,N=s] chocalhar/XYPL [CAT=v,T=inf,TR=_] chocalheiro/p [CAT=adj,N=s,G=m] chocalho/Gp[CAT=nc,G=m,N=s] -choca/p[CAT=nc,G=f,N=s] -choça/p [CAT=nc,G=f,N=s] chocar/XYPLnB [CAT=v,T=inf,TR=t] +chocarrice/p [CAT=nc,G=f,N=s] chochar/XYL[CAT=v,T=inf,TR=i] chocho/fpG [CAT=a_nc,G=m,N=s] choco/fpG [CAT=a_nc,G=m,N=s] @@ -11429,7 +11430,7 @@ desrespeitoso/pmf [CAT=adj,N=s,G=m] desrolhamento [CAT=nc,G=m,N=s] desse/fp [CAT=cp,Prep=de,Pdem=esse,G=m,N=s] desselecionar/XYP [PREAO90=desseleccionar,CAT=v,T=inf,TR=t] -destacar/XYPLMvB [CAT=v,T=inf,TR=t] +destacar/XYPLMvBN [CAT=v,T=inf,TR=t] destaque/p [CAT=nc,G=m,N=s] deste/fp [CAT=cp,Prep=de,Pdem=este,G=m,N=s] destemido/mp [CAT=adj,N=s,G=m] @@ -13389,6 +13390,7 @@ envolta [CAT=nc,G=f,N=s] envolto/fp [CAT=adj,N=s,G=m] envoltório[CAT=nc,G=m,N=s] envoltura [CAT=nc,G=f,N=s] +envolvência/p [CAT=nc,G=f,N=s] envolvente [CAT=adj,N=s,G=_] envolver/XYPLMn[CAT=v,T=inf,TR=t] enxabido [CAT=adj,N=s,G=m] @@ -14937,7 +14939,7 @@ extraterrestre/p[CAT=adj,N=s,G=_] extraterritorial/d [CAT=adj,N=s,G=_] extraterritorialidade/p[CAT=nc,G=f,N=s] extrassensorial/p [PREAO90=extra-sensorial,CAT=adj,N=s,G=m] -extrassolar/CAT=adj,N=s,G=m[PREAO90=extra-solar] +extrassolar[PREAO90=extra-solar,CAT=adj,N=s,G=m] extrauterino/p [PREAO90=extra-uterino,CAT=adj,N=s,G=m] extravagância/p [CAT=nc,G=f,N=s] extravaganciar/XYPL[CAT=v,T=inf,TR=_] @@ -16265,6 +16267,7 @@ fumaça/p [CAT=nc,G=f,N=s] fumaceira [CAT=nc,G=f,N=s] fumacento/fp [CAT=adj,N=s,G=m] fumada [CAT=nc,G=f,N=s] +fumagem/p [CAT=nc,G=f,N=s] fumão [CAT=nc,G=m,N=s] fumarada/p [CAT=nc,G=f,N=s] fumarento [CAT=adj,N=s,G=m] @@ -16390,7 +16393,7 @@ gadanhar/XYPL [CAT=v,T=inf,TR=t] gadanheiro/p [CAT=nc,G=m,N=s] gadanho/p [CAT=nc,G=m,N=s] gado/p [CAT=nc,G=m,N=s] -gafanhotada[CAT=nc,G=f,N=s] +gafanhotada/p [CAT=nc,G=f,N=s] gafanhoto/p[CAT=nc,G=m,N=s] gafa [CAT=nc,G=f,N=s] gafo [CAT=adj,N=s,G=_] @@
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 863d8f470b60a4fbe2595f2be6b5817913cb452d Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Thu Oct 9 01:55:36 2014 +0200 Updated core Project: translations f0108b522877624aaad39920a2f1a7a7e321c5a5 diff --git a/translations b/translations index f420344..f0108b5 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit f4203447b3707ebf5338530074831420cc2d9234 +Subproject commit f0108b522877624aaad39920a2f1a7a7e321c5a5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sd/source sfx2/source
sd/source/ui/docshell/docshel2.cxx |3 +-- sfx2/source/bastyp/sfxhtml.cxx |2 +- sfx2/source/menu/virtmenu.cxx |2 +- 3 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 2fff4927c4401f81b183883c94cb18d0b7806ca6 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 14 13:12:02 2014 +0100 coverity#1242426 Dereference after null check Change-Id: I59c96846aa5bf4780e4c5bfb0b71242e3b928976 diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 923e70b..0cf004b 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -296,8 +296,7 @@ bool DrawDocShell::CheckPageName (vcl::Window* pWin, OUString rName ) { aNameDlg-SetEditHelpId( HID_SD_NAMEDIALOG_PAGE ); -if( mpViewShell ) -aNameDlg-SetCheckNameHdl( LINK( this, DrawDocShell, RenameSlideHdl ) ); +aNameDlg-SetCheckNameHdl( LINK( this, DrawDocShell, RenameSlideHdl ) ); rtl::ReferenceFuPoor xFunc( mpViewShell-GetCurrentFunction() ); if( xFunc.is() ) commit f9a90514dec3dfbf1aea74a9296513c830ec6481 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 14 13:08:41 2014 +0100 coverity#1078471 Unchecked return value Change-Id: I2eb340eddf77ef5f007b5588e78d2b03bb5eb059 diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 0e036c9..8549e9b 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -332,7 +332,7 @@ double SfxHTMLParser::GetTableDataOptionsValNum( sal_uInt32 nNumForm, LanguageType eParseLang = (LanguageType )aNumStr.toInt32(); sal_uInt32 nParseForm = rFormatter.GetFormatForLanguageIfBuiltIn( 0, eParseLang ); double fVal; -rFormatter.IsNumberFormat( aValStr, nParseForm, fVal ); +(void)rFormatter.IsNumberFormat(aValStr, nParseForm, fVal); if ( comphelper::string::getTokenCount(aNumStr, ';') 2 ) { eNumLang = (LanguageType)aNumStr.getToken( 1, ';' ).toInt32(); commit 4f7cb49f93a55215c48f9e98f293b08293b56036 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 14 13:07:11 2014 +0100 coverity#735851 Dereference after null check Change-Id: I8f6e5803efe0db06d081903b9b852d1a1f881f7b diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index bd81d69..e6e4d8f 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -901,7 +901,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) { // Find the VirtualMenu for the SubMenu and if possible, bind a // VirtualMenu -bool bRet = Bind_Impl( pMenu ); +bool bRet = pMenu ? Bind_Impl(pMenu) : false; #ifdef DBG_UTIL if ( !bRet) DBG_WARNING( W1: Virtual menu could not be created! ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/examples
scripting/examples/java/debugger/DebugRunner.java |2 +- scripting/examples/java/debugger/OOBeanShellDebugger.java |2 +- scripting/examples/java/debugger/OORhinoDebugger.java |2 +- scripting/examples/java/debugger/OOScriptDebugger.java|2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 3f43627ac63b3131e7f621ecb53f5246224fd55d Author: Noel Grandin n...@peralex.com Date: Tue Oct 14 09:48:41 2014 +0200 fix import location of XScriptContext Change-Id: I3b0ec540ed37e40f59210b7fb563196aee63d1ea diff --git a/scripting/examples/java/debugger/DebugRunner.java b/scripting/examples/java/debugger/DebugRunner.java index 8e6c143..a3b4869 100644 --- a/scripting/examples/java/debugger/DebugRunner.java +++ b/scripting/examples/java/debugger/DebugRunner.java @@ -26,7 +26,7 @@ import java.net.URLDecoder; import com.sun.star.uno.XComponentContext; import com.sun.star.script.framework.provider.PathUtils; -import com.sun.star.script.framework.runtime.XScriptContext; +import com.sun.star.script.provider.XScriptContext; public class DebugRunner { diff --git a/scripting/examples/java/debugger/OOBeanShellDebugger.java b/scripting/examples/java/debugger/OOBeanShellDebugger.java index 23811fd..68a5087 100644 --- a/scripting/examples/java/debugger/OOBeanShellDebugger.java +++ b/scripting/examples/java/debugger/OOBeanShellDebugger.java @@ -47,7 +47,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import drafts.com.sun.star.script.framework.runtime.XScriptContext; +import com.sun.star.script.provider.XScriptContext; import bsh.Interpreter; public class OOBeanShellDebugger implements OOScriptDebugger, ActionListener, diff --git a/scripting/examples/java/debugger/OORhinoDebugger.java b/scripting/examples/java/debugger/OORhinoDebugger.java index f0d7aee..5144637 100644 --- a/scripting/examples/java/debugger/OORhinoDebugger.java +++ b/scripting/examples/java/debugger/OORhinoDebugger.java @@ -27,7 +27,7 @@ import org.mozilla.javascript.ImporterTopLevel; import org.mozilla.javascript.tools.debugger.Main; import org.mozilla.javascript.tools.debugger.ScopeProvider; -import drafts.com.sun.star.script.framework.runtime.XScriptContext; +import com.sun.star.script.provider.XScriptContext; public class OORhinoDebugger implements OOScriptDebugger { diff --git a/scripting/examples/java/debugger/OOScriptDebugger.java b/scripting/examples/java/debugger/OOScriptDebugger.java index 929936d..61fdbe7 100644 --- a/scripting/examples/java/debugger/OOScriptDebugger.java +++ b/scripting/examples/java/debugger/OOScriptDebugger.java @@ -19,7 +19,7 @@ package org.libreoffice.example.java_scripts; import java.io.InputStream; -import drafts.com.sun.star.script.framework.runtime.XScriptContext; +import com.sun.star.script.provider.XScriptContext; public interface OOScriptDebugger { public void go(XScriptContext ctxt, String filename); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/docs
readlicense_oo/docs/readme.xrm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a1679e47e681e01f91091d45889f672e6722eb1 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Oct 14 08:04:10 2014 -0500 fdo#81523 Bump the requirement for Mac in the Readme to 10.8 Change-Id: Ia9868b54824c03ee563973eb71e6ecade3ca589f diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index 8bc52e1..13ae196 100644 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -34,7 +34,7 @@ div class=MAC id=SystemRequirements_OSX ul li - p id=macxiOSX xml:lang=en-USMacOSX 10.5 (Leopard) or higher, Intel or PowerPC processor/p + p id=macxiOSX xml:lang=en-USMacOSX 10.8 (Mountain Lion) or higher/p /li /ul /div ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/axes/Tickmarks.cxx|6 - chart2/source/view/axes/VAxisProperties.cxx | 48 ++-- chart2/source/view/axes/VAxisProperties.hxx | 17 +++- chart2/source/view/axes/VCartesianAxis.cxx | 102 ++- chart2/source/view/axes/VCartesianAxis.hxx |4 - chart2/source/view/axes/VPolarRadiusAxis.cxx |6 - 6 files changed, 100 insertions(+), 83 deletions(-) New commits: commit 658f031bb155474fa64e69fb76326b29ef4a642c Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 15:07:31 2014 +0200 Revert Revert Make VCartesianAxis::get2DAxisMainLine() truly const method. This reverts commit bf302000ea8849ac7ecd9162f3014bac9da4406e, as clarified on IRC, --enable-chart-tests is known flaky and not intended to be used by anybody but moggi. diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 9942753..a8cd9a5 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -237,7 +237,7 @@ B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties rAxisP || ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END == rAxisProperties.m_eLabelPos ) bFarAwayLabels = true; -double fInnerDirectionSign = rAxisProperties.m_fInnerDirectionSign; +double fInnerDirectionSign = rAxisProperties.maLabelAlignment.mfInnerTickDirection; if( fInnerDirectionSign==0.0 ) fInnerDirectionSign = 1.0; @@ -269,11 +269,11 @@ B2DVector TickFactory2D::getDistanceAxisTickToText( const AxisProperties rAxisP } B2DVector aLabelDirection(aStart); -if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign ) +if (rAxisProperties.maLabelAlignment.mfInnerTickDirection != rAxisProperties.maLabelAlignment.mfLabelDirection) aLabelDirection = aEnd; B2DVector aOrthoLabelDirection(aOrthoDirection); -if( rAxisProperties.m_fInnerDirectionSign != rAxisProperties.m_fLabelDirectionSign ) +if (rAxisProperties.maLabelAlignment.mfInnerTickDirection != rAxisProperties.maLabelAlignment.mfLabelDirection) aOrthoLabelDirection*=-1.0; aOrthoLabelDirection.normalize(); if( bIncludeSpaceBetweenTickAndText ) diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 80c2261..9b449d5 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -30,11 +30,16 @@ #include com/sun/star/drawing/LineStyle.hpp #include com/sun/star/text/WritingMode2.hpp -namespace chart -{ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; +namespace chart { + +AxisLabelAlignment::AxisLabelAlignment() : +mfLabelDirection(1.0), +mfInnerTickDirection(1.0), +meAlignment(LABEL_ALIGN_RIGHT_TOP) {} + sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle) { sal_Int32 nWidth = AXIS2D_TICKLENGTH; //@maybefuturetodo this length could be offered by the model @@ -112,7 +117,7 @@ TickmarkProperties AxisProperties::makeTickmarkProperties( nTickmarkStyle = m_nMinorTickmarks; } -if( m_fInnerDirectionSign == 0.0 ) +if (maLabelAlignment.mfInnerTickDirection == 0.0) { if( nTickmarkStyle != 0 ) nTickmarkStyle = 3; //inner and outer tickmarks @@ -128,7 +133,7 @@ TickmarkProperties AxisProperties::makeTickmarkProperties( TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 /*nTextLevel*/ ) const { -sal_Int32 nTickmarkStyle = (m_fLabelDirectionSign==m_fInnerDirectionSign) ? 2/*outside*/ : 1/*inside*/; +sal_Int32 nTickmarkStyle = (maLabelAlignment.mfLabelDirection == maLabelAlignment.mfInnerTickDirection) ? 2/*outside*/ : 1/*inside*/; TickmarkProperties aTickmarkProperties; aTickmarkProperties.Length = nTickLength;// + nTextLevel*( lcl_calcTickLengthForDepth(0,nTickmarkStyle) ); @@ -158,9 +163,6 @@ AxisProperties::AxisProperties( const uno::Reference XAxis xAxisModel , m_eTickmarkPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ) , m_bCrossingAxisHasReverseDirection(false) , m_bCrossingAxisIsCategoryAxes(false) -, m_fLabelDirectionSign(1.0) -, m_fInnerDirectionSign(1.0) -, m_aLabelAlignment(LABEL_ALIGN_RIGHT_TOP) , m_bDisplayLabels( true ) , m_nNumberFormatKey(0) , m_nMajorTickmarks(1) @@ -185,9 +187,7 @@ AxisProperties::AxisProperties( const AxisProperties rAxisProperties ) , m_eTickmarkPos( rAxisProperties.m_eTickmarkPos ) , m_bCrossingAxisHasReverseDirection( rAxisProperties.m_bCrossingAxisHasReverseDirection ) , m_bCrossingAxisIsCategoryAxes( rAxisProperties.m_bCrossingAxisIsCategoryAxes ) -, m_fLabelDirectionSign( rAxisProperties.m_fLabelDirectionSign ) -
[Libreoffice-commits] core.git: 2 commits - svx/source vcl/source
svx/source/svdraw/svdomedia.cxx | 27 +++ vcl/source/gdi/impfont.cxx |2 +- 2 files changed, 20 insertions(+), 9 deletions(-) New commits: commit 782caa59cc0f72ef377b1d2c99b552b1be201f44 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 14 15:04:26 2014 +0200 svx: fix another temp file leak, from SdrMediaObj's glTF models These need a whole directory, apparently a model may have multiple files. Change-Id: I092c1764ddb1ed30947034f299fbb6882658d21b diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index da5860b..4655ec9 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -41,6 +41,7 @@ // For handling of glTF models #include unotools/tempfile.hxx +#include unotools/localfilehelper.hxx #include tools/urlobj.hxx using namespace ::com::sun::star; @@ -54,10 +55,17 @@ using namespace ::com::sun::star; struct MediaTempFile { OUString const m_TempFileURL; -MediaTempFile(OUString const rURL) : m_TempFileURL(rURL) {} +OUString const m_TempDirURL; // yet another hack, for the glTF models +MediaTempFile(OUString const rURL, OUString const rDirURL) +: m_TempFileURL(rURL), m_TempDirURL(rDirURL) +{} ~MediaTempFile() { ::osl::File::remove(m_TempFileURL); +if (!m_TempDirURL.isEmpty()) +{ +::utl::removeTree(m_TempDirURL); +} } }; @@ -270,10 +278,11 @@ uno::Referenceio::XInputStream SdrMediaObj::GetInputStream() static bool lcl_HandleJsonPackageURL( const OUString rURL, SdrModel* const pModel, -OUString o_rTempFileURL) +OUString o_rTempFileURL, +OUString o_rTempDirURL) { // Create a temporary folder which will contain all files of glTF model -const OUString sTempFolder = ::utl::TempFile( NULL, true ).GetURL(); +o_rTempDirURL = ::utl::TempFile(NULL, true).GetURL(); const sal_uInt16 nPackageLength = OString(vnd.sun.star.Package:).getLength(); const OUString sUrlPath = rURL.copy(nPackageLength,rURL.lastIndexOf(/)-nPackageLength); @@ -298,7 +307,7 @@ static bool lcl_HandleJsonPackageURL( { // Generate temp file path const OUString rFilename = aFilenames[nFileIndex]; -INetURLObject aUrlObj(sTempFolder); +INetURLObject aUrlObj(o_rTempDirURL); aUrlObj.insertName(rFilename); const OUString sFilepath = aUrlObj.GetMainURL( INetURLObject::NO_DECODE ); @@ -367,7 +376,7 @@ void SdrMediaObj::SetInputStream(uno::Referenceio::XInputStream const xStream bool const bSuccess = lcl_CopyToTempFile(xStream, tempFileURL); if (bSuccess) { -m_pImpl-m_pTempFile.reset(new MediaTempFile(tempFileURL)); +m_pImpl-m_pTempFile.reset(new MediaTempFile(tempFileURL, )); m_pImpl-m_MediaProperties.setURL( m_pImpl-m_LastFailedPkgURL, tempFileURL, ); } @@ -429,16 +438,18 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem rNewProper rNewProperties.getTempURL())) { OUString tempFileURL; +OUString tempDirURL; bool bSuccess; #if HAVE_FEATURE_GLTF if( url.endsWith(.json) ) -bSuccess = lcl_HandleJsonPackageURL(url, GetModel(), tempFileURL); +bSuccess = lcl_HandleJsonPackageURL(url, GetModel(), tempFileURL, tempDirURL); else #endif -bSuccess = lcl_HandlePackageURL( url, GetModel(), tempFileURL); +bSuccess = lcl_HandlePackageURL(url, GetModel(), tempFileURL); if (bSuccess) { -m_pImpl-m_pTempFile.reset(new MediaTempFile(tempFileURL)); +m_pImpl-m_pTempFile.reset( +new MediaTempFile(tempFileURL, tempDirURL)); m_pImpl-m_MediaProperties.setURL(url, tempFileURL, ); } else // this case is for Clone via operator= commit 616445cde0b594de1e6308944d3743cc64cd2a82 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 14 14:44:33 2014 +0200 vcl: warning C4717: GetCharCount() recursive on all control paths Change-Id: Id86dcd2c701510ce15cc2cf71e35c1d908ec6049 diff --git a/vcl/source/gdi/impfont.cxx b/vcl/source/gdi/impfont.cxx index 7f80a38..354edc1 100644 --- a/vcl/source/gdi/impfont.cxx +++ b/vcl/source/gdi/impfont.cxx @@ -416,7 +416,7 @@ bool FontCharMap::IsDefaultMap() const int FontCharMap::GetCharCount() const { -return GetCharCount(); +return mpImplFontCharMap-mnCharCount; } int FontCharMap::CountCharsInRange( sal_UCS4 cMin, sal_UCS4 cMax ) const ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: Revert Revert Make VCartesianAxis::get2DAxisMainLine() truly const method.
Markus, Can you please clarify the intended audience of --enable-chart-tests, and augment its description in configure.ac in case it is not intended for general usage. I had apparently at some point added it to my autogen.input in good faith, but can no longer reconstruct where I drew that faith from. Stephan On 10/14/2014 03:09 PM, Stephan Bergmann wrote: commit 658f031bb155474fa64e69fb76326b29ef4a642c Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 15:07:31 2014 +0200 Revert Revert Make VCartesianAxis::get2DAxisMainLine() truly const method. This reverts commit bf302000ea8849ac7ecd9162f3014bac9da4406e, as clarified on IRC, --enable-chart-tests is known flaky and not intended to be used by anybody but moggi. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - 86 commits - avmedia/source basctl/source basic/source bin/unpack-sources chart2/source configure.ac connectivity/source cppuhelper/s
avmedia/source/framework/modeltools.cxx |3 basctl/source/basicide/moduldl2.cxx | 10 basic/source/uno/namecont.cxx| 17 bin/unpack-sources | 10 chart2/source/controller/dialogs/res_ErrorBar.cxx| 20 chart2/source/controller/inc/res_ErrorBar.hxx|2 configure.ac | 27 connectivity/source/commontools/DateConversion.cxx |6 connectivity/source/parse/sqlbison.y |8 cppuhelper/source/servicemanager.cxx |1 dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk | 119 dbaccess/CppunitTest_dbaccess_nolib_save.mk | 119 dbaccess/Module_dbaccess.mk |2 dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java |2 dbaccess/qa/extras/empty-stdlib-save.cxx | 145 dbaccess/qa/extras/nolib-save.cxx| 135 dbaccess/source/core/api/RowSet.cxx |2 dbaccess/source/ui/querydesign/QueryDesignView.cxx |2 dbaccess/uiconfig/ui/specialsettingspage.ui |2 download.lst |8 external/coinmp/UnpackedTarball_coinmp.mk|1 external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 10 external/collada2gltf/StaticLibrary_collada2gltf.mk |1 external/collada2gltf/UnpackedTarball_collada2gltf.mk|1 external/collada2gltf/patches/kill_c++11_code.patch.1| 5824 +++ external/freetype/UnpackedTarball_freetype.mk|1 external/freetype/freetype-msvc-disable-sse2.patch.1 | 26 external/glew/UnpackedTarball_glew.mk|1 external/glew/glew-msvc-disable-sse2.patch.1 | 10 external/icu/ExternalProject_icu.mk |2 external/lcms2/UnpackedTarball_lcms2.mk |1 external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 10 external/libgltf/UnpackedTarball_libgltf.mk |1 external/libgltf/libgltf-msvc-disable-sse2.patch.1 | 10 external/libxml2/libxml2-vc10.patch |2 external/libxmlsec/xmlsec1-vc.patch |2 external/libxslt/libxslt-vc10.patch |2 external/nss/ExternalProject_nss.mk |4 external/nss/nss-linux-x86.patch.0 | 12 external/nss/nss-pem.patch | 17 external/nss/nss.aix.patch | 133 external/nss/nss.patch | 160 external/nss/nss_macosx.patch| 41 external/python3/UnpackedTarball_python3.mk |1 external/python3/python-msvc-disable-sse2.patch.1| 12 filter/source/config/fragments/filters/draw8.xcu |2 filter/source/config/fragments/filters/draw8_template.xcu|2 filter/source/config/fragments/filters/impress8.xcu |2 filter/source/config/fragments/filters/impress8_draw.xcu |2 filter/source/config/fragments/filters/impress8_template.xcu |2 framework/source/services/substitutepathvars.cxx |3 i18npool/Library_localedata_euro.mk |1 i18npool/source/localedata/data/ca_ES_valencia.xml | 43 i18npool/source/localedata/data/es_CR.xml| 17 i18npool/source/localedata/localedata.cxx|1 i18npool/source/search/textsearch.cxx|4 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |2 oox/CustomTarget_generated.mk|1 oox/source/docprop/ooxmldocpropimport.cxx|2 oox/source/drawingml/color.cxx | 30 oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 10 oox/source/drawingml/table/tablecell.cxx | 55 oox/source/token/properties.txt |1 oox/source/vml/vmlshape.cxx | 27 sc/source/core/data/column.cxx |6 sc/source/core/data/column4.cxx |7 sc/source/core/data/document10.cxx |4 sc/source/core/data/formulacell.cxx |2 sc/source/core/data/table3.cxx |7 sc/source/core/tool/token.cxx|2 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |1
[Libreoffice-commits] core.git: bridges/test
bridges/test/java_uno/nativethreadpool/Relay.java |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a760e45df6602b9cf7b3fc728a8ed3e11f89b12b Author: Noel Grandin n...@peralex.com Date: Tue Oct 14 15:21:26 2014 +0200 fix use of RuntimeException constructor Change-Id: Ia8fe44ea365183a8dec8027812b4877be080070d diff --git a/bridges/test/java_uno/nativethreadpool/Relay.java b/bridges/test/java_uno/nativethreadpool/Relay.java index c5322b6..fb1063b 100644 --- a/bridges/test/java_uno/nativethreadpool/Relay.java +++ b/bridges/test/java_uno/nativethreadpool/Relay.java @@ -45,7 +45,7 @@ public final class Relay implements XRelay, XSource { } catch (com.sun.star.uno.Exception e) { throw new WrappedTargetRuntimeException(e.getMessage(), this, e); } catch (Exception e) { -throw new com.sun.star.uno.RuntimeException(e, this); +throw new com.sun.star.uno.RuntimeException(e, , this); } final XAcceptor acceptor = Acceptor.create(context); final XBridgeFactory factory; @@ -85,7 +85,7 @@ public final class Relay implements XRelay, XSource { Thread.sleep(3000); // wait for new thread to accept connection } catch (InterruptedException e) { Thread.currentThread().interrupt(); -throw new com.sun.star.uno.RuntimeException(e, this); +throw new com.sun.star.uno.RuntimeException(e, , this); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - readlicense_oo/docs
readlicense_oo/docs/readme.xrm |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ffa12f6502af07c257aabd5198854b3b7c03d0da Author: Michael Stahl mst...@redhat.com Date: Tue Oct 14 15:21:25 2014 +0200 readme: official builds don't actually run on Mac OS X 10.5 Change-Id: I31c0ec00d08f1ddf0624f93d41d9ce5d9194039e Reviewed-on: https://gerrit.libreoffice.org/11969 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm index df8a5e6..f14b315 100644 --- a/readlicense_oo/docs/readme.xrm +++ b/readlicense_oo/docs/readme.xrm @@ -34,7 +34,7 @@ div class=MAC id=SystemRequirements_OSX ul li - p id=macxiOSX xml:lang=en-USMacOSX 10.5 (Leopard) or higher, Intel or PowerPC processor/p + p id=macxiOSX xml:lang=en-USMacOSX 10.6 (Snow Leopard) or higher/p /li /ul /div ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/ConfigGroup.java | 4 wizards/com/sun/star/wizards/common/ConfigSet.java | 10 - wizards/com/sun/star/wizards/common/Configuration.java | 10 - wizards/com/sun/star/wizards/common/Desktop.java | 21 -- wizards/com/sun/star/wizards/common/FileAccess.java | 73 -- wizards/com/sun/star/wizards/common/Helper.java | 1 wizards/com/sun/star/wizards/common/JavaTools.java | 22 --- wizards/com/sun/star/wizards/common/NumberFormatter.java | 12 - wizards/com/sun/star/wizards/common/NumericalHelper.java | 24 --- wizards/com/sun/star/wizards/common/PropertySetHelper.java | 1 wizards/com/sun/star/wizards/common/Resource.java| 3 wizards/com/sun/star/wizards/common/SystemDialog.java| 20 -- wizards/com/sun/star/wizards/common/UCB.java | 9 - wizards/com/sun/star/wizards/db/CommandMetaData.java | 9 - wizards/com/sun/star/wizards/db/DBMetaData.java | 4 wizards/com/sun/star/wizards/db/TableDescriptor.java | 10 - wizards/com/sun/star/wizards/db/TypeInspector.java | 2 wizards/com/sun/star/wizards/document/Control.java | 5 wizards/com/sun/star/wizards/document/FormHandler.java | 27 --- wizards/com/sun/star/wizards/document/OfficeDocument.java| 1 wizards/com/sun/star/wizards/report/IReportBuilderLayouter.java | 9 - wizards/com/sun/star/wizards/report/IReportDefinitionReadAccess.java | 1 wizards/com/sun/star/wizards/report/IReportDocument.java | 30 wizards/com/sun/star/wizards/report/ReportImplementationHelper.java | 4 wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java | 1 wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java| 4 wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 4 wizards/com/sun/star/wizards/reportbuilder/layout/SectionLabel.java | 1 wizards/com/sun/star/wizards/table/CallTableWizard.java | 1 wizards/com/sun/star/wizards/text/TextDocument.java | 2 wizards/com/sun/star/wizards/text/TextFieldHandler.java | 2 wizards/com/sun/star/wizards/ui/ButtonList.java | 50 -- wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 17 -- wizards/com/sun/star/wizards/ui/FilterComponent.java | 9 - wizards/com/sun/star/wizards/ui/ImageList.java | 10 - wizards/com/sun/star/wizards/ui/PeerConfig.java | 15 -- wizards/com/sun/star/wizards/ui/SortingComponent.java| 2 wizards/com/sun/star/wizards/ui/UnoDialog.java | 21 -- wizards/com/sun/star/wizards/ui/WizardDialog.java| 36 wizards/com/sun/star/wizards/ui/event/DataAware.java | 1 wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 5 wizards/com/sun/star/wizards/ui/event/TaskEvent.java | 5 wizards/com/sun/star/wizards/ui/event/TaskListener.java | 1 43 files changed, 25 insertions(+), 474 deletions(-) New commits: commit 959f7f2b7de87f75e83068efaeebe07d5c2be4ac Author: Noel Grandin n...@peralex.com Date: Tue Oct 14 15:41:30 2014 +0200 java: remove useless javadoc tags Change-Id: I83c59418c9eb32984dd5a2105e3d729e400520a4 diff --git a/wizards/com/sun/star/wizards/common/ConfigGroup.java b/wizards/com/sun/star/wizards/common/ConfigGroup.java index 0a71af2..c9ae076 100644 --- a/wizards/com/sun/star/wizards/common/ConfigGroup.java +++ b/wizards/com/sun/star/wizards/common/ConfigGroup.java @@ -65,12 +65,10 @@ public class ConfigGroup implements ConfigNode } /** - * convert the primitive type value of the + * Convert the primitive type value of the * given Field object to the corresponding * Java Object value. - * @param field * @return the value of the field as a Object. - * @throws IllegalAccessException */ public Object convertValue(Field field) throws IllegalAccessException { diff --git a/wizards/com/sun/star/wizards/common/ConfigSet.java b/wizards/com/sun/star/wizards/common/ConfigSet.java index 2e97984..9b8b647 100644 ---
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
On 10/14/2014 12:06 PM, Bjoern Michaelsen wrote: I havent bibisected with that repo myself yet, just saw that e.g.: https://bugs.freedesktop.org/show_bug.cgi?id=84733#c1 has a lot of skipped commits. (Looks like I at least cannot easily reproduce that on my Fedora machine, as that bibisect repo is apparently build --with-system-jpeg so requires a libjpeg.so.8 I don't have.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/epptbase.hxx | 25 - 1 file changed, 25 deletions(-) New commits: commit a24f9d91977766df63a17395ce4854bdc747b88b Author: Noel Grandin n...@peralex.com Date: Mon Oct 13 10:33:56 2014 +0200 remove duplicate definitions of PPT_TRANSITION_TYPE constants Change-Id: I8b6743c4f2c5c3d52c7df33953ed3dd7b32a1a46 diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index b3e6abd..b5dd803 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -415,31 +415,6 @@ public: static sal_Int8 GetTransition( ::com::sun::star::presentation::FadeEffect eEffect, sal_uInt8 nDirection ); }; -#define PPT_TRANSITION_TYPE_NONE0 -#define PPT_TRANSITION_TYPE_RANDOM 1 -#define PPT_TRANSITION_TYPE_BLINDS 2 -#define PPT_TRANSITION_TYPE_CHECKER 3 -#define PPT_TRANSITION_TYPE_COVER 4 -#define PPT_TRANSITION_TYPE_DISSOLVE5 -#define PPT_TRANSITION_TYPE_FADE6 -#define PPT_TRANSITION_TYPE_PULL7 -#define PPT_TRANSITION_TYPE_RANDOM_BARS 8 -#define PPT_TRANSITION_TYPE_STRIPS 9 -#define PPT_TRANSITION_TYPE_WIPE 10 -#define PPT_TRANSITION_TYPE_ZOOM 11 -#define PPT_TRANSITION_TYPE_SPLIT 13 - -// effects, new in xp -#define PPT_TRANSITION_TYPE_DIAMOND 17 -#define PPT_TRANSITION_TYPE_PLUS18 -#define PPT_TRANSITION_TYPE_WEDGE 19 -#define PPT_TRANSITION_TYPE_PUSH20 -#define PPT_TRANSITION_TYPE_COMB21 -#define PPT_TRANSITION_TYPE_NEWSFLASH 22 -#define PPT_TRANSITION_TYPE_SMOOTHFADE 23 -#define PPT_TRANSITION_TYPE_WHEEL 26 -#define PPT_TRANSITION_TYPE_CIRCLE 27 - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: core.git: sc/qa
hi Markus, i wonder if there's a buggy OpenCL driver on that Mac that needs to be blacklisted somewhere? On 14.10.2014 09:35, Noel Grandin wrote: sc/qa/unit/opencl-test.cxx | 10 ++ 1 file changed, 10 insertions(+) New commits: commit c60eac8db02fa6bd9097dfd387251bf85d9a7616 Author: Noel Grandin n...@peralex.com Date: Tue Oct 14 09:32:45 2014 +0200 don't execute ScOpenCLTest::testFinacialIRRFormula on OSX it has intermittent failures which causes the tinderboxes to unnecessarily spam my inbox ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: core.git: sc/qa
i wonder if there's a buggy OpenCL driver on that Mac that needs to be blacklisted somewhere? Somebody else was wondering the same earlier this week. But there isn't such a large variety of OpenCL drivers (or whatever the correct term is) on OS X. Either or code is sliughtly buggy, or there is a bug in Apple's OpenCL implementation that manifests itself when the code happens to execute on a specific OpenCL device (i.e. the CPU or a specific GPU). But the OpenCL driver version number as seen by our code is the same in all cases on a certain OS X version, I think. Not sure if we can blacklist only based on OpenCL driver version, or also specific driver+device combinations. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
libjpeg
On 14.10.2014 15:46, Stephan Bergmann wrote: On 10/14/2014 12:06 PM, Bjoern Michaelsen wrote: I havent bibisected with that repo myself yet, just saw that e.g.: https://bugs.freedesktop.org/show_bug.cgi?id=84733#c1 has a lot of skipped commits. (Looks like I at least cannot easily reproduce that on my Fedora machine, as that bibisect repo is apparently build --with-system-jpeg so requires a libjpeg.so.8 I don't have.) yes, that's an endemic problem with all bibisect repos, except the very latest from Bjoern, they're all missing --without-system-jpeg and thus require that particular libjpeg.so.8 on the system. i've worked around that by just building it from source and LD_PRELOADing it. on a related note, why are we bundling IJG libjpeg-8 [1] ... even libjpeg-9 on master with LO, instead of libjpeg-turbo [2] like most linux distros do nowadays? apparently the prevailing opinion is that libjpeg 6 just adds questionable new features that, when used, cause interop problems with older software that supports only the ISO standard, i.e., what's implemented in libjpeg-6, whereas libjpeg-turbo is standard JPEG and is quite optimized on x86 CPUs. this seems to be a good summary of the situation: https://lists.debian.org/debian-devel-announce/2014/08/msg0.html [1] http://ijg.org/ [2] http://www.libjpeg-turbo.org/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: core.git: sc/qa
On 14.10.2014 16:04, Tor Lillqvist wrote: i wonder if there's a buggy OpenCL driver on that Mac that needs to be blacklisted somewhere? Somebody else was wondering the same earlier this week. But there isn't such a large variety of OpenCL drivers (or whatever the correct term is) on OS X. Either or code is sliughtly buggy, or there is a bug in Apple's OpenCL implementation that manifests itself when the code happens to execute on a specific OpenCL device (i.e. the CPU or a specific GPU). But the OpenCL driver version number as seen by our code is the same in all cases on a certain OS X version, I think. Not sure if we can blacklist only based on OpenCL driver version, or also specific driver+device combinations. in any case, somebody needs to investigate *why* the test is failing for some, as it may fail for end users too in some scenario then; just disabling it on Mac is not the best strategy :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: core.git: sc/qa
On Tue, 2014-10-14 at 16:16 +0200, Michael Stahl wrote: On 14.10.2014 16:04, Tor Lillqvist wrote: i wonder if there's a buggy OpenCL driver on that Mac that needs to be blacklisted somewhere? Somebody else was wondering the same earlier this week. But there isn't such a large variety of OpenCL drivers (or whatever the correct term is) on OS X. Either or code is sliughtly buggy, or there is a bug in Apple's OpenCL implementation that manifests itself when the code happens to execute on a specific OpenCL device (i.e. the CPU or a specific GPU). But the OpenCL driver version number as seen by our code is the same in all cases on a certain OS X version, I think. Not sure if we can blacklist only based on OpenCL driver version, or also specific driver+device combinations. in any case, somebody needs to investigate *why* the test is failing for some, as it may fail for end users too in some scenario then; just disabling it on Mac is not the best strategy :) So, that somebody will probably end up being me (unless someone else volunteers). The problem is that, I don't have OS X hardware to test on, and I'm not the original author of the test and hence will likely take a fair amount of time to study it. Either way, disabling it on OS X may be our only short-term solution (or compromise if you prefer the term) given the circumstance. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
On Tue, 2014-10-14 at 12:12 +0200, Bjoern Michaelsen wrote: Since you have the source hash in the build-info.txt file, it might be helpful to have some script tagging the commit accordingly so that 'git bisect log' shows the source hashes too. That would be helpful. However, I would ask for the date to show as well: the ability to predict the next step will go forward/backward and then to see that happen helps to build confidence. I have added a paragraph to the wiki page [1,2] asking for source hashes in the report of results. Would it be worthwhile to provide a table of source hashes by date linked from that wiki page? Or will existing versions in the repository be retagged with the additional info? Terry. Links - [1] wiki...HowToBibisect, my change https://wiki.documentfoundation.org/index.php?title=QA%2FHowToBibisectdiff=102563oldid=102562 [2] wiki...HowToBibisect, current https://wiki.documentfoundation.org/QA/HowToBibisect ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: core.git: sc/qa
On 2014-10-14 04:16 PM, Michael Stahl wrote: On 14.10.2014 16:04, Tor Lillqvist wrote: i wonder if there's a buggy OpenCL driver on that Mac that needs to be blacklisted somewhere? Somebody else was wondering the same earlier this week. But there isn't such a large variety of OpenCL drivers (or whatever the correct term is) on OS X. Either or code is sliughtly buggy, or there is a bug in Apple's OpenCL implementation that manifests itself when the code happens to execute on a specific OpenCL device (i.e. the CPU or a specific GPU). But the OpenCL driver version number as seen by our code is the same in all cases on a certain OS X version, I think. Not sure if we can blacklist only based on OpenCL driver version, or also specific driver+device combinations. in any case, somebody needs to investigate *why* the test is failing for some, as it may fail for end users too in some scenario then; just disabling it on Mac is not the best strategy :) It doesn't fail reliably, and it only seems to happen under high load. Anyhow, it's been failing for months and no-one has stepped up, so I commented it out so I can stop ignoring the buildbots. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/menuids_tmpl.src | 35 --- sd/source/ui/app/popup.src|4 sd/source/ui/app/popup2_tmpl.src |5 - 3 files changed, 44 deletions(-) New commits: commit 72cb37b6858a2636ff1e7bc8228efdc52eebf922 Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Tue Oct 14 16:33:21 2014 +0200 fdo#84236 Remove view modes from sd context menu Change-Id: I7146ee946c7f882decae2c8d93c63002d00dd511 diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index 77273dd..cb89cdc 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -35,41 +35,6 @@ Text [ en-US ] = ~Distribution... ; \ }; -#define MN_DRAWINGMODE \ -MenuItem\ -{\ -Identifier = SID_DRAWINGMODE ; \ -HelpId = CMD_SID_DRAWINGMODE ; \ -Check = TRUE ; \ -Text [ en-US ] = ~Drawing View ; \ -}; - -#define MN_OUTLINEMODE \ -MenuItem\ -{\ -Identifier = SID_OUTLINEMODE ; \ -HelpId = CMD_SID_OUTLINEMODE ; \ -Check = TRUE ; \ -Text [ en-US ] = ~Outline View ; \ -}; - -#define MN_DIAMODE \ -MenuItem\ -{\ -Identifier = SID_DIAMODE ; \ -HelpId = CMD_SID_DIAMODE ; \ -Check = TRUE ; \ -Text [ en-US ] = ~Slide Sorter ; \ -}; - -#define MN_PRESENTATION \ -MenuItem\ -{\ -Identifier = SID_PRESENTATION ; \ -HelpId = CMD_SID_PRESENTATION ; \ -Text [ en-US ] = Slide Sho~w ; \ -}; - #define MN_CAPTUREPOINT \ MenuItem\ {\ diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index 1fd5561..19f5448 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -352,10 +352,6 @@ Menu RID_OUTLINE_POPUP ITEM_FORMAT_NUMBERING ITEM_TRANSLITERATE_MENU MN_PRESENTATIONOBJECT -SEPARATOR -MN_DRAWINGMODE -MN_DIAMODE -MN_PRESENTATION }; }; diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 7d54ed5..f80926e 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -522,11 +522,6 @@ #elif SD_POPUP == RID_GRAPHIC_TEXTOBJ_POPUP MN_PAGE_MENU #endif -#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP -MN_OUTLINEMODE -MN_DIAMODE -MN_PRESENTATION -#endif SEPARATOR MN_RULER MN_GRID ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_odfimport.mk sw/qa sw/source
sw/CppunitTest_sw_odfimport.mk |3 ++ sw/qa/extras/odfimport/data/bnc800714.fodt | 35 + sw/qa/extras/odfimport/odfimport.cxx | 11 + sw/source/core/text/frmform.cxx|7 - 4 files changed, 55 insertions(+), 1 deletion(-) New commits: commit 2d35baed5e87ffe7ca371986391cdb3983cdd2b1 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Oct 14 16:31:13 2014 +0200 bnc#800714 SwTxtFrm::FormatAdjust: still call SplitFrm if we have columns Regression from c5a8a2c3cbcee0175127a0662e3d820ea4deea22 (sw34bf05: i#84870 - method SwTxtFrm::FormatAdjust(..) - do not split text frame which only contains on as-character anchored object, 2011-03-11), the i#84870 fix was for a document which didn't have columns, and didn't consider that this causes a layout loop in case: 1) There are two paragraphs in a section, having multiple columns. 2) The second paragraph has fo:keep-together=always. In this case originally we tried to call SplitFrm(), realized that it didn't help, and then gave up. But after the change, we kept trying to satisfy the two conflicting requirements (balance content in the 3 columns vs keep the second paragraph with the first one). Fix the problem by not calling SplitFrm() only in case we're not inside columns. Change-Id: I64e969ef5e8f519314f5613f8e6fae626ae085ce diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index 57086ef..7122302 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -58,6 +58,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\ embeddedobj/util/embobj \ filter/source/config/cache/filterconfig1 \ filter/source/storagefilterdetect/storagefd \ + filter/source/odfflatxml/odfflatxml \ + filter/source/xmlfilterdetect/xmlfd \ + filter/source/xmlfilteradaptor/xmlfa \ framework/util/fwk \ i18npool/util/i18npool \ lingucomponent/source/languageguessing/guesslang \ diff --git a/sw/qa/extras/odfimport/data/bnc800714.fodt b/sw/qa/extras/odfimport/data/bnc800714.fodt new file mode 100644 index 000..a759b7c --- /dev/null +++ b/sw/qa/extras/odfimport/data/bnc800714.fodt @@ -0,0 +1,35 @@ +?xml version=1.0 encoding=UTF-8? +office:document xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 xmlns:math=http://www.w3.org/1998/Math/MathML; xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 xmlns:config=urn:oas is:names:tc:opendocument:xmlns:config:1.0 xmlns:ooo=http://openoffice.org/2004/office; xmlns:ooow=http://openoffice.org/2004/writer; xmlns:oooc=http://openoffice.org/2004/calc; xmlns:dom=http://www.w3.org/2001/xml-events; xmlns:xforms=http://www.w3.org/2002/xforms; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:rpt=http://openoffice.org/2005/report; xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 xmlns:xhtml=http://www.w3.org/1999/xhtml; xmlns:grddl=http://www.w3.org/2003/g/data-view#; xmlns:officeooo=http://openoffice.org/2009/office; xmlns:tableooo=http://openoffice.org/2009/table; xmlns:drawooo=http://openoffice.org/2010/draw; xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0 xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 xmlns:formx=urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0 xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 office:mimetype=application/vnd.oasis.opendocument.text + office:automatic-styles + style:style style:name=P1 style:family=paragraph/ + style:style style:name=P2 style:family=paragraph + style:paragraph-properties fo:keep-with-next=always/ + /style:style + style:style style:name=fr1 style:family=graphic style:parent-style-name=Frame + style:graphic-properties style:vertical-pos=top style:vertical-rel=baseline/ + /style:style + style:style style:name=Sect1 style:family=section + style:section-properties
[Libreoffice-commits] core.git: Branch 'feature/perfwork2' - 4 commits - chart2/source
chart2/source/view/axes/Tickmarks.cxx|6 - chart2/source/view/axes/VAxisProperties.cxx | 48 chart2/source/view/axes/VAxisProperties.hxx | 17 ++ chart2/source/view/axes/VCartesianAxis.cxx | 102 + chart2/source/view/axes/VCartesianAxis.hxx |4 chart2/source/view/axes/VPolarRadiusAxis.cxx |6 - chart2/source/view/main/ChartView.cxx| 155 --- 7 files changed, 192 insertions(+), 146 deletions(-) New commits: commit 726b89eaf6c8f6e77676db676a144c5dbd2aeecc Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Oct 13 19:32:15 2014 -0400 More on documenting the methods. Change-Id: Ibdbc1b26521e56de5dcba1b9572bb0221fc0fff5 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 3de0c47..4ba924b 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -255,11 +255,23 @@ public: * largest axis label text object prior to calling this method. * * The new axis scaling data will be stored in the VCoordinateSystem - * objects. + * objects. The label alignment direction for each axis will also get + * determined during this process, and stored in VAxis. */ void doAutoScaling( ChartModel rModel ); + +/** + * After auto-scaling is performed, call this method to set the explicit + * scaling and increment data to all relevant VAxis objects. + */ void updateScalesAndIncrementsOnAxes(); + +/** + * After auto-scaling is performed, call this method to set the explicit + * scaling data to all the plotters. + */ void setScalesFromCooSysToPlotter(); + void setNumberFormatsFromAxes(); drawing::Direction3D getPreferredAspectRatio(); commit 8128574ac559e7c13c26cf60e9c4560535efcd6e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Mon Oct 13 15:24:33 2014 -0400 Scope level reduction explain what the max axis index really is. The concept of axis index and dimension index is quite confusing in the chart2 code Change-Id: I035af0a225396bd5394089d6f584f78dcaf0ad31 diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 732d01e..3de0c47 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -276,7 +276,15 @@ private: SeriesPlottersType m_aSeriesPlotterList; std::vector VCoordinateSystem* m_rVCooSysList; ::std::map uno::Reference XAxis , AxisUsage m_aAxisUsageList; + +/** + * Max axis index of all dimensions. Currently this can be either 0 or 1 + * since we only support primary and secondary axes per dimension. The + * value of 0 means all dimensions have only primary axis, while 1 means + * at least one dimension has a secondary axis. + */ sal_Int32 m_nMaxAxisIndex; + bool m_bChartTypeUsesShiftedCategoryPositionPerDefault; sal_Int32 m_nDefaultDateNumberFormat; }; @@ -778,85 +786,85 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel continue; uno::Reference XDiagram xDiagram( rModel.getFirstDiagram() ); -if( xDiagram.is() ) +if (!xDiagram.is()) +continue; + +bool bSeriesAttachedToThisAxis = false; +sal_Int32 nAttachedAxisIndex = -1; { -bool bSeriesAttachedToThisAxis = false; -sal_Int32 nAttachedAxisIndex = -1; +::std::vector Reference XDataSeries aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); +::std::vector Reference XDataSeries ::const_iterator aIter = aSeriesVector.begin(); +for( ; aIter != aSeriesVector.end(); ++aIter ) { -::std::vector Reference XDataSeries aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) ); -::std::vector Reference XDataSeries ::const_iterator aIter = aSeriesVector.begin(); -for( ; aIter != aSeriesVector.end(); ++aIter ) +sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); +if( nAxisIndex == nCurrentIndex ) { -sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter ); -if( nAxisIndex == nCurrentIndex ) -{ -bSeriesAttachedToThisAxis = true; -break; -} -else if( nAttachedAxisIndex0 || nAttachedAxisIndexnCurrentIndex ) -nAttachedAxisIndex=nCurrentIndex; +bSeriesAttachedToThisAxis = true; +break; } +else if(
[Libreoffice-commits] core.git: odk/examples qadevOOo/runner
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java |2 qadevOOo/runner/util/ValueChanger.java | 1914 +- 2 files changed, 980 insertions(+), 936 deletions(-) New commits: commit cc25440a9d7881b3df479179a4c320da53220119 Author: Noel Grandin n...@peralex.com Date: Tue Oct 14 16:01:30 2014 +0200 reformat ValueChanger so that it is at least marginally legible Change-Id: I20882ad77d6488bb1f2b9dc9e91dc47458596b4a diff --git a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java index 2640100..576fb50 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java +++ b/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java @@ -111,14 +111,12 @@ public class FunctionHelper { // Any UNO method of this scope can throw this exception. // Reset the return value only. -aURL = null; } catch(com.sun.star.uno.Exception exUno) { // createInstance() method of used service manager can throw it. // Then it wasn't possible to get the URL transformer. // Return default instead of really parsed URL. -aURL = null; } return aURL; diff --git a/qadevOOo/runner/util/ValueChanger.java b/qadevOOo/runner/util/ValueChanger.java index adba18d..f814f1a 100644 --- a/qadevOOo/runner/util/ValueChanger.java +++ b/qadevOOo/runner/util/ValueChanger.java @@ -21,968 +21,1014 @@ package util; import com.sun.star.awt.Point; import com.sun.star.beans.PropertyValue; import com.sun.star.drawing.PolygonFlags; -import com.sun.star.uno.Enum ; -import java.lang.reflect.Field ; -import java.lang.reflect.Method ; -import java.lang.reflect.Modifier ; -import java.lang.reflect.Array ; +import com.sun.star.uno.Enum; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Array; import com.sun.star.uno.Any; import com.sun.star.uno.AnyConverter; - public class ValueChanger { +// Method to change a Value, thought for properties +public static Object changePValue(Object oldValue) { - // Method to change a Value, thought for properties - public static Object changePValue( Object oldValue ) { - - Object newValue = null; - - if (oldValue instanceof com.sun.star.uno.Any) { - try { -oldValue = AnyConverter.toObject(((Any) oldValue).getType(),oldValue); - } catch (com.sun.star.lang.IllegalArgumentException iae) { - } - } - - if (oldValue == null) - return null; - - if (oldValue instanceof Boolean) { - boolean oldbool = ((Boolean) oldValue).booleanValue(); - newValue = Boolean.valueOf(!oldbool); - } else - - if (oldValue instanceof Integer) { - int oldint = ((Integer) oldValue).intValue(); - newValue = Integer.valueOf(oldint+5); - } else - - if (oldValue instanceof Long) { - long oldlong = ((Long) oldValue).longValue(); - newValue = Long.valueOf(oldlong + 15); - } else - - if (oldValue instanceof Short) { - short oldshort = ((Short) oldValue).shortValue(); - newValue = Short.valueOf((short) (oldshort + 1)); - } else - - if (oldValue instanceof Byte) { - byte oldbyte = ((Byte) oldValue).byteValue(); - newValue = Byte.valueOf((byte) (oldbyte + 1)); - } else - - if (oldValue instanceof Float) { - float oldfloat = ((Float) oldValue).floatValue(); - newValue = new Float((float) (oldfloat + 16.7)); - } else - - if (oldValue instanceof Double) { - double olddouble = ((Double) oldValue).doubleValue(); - newValue = new Double(olddouble + 17.8); - } else - - if (oldValue instanceof String) { - String oldString = (String) oldValue; - newValue = oldString + New; - } else - - - if (oldValue instanceof com.sun.star.chart.ChartAxisArrangeOrderType) { - Object AO1 = com.sun.star.chart.ChartAxisArrangeOrderType.AUTO; - Object AO2= com.sun.star.chart.ChartAxisArrangeOrderType.SIDE_BY_SIDE; - Object AO3= com.sun.star.chart.ChartAxisArrangeOrderType.STAGGER_EVEN; - Object AO4= com.sun.star.chart.ChartAxisArrangeOrderType.STAGGER_ODD; - - if (oldValue.equals(AO1)) newValue = AO2; - if (oldValue.equals(AO2)) newValue = AO3; - if (oldValue.equals(AO3)) newValue = AO4; - if (oldValue.equals(AO4)) newValue = AO1; - } else - - if (oldValue instanceof com.sun.star.view.PaperOrientation) { - Object OR1 = com.sun.star.view.PaperOrientation.LANDSCAPE; - Object OR2 = com.sun.star.view.PaperOrientation.PORTRAIT; - - if (oldValue.equals(OR1)) newValue = OR2; - else newValue = OR1; - } else - - if (oldValue instanceof com.sun.star.lang.Locale) { -
[Libreoffice-commits] core.git: 3 commits - configure.ac include/svx
configure.ac |5 - include/svx/msdffdef.hxx | 33 - 2 files changed, 20 insertions(+), 18 deletions(-) New commits: commit f57a697fac4e2c885bfaf5add1dfe05ede552cd5 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 17:00:27 2014 +0200 Add clarification of --enable-chart-tests ...provided by moggi via private mail. Change-Id: If163e1ce40053c3fe9a5f76ea0356bf5c073e55b diff --git a/configure.ac b/configure.ac index 2572e96..1a56cb8 100644 --- a/configure.ac +++ b/configure.ac @@ -1239,7 +1239,10 @@ AC_ARG_ENABLE(cve-tests, AC_ARG_ENABLE(chart-tests, AS_HELP_STRING([--enable-chart-tests], -[Executes chart XShape tests]), +[Executes chart XShape tests. In a perfect world these tests would be + stable and everyone could run them, in reality it is best to run them + only on a few machines that are known to work and maintained by people + who can judge if a test failure is a regression or not.]), ,) AC_ARG_ENABLE(build-unowinreg, commit 73b44845c6794aaea198aebaeb2098f96b7ffb9a Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 16:57:17 2014 +0200 Make -1 a valid value of enum MSO_SPT ...as e.g. CppunitTest_sw_filters_test under -fsanitize=undefined complains svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx:304:13: runtime error: load of value 4294967295, which is not a valid value for type 'const MSO_SPT' EnhancedCustomShapeTypeNames::Get(MSO_SPT) svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx:304:5 SdrObjCustomShape::MergeDefaultAttributes(rtl::OUString const*) svx/source/svdraw/svdoashp.cxx:873:26 SvxCustomShape::createCustomShapeDefaults(rtl::OUString const) svx/source/unodraw/unoshap2.cxx:1933:26 non-virtual thunk to SvxCustomShape::createCustomShapeDefaults(rtl::OUString const) svx/source/unodraw/unoshap2.cxx:1934:1 oox::vml::CustomShape::implConvertAndInsert(com::sun::star::uno::Referencecom::sun::star::drawing::XShapes const, com::sun::star::awt::Rectangle const) const oox/source/vml/vmlshape.cxx:976:9 oox::vml::ComplexShape::implConvertAndInsert(com::sun::star::uno::Referencecom::sun::star::drawing::XShapes const, com::sun::star::awt::Rectangle const) const oox/source/vml/vmlshape.cxx:1073:12 oox::vml::ShapeBase::convertAndInsert(com::sun::star::uno::Referencecom::sun::star::drawing::XShapes const, oox::vml::ShapeParentAnchor const*) const oox/source/vml/vmlshape.cxx:307:22 oox::shape::ShapeContextHandler::getShape() oox/source/shape/ShapeContextHandler.cxx:432:27 non-virtual thunk to oox::shape::ShapeContextHandler::getShape() oox/source/shape/ShapeContextHandler.cxx:545:1 writerfilter::ooxml::OOXMLFastContextHandlerShape::sendShape(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1742:48 writerfilter::ooxml::OOXMLFastContextHandlerShape::lcl_endFastElement(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1769:9 writerfilter::ooxml::OOXMLFastContextHandler::endFastElement(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:249:9 non-virtual thunk to writerfilter::ooxml::OOXMLFastContextHandler::endFastElement(int) writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:250:1 (anonymous namespace)::Entity::endElement() sax/source/fastparser/fastparser.cxx:484:13 sax_fastparser::FastSaxParserImpl::callbackEndElement(char const*) sax/source/fastparser/fastparser.cxx:1216:9 (anonymous namespace)::call_callbackEndElement(void*, char const*) sax/source/fastparser/fastparser.cxx:295:5 doContent (instdir/program/libexpwraplo.so+0x369381) contentProcessor (instdir/program/libexpwraplo.so+0x34d9ee) doProlog (instdir/program/libexpwraplo.so+0x330991) prologProcessor (instdir/program/libexpwraplo.so+0x32a1f6) prologInitProcessor (instdir/program/libexpwraplo.so+0x38d185) XML_ParseBuffer (instdir/program/libexpwraplo.so+0x31359b) XML_Parse (instdir/program/libexpwraplo.so+0x30f34e) sax_fastparser::FastSaxParserImpl::parse() sax/source/fastparser/fastparser.cxx:1058:52 sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource const) sax/source/fastparser/fastparser.cxx:852:13 sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const) sax/source/fastparser/fastparser.cxx:1339:5 non-virtual thunk to sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource const) sax/source/fastparser/fastparser.cxx:1340:1 writerfilter::ooxml::OOXMLDocumentImpl::resolve(writerfilter::Stream) writerfilter/source/ooxml/OOXMLDocumentImpl.cxx:500:13 WriterFilter::filter(com::sun::star::uno::Sequencecom::sun::star::beans::PropertyValue const) writerfilter/source/filter/ImportFilter.cxx:107:9 non-virtual thunk to
[Libreoffice-commits] core.git: 2 commits - basebmp/source include/basebmp sal/qa vcl/headless
basebmp/source/bitmapdevice.cxx | 27 ++-- include/basebmp/bitmapdevice.hxx |4 + sal/qa/osl/process/osl_Thread.cxx | 128 ++ vcl/headless/svpgdi.cxx |3 4 files changed, 77 insertions(+), 85 deletions(-) New commits: commit 578fd01ee9d1a3b550e115d5db64523c7f57efde Author: Michael Meeks michael.me...@collabora.com Date: Tue Oct 14 11:59:04 2014 -0300 basebmp: accelerated method to create a clipping device. This was some staggering proportion of tiled rendering documents with complex clipping; it seems 'clear' is not what memset is for 1bit clip masks. Change-Id: I9142ffb7d7016603feb7782d6f03b9992b9494e3 diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx index 4104c18..d79afd5 100644 --- a/basebmp/source/bitmapdevice.cxx +++ b/basebmp/source/bitmapdevice.cxx @@ -1944,7 +1944,8 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector boost::shared_array sal_uInt8pMem, PaletteMemorySharedVector pPal, const basegfx::B2IBox* pSubset, - const IBitmapDeviceDamageTrackerSharedPtr rDamage ) + const IBitmapDeviceDamageTrackerSharedPtr rDamage, + bool bBlack = true) { OSL_ASSERT(rSize.getX() 0 rSize.getY() 0); @@ -1990,7 +1991,10 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const basegfx::B2IVector rtl_freeMemory ); if (pMem.get() == 0 nMemSize != 0) return BitmapDeviceSharedPtr(); -memset(pMem.get(), 0, nMemSize); +if (bBlack) +memset(pMem.get(), 0, nMemSize); +else +memset(pMem.get(), 0xFF, nMemSize); } sal_uInt8* pFirstScanline = nScanlineStride 0 ? @@ -2129,9 +2133,10 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const basegfx::B2IVector boost::shared_array sal_uInt8 pMem, PaletteMemorySharedVector pPal, const basegfx::B2IBox* pSubset, - const IBitmapDeviceDamageTrackerSharedPtr rDamage ) + const IBitmapDeviceDamageTrackerSharedPtr rDamage, + bool bBlack = true) { -BitmapDeviceSharedPtr result( createBitmapDeviceImplInner( rSize, bTopDown, nScanlineFormat, pMem, pPal, pSubset, rDamage ) ); +BitmapDeviceSharedPtr result( createBitmapDeviceImplInner( rSize, bTopDown, nScanlineFormat, pMem, pPal, pSubset, rDamage, bBlack ) ); #ifdef SAL_LOG_INFO std::ostringstream subset; @@ -2194,6 +2199,20 @@ BitmapDeviceSharedPtr createBitmapDevice( const basegfx::B2IVectorrSize IBitmapDeviceDamageTrackerSharedPtr() ); } +BitmapDeviceSharedPtr createClipDevice( const basegfx::B2IVectorrSize ) +{ +BitmapDeviceSharedPtr xClip( + createBitmapDeviceImpl( rSize, + false, /* bTopDown */ + basebmp::FORMAT_ONE_BIT_MSB_GREY, + boost::shared_array sal_uInt8 (), + PaletteMemorySharedVector(), + NULL, + IBitmapDeviceDamageTrackerSharedPtr(), + false /* white */) ); +return xClip; +} + BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr rProto, const basegfx::B2IBox rSubset ) { diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx index 1a81514..a4c38e8 100644 --- a/include/basebmp/bitmapdevice.hxx +++ b/include/basebmp/bitmapdevice.hxx @@ -690,6 +690,10 @@ BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createBitmapDevice( const basegfx::B2IVe const PaletteMemorySharedVector rPalette ); +/** Function to create a 1 bit grey clipping mask initialized to white. + */ +BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createClipDevice( const basegfx::B2IVectorrSize ); + /** Function to retrieve a subsetted BitmapDevice to the same memory. diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 6f993db..9ad4c7b 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -168,8 +168,7 @@ void SvpSalGraphics::ensureClip() m_aDevice = m_aOrigDevice; basegfx::B2IVector
Re: [Libreoffice-commits] core.git: Revert Revert Make VCartesianAxis::get2DAxisMainLine() truly const method.
On 10/14/2014 04:08 PM, Markus Mohrhard wrote: So it is a bit complicated. In contrast to draw/impress the xshape test in chart2 are not perfectly stable across machines. There are many factors that may result in differences between different computers. The reference machine for these tests was the @50 tinderbox which always produced the same results as my local Linux machine (which of course was helpful for me). Personally I regard all test failures of these tests a bit sceptical. I always check if there was a chart2 change that explains the test failure and if so regenerate the reference files (of course checking it is not a regression is still necessary). If there is none it is for sure a regression and the idea was that it is easier to find some of the problems introduced by commits to drawinglayer already through the automated tests. So in a perfect world these tests would be stable and everyone could run them, in reality it is best to run the only on a few machines that are known to work and maintained by people who can judge if a test failure is a regression or not. now updated http://cgit.freedesktop.org/libreoffice/core/commit/?id=f57a697fac4e2c885bfaf5add1dfe05ede552cd5 Add clarification of --enable-chart-tests Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Re: [Libreoffice-commits] core.git: Revert Revert Make VCartesianAxis::get2DAxisMainLine() truly const method.
Only sent that to Stephan. -- Forwarded message -- From: Markus Mohrhard markus.mohrh...@googlemail.com Date: Oct 14, 2014 10:08 PM Subject: Re: [Libreoffice-commits] core.git: Revert Revert Make VCartesianAxis::get2DAxisMainLine() truly const method. To: Stephan Bergmann sberg...@redhat.com Cc: On Oct 14, 2014 9:15 PM, Stephan Bergmann sberg...@redhat.com wrote: Markus, Can you please clarify the intended audience of --enable-chart-tests, and augment its description in configure.ac in case it is not intended for general usage. I had apparently at some point added it to my autogen.input in good faith, but can no longer reconstruct where I drew that faith from. So it is a bit complicated. In contrast to draw/impress the xshape test in chart2 are not perfectly stable across machines. There are many factors that may result in differences between different computers. The reference machine for these tests was the @50 tinderbox which always produced the same results as my local Linux machine (which of course was helpful for me). Personally I regard all test failures of these tests a bit sceptical. I always check if there was a chart2 change that explains the test failure and if so regenerate the reference files (of course checking it is not a regression is still necessary). If there is none it is for sure a regression and the idea was that it is easier to find some of the problems introduced by commits to drawinglayer already through the automated tests. So in a perfect world these tests would be stable and everyone could run them, in reality it is best to run the only on a few machines that are known to work and maintained by people who can judge if a test failure is a regression or not. Does that help? Regards, Markus Stephan On 10/14/2014 03:09 PM, Stephan Bergmann wrote: commit 658f031bb155474fa64e69fb76326b29ef4a642c Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 15:07:31 2014 +0200 Revert Revert Make VCartesianAxis::get2DAxisMainLine() truly const method. This reverts commit bf302000ea8849ac7ecd9162f3014bac9da4406e, as clarified on IRC, --enable-chart-tests is known flaky and not intended to be used by anybody but moggi. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork2' - chart2/source
chart2/source/view/axes/VCartesianAxis.cxx |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 9894c8559d13ea70a5e62a52c478522b9485d1df Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Oct 14 11:35:29 2014 -0400 Take the current axis alignment state. Change-Id: I02c28f44af0a1510bdb780d1e6c70561b7ba24e5 diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index d28c031..be13e64 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1248,10 +1248,9 @@ TickFactory* VCartesianAxis::createTickFactory() TickFactory2D* VCartesianAxis::createTickFactory2D() { -AxisLabelAlignment aLabelAlign; +AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment; B2DVector aStart, aEnd; get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue()); -m_aAxisProperties.maLabelAlignment = aLabelAlign; B2DVector aLabelLineStart, aLabelLineEnd; get2DAxisMainLine(aLabelLineStart, aLabelLineEnd, aLabelAlign, getLabelLineIntersectionValue()); @@ -1301,7 +1300,7 @@ sal_Int32 VCartesianAxis::estimateMaximumAutoMainIncrementCount() return nRet; B2DVector aStart, aEnd; -AxisLabelAlignment aLabelAlign; +AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment; get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue()); m_aAxisProperties.maLabelAlignment = aLabelAlign; @@ -1647,7 +1646,7 @@ void VCartesianAxis::createShapes() if (!rtl::math::isNan(fExtraLineCrossesOtherAxis)) { B2DVector aStart, aEnd; -AxisLabelAlignment aLabelAlign; +AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment; get2DAxisMainLine(aStart, aEnd, aLabelAlign, fExtraLineCrossesOtherAxis); m_aAxisProperties.maLabelAlignment = aLabelAlign; drawing::PointSequenceSequence aPoints( lcl_makePointSequence(aStart,aEnd) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 83210e28aeb0ba1faa809dbe705ce780cdd6fb4e Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Oct 14 11:35:29 2014 -0400 Take the current axis alignment state. Change-Id: I02c28f44af0a1510bdb780d1e6c70561b7ba24e5 diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index d28c031..be13e64 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1248,10 +1248,9 @@ TickFactory* VCartesianAxis::createTickFactory() TickFactory2D* VCartesianAxis::createTickFactory2D() { -AxisLabelAlignment aLabelAlign; +AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment; B2DVector aStart, aEnd; get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue()); -m_aAxisProperties.maLabelAlignment = aLabelAlign; B2DVector aLabelLineStart, aLabelLineEnd; get2DAxisMainLine(aLabelLineStart, aLabelLineEnd, aLabelAlign, getLabelLineIntersectionValue()); @@ -1301,7 +1300,7 @@ sal_Int32 VCartesianAxis::estimateMaximumAutoMainIncrementCount() return nRet; B2DVector aStart, aEnd; -AxisLabelAlignment aLabelAlign; +AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment; get2DAxisMainLine(aStart, aEnd, aLabelAlign, getAxisIntersectionValue()); m_aAxisProperties.maLabelAlignment = aLabelAlign; @@ -1647,7 +1646,7 @@ void VCartesianAxis::createShapes() if (!rtl::math::isNan(fExtraLineCrossesOtherAxis)) { B2DVector aStart, aEnd; -AxisLabelAlignment aLabelAlign; +AxisLabelAlignment aLabelAlign = m_aAxisProperties.maLabelAlignment; get2DAxisMainLine(aStart, aEnd, aLabelAlign, fExtraLineCrossesOtherAxis); m_aAxisProperties.maLabelAlignment = aLabelAlign; drawing::PointSequenceSequence aPoints( lcl_makePointSequence(aStart,aEnd) ); ___ 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/oox/workbookfragment.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit b44b76746d8834a4c32f704273a8b7b7547a9328 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 17:52:07 2014 +0200 Use C++11 std::thread::hardware_concurrency() ...and hope it gets past our various tinderboxes. Change-Id: I4dd95e77c4a74ae58e66f98753fcf5e438080146 diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 1ce4376..bacbc65 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -60,7 +60,9 @@ #include salhelper/thread.hxx #include osl/conditn.hxx +#include algorithm #include queue +#include thread #include boost/scoped_ptr.hpp #include oox/ole/vbaproject.hxx @@ -296,7 +298,7 @@ public: void importSheetFragments( WorkbookFragment rWorkbookHandler, SheetFragmentVector rSheets ) { -sal_Int32 nThreads = std::min( rSheets.size(), (size_t) 4 /* FIXME: ncpus/2 */ ); +sal_Int32 nThreads = std::min( rSheets.size(), (size_t) std::max(std::thread::hardware_concurrency(), 1U) ); Reference XComponentContext xContext = comphelper::getProcessComponentContext(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/qa
sal/qa/osl/process/osl_Thread.cxx | 17 - 1 file changed, 17 deletions(-) New commits: commit 40f001b55074f1d0f5d722999c643406caad1b2b Author: Stephan Bergmann sberg...@redhat.com Date: Tue Oct 14 17:55:43 2014 +0200 Remove spurious cpu_count Change-Id: Ic90e806d279f8180d78f78597dbc549264338295 diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 134a4ba..1840d3b 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -1581,23 +1581,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class wait -class cpu_count : public CppUnit::TestFixture -{ -public: -void setUp() SAL_OVERRIDE {} -void tearDown() SAL_OVERRIDE {} - -void cpu_count_001() -{ -sal_uInt32 nThreads = osl_getCPUThreadCount(); -CPPUNIT_ASSERT(false nThreads 0); -} - -CPPUNIT_TEST_SUITE(cpu_count); -CPPUNIT_TEST(cpu_count_001); -CPPUNIT_TEST_SUITE_END(); -}; // class cpu_count - /** osl::Thread::yield method: can not design good test scenario to test up to now */ class yield : public CppUnit::TestFixture ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - connectivity/source filter/source sd/CppunitTest_sd_filters_test.mk sd/qa svtools/source
connectivity/source/drivers/jdbc/InputStream.cxx |2 filter/source/graphicfilter/icgm/actimpr.cxx | 67 --- filter/source/graphicfilter/icgm/bundles.cxx | 10 filter/source/graphicfilter/icgm/cgm.cxx | 41 +- filter/source/graphicfilter/icgm/cgm.hxx |5 filter/source/graphicfilter/icgm/outact.cxx | 33 - sd/CppunitTest_sd_filters_test.mk|6 sd/qa/unit/data/cgm/fail/ooo6420-1.cgm | 400 +++ sd/qa/unit/data/cgm/pass/circles.cgm |binary sd/qa/unit/filters-test.cxx |4 svtools/source/control/tabbar.cxx|7 11 files changed, 471 insertions(+), 104 deletions(-) New commits: commit b13591d48f58b45f4465ce03bd1248ec1e95584f Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 14 15:34:53 2014 +0100 valgrind: init GroupLevels Change-Id: Idccebc826ade29a507e115108d20fd461b7bb4ec diff --git a/filter/source/graphicfilter/icgm/outact.cxx b/filter/source/graphicfilter/icgm/outact.cxx index 7d09983..283b35c 100644 --- a/filter/source/graphicfilter/icgm/outact.cxx +++ b/filter/source/graphicfilter/icgm/outact.cxx @@ -28,7 +28,7 @@ CGMOutAct::CGMOutAct( CGM rCGM ) mpCGM = rCGM; mnCurrentPage = 0; mnGroupActCount = mnGroupLevel = 0; -mpGroupLevel = new sal_uInt32[ CGM_OUTACT_MAX_GROUP_LEVEL ]; +mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] {}; mpPoints = (Point*)new sal_Int8[ 0x2000 * sizeof( Point ) ]; mpFlags = new sal_uInt8[ 0x2000 ]; @@ -41,9 +41,7 @@ CGMOutAct::~CGMOutAct() delete[] (sal_Int8*) mpPoints; delete[] mpFlags; delete[] mpGroupLevel; - -if ( mpGradient ) -delete mpGradient; +delete mpGradient; } void CGMOutAct::BeginFigure() commit 740617901dc2e7a1effd211c755ea9d00b32094b Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 14 15:00:31 2014 +0100 stray ;s all other the place Change-Id: If67bf3361e082c1321f42ae7717cc941dc96e74b diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index ad03946..03df394 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -74,9 +74,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM rCGM, const uno::Reference frame::XMod } mpCGM-mbStatus = bStatRet; } -}; - - +} bool CGMImpressOutAct::ImplInitPage() { @@ -176,9 +174,7 @@ void CGMImpressOutAct::ImplSetLineBundle() aAny = aLineDash; maXPropSet-setPropertyValue( LineDash, aAny ); } -}; - - +} void CGMImpressOutAct::ImplSetFillBundle() { @@ -343,9 +339,7 @@ void CGMImpressOutAct::ImplSetFillBundle() aAny = aHatch; maXPropSet-setPropertyValue( FillHatch, aAny ); } -}; - - +} void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference beans::XPropertySet rProperty ) { @@ -387,9 +381,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference beans::XProperty } aAny = aFontDescriptor; rProperty-setPropertyValue( FontDescriptor, aAny ); -}; - - +} void CGMImpressOutAct::InsertPage() { @@ -401,9 +393,7 @@ void CGMImpressOutAct::InsertPage() mpCGM-mbStatus = false; } mnCurrentPage++; -}; - - +} void CGMImpressOutAct::BeginGroup() { @@ -413,9 +403,7 @@ void CGMImpressOutAct::BeginGroup() } mnGroupLevel++; mnGroupActCount = mpCGM-mnActCount; -}; - - +} void CGMImpressOutAct::EndGroup() { @@ -446,9 +434,7 @@ void CGMImpressOutAct::EndGroup() } } } -}; - - +} void CGMImpressOutAct::EndGrouping() { @@ -458,8 +444,6 @@ void CGMImpressOutAct::EndGrouping() } } - - void CGMImpressOutAct::DrawRectangle( FloatRect rFloatRect ) { if ( mnGroupActCount != ( mpCGM-mnActCount - 1 ) ) // POWERPOINT HACK !!! @@ -472,9 +456,7 @@ void CGMImpressOutAct::DrawRectangle( FloatRect rFloatRect ) ImplSetFillBundle(); } } -}; - - +} void CGMImpressOutAct::DrawEllipse( FloatPoint rCenter, FloatPoint rSize, double rOrientation ) { @@ -499,9 +481,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint rCenter, FloatPoint rSize, doub } ImplSetFillBundle(); } -}; - - +} void CGMImpressOutAct::DrawEllipticalArc( FloatPoint rCenter, FloatPoint rSize, double rOrientation, sal_uInt32 nType, double fStartAngle, double fEndAngle ) @@ -572,9 +552,7 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint rCenter, FloatPoint rSize } } } -}; - - +} void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc ) { @@ -613,9 +591,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc ) } } -}; - - +} void CGMImpressOutAct::DrawPolygon( Polygon rPoly ) { @@ -645,10 +621,7 @@ void CGMImpressOutAct::DrawPolygon( Polygon rPoly )
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/templatedlg.hxx|2 +- sfx2/source/doc/templatedlg.cxx |2 +- sfx2/uiconfig/ui/templatedlg.ui |3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 60126254eba8a6a6b94c60b2101ee90986161e24 Author: Caolán McNamara caol...@redhat.com Date: Tue Oct 14 17:16:34 2014 +0100 Resolves: fdo#72587 make template dialog Modal Change-Id: Iefb63bc7cdbff2217f16c1a72fc271361227588b diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 984b06a..b9597cb 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -48,7 +48,7 @@ class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public ModelessDialog public: -SfxTemplateManagerDlg (vcl::Window *parent = DIALOG_NO_PARENT); +SfxTemplateManagerDlg(vcl::Window *parent = NULL); virtual ~SfxTemplateManagerDlg (); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index fd3fa77..bdd2b27 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -175,7 +175,7 @@ static bool cmpSelectionItems (const ThumbnailViewItem *pItem1, const ThumbnailV } SfxTemplateManagerDlg::SfxTemplateManagerDlg(vcl::Window *parent) -: ModelessDialog(parent, TemplateDialog, sfx/ui/templatedlg.ui), +: ModalDialog(parent, TemplateDialog, sfx/ui/templatedlg.ui), maSelTemplates(cmpSelectionItems), maSelFolders(cmpSelectionItems), mbIsSaveMode(false), diff --git a/sfx2/uiconfig/ui/templatedlg.ui b/sfx2/uiconfig/ui/templatedlg.ui index 945fca2..0c7eec7 100644 --- a/sfx2/uiconfig/ui/templatedlg.ui +++ b/sfx2/uiconfig/ui/templatedlg.ui @@ -7,6 +7,7 @@ property name=width_request800/property property name=height_request560/property property name=can_focusFalse/property +property name=modalTrue/property property name=title translatable=yesTemplate Manager/property child object class=GtkBox id=box1 @@ -327,6 +328,7 @@ object class=sfxlo-TemplateSearchView id=search_view property name=can_focusTrue/property property name=no_show_allTrue/property +property name=margin0/property property name=hexpandTrue/property property name=vexpandTrue/property /object @@ -340,6 +342,7 @@ object class=sfxlo-TemplateRemoteView id=remote_view property name=can_focusTrue/property property name=no_show_allTrue/property +property name=margin0/property property name=hexpandTrue/property property name=vexpandTrue/property /object ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/CppunitTest_sw_odfimport.mk sw/qa sw/source
sw/CppunitTest_sw_odfimport.mk |3 ++ sw/qa/extras/odfimport/data/bnc800714.fodt | 35 + sw/qa/extras/odfimport/odfimport.cxx | 11 + sw/source/core/text/frmform.cxx|7 - 4 files changed, 55 insertions(+), 1 deletion(-) New commits: commit bea74d73f4782b17f5286327f15db60ab3ae85de Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Oct 14 16:31:13 2014 +0200 bnc#800714 SwTxtFrm::FormatAdjust: still call SplitFrm if we have columns Regression from c5a8a2c3cbcee0175127a0662e3d820ea4deea22 (sw34bf05: i#84870 - method SwTxtFrm::FormatAdjust(..) - do not split text frame which only contains on as-character anchored object, 2011-03-11), the i#84870 fix was for a document which didn't have columns, and didn't consider that this causes a layout loop in case: 1) There are two paragraphs in a section, having multiple columns. 2) The second paragraph has fo:keep-together=always. In this case originally we tried to call SplitFrm(), realized that it didn't help, and then gave up. But after the change, we kept trying to satisfy the two conflicting requirements (balance content in the 3 columns vs keep the second paragraph with the first one). Fix the problem by not calling SplitFrm() only in case we're not inside columns. (cherry picked from commit 2d35baed5e87ffe7ca371986391cdb3983cdd2b1) Conflicts: sw/qa/extras/odfimport/odfimport.cxx Change-Id: I64e969ef5e8f519314f5613f8e6fae626ae085ce Reviewed-on: https://gerrit.libreoffice.org/11973 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk index 60424f6..e57d308 100644 --- a/sw/CppunitTest_sw_odfimport.mk +++ b/sw/CppunitTest_sw_odfimport.mk @@ -57,6 +57,9 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\ embeddedobj/util/embobj \ filter/source/config/cache/filterconfig1 \ filter/source/storagefilterdetect/storagefd \ + filter/source/odfflatxml/odfflatxml \ + filter/source/xmlfilterdetect/xmlfd \ + filter/source/xmlfilteradaptor/xmlfa \ framework/util/fwk \ i18npool/util/i18npool \ lingucomponent/source/languageguessing/guesslang \ diff --git a/sw/qa/extras/odfimport/data/bnc800714.fodt b/sw/qa/extras/odfimport/data/bnc800714.fodt new file mode 100644 index 000..a759b7c --- /dev/null +++ b/sw/qa/extras/odfimport/data/bnc800714.fodt @@ -0,0 +1,35 @@ +?xml version=1.0 encoding=UTF-8? +office:document xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 xmlns:math=http://www.w3.org/1998/Math/MathML; xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 xmlns:config=urn:oas is:names:tc:opendocument:xmlns:config:1.0 xmlns:ooo=http://openoffice.org/2004/office; xmlns:ooow=http://openoffice.org/2004/writer; xmlns:oooc=http://openoffice.org/2004/calc; xmlns:dom=http://www.w3.org/2001/xml-events; xmlns:xforms=http://www.w3.org/2002/xforms; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:rpt=http://openoffice.org/2005/report; xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 xmlns:xhtml=http://www.w3.org/1999/xhtml; xmlns:grddl=http://www.w3.org/2003/g/data-view#; xmlns:officeooo=http://openoffice.org/2009/office; xmlns:tableooo=http://openoffice.org/2009/table; xmlns:drawooo=http://openoffice.org/2010/draw; xmlns:calcext=urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0 xmlns:loext=urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0 xmlns:field=urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0 xmlns:formx=urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0 xmlns:css3t=http://www.w3.org/TR/css3-text/; office:version=1.2 office:mimetype=application/vnd.oasis.opendocument.text + office:automatic-styles + style:style style:name=P1 style:family=paragraph/ + style:style style:name=P2 style:family=paragraph + style:paragraph-properties
[Libreoffice-commits] core.git: include/tools tools/source
include/tools/unqidx.hxx |7 +-- tools/source/memtools/unqidx.cxx | 36 ++-- 2 files changed, 23 insertions(+), 20 deletions(-) New commits: commit 4e3772b1b472636b381ed511dcfff216fbe55d37 Author: Takeshi Abe t...@fixedpoint.jp Date: Mon Oct 13 21:05:31 2014 +0900 fdo#75757: remove inheritance to std::map from UniqueIndexImpl. Change-Id: Iaa9040dff117ed5b05955c9f6eef31878dccf3b0 Reviewed-on: https://gerrit.libreoffice.org/11951 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/tools/unqidx.hxx b/include/tools/unqidx.hxx index 9042476..27de75f 100644 --- a/include/tools/unqidx.hxx +++ b/include/tools/unqidx.hxx @@ -25,18 +25,21 @@ #define UNIQUEINDEX_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND -class TOOLS_DLLPUBLIC SAL_WARN_UNUSED UniqueIndexImpl : public std::mapsal_uInt32, void* +class TOOLS_DLLPUBLIC SAL_WARN_UNUSED UniqueIndexImpl { private: +std::mapsal_uInt32, void* maMap; sal_uIntPtr nStartIndex; sal_uIntPtr nUniqIndex; sal_uIntPtr nCount; public: UniqueIndexImpl( sal_uIntPtr _nStartIndex = 0 ) -: std::mapsal_uInt32, void*(), +: maMap(), nStartIndex(_nStartIndex), nUniqIndex(_nStartIndex), nCount(0) {} +size_t size() const { return maMap.size(); } + sal_uIntPtr Insert( void* p ); // insert value with key, replacing existing entry if necessary void Insert( sal_uIntPtr aIndex, void* p ); diff --git a/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx index d9d7e7b..726c96c 100644 --- a/tools/source/memtools/unqidx.cxx +++ b/tools/source/memtools/unqidx.cxx @@ -26,7 +26,7 @@ sal_uIntPtr UniqueIndexImpl::Insert( void* p ) return UNIQUEINDEX_ENTRY_NOTFOUND; // Expend array if full -sal_uIntPtr nTmp = size(); +sal_uIntPtr nTmp = maMap.size(); if( nTmp == nCount ) nTmp++; @@ -34,11 +34,11 @@ sal_uIntPtr UniqueIndexImpl::Insert( void* p ) nUniqIndex = nUniqIndex % nTmp; // Search next empty index -while ( find( nUniqIndex ) != end() ) +while ( maMap.find( nUniqIndex ) != maMap.end() ) nUniqIndex = (nUniqIndex+1) % nTmp; // Insert object to array -(*this)[ nUniqIndex ] = p; +maMap[ nUniqIndex ] = p; nCount++; nUniqIndex++; @@ -53,10 +53,10 @@ void UniqueIndexImpl::Insert( sal_uIntPtr nIndex, void* p ) sal_uIntPtr nContIndex = nIndex - nStartIndex; -bool bFound = find( nContIndex ) != end(); +bool bFound = maMap.find( nContIndex ) != maMap.end(); // Insert object to array -(*this)[ nContIndex ] = p; +maMap[ nContIndex ] = p; if( !bFound ) nCount++; @@ -70,11 +70,11 @@ void* UniqueIndexImpl::Remove( sal_uIntPtr nIndex ) { // insert index as empty entry, and reduce indexcount, // if this entry was used -iterator it = find( nIndex - nStartIndex ); -if( it != end() ) +std::mapsal_uInt32, void*::iterator it = maMap.find( nIndex - nStartIndex ); +if( it != maMap.end() ) { void* p = it-second; -erase( it ); +maMap.erase( it ); nCount--; return p; } @@ -88,8 +88,8 @@ void* UniqueIndexImpl::Get( sal_uIntPtr nIndex ) const if ( (nIndex = nStartIndex) (nIndex (size() + nStartIndex)) ) { -const_iterator it = find( nIndex - nStartIndex ); -if( it != end() ) +std::mapsal_uInt32, void*::const_iterator it = maMap.find( nIndex - nStartIndex ); +if( it != maMap.end() ) return it-second; } return NULL; @@ -97,34 +97,34 @@ void* UniqueIndexImpl::Get( sal_uIntPtr nIndex ) const sal_uIntPtr UniqueIndexImpl::FirstIndex() const { -if ( empty() ) +if ( maMap.empty() ) return UNIQUEINDEX_ENTRY_NOTFOUND; -return begin()-first; +return maMap.begin()-first; } sal_uIntPtr UniqueIndexImpl::LastIndex() const { -if ( empty() ) +if ( maMap.empty() ) return UNIQUEINDEX_ENTRY_NOTFOUND; -return rbegin()-first; +return maMap.rbegin()-first; } sal_uIntPtr UniqueIndexImpl::NextIndex(sal_uIntPtr aIndex) const { -const_iterator it = find( aIndex ); -if ( it == end() ) +std::mapsal_uInt32, void*::const_iterator it = maMap.find( aIndex ); +if ( it == maMap.end() ) return UNIQUEINDEX_ENTRY_NOTFOUND; ++it; -if ( it == end() ) +if ( it == maMap.end() ) return UNIQUEINDEX_ENTRY_NOTFOUND; return it-first; } sal_uIntPtr UniqueIndexImpl::GetIndexOf(void* p) const { -for( const_iterator it = begin(); it != end(); ++it ) +for( std::mapsal_uInt32, void*::const_iterator it = maMap.begin(); it != maMap.end(); ++it ) if( it-second == p ) return it-first; return UNIQUEINDEX_ENTRY_NOTFOUND;
python in autogen
Hi, I thought I would have a look at the LO code as a means of upgrading my programming skills and followed the instructions here: https://wiki.documentfoundation.org/Development/How_to_build https://wiki.documentfoundation.org/Development/How_to_build I am running Fedora 21 Alpha which was installed from a live CD so I guess, minimal install. I have been adding dependencies as I go. Searching the web has normally explained what I need to install but I have run into a brick wall with regard to python headers. I installed python-devel but that didn't help. Any suggestions? I can see lots of python*devel packages but I dont really want to install them all if I don't need them. Cheers -- View this message in context: http://nabble.documentfoundation.org/python-in-autogen-tp4125657.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
sw export test failures
Hi, on very recent master (9aad656156fbf76288e8a281760e60f1eccc6622), on VS 2013 the xmlexport tests are failing here [1]: // This is 17667 in the original document, was 504666 (so the image // become invisible), now is around 19072. CPPUNIT_ASSERT(getXPath(pXmlDoc, //a:srcRect, l).toInt32() 2); looking into it, reveals that the XPATH in question is: a:srcRect l=23842 t=0 r=23842 b=0 / the whole word/document.xml is [2] and the stack trace is [3]. It looks like this test was added recently, in this commit: 4cdce63d. On VS2013 i was able to build LO with all tests before. When i increase the value to 24000 to pass this specific tests, then the next test that is failing is: testExportImageProperties::Import_Export [4], that sounds familiar: 'hspace' of '/html/body/p/a/font/img' incorrect value [1] http://paste.openstack.org/show/120393 [2] http://paste.openstack.org/show/120396 [3] http://paste.openstack.org/show/120397 [4] http://paste.openstack.org/show/120406 David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC call Thursday 16:00 central European time ...
Hi, Le 07/10/2014 21:58, Michael Meeks a écrit : Hi guys, You are warmly invited (if you can make a phone-call) to hear what we get up to in the Engineering Steering Committee, ask questions at a suitable time in the agenda etc. We maintain our agenda in an etherpad here: http://pad.documentfoundation.org/p/esc I do not know where to write in the agenda, so I do my suggestion here: disclaimer: sorry for my bad English, I will do my best to be as clear as possible. ESC should study the case of sorting modification made in the case of cells containing references. The problem is set in https://bugs.freedesktop.org/show_bug.cgi?id=81309 : Sorting should automatically adjust references and discussed in https://bugs.freedesktop.org/show_bug.cgi?id=81633 Sorting shouldn't always automatically adjust references. The problem is not in the change itself, it is in the fact that the change has been done in bugfix versions, 4.2.7 and 4.3.1 because: 1/ in these bugfixes the change is not complete : the configuration option can't be backported from master to previous branches 2/ fdo#81309 is not a simple bug, it is a big change in the way Calc does sorting 3/ A big change like that should not be done in bugfixes. 4/ Comments in and duplicates of fdo#81633 show that users are strongly disturbed by this change. My suggestion is to revert this change in both 4.2.7 and 4.3.3, and to clearly communicate about it in release notes for 4.4. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Scripting: idesupport package is dead and can be dropped?
Hi David, This package used to be maintained by Steffen Grund and Juergen Schmidt in the Sun/Oracle times... but I think nobody is using it anymore. I'm not even sure it actually works with the latest versions of LO. -- Cedric On Thu, 2014-10-09 at 10:04 +0200, David Ostrovsky wrote: I asked this question on IRC yesterday, but didn't get an answer, so re-asking it here. Am i right in my assumption that idesupport package is dead and can be removed? The reason i am asking is while reviewing this Gerrit change [1] i was wondering that the base version was already broken, at least since this commit [2], 1.5 years ago but wasn't noticed because it was never migrated to gbuild or was already dead in dmake era. Anyway if no one objects i will bury this dead body, unless someone else is faster than me ;-) [1] https://gerrit.libreoffice.org/11861 [2] 8be40d31d78723debd47f671544f480c1c606db7 David ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Building LO fails with autogen
Hello, I just enlisted in a fresh core source tree to build a local copy of LO. However, autogen fails. libreoffice ./autogen.sh autoconf: invalid option -I Try `autoconf --help' for more information. Failed to run autoconf at ./autogen.sh line 158. This is with the default GNU autoconf 2.52. When I change line 158 in autogen.sh to use autoconf-2.69 I get this: libreoffice ./autogen.sh configure.ac:57: error: possibly undefined macro: AC_MSG_WARN If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:117: error: possibly undefined macro: AC_MSG_CHECKING configure.ac:123: error: possibly undefined macro: AC_MSG_RESULT configure.ac:266: error: possibly undefined macro: AC_DEFINE configure.ac:3206: error: possibly undefined macro: AC_LANG_SOURCE configure.ac:3685: error: possibly undefined macro: AC_LANG_PUSH configure.ac:3698: error: possibly undefined macro: AC_LANG_POP configure.ac:4885: error: possibly undefined macro: AC_RUN_IFELSE Failed to run autoconf at ./autogen.sh line 158. How can I fix this? What are the tools dependencies here? Jens -- Jens Tröger http://savage.light-speed.de/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
build failure in [build SAX]
Greetings, I am trying to do a clean build of master commit c967872, fetched around 2014-10-12 12:50 UTC and still current as I write this, configured: CXXFLAGS=-std=c++11 --enable-option-checking=fatal --enable-dbgutil --enable-crashdump --without-system-postgresql --without-myspell-dicts --with-extra-buildid --without-doxygen --with-external-tar=/home/terry/lo_hacking/git/src --disable-gstreamer --enable-gstreamer-0-10 on debian-wheezy 64-bit. This is my first time using parameters CXXFLAGS=-std=c++11 --disable-gstreamer --enable-gstreamer-0-10. The build fails in the first [build SAX]. Trying again with `make verbose=t` ends at the same step with messages: [build SAX] CustomTarget/i18npool/localedata/localedata_en_AU.cxx S=/home/terry/lo_hacking/git/libo4 I=$S/instdir W=$S/workdir LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$I/ure/lib:$I/program $W/LinkTarget/Executable/saxparser en_AU $S/i18npool/source/localedata/data/en_AU.xml $W/CustomTarget/i18npool/localedata/localedata_en_AU.cxx.tmp -env:LO_LIB_DIR=file://$I/program -env:URE_MORE_SERVICES=file://$W/Rdb/saxparser.rdb sed 's/\(^.*get[^;]*$\)/SAL_DLLPUBLIC_EXPORT \1/' $W/CustomTarget/i18npool/localedata/localedata_en_AU.cxx.tmp $W/CustomTarget/i18npool/localedata/localedata_en_AU.cxx rm $W/CustomTarget/i18npool/localedata/localedata_en_AU.cxx.tmp ERROR: Cannot open uno ini file:///home/terry/lo_hacking/git/libo4/instdir/ure/lib/unorc The file reported to be absent is indeed absent. Advice welcome, both about how I might get on with the build and about anything I should have done to help myself. Thanks, Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo82071.rtf | 46 + sw/qa/extras/rtfimport/rtfimport.cxx | 11 + writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 ++ 3 files changed, 62 insertions(+) New commits: commit 75d0cbb2e8f737e4c1721285a172618a1af78135 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Oct 14 22:09:03 2014 +0200 fdo#82071 RTF import: get rid of unexpected underlining in TOC field Regression from commit 9679e9c23216decb5f9f25f85b04cb3f2521 (fdo#69649 Fix for pre-rendered Table Of Contents, 2013-12-30), now that we handle hand-edited TOC, it's necessary to properly track correctly if a property came from a style or as a direct formatting. Fix RTFDocumentImpl::getProperties() to detect direct formatting that cames from a char style and would result in attribute tokens. Change-Id: Iab5a14770de43249961c280a5dc698200abc8f49 diff --git a/sw/qa/extras/rtfimport/data/fdo82071.rtf b/sw/qa/extras/rtfimport/data/fdo82071.rtf new file mode 100644 index 000..776c2a9 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo82071.rtf @@ -0,0 +1,46 @@ +{\rtf1 +\noqfpromote +{\stylesheet +{\s19\ql \li0\ri0\sb240\widctlpar\tqr\tldot\tx9350\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 +\af0\afs24\alang1025 \ltrch\fcs0 \b\f40\fs22\lang1024\langfe1024\cgrid\noproof\langnp1033\langfenp1033 \sbasedon0 \snext24 \spriority39 toc 1;} +{\*\cs25 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf2 \sbasedon10 Hyperlink;} +} +\pard\plain \ltrpar\s19\ql \li0\ri0\sb240\widctlpar\tqr\tldot\tx9350\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs24\alang1025 \ltrch\fcs0 \b\f40\fs22\lang1024\langfe1024\cgrid\noproof\langnp1033\langfenp1033 +{\field\fldedit +{\*\fldinst +{\rtlch\fcs1 \ab\af1\afs32 \ltrch\fcs0 \b0\i\f41\fs28\kerning32\insrsid10439798\charrsid5798973 TOC \\o 1-3 \\h \\z \\u } +} +{\fldrslt +{\field\fldedit +{\*\fldinst +{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid7957398 HYPERLINK \\ +l _Toc363816075 } +{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid7168667 +} +} +{\fldrslt +{\rtlch\fcs1 \af0 \ltrch\fcs0 +\cs25\ul\cf2\insrsid4260481\charrsid12675072 Chapter 1} +{\rtlch\fcs1 \af0 \ltrch\fcs0 \webhidden\insrsid4260481 \tab } +{\field +{\*\fldinst +{\rtlch\fcs1 \af0 \ltrch\fcs0 \webhidden\insrsid4260481 PAGEREF _Toc363816075 \\h } +{\rtlch\fcs1 \af0 \ltrch\fcs0 +\webhidden\insrsid7168667 +} +} +{\fldrslt +{\rtlch\fcs1 \af0 \ltrch\fcs0 \webhidden\insrsid4260481 1} +} +} +\sectd \ltrsect +\psz1\linex0\endnhere\titlepg\sectlinegrid360\sectdefaultcl\sectrsid204056\sftnbj } +} +\sectd \ltrsect\psz1\linex0\endnhere\titlepg\sectlinegrid360\sectdefaultcl\sectrsid204056\sftnbj +{\rtlch\fcs1 \af31507\afs22 \ltrch\fcs0 +\b0\loch\af31506\hich\af31506\dbch\af31505\insrsid4260481 +\par } +} +} +\pard\par +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 57717b7..5969c66 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -9,6 +9,7 @@ #include swmodeltestbase.hxx #include com/sun/star/awt/FontDescriptor.hpp +#include com/sun/star/awt/FontUnderline.hpp #include com/sun/star/awt/FontWeight.hpp #include com/sun/star/document/XFilter.hpp #include com/sun/star/document/XImporter.hpp @@ -1963,6 +1964,16 @@ DECLARE_RTFIMPORT_TEST(testFdo84679, fdo84679.rtf) CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0), getPropertysal_Int32(getParagraphOfText(1, xCell-getText()), ParaBottomMargin)); } +DECLARE_RTFIMPORT_TEST(testFdo82071, fdo82071.rtf) +{ +// The problem was that in TOC, chapter names were underlined, but they should not be. +uno::Referencetext::XTextRange xRun = getRun(getParagraph(2), 1); +// Make sure we test the right text portion. +CPPUNIT_ASSERT_EQUAL(OUString(Chapter 1), xRun-getString()); +// This was awt::FontUnderline::SINGLE. +CPPUNIT_ASSERT_EQUAL(awt::FontUnderline::NONE, getPropertysal_Int16(xRun, CharUnderline)); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 85884f94..ed963a3 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -464,9 +464,14 @@ writerfilter::ReferenceProperties::Pointer_t RTFDocumentImpl::getProperties(RT // createStyleProperties() puts properties to rPr, but here we need a flat list. if (itSprm-first == NS_ooxml::LN_CT_Style_rPr) { +// rPr can have both attributes and SPRM's, copy over both types. RTFSprms rRPrSprms = itSprm-second-getSprms(); for (RTFSprms::Iterator_t itRPrSprm = rRPrSprms.begin(); itRPrSprm != rRPrSprms.end(); ++itRPrSprm)
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/outact.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9e0ab477728f543efa78a04411057aed6c6c1e5 Author: Michael Meeks michael.me...@collabora.com Date: Tue Oct 14 18:16:52 2014 -0300 fix tinderboxen with the right sort of brackets. Change-Id: I13869771890ce5702d64053e7823dd5cedc82a40 diff --git a/filter/source/graphicfilter/icgm/outact.cxx b/filter/source/graphicfilter/icgm/outact.cxx index 283b35c..605be09 100644 --- a/filter/source/graphicfilter/icgm/outact.cxx +++ b/filter/source/graphicfilter/icgm/outact.cxx @@ -28,7 +28,7 @@ CGMOutAct::CGMOutAct( CGM rCGM ) mpCGM = rCGM; mnCurrentPage = 0; mnGroupActCount = mnGroupLevel = 0; -mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] {}; +mpGroupLevel = new sal_uInt32[CGM_OUTACT_MAX_GROUP_LEVEL] (); mpPoints = (Point*)new sal_Int8[ 0x2000 * sizeof( Point ) ]; mpFlags = new sal_uInt8[ 0x2000 ]; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork2' - 5 commits - include/svx svx/source
include/svx/svdotext.hxx |5 ++ include/svx/svdtrans.hxx |4 +- svx/source/svdraw/svdotext.cxx | 78 ++--- svx/source/svdraw/svdotxtr.cxx | 26 - 4 files changed, 57 insertions(+), 56 deletions(-) New commits: commit e595874c9ae71831bf6306beafa37a430172a618 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Oct 14 17:40:40 2014 -0400 AdoptTextMinSize() calls NbcAdjustTextFrameWidthAndHeight() at the end. No need to call this again in the caller. Change-Id: Ib36853cf5a0720082275e0490b4443cd9e0bd007 diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index dc533d6..1108817 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -63,11 +63,6 @@ void SdrTextObj::NbcSetSnapRect(const Rectangle rRect) // #115391# AdaptTextMinSize(); -if (bTextFrame (pModel==NULL || !pModel-IsPasteResize())) -{ -NbcAdjustTextFrameWidthAndHeight(); -} - ImpCheckShear(); SetRectsDirty(); } @@ -92,11 +87,6 @@ void SdrTextObj::NbcSetLogicRect(const Rectangle rRect) // #115391# AdaptTextMinSize(); -if(bTextFrame) -{ -NbcAdjustTextFrameWidthAndHeight(); -} - SetRectsDirty(); } commit 261703bc241760ccaf4abf3bac3625f3246de2e9 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Oct 14 17:19:56 2014 -0400 Reduce scope level Annotate the code a bit. Change-Id: I6ebf849243000920b1c1f7e67d2dc81fcee9e16b diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index bdf85d0..a96efe9 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -548,51 +548,59 @@ bool SdrTextObj::NbcSetEckenradius(long nRad) // states of IsAutoGrowWidth/Height to correctly set TextMinFrameWidth/Height void SdrTextObj::AdaptTextMinSize() { -if(bTextFrame (!pModel || !pModel-IsPasteResize())) -{ -const bool bW(IsAutoGrowWidth()); -const bool bH(IsAutoGrowHeight()); +if (!bTextFrame) +// Only do this for text frame. +return; -if(bW || bH) -{ -SfxItemSet aSet( -*GetObjectItemSet().GetPool(), -SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, -SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH, // contains SDRATTR_TEXT_MAXFRAMEWIDTH -0, 0); +if (pModel pModel-IsPasteResize()) +// Don't do this during paste resize. +return; -if(bW) -{ -const long nDist(GetTextLeftDistance() + GetTextRightDistance()); -const long nW(std::max(long(0), (long)(aRect.GetWidth() - 1 - nDist))); +const bool bW = IsAutoGrowWidth(); +const bool bH = IsAutoGrowHeight(); -aSet.Put(makeSdrTextMinFrameWidthItem(nW)); +if (!bW !bH) +// No auto grow requested. Bail out. +return; -if(!IsVerticalWriting() bDisableAutoWidthOnDragging) -{ -bDisableAutoWidthOnDragging = true; -aSet.Put(makeSdrTextAutoGrowWidthItem(false)); -} -} +SfxItemSet aSet( +*GetObjectItemSet().GetPool(), +SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT, +SDRATTR_TEXT_MINFRAMEWIDTH, SDRATTR_TEXT_AUTOGROWWIDTH, // contains SDRATTR_TEXT_MAXFRAMEWIDTH +0, 0); -if(bH) -{ -const long nDist(GetTextUpperDistance() + GetTextLowerDistance()); -const long nH(std::max(long(0), (long)(aRect.GetHeight() - 1 - nDist))); +if(bW) +{ +// Set minimum width. +const long nDist = GetTextLeftDistance() + GetTextRightDistance(); +const long nW = std::maxlong(0, aRect.GetWidth() - 1 - nDist); // text width without margins -aSet.Put(makeSdrTextMinFrameHeightItem(nH)); +aSet.Put(makeSdrTextMinFrameWidthItem(nW)); -if(IsVerticalWriting() bDisableAutoWidthOnDragging) -{ -bDisableAutoWidthOnDragging = false; -aSet.Put(makeSdrTextAutoGrowHeightItem(false)); -} -} +if(!IsVerticalWriting() bDisableAutoWidthOnDragging) +{ +bDisableAutoWidthOnDragging = true; +aSet.Put(makeSdrTextAutoGrowWidthItem(false)); +} +} -SetObjectItemSet(aSet); -NbcAdjustTextFrameWidthAndHeight(); +if(bH) +{ +// Set Minimum height. +const long nDist = GetTextUpperDistance() + GetTextLowerDistance(); +const long nH = std::maxlong(0, aRect.GetHeight() - 1 - nDist); // text height without margins + +aSet.Put(makeSdrTextMinFrameHeightItem(nH)); + +if(IsVerticalWriting()
[Libreoffice-commits] core.git: 7 commits - sal/cppunittester sc/qa sot/source sw/source
sal/cppunittester/cppunittester.cxx |3 +++ sc/qa/extras/htmlexporttest.cxx | 19 --- sc/qa/unit/subsequent_export-test.cxx|1 + sc/qa/unit/subsequent_filters-test.cxx |2 ++ sc/qa/unit/ucalc.cxx |3 +++ sot/source/sdstor/stgstrms.cxx |2 +- sw/source/filter/ww8/docxattributeoutput.cxx |1 + 7 files changed, 23 insertions(+), 8 deletions(-) New commits: commit 9f874d411adf260d13626e3a70a47fcf67a28152 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 14 23:56:47 2014 +0200 sc: fix temp file leak in ScHTMLExportTest Change-Id: Iab385ce8b24dd24985ec9b2d0c9d2a4e603d0fd0 diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx index a9c..8e61944d 100644 --- a/sc/qa/extras/htmlexporttest.cxx +++ b/sc/qa/extras/htmlexporttest.cxx @@ -19,6 +19,7 @@ #include comphelper/processfactory.hxx #include unotools/mediadescriptor.hxx #include unotools/ucbstreamhelper.hxx +#include unotools/localfilehelper.hxx #include unotest/macros_test.hxx #include sfx2/docfilt.hxx #include sfx2/docfile.hxx @@ -33,7 +34,6 @@ using namespace utl; class ScHTMLExportTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools, public HtmlTestTools { ReferenceXComponent mxComponent; -TempFile maTempFile; OUString maFilterOptions; void load(const char* pDir, const char* pName) @@ -45,8 +45,6 @@ class ScHTMLExportTest : public test::BootstrapFixture, public unotest::MacrosTe void save(const OUString aFilterName, TempFile rTempFile) { -rTempFile.EnableKillingFile(); - ReferenceXStorable xStorable(mxComponent, UNO_QUERY); MediaDescriptor aMediaDescriptor; aMediaDescriptor[FilterName] = aFilterName; @@ -75,11 +73,16 @@ public: void testHtmlSkipImage() { +// need a temp dir, because there's an image exported too +TempFile aTempDir(0, true); +OUString const url(aTempDir.GetURL()); +TempFile aTempFile(url, false); + htmlDocPtr pDoc; load(/sc/qa/extras/testdocuments/, BaseForHTMLExport.ods); -save(HTML (StarCalc), maTempFile); -pDoc = parseHtml(maTempFile); +save(HTML (StarCalc), aTempFile); +pDoc = parseHtml(aTempFile); CPPUNIT_ASSERT (pDoc); assertXPath(pDoc, /html/body, 1); @@ -87,12 +90,14 @@ public: load(/sc/qa/extras/testdocuments/, BaseForHTMLExport.ods); maFilterOptions = OUString(SkipImages); -save(HTML (StarCalc), maTempFile); +save(HTML (StarCalc), aTempFile); -pDoc = parseHtml(maTempFile); +pDoc = parseHtml(aTempFile); CPPUNIT_ASSERT (pDoc); assertXPath(pDoc, /html/body, 1); assertXPath(pDoc, /html/body/table/tr/td/img, 0); + +utl::removeTree(aTempDir.GetURL()); } CPPUNIT_TEST_SUITE(ScHTMLExportTest); commit c0b1d1bf5701d5f94b618f70da8e863d32d97ab4 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 14 23:32:05 2014 +0200 cppunittester: make tracking down temp file leaks easier Temp files created before first test method don't see LO_TESTNAME Change-Id: Iff74abf574f5151980f463646f11c1b32ad0c241 diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx index 51bc5c6..148eed0 100644 --- a/sal/cppunittester/cppunittester.cxx +++ b/sal/cppunittester/cppunittester.cxx @@ -237,6 +237,9 @@ public: #ifdef UNX EyecatcherListener eye; result.addListener(eye); +// set this to track down files created before first test method +std::string lib(testlib.substr(testlib.rfind('/')+1)); +setenv(LO_TESTNAME, lib.c_str(), true); #endif CppUnit::TestRunner runner; commit 33cac6c68bd2f2628832953c22be22022169f241 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 14 22:53:04 2014 +0200 sc: fix temp file leaks in ucalc Test Change-Id: Id5243aa37578cf9ed534603f3b27e83f0678c3fb diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 19d13a3..5aaec72 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -167,6 +167,7 @@ void Test::setUp() void Test::tearDown() { +m_pImpl-m_xDocShell-DoClose(); m_pImpl-m_xDocShell.Clear(); BootstrapFixture::tearDown(); } @@ -4686,6 +4687,8 @@ void Test::testCopyPasteFormulasExternalDoc() CPPUNIT_ASSERT_EQUAL(aFormula, OUString(='file:///source.fake'#$Sheet2.B$1)); rExtDoc.GetFormula(1,6,1, aFormula); CPPUNIT_ASSERT_EQUAL(aFormula, OUString(=$ExtSheet2.$B$2)); + +xExtDocSh-DoClose(); } void Test::testFindAreaPosVertical() commit 03d103b04b4ac7f926bf1b1bb3c30829900e4239 Author: Michael Stahl mst...@redhat.com Date: Tue Oct 14 22:44:40 2014 +0200 sc: fix temp file leak in ScFiltersTest Change-Id:
[Bug 64975] FORMATTING: autoIndent for Chinese should be two characters
https://bugs.freedesktop.org/show_bug.cgi?id=64975 --- Comment #6 from Jiero lilil...@gmail.com --- (In reply to Kevin Suo from comment #5) In version 4.3.2, set first line indent to 2 字 or 2 ch will work. If you want all your documents do be indent 2 chars, please set your Text Body style and save it as default template. (I realized that 字 should be “字符 here. Translation has been revised and will be reflacted in 4.3.3 release. So start from version 4.3.3, input 2 字符 or 2 ch instead) As this easy workaround, set Importance to Medium Normal. Hi Kevin, I don't get 4.3.2 installed yet; as in default, your test run can be little rough. Yes, I agree it is an easy hack but problem isn't solved by changing the translation. It was a dirty hack assuming the user ONLY work with text size 12. Auto-indent works well actually, on Japanese language which have one glyph as indent. All we need is an added rule to get it up for Chinese. Locate the code and hack it, sorry, I'm still not looking up the codebase myself as Im lazy to learn coding (and lazier to be in a project) while it impress me this bug - one complained by thousands as a major headache/denial to Chinese users over years is not fixed. Ha, stupid Chinese just won't do anything but translations and bug reportings. How smart :S Cheers Jiero -- 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: 3 commits - sc/inc sc/source
sc/inc/markarr.hxx|1 sc/inc/rangelst.hxx |1 sc/source/core/data/markarr.cxx | 15 ++ sc/source/core/data/markdata.cxx | 17 +++ sc/source/core/tool/rangelst.cxx | 49 -- sc/source/ui/Accessibility/AccessibleDocument.cxx |4 - 6 files changed, 78 insertions(+), 9 deletions(-) New commits: commit defa080e585fb351bc4049b2f280d2e7e5256f6e Author: Eike Rathke er...@redhat.com Date: Wed Oct 15 02:03:09 2014 +0200 remove duplicated call to mpChildrenShapes-SelectionChanged() Found when investigating performance bottlenecks of fdo#75486, after the selection is completed ScTabViewObj::getSelection() is called multiple times, each creating a ScCellRangesObj of the range list of filtered ranges, which then is used for ScChildrenShapes::FindSelectedShapesChanges() The duplicated call was introduced with b41332475783c31136673fb44cf4c411bb0148f8 but IMHO does not make any sense at all unless it has obscure side effects, it only slows down things even more. Change-Id: I3cee2e3e62c24ad72efb8cc2021e74d0afc70b69 diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 975dfc7..751a9fe 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1691,10 +1691,6 @@ void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject / CommitChange(aEvent); } -if(mpChildrenShapes ) -{ -mpChildrenShapes-SelectionChanged(); -} } //= XInterface = commit 94efc482d514bf9c6c4edb149f86084d672b724f Author: Eike Rathke er...@redhat.com Date: Tue Oct 14 23:50:24 2014 +0200 speed up simple range list joins that could be appends, fdo#75486 related Change-Id: I734ff88bc4c0633875c9e9c19a817b8b08511c83 diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 897bb97..4a10eed 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -93,6 +93,7 @@ public: private: ::std::vectorScRange* maRanges; +SCROW mnMaxRowUsed; typedef std::vectorScRange*::iterator iterator; typedef std::vectorScRange*::const_iterator const_iterator; }; diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 6e276bc..ab5653f5 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -229,6 +229,37 @@ void ScRangeList::Join( const ScRange r, bool bIsInList ) SCROW nRow2 = r.aEnd.Row(); SCTAB nTab2 = r.aEnd.Tab(); +// One common usage is to join ranges that actually are top to bottom +// appends but the caller doesn't exactly know about it, e.g. when invoked +// by ScMarkData::FillRangeListWithMarks(), check for this special case +// first and speed up things by not looping over all ranges for each range +// to be joined. We don't remember the exact encompassing range that would +// have to be updated on refupdates and insertions and deletions, instead +// remember just the maximum row used, even independently of the sheet. +// This satisfies most use cases. + +if (!bIsInList) +{ +if (nRow1 mnMaxRowUsed + 1) +{ +Append( r ); +return; +} +else if (nRow1 == mnMaxRowUsed + 1) +{ +// Check if we can simply enlarge the last range. +ScRange* p = maRanges.back(); +if (p-aEnd.Row() + 1 == nRow1 +p-aStart.Col() == nCol1 p-aEnd.Col() == nCol2 +p-aStart.Tab() == nTab1 p-aEnd.Tab() == nTab2) +{ +p-aEnd.SetRow( nRow2 ); +mnMaxRowUsed = nRow2; +return; +} +} +} + ScRange* pOver = (ScRange*) r; // fies aber wahr wenn bInList size_t nOldPos = 0; if ( bIsInList ) @@ -403,6 +434,8 @@ bool ScRangeList::UpdateReference( bChanged = true; pR-aStart.Set( theCol1, theRow1, theTab1 ); pR-aEnd.Set( theCol2, theRow2, theTab2 ); +if (mnMaxRowUsed theRow2) +mnMaxRowUsed = theRow2; } } @@ -435,6 +468,8 @@ void ScRangeList::InsertRow( SCTAB nTab, SCCOL nColStart, SCCOL nColEnd, SCROW n SCROW nNewRangeEndRow = nRowPos + nSize - 1; aNewRanges.push_back(ScRange(nNewRangeStartCol, nNewRangeStartRow, nTab, nNewRangeEndCol, nNewRangeEndRow, nTab)); +if (mnMaxRowUsed nNewRangeEndRow) +mnMaxRowUsed = nNewRangeEndRow; } } } @@ -983,16 +1018,19 @@ ScRange* ScRangeList::Find( const ScAddress rAdr ) return itr == maRanges.end() ?
[solved] Re: build failure in [build SAX]
Thanks to the good folks on IRC, my build is proceeding. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62957] FILESAVE: Save Last Slide Position in Impress
https://bugs.freedesktop.org/show_bug.cgi?id=62957 --- Comment #15 from ign_christian ign_christ...@yahoo.com --- (In reply to Sujay from comment #14) I have submitted the patch for review, hopefully it gets accepted. :) https://gerrit.libreoffice.org/#/c/8946/ Sorry..just a ping. Has it been implemented? Seems the issue still exist on 4.3.2.2 and 4.2.6.3 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=30732 --- Comment #33 from Harry Chapman harry@openmailbox.org --- (In reply to Tobias Lippert from comment #32) Hello Harry, I have explicitly included only a few selected character formats. There might be users who would rather not have the highlights in the table of contents. Unfortunately, I do not know who decides which formats should be applied in the table. If you find out, and get a positive feedback, I can help to add the functionality. :-) Tobias Hi Tobias, Thanks for your response! Yeah I understand that transferring the highlighting wouldn't be ideal for everyone - I thought that as it's the default behaviour on MS Word it wouldn't be too controversial, but it's definitely possible that people might get up in arms about it. I'm not really involved in the LO community so wouldn't know how to gauge opinions on this... I know it would probably be a lot more work, but I guess the ideal situation would be for each sort of character formatting to be able to be turned on and off in the settings of the TOC index. Or, alternatively, you could have a check box to turn on and off the transfer of *all* formatting. Just a thought ;) -- 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: editeng/source
editeng/source/editeng/editdoc.cxx |9 ++-- editeng/source/editeng/editdoc.hxx | 45 editeng/source/editeng/impedit.cxx |2 - editeng/source/editeng/impedit2.cxx | 38 ++-- editeng/source/editeng/impedit3.cxx | 67 ++-- 5 files changed, 84 insertions(+), 77 deletions(-) New commits: commit 0141e9cac82c16b7cdb01f4e7e595c9d98f8d6ce Author: Noel Grandin n...@peralex.com Date: Mon Oct 13 11:00:19 2014 +0200 convert PORTION_KIND constants to enum Change-Id: I32d65cfd7a67cd7ebca0f99061293a9ac3398133 Reviewed-on: https://gerrit.libreoffice.org/11970 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Noel Grandin noelgran...@gmail.com diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 53662ae..8baa214 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1088,9 +1088,9 @@ Size EditLine::CalcTextSize( ParaPortion rParaPortion ) pPortion = rParaPortion.GetTextPortions()[n]; switch ( pPortion-GetKind() ) { -case PORTIONKIND_TEXT: -case PORTIONKIND_FIELD: -case PORTIONKIND_HYPHENATOR: +case PortionKind::TEXT: +case PortionKind::FIELD: +case PortionKind::HYPHENATOR: { aTmpSz = pPortion-GetSize(); aSz.Width() += aTmpSz.Width(); @@ -1098,11 +1098,12 @@ Size EditLine::CalcTextSize( ParaPortion rParaPortion ) aSz.Height() = aTmpSz.Height(); } break; -case PORTIONKIND_TAB: +case PortionKind::TAB: { aSz.Width() += pPortion-GetSize().Width(); } break; +case PortionKind::LINEBREAK: break; } } diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 1aa1c58..8ed9816 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -329,11 +329,14 @@ public: bool operator !() const { return !pNode !nIndex; } }; -#define PORTIONKIND_TEXT0 -#define PORTIONKIND_TAB 1 -#define PORTIONKIND_LINEBREAK 2 -#define PORTIONKIND_FIELD 3 -#define PORTIONKIND_HYPHENATOR 4 +enum class PortionKind +{ +TEXT= 0, +TAB = 1, +LINEBREAK = 2, +FIELD = 3, +HYPHENATOR = 4 +}; #define DELMODE_SIMPLE 0 #define DELMODE_RESTOFWORD 1 @@ -378,10 +381,10 @@ class TextPortion { private: ExtraPortionInfo* pExtraInfos; -sal_Int32 nLen; +sal_Int32 nLen; SizeaOutSz; -sal_uInt8 nKind; -sal_uInt8nRightToLeft; +PortionKind nKind; +sal_uInt8 nRightToLeft; sal_Unicode nExtraValue; @@ -389,7 +392,7 @@ private: : pExtraInfos( NULL ) , nLen( 0 ) , aOutSz() -, nKind( PORTIONKIND_TEXT ) +, nKind( PortionKind::TEXT ) , nRightToLeft( sal_False ) , nExtraValue( 0 ) { @@ -400,7 +403,7 @@ public: : pExtraInfos( NULL ) , nLen( nL ) , aOutSz( -1, -1 ) -, nKind( PORTIONKIND_TEXT ) +, nKind( PortionKind::TEXT ) , nRightToLeft( sal_False ) , nExtraValue( 0 ) { @@ -418,22 +421,22 @@ public: sal_Int32 GetLen() const { return nLen; } -voidSetLen( sal_Int32 nL ) { nLen = nL; } +void SetLen( sal_Int32 nL ) { nLen = nL; } -Size GetSize() { return aOutSz; } -const Size GetSize() const { return aOutSz; } +Size GetSize() { return aOutSz; } +const SizeGetSize() const { return aOutSz; } -sal_uInt8 GetKind() { return nKind; } -sal_uInt8 GetKind() const { return nKind; } +PortionKind GetKind() { return nKind; } +PortionKindGetKind() const { return nKind; } -voidSetRightToLeft( sal_uInt8 b ){ nRightToLeft = b; } -sal_uInt8GetRightToLeft() const { return nRightToLeft; } -boolIsRightToLeft() const { return (nRightToLeft1); } +void SetRightToLeft( sal_uInt8 b ){ nRightToLeft = b; } +sal_uInt8 GetRightToLeft() const { return nRightToLeft; } +bool IsRightToLeft() const { return (nRightToLeft1); } -sal_Unicode GetExtraValue() const { return nExtraValue; } -voidSetExtraValue( sal_Unicode n ) { nExtraValue = n; } +sal_UnicodeGetExtraValue() const
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/ui/UIConsts.java | 56 +- wizards/com/sun/star/wizards/ui/event/EventNames.java | 31 - 2 files changed, 43 insertions(+), 44 deletions(-) New commits: commit cdecac849b2aaf8314f3cb2046f70b3b436519a7 Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Tue Oct 14 16:08:30 2014 +0200 rm âpublic static finalâ modifiers from field declarations within interfaces Change-Id: I2154052f89787b6fe17edb2f6e6ea132347b3d13 Reviewed-on: https://gerrit.libreoffice.org/11971 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index 9c4d77c..0d2e956 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -21,41 +21,41 @@ package com.sun.star.wizards.ui; public interface UIConsts { -public static final int RID_COMMON = 500; -public static final int RID_DB_COMMON = 1000; -public static final int RID_FORM = 2200; -public static final int RID_QUERY = 2300; -public static final int RID_REPORT = 2400; -public static final int RID_TABLE = 2600; -public static final int RID_IMG_REPORT = 1000; -public static final int RID_IMG_FORM = 1100; -public static final int RID_IMG_WEB = 1200; -public static final Integer INVISIBLESTEP = 99; -public static final String INFOIMAGEURL = private:resource/dbu/image/19205; -public static final String INFOIMAGEURL_HC = private:resource/dbu/image/19230; +int RID_COMMON = 500; +int RID_DB_COMMON = 1000; +int RID_FORM = 2200; +int RID_QUERY = 2300; +int RID_REPORT = 2400; +int RID_TABLE = 2600; +int RID_IMG_REPORT = 1000; +int RID_IMG_FORM = 1100; +int RID_IMG_WEB = 1200; +Integer INVISIBLESTEP = 99; +String INFOIMAGEURL = private:resource/dbu/image/19205; +String INFOIMAGEURL_HC = private:resource/dbu/image/19230; /** * The tabindex of the navigation buttons in a wizard must be assigned a very * high tabindex because on every step their taborder must appear at the end */ -public static final short SOFIRSTWIZARDNAVITABINDEX = 3; -public static final Integer INTEGER_8 = 8; -public static final Integer INTEGER_12 = 12; -public static final Integer INTEGER_14 = 14; -public static final Integer INTEGER_16 = 16; -public static final Integer INTEGER_40 = 40; -public static final Integer INTEGER_50 = 50; +short SOFIRSTWIZARDNAVITABINDEX = 3; +Integer INTEGER_8 = 8; +Integer INTEGER_12 = 12; +Integer INTEGER_14 = 14; +Integer INTEGER_16 = 16; +Integer INTEGER_40 = 40; +Integer INTEGER_50 = 50; /**Steps of the QueryWizard * */ -public static final int SOFIELDSELECTIONPAGE = 1; -public static final int SOSORTINGPAGE = 2; -public static final int SOFILTERPAGE = 3; -public static final int SOAGGREGATEPAGE = 4; -public static final int SOGROUPSELECTIONPAGE = 5; -public static final int SOGROUPFILTERPAGE = 6; -public static final int SOTITLESPAGE = 7; -public static final int SOSUMMARYPAGE = 8; -public static final Integer[] INTEGERS = new Integer[] +int SOFIELDSELECTIONPAGE = 1; +int SOSORTINGPAGE = 2; +int SOFILTERPAGE = 3; +int SOAGGREGATEPAGE = 4; +int SOGROUPSELECTIONPAGE = 5; +int SOGROUPFILTERPAGE = 6; +int SOTITLESPAGE = 7; +int SOSUMMARYPAGE = 8; +Integer[] INTEGERS = new Integer[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }; diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index fbb733f..e49ee30 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -19,21 +19,20 @@ package com.sun.star.wizards.ui.event; public interface EventNames { - //common listener events -public static final String EVENT_ACTION_PERFORMED = APR; -public static final String EVENT_ITEM_CHANGED = ICH; -public static final String EVENT_TEXT_CHANGED = TCH;//window events (XWindow) -public static final String EVENT_WINDOW_RESIZED = WRE; -public static final String EVENT_WINDOW_MOVED = WMO; -public static final String EVENT_WINDOW_SHOWN = WSH; -public static final String EVENT_WINDOW_HIDDEN = WHI;//focus events (XWindow) -public static final String EVENT_FOCUS_GAINED = FGA; -public static final String EVENT_FOCUS_LOST = FLO;//keyboard events -public static final String EVENT_KEY_PRESSED = KPR; -public static final String EVENT_KEY_RELEASED = KRE;//mouse events -public static final String EVENT_MOUSE_PRESSED = MPR; -public static final String EVENT_MOUSE_RELEASED = MRE; -public static final String
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/util/XMLTools.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b11968e8bfcc1c4560427a9ca1d9e20a1075eb1b Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Tue Oct 14 15:23:57 2014 +0200 runner: replace '.size() == 0' with '.isEmpty()' (collections) http://docs.oracle.com/javase/1.5.0/docs/api/java/util/ArrayList.html#isEmpty() Change-Id: I9a8f4feab9120d2d9fbf845f305380cda9b263bb Reviewed-on: https://gerrit.libreoffice.org/11968 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/qadevOOo/runner/util/XMLTools.java b/qadevOOo/runner/util/XMLTools.java index ce15982..7dea190 100644 --- a/qadevOOo/runner/util/XMLTools.java +++ b/qadevOOo/runner/util/XMLTools.java @@ -718,7 +718,7 @@ public class XMLTools { if (!isWellFormed()) log.println(!!! Some errors were found in XML structure) ; -boolean result = tags.isEmpty() chars.size() == 0 isWellFormed(); +boolean result = tags.isEmpty() chars.isEmpty() isWellFormed(); reset(); return result; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] LibreOffice Has Been Reviewed at ListOfFreeware
Hello, I am Ubaid from www.listoffreeware.com. This is a popular tech blog that lists best free software out there. I am sending this mail to let you know that we recently reviewed LibreOffice on our website here: http://listoffreeware.com/list-of-best-free-visio-viewer-software-for-windows/ Congrats! If you want to flaunt this review on your website, feel free to use the badge that I have attached with this email, or you can also use the code I have added below: a href=http://listoffreeware.com/list-of-best-free-visio-viewer-software-for-windows/; title=4 Best Free Visio Viewer Software For Windowsimg border=0 src=*http://listoffreeware.com/wp-content/uploads/Reviewed_At_ListOfFreeware.png http://listoffreeware.com/wp-content/uploads/Reviewed_At_ListOfFreeware.png* //a Feel free to get back to me with any questions. Have Fun, Ubaid Collaboration Manager w: http://www.listoffreeware.com/ ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 84972] Font rendering in Charts issue
https://bugs.freedesktop.org/show_bug.cgi?id=84972 raal r...@post.cz changed: What|Removed |Added Version|3.4.2 release |4.3.2.2 release --- Comment #4 from raal r...@post.cz --- I can not confirm on 4.3.2, Win7. Changing version to 4.3.2, first appear of bug. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83846] Bad allocation on Windows 7 x64 when working with master document
https://bugs.freedesktop.org/show_bug.cgi?id=83846 Darius Daniel Grigoras daniel.grigo...@movidius.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #5 from Darius Daniel Grigoras daniel.grigo...@movidius.com --- (In reply to Julien Nabet from comment #4) Following your last comment I put it back to UNCONFIRMED. Why would you do that? This is a real issue. -- 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 84913] Repagination on PDF export changes page number
https://bugs.freedesktop.org/show_bug.cgi?id=84913 Darius Daniel Grigoras daniel.grigo...@movidius.com changed: What|Removed |Added Status|NEEDINFO|NEW --- Comment #2 from Darius Daniel Grigoras daniel.grigo...@movidius.com --- (In reply to tommy27 from comment #1) test file needed. I set status to NEEDINFO. revert status to UNCONFIRMED when you provide requested infos. All the documents I work with contain confidential and proprietary data and information. However, I remember creating a sample master doc a while ago, which you can download from here: https://www.dropbox.com/s/vz43d9x0v1t3fxr/master_for_support.zip?dl=0 -- 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 83846] Bad allocation on Windows 7 x64 when working with master document
https://bugs.freedesktop.org/show_bug.cgi?id=83846 --- Comment #6 from Darius Daniel Grigoras daniel.grigo...@movidius.com --- I remember creating a sample master doc a while ago, which you can download from here: https://www.dropbox.com/s/vz43d9x0v1t3fxr/master_for_support.zip?dl=0 -- 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 68071] Editing: Non-printing Characters are Not Set Apart from Text
https://bugs.freedesktop.org/show_bug.cgi?id=68071 Ulrich Windl ulrich.wi...@rz.uni-regensburg.de changed: What|Removed |Added CC||ulrich.wi...@rz.uni-regensb ||urg.de --- Comment #13 from Ulrich Windl ulrich.wi...@rz.uni-regensburg.de --- Actually I don't quite understand the issue: The non-printing characters discussed are not non-printing characters, but formatting marks (well-printable characters (in the sense of isprint()). As you can turn on and off display of formatting marks, I don't quite see the issue, especially if the text in question can be blue anyway. I have the impression it was done, because it could be done, but not because it was necessary or reasonable. What about really unprintable characters (those that are requested but missing in the fonts available)? Those will actually cause a loss of information. -- 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 84756] Chart Labels not aligned as expected
https://bugs.freedesktop.org/show_bug.cgi?id=84756 mmaurer muriel.mau...@vector.com changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 -- 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 84756] Chart Labels not aligned as expected
https://bugs.freedesktop.org/show_bug.cgi?id=84756 --- Comment #2 from mmaurer muriel.mau...@vector.com --- Created attachment 107804 -- https://bugs.freedesktop.org/attachment.cgi?id=107804action=edit Macro to open the chart I have attached a Document with a macro that open a new chart diagram and set the properties to reproduced the behavior. -- 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 84975] New: UI Comment popups have transparent background when desktop effects with OpenGL are turned on
https://bugs.freedesktop.org/show_bug.cgi?id=84975 Bug ID: 84975 Summary: UI Comment popups have transparent background when desktop effects with OpenGL are turned on Product: LibreOffice Version: 4.3.1.2 release Hardware: Other OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Spreadsheet Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: dan...@tamm-tamm.de Created attachment 107805 -- https://bugs.freedesktop.org/attachment.cgi?id=107805action=edit Example of comment when mouse is hovered over the cell Comments in spreadsheets are shown with transparent background and without border when hovering over a cell containing a comment and desktop effects with OpenGL 2.0 are switched on. Only the text itself has an opaque background, the rest of the box is transparent. This makes it difficult to distinguish the comment from the surrounding content. Switching off desktop effects solves the problem. Also choosing Show Comment from the cell's context menu shows the comment with border, background and shadow. Tested on Kubuntu 14.04 64bit, KDE 4.13.3, Qt 4.8.6, Intel Core 2 Duo. -- 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 84975] UI Comment popups have transparent background when desktop effects with OpenGL are turned on
https://bugs.freedesktop.org/show_bug.cgi?id=84975 --- Comment #1 from dan...@tamm-tamm.de --- Created attachment 107806 -- https://bugs.freedesktop.org/attachment.cgi?id=107806action=edit Comment when shown explicitly via context menu. -- 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 68071] Editing: Non-printing Characters are Not Set Apart from Text
https://bugs.freedesktop.org/show_bug.cgi?id=68071 --- Comment #14 from Cosmin Saveanu c.save...@laposte.net --- Any solution for Mac OS X users ? According to: https://wiki.documentfoundation.org/ReleaseNotes/4.3#Solarized_blue_for_Non-printing_characters ... Non-printing Characters are shown with Solarized blue color (currently not available on Mac OSX)... It is great that, on other systems, the color of these characters was changed but I don't think this bug is really fixed until a cross-platform solution is reached. By the way, I disagree with Ulrich - this is not something that was done because it could be done: it improves user interface. Seeing spaces, tabs or end of line characters in a way that makes them less conspicuous is an enhancement that is important for some users, me included. Word has a very nice way to deal with these characters - they are shown in a smaller font and their size varies when zooming in or out of the page differently from the main text. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84913] Repagination on PDF export changes page number
https://bugs.freedesktop.org/show_bug.cgi?id=84913 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 -- 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 84913] Repagination on PDF export changes page number
https://bugs.freedesktop.org/show_bug.cgi?id=84913 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEW |NEEDINFO -- 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 84236] CONTEXT MENU: Adding all view modes and including them in a submenu
https://bugs.freedesktop.org/show_bug.cgi?id=84236 --- Comment #5 from Jay Philips philip...@hotmail.com --- Looking at the OOo stats shows that there was around a 50/50 percent split between users going to the view menu and using the context menu for outline view. Unfortunately there were no stats for the number of people who clicked the tabs. :D I would be in favour of removing them as well to reduce the clutter in the context menu, so go for it. -- 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 84854] Calc issues with screen drawing
https://bugs.freedesktop.org/show_bug.cgi?id=84854 --- Comment #26 from David Tardon dtar...@redhat.com --- (In reply to V Stuart Foote from comment #25) Sorry for the noise of attaching another Stack Trace, but guess there is some chance that bug 84911 and this bug are related. They are not. The description of bug 84911 says it happenewithon build from Oct 8 already. The Fraction-boost::rational change that caused this bug has been pushed on Oct 9. -- 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 84913] Repagination on PDF export changes page number
https://bugs.freedesktop.org/show_bug.cgi?id=84913 --- Comment #3 from tommy27 ba...@quipo.it --- thanks. I got the .odm master document and the other .odt file. please tell me step by step what I have to do in order to reproduce the bug. P.S. which LibO version are you using? -- 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 84913] Repagination on PDF export changes page number
https://bugs.freedesktop.org/show_bug.cgi?id=84913 --- Comment #4 from Darius Daniel Grigoras daniel.grigo...@movidius.com --- (In reply to tommy27 from comment #3) thanks. I got the .odm master document and the other .odt file. please tell me step by step what I have to do in order to reproduce the bug. P.S. which LibO version are you using? I'm using version 4.3.2.2, build 430m0(Build:2), which should be the latest stable version. To reproduce the bug just insert all of the subdocuments, i.e. the ODTs into the master document (ODM). Wait for it to reflow the text. Update the TOC and then export to PDF. Repagination is carried out and then the PDF is exported. Looking in the PDF you will see that the page numbers mentioned in the TOC for the headings does not correspond anymore to the real page number. -- 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 84887] FILEOPEN: TabBar::ImplShowPage(unsigned short) crash opening ODG
https://bugs.freedesktop.org/show_bug.cgi?id=84887 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |caol...@redhat.com |desktop.org | Ever confirmed|0 |1 --- Comment #3 from Caolán McNamara caol...@redhat.com --- I can reproduce it -- 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