[Libreoffice-commits] core.git: 8 commits - connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx | 44 +-- connectivity/source/drivers/firebird/ResultSet.cxx | 181 + connectivity/source/drivers/firebird/ResultSet.hxx | 24 + 3 files changed, 175 insertions(+), 74 deletions(-) New commits: commit c856ab73af3ab108f64e0c9d9857c35a4849f030 Author: Andrzej J.R. Hunt Date: Thu Sep 19 20:35:50 2013 +0100 Cleanup ResultSet exceptions. Change-Id: I77e4fd5fffe45446050f8a1dfbcc8cc27290c786 diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index 087453d..0700e11 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -278,15 +278,18 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, Runtim } } -void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 index) +void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex) throw (SQLException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); -if( index < 1 || index > m_fieldCount ) +if( nIndex < 1 || nIndex > m_fieldCount ) { -throw SQLException( "Column Index is outwith valid range", *this, OUString(), 1, Any() ); +::dbtools::throwSQLException( +"No column " + OUString::number(nIndex), +::dbtools::SQL_COLUMN_NOT_FOUND, +*this); } } @@ -298,7 +301,10 @@ void SAL_CALL OResultSet::checkRowIndex() if((m_currentRow < 1) || m_bIsAfterLastRow) { -throw SQLException( "Row index is out of valid range.", *this, OUString(),1, Any() ); +::dbtools::throwSQLException( +"Invalid Row", +::dbtools::SQL_INVALID_CURSOR_POSITION, +*this); } } commit 65719df3e38e16feecf025f4773562dfa2011f28 Author: Andrzej J.R. Hunt Date: Thu Sep 19 20:33:38 2013 +0100 Cleanup exceptions in PreparedStatement. Change-Id: Ice11ec8131a00335db48a05661bbe0285bb53fea diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 574bc06..d578450 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -316,16 +316,11 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType setParameterNull(nIndex, true); } -void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 nIndex, sal_Bool x) +void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 /*nIndex*/, sal_Bool /*bValue*/) throw(SQLException, RuntimeException) { -(void) nIndex; -(void) x; -MutexGuard aGuard(m_aMutex); -checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); - -// TODO: decide how to deal with bools. Probably just as a byte, although -// it might be best to just determine the db type and set as appropriate? +// FIREBIRD3: will need to be implemented. +::dbtools::throwFunctionNotSupportedException("XParameters::setBoolean", *this); } template @@ -355,9 +350,7 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) void SAL_CALL OPreparedStatement::setByte(sal_Int32 /*nIndex*/, sal_Int8 /*nValue*/) throw(SQLException, RuntimeException) { -::dbtools::throwFunctionNotSupportedException("setByte not supported in firebird", - *this, - Any()); +::dbtools::throwFunctionNotSupportedException("XParameters::setByte", *this); } void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 nValue) @@ -588,8 +581,12 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 nParameterIndex) { ensurePrepared(); if ((nParameterIndex == 0) || (nParameterIndex > m_pInSqlda->sqld)) -throw SQLException(); -// TODO: sane error message here. +{ +::dbtools::throwSQLException( +"No column " + OUString::number(nParameterIndex), +::dbtools::SQL_COLUMN_NOT_FOUND, +*this); +} } void OPreparedStatement::setParameterNull(sal_Int32 nParameterIndex, commit 101040a13010edca81d1ad127726d4118f00c5e0 Author: Andrzej J.R. Hunt Date: Thu Sep 19 20:18:20 2013 +0100 Set sane default for type. Change-Id: Ib63e6abd7b378671d1e01bf9357dd811ae88fc40 diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index 0fdcc09..087453d 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -550,14 +550,14 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 nColumnIndex) throw(SQLException, RuntimeException) { // Not a native firebird type hence we always have to c
[Libreoffice-commits] core.git: 8 commits - connectivity/source
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 15 +++- connectivity/source/drivers/ado/AResultSet.cxx | 20 -- connectivity/source/drivers/ado/AStatement.cxx | 31 ++ connectivity/source/drivers/firebird/StatementCommonBase.cxx| 30 ++--- connectivity/source/drivers/jdbc/JStatement.cxx | 30 ++--- connectivity/source/drivers/jdbc/ResultSet.cxx | 22 +-- connectivity/source/drivers/kab/KResultSet.cxx | 23 +-- connectivity/source/drivers/kab/KStatement.cxx | 30 ++--- connectivity/source/drivers/macab/MacabResultSet.cxx| 23 +-- connectivity/source/drivers/macab/MacabStatement.cxx| 30 ++--- connectivity/source/drivers/mork/MResultSet.cxx | 19 -- connectivity/source/drivers/mork/MStatement.cxx | 29 ++--- connectivity/source/drivers/mozab/MResultSet.cxx| 19 -- connectivity/source/drivers/mozab/MStatement.cxx| 29 ++--- connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 15 +++- connectivity/source/drivers/odbc/OResultSet.cxx | 23 +-- connectivity/source/drivers/odbc/OStatement.cxx | 30 ++--- connectivity/source/inc/propertyids.hxx | 15 18 files changed, 290 insertions(+), 143 deletions(-) New commits: commit 0fadbdbbdbd55cf60f9a202f1cf7b1d60517078c Author: Julien Nabet Date: Mon May 12 22:52:25 2014 +0200 Kill DECL_PROP0 and the rest + clean propertyids.hxx Change-Id: I872bc07ff9b1fe96a35e06ad3c5d8aaa75199bdd diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index de43945..d711304 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -706,11 +706,16 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) Sequence< com::sun::star::beans::Property > aProps(5); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; -DECL_PROP0(CURSORNAME, OUString); -DECL_PROP0(FETCHDIRECTION, sal_Int32); -DECL_PROP0(FETCHSIZE, sal_Int32); -DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); -DECL_PROP0(RESULTSETTYPE, sal_Int32); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), +PROPERTY_ID_CURSORNAME, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), +PROPERTY_ID_FETCHDIRECTION, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), +PROPERTY_ID_FETCHSIZE, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), +PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), +PROPERTY_ID_RESULTSETTYPE, cppu::UnoType::get(), 0); return new ::cppu::OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index a232ad1..03e06a0 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -654,17 +654,26 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R Sequence< com::sun::star::beans::Property > aProps(10); com::sun::star::beans::Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; -DECL_PROP0(CURSORNAME, OUString); -DECL_BOOL_PROP0(ESCAPEPROCESSING); -DECL_PROP0(FETCHDIRECTION,sal_Int32); -DECL_PROP0(FETCHSIZE, sal_Int32); -DECL_PROP0(MAXFIELDSIZE,sal_Int32); -DECL_PROP0(MAXROWS, sal_Int32); -DECL_PROP0(QUERYTIMEOUT,sal_Int32); -DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); -DECL_PROP0(RESULTSETTYPE,sal_Int32); -DECL_BOOL_PROP0(USEBOOKMARKS); - +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), +PROPERTY_ID_CURSORNAME, cppu::UnoType::get(), 0); +pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), +PROPERTY_ID_ESCAPEPROCESSING, ::
[Libreoffice-commits] core.git: 8 commits - connectivity/source extensions/source sw/source xmloff/source
connectivity/source/parse/sqlnode.cxx |2 extensions/source/plugin/base/context.cxx |4 - extensions/source/plugin/base/manager.cxx |5 +- extensions/source/plugin/base/xplugin.cxx |3 - extensions/source/plugin/inc/plugin/impl.hxx |8 ++- sw/source/core/doc/SwStyleNameMapper.cxx |4 - sw/source/filter/ww8/ww8par.cxx| 40 sw/source/filter/ww8/ww8par.hxx|7 ++ sw/source/filter/ww8/ww8par2.cxx | 10 ++-- sw/source/filter/ww8/ww8par3.cxx | 60 +++-- xmloff/source/transform/StyleOASISTContext.cxx |1 11 files changed, 67 insertions(+), 77 deletions(-) New commits: commit 8871a650b951a012a251a72aa1d3de46628d4c2d Author: Caolán McNamara Date: Wed Jul 2 10:41:25 2014 +0100 SAL_WARN->assert immediately dereferenced Change-Id: I96a657973c219facbaa64dd079dc3c1c4dd8 diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 1b83a24..fa7f395 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1994,7 +1994,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool pNewComparison = new OSQLParseNode(OUString("="),SQL_NODE_EQUAL,SQL_EQUAL); break; default: -SAL_WARN( "connectivity.parse", "OSQLParseNode::negateSearchCondition: unexpected node type!" ); +assert(false && "OSQLParseNode::negateSearchCondition: unexpected node type!"); break; } pSearchCondition->replace(pComparison, pNewComparison); commit c7eb405d226e7594b5e9c6f62dab60c127b1167f Author: Caolán McNamara Date: Wed Jul 2 10:39:43 2014 +0100 coverity#1209529 Explicit null dereferenced Change-Id: I3d5f1880deaa43fd4d40f456c0d265c18bb9b9c5 diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx index 6bff575..deabe3c 100644 --- a/sw/source/core/doc/SwStyleNameMapper.cxx +++ b/sw/source/core/doc/SwStyleNameMapper.cxx @@ -468,9 +468,7 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag break; default: { -// TODO: Is there a better way of failing here? -*pHashPointer = new NameToIdHash( 0 ); -return **pHashPointer; +assert(false && "unknown pool family"); } break; } commit 63bfc8ab1038477bce0059e6b75982635527fcab Author: Caolán McNamara Date: Wed Jul 2 10:24:44 2014 +0100 coverity#705353 Missing break in switch, probably intentional Change-Id: I17d22443f24de5b4bf5c259e38912abc2c14ab94 diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 0e78db0..4807b1d 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -864,6 +864,7 @@ void XMLStyleOASISTContext::StartElement( break; case XML_ATACTION_DECODE_STYLE_NAME: m_bControlStyle = rAttrValue.startsWith( "ctrl" ); +// fall-through case XML_ATACTION_DECODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); commit fa0421c763a92dbfead1d0144b434a3b6ab9dccb Author: Oliver-Rainer Wittmann Date: Tue Jul 1 15:20:58 2014 + Related: #i78498# some further improvements and corrections for outlines - apply default outline level to WW8 Build-in Heading Styles - get WW8 Build-In Heading Styles' list level applied to the paragraphs - apply list level properties of WW8 Built-In Heading Styles only, if the list level of the WW8 Build-In Heading Style corresponds to its outline level (cherry picked from commit 90ea610040acc8cc2ae66e774aff11b0bafcc59c) (cherry picked from commit 2b0eadc3a706a2b2b41c48caa4f01691978f1190) Conflicts: sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.hxx sw/source/filter/ww8/ww8par3.cxx diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index b9c9771..53d7aa5 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5794,12 +5794,6 @@ void SwWW8ImplReader::SetOutlineStyles() } } -if (pChosenWW8ListStyle == NULL) -{ -// no WW8 list style for Outline Style found --> nothing to do -return; -} - // - set list level properties of Outline Style - ODF's list style applied // by default to headings // - assign corresponding Heading Paragraph Styles to the Outline Style @@ -5807,8 +5801,9 @@ void SwWW8ImplReader::SetOutlineStyles() // had been chosen as // the one which provides the list
[Libreoffice-commits] core.git: 8 commits - connectivity/source include/tools include/vcl rsc/inc rsc/source vcl/source
connectivity/source/drivers/file/FResultSet.cxx |3 +- connectivity/source/drivers/odbc/OPreparedStatement.cxx |5 +--- connectivity/source/drivers/odbc/OStatement.cxx | 20 connectivity/source/inc/file/FResultSet.hxx |3 +- connectivity/source/inc/odbc/OPreparedStatement.hxx |3 +- connectivity/source/inc/odbc/OStatement.hxx | 11 include/tools/rcid.h|2 - include/vcl/fixed.hxx |4 --- rsc/inc/rscdb.hxx |1 rsc/source/parser/rscicpx.cxx | 20 rsc/source/parser/rscinit.cxx |4 --- vcl/source/control/fixed.cxx| 12 - 12 files changed, 25 insertions(+), 63 deletions(-) New commits: commit 6a6d83ace33789de951f8655be0108f70108660e Author: Caolán McNamara Date: Wed Jul 2 09:33:29 2014 +0100 coverity#706374 Uncaught exception Change-Id: Ie17e29e6893c6f69f176d77fab9dcb6a90cb432b diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 390f2c3..2855ddf 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -196,8 +196,8 @@ void SAL_CALL OStatement::clearBatch( ) throw(SQLException, RuntimeException, s } - -void OStatement_Base::reset() throw (SQLException) +void OStatement_Base::reset() +throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 511b8db..16b9317 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -103,7 +103,7 @@ namespace connectivity virtual void setResultSetType(sal_Int32 _par0) ; virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; -void reset () throw( ::com::sun::star::sdbc::SQLException); +void reset() throw (css::sdbc::SQLException, css::uno::RuntimeException); void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException); void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw (css::sdbc::SQLException, css::uno::RuntimeException); commit 7501ee9d9daf69915385d2ea2c9f54be9bdd78b1 Author: Caolán McNamara Date: Wed Jul 2 09:32:39 2014 +0100 coverity#706373 Uncaught exception Change-Id: Iee4774dffd43be3fc3eacbcc81f150706625fcad diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 1398efa..390f2c3 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -217,9 +217,8 @@ void OStatement_Base::reset() throw (SQLException) // clearMyResultSet // If a ResultSet was created for this Statement, close it - - -void OStatement_Base::clearMyResultSet () throw (SQLException) +void OStatement_Base::clearMyResultSet() +throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 8cfc760..511b8db 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -104,7 +104,7 @@ namespace connectivity virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; void reset () throw( ::com::sun::star::sdbc::SQLException); -void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); +void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException); void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw (css::sdbc::SQLException, css::uno::RuntimeException); bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException); commit 051a8f9577fb133a4356d94965cc76a7a287c2e4 Author: Caolán McNamara Date: Wed Jul 2 09:31:43 2014 +0100 coverity#706371 Uncaught exception Change-Id: I201972b1acb336b3002faca312c658f28671 diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 3e1f829..1398efa 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -310,9 +310,8 @@ void OStatement_Base::setWarning (const SQLWarning &ex) // getColumnCount // Return the number of columns in the ResultSet - - -sal_Int32 OStatement_Base::getColumnCount () throw( SQLException) +sal_Int32 OStatement_
[Libreoffice-commits] core.git: 8 commits - connectivity/source extensions/source offapi/com reportbuilder/java reportdesign/source xmloff/inc xmloff/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |1 extensions/source/propctrlr/formmetadata.cxx |2 extensions/source/propctrlr/propcontroller.cxx |6 extensions/source/propctrlr/propcontroller.hxx |2 offapi/com/sun/star/report/XReportControlModel.idl |2 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/AbstractReportElementLayoutController.java | 144 +- reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FixedTextLayoutController.java |2 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormatValueUtility.java | 132 + reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/FormattedTextLayoutController.java |4 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java |4 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java |2 reportbuilder/java/com/sun/star/report/pentaho/layoutprocessor/TableCellLayoutController.java | 40 ++ reportbuilder/java/com/sun/star/report/pentaho/model/ReportElement.java | 10 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt-schema-v1.0-os.xsd |2 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/FormattedTextReadHandler.java |2 reportbuilder/java/com/sun/star/report/pentaho/parser/rpt/ReportElementReadHandler.java |4 reportdesign/source/core/inc/ReportControlModel.hxx |2 reportdesign/source/filter/xml/xmlEnums.hxx |4 reportdesign/source/filter/xml/xmlExport.cxx |2 reportdesign/source/filter/xml/xmlReportElement.cxx |8 reportdesign/source/filter/xml/xmlfilter.cxx |2 reportdesign/source/ui/inc/metadata.hxx | 16 - reportdesign/source/ui/inspection/inspection.src |2 xmloff/inc/xmloff/xmltoken.hxx |2 xmloff/source/core/xmltoken.cxx |2 25 files changed, 221 insertions(+), 178 deletions(-) New commits: commit 7acc78705242464fa3fd5248cd8c73ff259ccc8b Author: Lionel Elie Mamane Date: Tue Feb 19 12:27:51 2013 +0100 Tweak properties ordering That's so that heavily related ones stay together: PRINTREPEATEDVALUES PRINTWHENGROUPCHANGE Change-Id: I90513da4ae9ce0798dec91e5057b112735c1cdc2 diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 2757a27..a4812ea 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -129,9 +129,9 @@ namespace pcr DEF_INFO_3( READONLY, READONLY, READONLY, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( PRINTABLE, PRINTABLE, PRINTABLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_3( STEP, STEP, STEP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), +DEF_INFO_3( WHEEL_BEHAVIOR,WHEEL_BEHAVIOR, WHEEL_BEHAVIOR, FORM_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_3( TABSTOP, TABSTOP,TABSTOP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ), DEF_INFO_2( TABINDEX, TABINDEX, TABINDEX, FORM_VISIBLE, DIALOG_VISIBLE ), -DEF_INFO_3( WHEEL_BEHAVIOR,WHEEL_BEHAVIOR, WHEEL_BEHAVIOR, FORM_VISIBLE, ENUM, COMPOSEABLE ), DEF_INFO_2( BOUND_CELL,BOUND_CELL, BOUND_CELL, FORM_VISIBLE, DATA_PROPERTY ), DEF_INFO_3( CELL_EXCHANGE_TYPE,CELL_EXCHANGE_TYPE, CELL_EXCHANGE_TYPE,FORM_VISIBLE, DATA_PROPERTY, ENUM ), diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 97ee6b2..06493f0 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -113,14 +113,14 @@ namespace rptui #define PROPERTY_ID_WIDTH 14 #define PROPER
[Libreoffice-commits] core.git: 8 commits - connectivity/source external/boost external/clucene external/liborcus external/neon external/nss external/vigra sdext/source ucb/source
connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h |3 connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h |3 connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h |3 connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h |3 connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h |3 connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx |3 external/boost/boost.wdeprecated-auto_ptr.patch.0 | 125 +++--- external/boost/boost_1_44_0-clang-warnings.patch | 52 +++- external/clucene/patches/clucene-warnings.patch | 86 ++ external/liborcus/ExternalProject_liborcus.mk |4 external/neon/neon.patch | 13 - external/nss/ExternalProject_nss.mk | 28 +- external/nss/UnpackedTarball_nss.mk |2 external/nss/nss.patch | 63 - external/nss/nss_macosx.patch | 90 --- external/vigra/vigra1.6.0.patch | 22 - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |4 ucb/source/ucp/webdav-neon/NeonLockStore.cxx |1 ucb/source/ucp/webdav-neon/NeonTypes.hxx |8 19 files changed, 296 insertions(+), 220 deletions(-) New commits: commit ee9ab2765f2892104f68fd3b076b506921de7fd7 Author: Michael Stahl Date: Thu Nov 14 15:55:32 2013 +0100 vigra: stop using #pragma GCC system_header ... don't even get any warning with that removed. Change-Id: I2647a5951a4ac3cba174a3564e99ef81e4959992 diff --git a/external/vigra/vigra1.6.0.patch b/external/vigra/vigra1.6.0.patch index db57c2e..560fd44 100644 --- a/external/vigra/vigra1.6.0.patch +++ b/external/vigra/vigra1.6.0.patch @@ -1076,17 +1076,6 @@ diff -uprN misc/vigra1.6.0/include/vigra/recursiveconvolution.hxx misc/build/vig diff -uprN misc/vigra1.6.0/include/vigra/rgbvalue.hxx misc/build/vigra1.6.0/include/vigra/rgbvalue.hxx --- misc/vigra1.6.0/include/vigra/rgbvalue.hxx 2008-08-13 08:15:41.0 -0500 +++ misc/build/vigra1.6.0/include/vigra/rgbvalue.hxx 2012-09-19 17:30:24.0 -0500 -@@ -39,6 +39,10 @@ - #ifndef VIGRA_RGBVALUE_HXX - #define VIGRA_RGBVALUE_HXX - -+#if defined __GNUC__ -+#pragma GCC system_header -+#endif -+ - #include // abs(double) - #include // abs(int) - #include "config.hxx" @@ -702,8 +706,6 @@ operator/=(RGBValue return l; } @@ -1420,17 +1409,6 @@ diff -uprN misc/vigra1.6.0/include/vigra/static_assert.hxx misc/build/vigra1.6.0 diff -uprN misc/vigra1.6.0/include/vigra/tinyvector.hxx misc/build/vigra1.6.0/include/vigra/tinyvector.hxx --- misc/vigra1.6.0/include/vigra/tinyvector.hxx 2008-08-13 08:15:42.0 -0500 +++ misc/build/vigra1.6.0/include/vigra/tinyvector.hxx 2012-09-19 17:30:24.0 -0500 -@@ -39,6 +39,10 @@ - #ifndef VIGRA_TINYVECTOR_HXX - #define VIGRA_TINYVECTOR_HXX - -+#if defined __GNUC__ -+#pragma GCC system_header -+#endif -+ - #include // abs(double) - #include // abs(int) - #include// ostream @@ -49,7 +53,6 @@ namespace vigra { commit ee59dff09c4f2ace54c43b597e216fce463a9a06 Author: Michael Stahl Date: Thu Nov 14 15:55:07 2013 +0100 neon: stop using #pragma GCC system_header ... it breaks dependency generation. Change-Id: I524f1789c32a633e8930a4e36a893ce02de66390 diff --git a/external/neon/neon.patch b/external/neon/neon.patch index 95d6b55..de52043 100644 --- a/external/neon/neon.patch +++ b/external/neon/neon.patch @@ -174,19 +174,6 @@ ctx->found = 1; } } src/ne_locks.h 2006-01-02 12:43:19.0 +0100 -+++ src/ne_locks.h 2011-02-03 10:26:21.0 +0100 -@@ -22,6 +22,10 @@ - #ifndef NE_LOCKS_H - #define NE_LOCKS_H - -+# if defined __GNUC__ -+# pragma GCC system_header -+# endif -+ - #include "ne_request.h" /* for ne_session + ne_request */ - #include "ne_uri.h" /* for ne_uri */ - --- src/ne_sspi.c 2007-08-10 17:26:08.0 +0200 +++ src/ne_sspi.c 2011-02-03 10:26:21.0 +0100 @@ -206,6 +206,45 @@ diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 17e43bb..f76dc09 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -27,7 +27,6 @@ / -#include #in