[Libreoffice-commits] core.git: connectivity/source extensions/source shell/source sw/qa toolkit/qa
connectivity/source/drivers/macab/MacabResultSet.cxx |2 connectivity/source/drivers/macab/MacabStatement.cxx |2 extensions/source/config/ldap/ldapuserprofilebe.cxx |8 +- shell/source/backends/macbe/macbackend.mm| 52 +-- shell/source/cmdmail/cmdmailmsg.cxx | 14 ++--- sw/qa/core/unocore/unocore.cxx | 14 ++--- toolkit/qa/cppunit/EventContainer.cxx|8 +- 7 files changed, 50 insertions(+), 50 deletions(-) New commits: commit a1c62cfc605a35f82dba4d9bfa47ab065e47cd99 Author: Stephan Bergmann AuthorDate: Wed May 4 12:20:49 2022 +0200 Commit: Stephan Bergmann CommitDate: Wed May 4 15:26:09 2022 +0200 Just use Any ctor instead of makeAny (macOS) Change-Id: I6c185eecf943205f78567393f0ef588580ee4dab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133821 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index bd9dbb079cc0..4142fcb6cce0 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -885,7 +885,7 @@ Any SAL_CALL MacabResultSet::getBookmark() { if(uidField->type == kABStringProperty) { -return makeAny(CFStringToOUString( static_cast(uidField->value) )); +return Any(CFStringToOUString( static_cast(uidField->value) )); } } } diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index a2fb748db7ac..95b922ce6bc7 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -472,7 +472,7 @@ Any SAL_CALL MacabCommonStatement::getWarnings( ) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); -return makeAny(m_aLastWarning); +return Any(m_aLastWarning); } void SAL_CALL MacabCommonStatement::clearWarnings( ) diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index 41fbe634cc34..2012afd8bbc5 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -93,7 +93,7 @@ bool LdapUserProfileBe::readLdapConfiguration( uno::Reference< lang::XMultiServiceFactory > xCfgProvider( css::configuration::theDefaultProvider::get(context)); -css::beans::NamedValue aPath("nodepath", uno::makeAny(OUString("org.openoffice.LDAP/UserDirectory")) ); +css::beans::NamedValue aPath("nodepath", uno::Any(OUString("org.openoffice.LDAP/UserDirectory")) ); uno::Sequence< uno::Any > aArgs{ uno::Any(aPath) }; @@ -172,16 +172,16 @@ css::uno::Any LdapUserProfileBe::getPropertyValue( } LdapData::iterator k(data_.find(PropertyName.copy(i, j - i))); if (k != data_.end()) { -return css::uno::makeAny( +return css::uno::Any( css::beans::Optional< css::uno::Any >( -true, css::uno::makeAny(k->second))); +true, css::uno::Any(k->second))); } if (j == PropertyName.getLength()) { break; } i = j + 1; } -return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); +return css::uno::Any(css::beans::Optional< css::uno::Any >()); } diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm index 04ab5569e606..cb35a4b9d066 100644 --- a/shell/source/backends/macbe/macbackend.mm +++ b/shell/source/backends/macbe/macbackend.mm @@ -204,9 +204,9 @@ css::uno::Any MacOSXBackend::getPropertyValue( if( aDocDir.getLength() > 0 && osl_getFileURLFromSystemPath( aDocDir.pData, ) == osl_File_E_None ) { -return css::uno::makeAny( +return css::uno::Any( css::beans::Optional< css::uno::Any >( -true, css::uno::makeAny( aDocURL ) ) ); +true, css::uno::Any( aDocURL ) ) ); } else { @@ -217,7 +217,7 @@ css::uno::Any MacOSXBackend::getPropertyValue( { SAL_WARN("shell", "Got nil or empty list of user document directories" ); } -return css::uno::makeAny(css::beans::Optional< css::uno::Any >()); +return css::uno::Any(css::beans::Optional< css::uno::Any >()); } else if ( PropertyName == "ooInetFTPProxyName" ) { char host[MAXHOSTNAMELEN]; @@ -231,12 +231,12 @@ css::uno::Any MacOSXBackend::getPropertyValue( auto const Server = OUString::createFromAscii( host ); if( Server.getLength() > 0 ) { -
[Libreoffice-commits] core.git: connectivity/source extensions/source
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx |4 +- connectivity/source/drivers/ado/AResultSet.cxx |4 +- connectivity/source/drivers/ado/Aolevariant.cxx|6 +-- connectivity/source/drivers/ado/Awrapado.cxx |2 - extensions/source/activex/SOActionsApproval.h |2 - extensions/source/activex/SOActiveX.cxx| 10 +++--- extensions/source/activex/SOComWindowPeer.h|2 - extensions/source/activex/SODispatchInterceptor.cxx| 10 +++--- extensions/source/activex/SODispatchInterceptor.h |2 - extensions/source/ole/unoconversionutilities.hxx | 16 +- 10 files changed, 29 insertions(+), 29 deletions(-) New commits: commit 5a448a920302c52b1366844efeab0f2e23bef95a Author: Stephan Bergmann AuthorDate: Thu Nov 26 15:38:15 2020 +0100 Commit: Stephan Bergmann CommitDate: Thu Nov 26 17:01:08 2020 +0100 The Windows oleauto.h SafeArray* functions use LONG for indexing Change-Id: If973cc337e0674462cfe2a15e347881a861a761f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106697 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 16acbc133bf3..a12f6e1fd6c4 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -151,14 +151,14 @@ Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinar //Copy the data only up to the Actual Size of Field. sal_Int32 nSize = aField.GetActualSize(); Sequence aData(nSize); -long index = 0; +sal_Int32 index = 0; while(index < nSize) { m_aValue = aField.GetChunk(BLOCK_SIZE); if(m_aValue.isNull()) break; UCHAR chData; -for(long index2 = 0;index2 < BLOCK_SIZE;++index2) +for(LONG index2 = 0;index2 < BLOCK_SIZE;++index2) { HRESULT hr = ::SafeArrayGetElement(m_aValue.parray,,); if(SUCCEEDED(hr)) diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index dae0f91efb61..bf33edbd4528 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -174,14 +174,14 @@ Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int //Copy the data only up to the Actual Size of Field. sal_Int32 nSize = aField.GetActualSize(); Sequence aData(nSize); -long index = 0; +sal_Int32 index = 0; while(index < nSize) { m_aValue = aField.GetChunk(BLOCK_SIZE); if(m_aValue.isNull()) break; UCHAR chData; -for(long index2 = 0;index2 < BLOCK_SIZE;++index2) +for(LONG index2 = 0;index2 < BLOCK_SIZE;++index2) { HRESULT hr = ::SafeArrayGetElement(m_aValue.parray,,); if(SUCCEEDED(hr)) diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index ae7c3f30572c..5c2d014b31d1 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -437,16 +437,16 @@ css::uno::Sequence< sal_Int8 > OLEVariant::getByteSequence() const if(pArray) { HRESULT hresult1,hresult2; -long lBound,uBound; +LONG lBound,uBound; // Verify that the SafeArray is the proper shape. hresult1 = ::SafeArrayGetLBound(pArray, 1, ); hresult2 = ::SafeArrayGetUBound(pArray, 1, ); if ( SUCCEEDED(hresult1) && SUCCEEDED(hresult2) ) { -long nCount = uBound-lBound+1; +LONG nCount = uBound-lBound+1; aRet.realloc(nCount); sal_Int8* pData = aRet.getArray(); -for(long i=0; SUCCEEDED(hresult1) && lBound <= uBound ;++i,++lBound) +for(; SUCCEEDED(hresult1) && lBound <= uBound ;++lBound) { sal_Int32 nData = 0; hresult1 = ::SafeArrayGetElement(pArray,,); diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx index 1fc664f89a5a..0393dc35c9a2 100644 --- a/connectivity/source/drivers/ado/Awrapado.cxx +++ b/connectivity/source/drivers/ado/Awrapado.cxx @@ -1981,7 +1981,7 @@ ADORecordset* WpADOConnection::getTables( const css::uno::Any& catalog, SAFEARRAY *psa = SafeArrayCreate( VT_VARIANT, 1, rgsabound ); // Set the values for each element of the
[Libreoffice-commits] core.git: connectivity/source extensions/source svtools/source sw/source vcl/opengl
connectivity/source/inc/ado/Aolewrap.hxx |3 +-- extensions/source/ole/oleobjw.cxx| 10 +- svtools/source/control/inettbc.cxx |6 ++ sw/source/uibase/dbui/dbmgr.cxx |6 ++ vcl/opengl/win/WinDeviceInfo.cxx |6 ++ 5 files changed, 12 insertions(+), 19 deletions(-) New commits: commit 05bec2bc26c02177a56df9792b083eb04b99f778 Author: Stephan Bergmann AuthorDate: Fri Nov 8 10:15:04 2019 +0100 Commit: Stephan Bergmann CommitDate: Fri Nov 8 11:28:31 2019 +0100 loplugin:stringadd (clang-cl) Change-Id: Icf2894f77c90aa4620910d621249947bad4be8b7 Reviewed-on: https://gerrit.libreoffice.org/82269 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 042d5fee6dfc..ef5c1a85995f 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -167,8 +167,7 @@ namespace connectivity if (FAILED(pInterface->get_Item(OLEVariant(sStr), ))) { #if OSL_DEBUG_LEVEL > 0 -OString sTemp("Unknown Item: "); -sTemp += OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding()); +OString sTemp("Unknown Item: " + OString(sStr.getStr(),sStr.getLength(),osl_getThreadTextEncoding())); OSL_FAIL(sTemp.getStr()); #endif } diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index c3f81bfa5df5..8c98290b2125 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -1427,9 +1427,9 @@ uno::Any SAL_CALL IUnknownWrapper::directInvoke( const OUString& aName, const un "DISP_E_BADVARTYPE.", nullptr); break; case DISP_E_EXCEPTION: -message = "[automation bridge]: "; -message += OUString(o3tl::toU(excepinfo.bstrDescription), -::SysStringLen(excepinfo.bstrDescription)); +message = "[automation bridge]: " ++ OUString(o3tl::toU(excepinfo.bstrDescription), +::SysStringLen(excepinfo.bstrDescription)); throw InvocationTargetException(message, Reference(), Any()); break; case DISP_E_MEMBERNOTFOUND: @@ -2049,8 +2049,8 @@ Any IUnknownWrapper::invokeWithDispIdComTlb(FuncDesc& aFuncDesc, "DISP_E_BADVARTYPE.", nullptr); break; case DISP_E_EXCEPTION: -message = "[automation bridge]: "; -message += OUString(o3tl::toU(excepinfo.bstrDescription), +message = "[automation bridge]: " ++ OUString(o3tl::toU(excepinfo.bstrDescription), ::SysStringLen(excepinfo.bstrDescription)); throw InvocationTargetException(message, Reference(), Any()); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index beec4c1d6d3e..cce328d77052 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -825,8 +825,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') ) { // cut to first segment -OUString aTmp = INetURLObject::GetScheme( eBaseProt ); -aTmp += "/"; +OUString aTmp = INetURLObject::GetScheme( eBaseProt ) + "/"; aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset ); aObj.SetURL( aTmp ); @@ -1889,8 +1888,7 @@ OUString URLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseURL ) if( aText.startsWith("\\") && (aText.getLength() < 2 || aText[ 1 ] != '\\') ) { // cut to first segment -OUString aTmp = INetURLObject::GetScheme( eBaseProt ); -aTmp += "/"; +OUString aTmp = INetURLObject::GetScheme( eBaseProt ) + "/"; aTmp += aObj.getName( 0, true, INetURLObject::DecodeMechanism::WithCharset ); aObj.SetURL( aTmp ); diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index c8e3554d9fb9..d3e29c4eaad1 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2660,8 +2660,7 @@ uno::Any GetDBunoURI(const INetURLObject , DBConnURIType& rType) case DBConnURIType::MSJET: #ifdef _WIN32 { -OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE="); -sDBURL += rURL.PathToFileName(); +OUString sDBURL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=" +
[Libreoffice-commits] core.git: connectivity/source extensions/source
connectivity/source/drivers/odbc/OStatement.cxx |3 +-- extensions/source/scanner/sane.cxx |3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) New commits: commit 9d936de849f1d2267dc733d38ff66d66490b04f7 Author: Noel Grandin AuthorDate: Fri Oct 19 20:49:19 2018 +0200 Commit: Noel Grandin CommitDate: Sat Oct 20 07:59:53 2018 +0200 clang-tidy readability-delete-null-pointer Change-Id: Ib47fc58f1cdfdd54adff07687c56198aa6f2091e Reviewed-on: https://gerrit.libreoffice.org/62029 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index eea0d2d147c2..3a74bf565fe7 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -822,8 +822,7 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) { setStmtOption(SQL_ATTR_ROW_ARRAY_SIZE, _par0); -if (m_pRowStatusArray) -delete[] m_pRowStatusArray; +delete[] m_pRowStatusArray; m_pRowStatusArray = new SQLUSMALLINT[_par0]; setStmtOption(SQL_ATTR_ROW_STATUS_PTR, m_pRowStatusArray); } diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index 167d6ba97b20..0adeb593d695 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -875,8 +875,7 @@ bool Sane::Start( BitmapTransporter& rBitmap ) p_cancel( maHandle ); CheckConsistency( "sane_cancel" ); } -if( pBuffer ) -delete [] pBuffer; +delete [] pBuffer; ReloadOptions(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source extensions/source forms/source include/comphelper include/filter include/onlineupdate include/svl io/source jurt/com sal/qa sc/source solenv/bin sw/
connectivity/source/manager/mdrivermanager.cxx|2 +- extensions/source/propctrlr/formcomponenthandler.hxx |2 +- forms/source/component/FormattedFieldWrapper.cxx |2 +- include/comphelper/propagg.hxx|2 +- include/filter/msfilter/msdffimp.hxx |2 +- include/onlineupdate/mozilla/TypeTraits.h |2 +- include/svl/zformat.hxx |2 +- io/source/acceptor/acceptor.cxx |2 +- io/source/stm/odata.cxx |2 +- jurt/com/sun/star/lib/connections/pipe/pipeConnector.java |2 +- jurt/com/sun/star/lib/connections/socket/socketConnector.java |2 +- sal/qa/osl/mutex/osl_Mutex.cxx|8 sc/source/core/data/documen4.cxx |2 +- sc/source/ui/dbgui/sfiltdlg.cxx |6 +++--- solenv/bin/modules/installer/windows/directory.pm |2 +- sw/inc/docary.hxx |2 +- vcl/source/filter/ixpm/xpmread.cxx|2 +- 17 files changed, 22 insertions(+), 22 deletions(-) New commits: commit 15e3ce53283f288cb2c4c52acb203c9c281914ac Author: Andrea GelminiDate: Wed Mar 15 14:58:38 2017 +0100 Fix typos Change-Id: I1488e2147fa0cd4a821eb5bfe172a58a4e396ace Reviewed-on: https://gerrit.libreoffice.org/35224 Tested-by: Jenkins Reviewed-by: Björn Michaelsen diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index d04527f3530c..bbc6314d5e32 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -377,7 +377,7 @@ void OSDBCDriverManager::initializeDriverPrecedence() // move the DriverAccess pointed to by aPos.first to the position pointed to by aNoPrefDriversStart if ( aPos.first != aNoPrefDriversStart ) -{ // if this does not hold, the DriverAccess alread has the correct position +{ // if this does not hold, the DriverAccess already has the correct position // rotate the range [aNoPrefDriversStart, aPos.second) right 1 element std::rotate( aNoPrefDriversStart, aPos.second - 1, aPos.second ); diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index 6d16fa684811..5db0a3c54601 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -90,7 +90,7 @@ namespace pcr boolm_bHaveListSource : 1; /// our component has a "Command" property boolm_bHaveCommand : 1; -/// the class id of the component - if appliable +/// the class id of the component - if applicable sal_Int16 m_nClassId; public: diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 812b58595586..3cc5c3848d8e 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -237,7 +237,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const Reference& { SolarMutexGuard g; if (m_xAggregate.is()) -{ // we alread did a decision if we're an EditModel or a FormattedModel +{ // we already did a decision if we're an EditModel or a FormattedModel // if we act as formatted, we have to read the edit part first if (m_xFormattedPart.is()) diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx index 0779e4ed8f1b..c1e521f3ee67 100644 --- a/include/comphelper/propagg.hxx +++ b/include/comphelper/propagg.hxx @@ -109,7 +109,7 @@ public: If not NULL, the object pointed to is used to calc handles which should be used for referring the aggregate's properties from outside. If one of the properties returned from the info service conflict with other handles -alread present (e.g. through _rProperties), the property is handled as if -1 was returned. +already present (e.g. through _rProperties), the property is handled as if -1 was returned. If NULL (or, for a special property, a call to getPreferredPropertyId returns -1), the aggregate property(ies) get a new handle which they can be referred by from outside. @param
[Libreoffice-commits] core.git: connectivity/source extensions/source
connectivity/source/drivers/kab/KDEInit.cxx |2 +- extensions/source/bibliography/bibview.cxx |3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit f25a8fdff891809b836ae76913276919e79d5d2c Author: dennisroczekDate: Thu Mar 2 23:49:51 2017 + Remove bogus source code comments Change-Id: I616ca3483d926c8e4155512ef5138e3f7978ece3 Reviewed-on: https://gerrit.libreoffice.org/34842 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx index 5317c62..c5ace04 100644 --- a/connectivity/source/drivers/kab/KDEInit.cxx +++ b/connectivity/source/drivers/kab/KDEInit.cxx @@ -130,7 +130,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL shutdownKApplication() a positive value if the version is too new to know whether it works with this driver -#i60062# / 2006-01-06 / frank.schoenh...@sun.com +#i60062# */ extern "C" SAL_DLLPUBLIC_EXPORT int SAL_CALL matchKDEVersion() { diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 91e7a3e..32739be 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -111,7 +111,6 @@ namespace bib // TODO: // this is _strange_: Why not updating the existent general page? // I consider the current behaviour a HACK. -// frank.schoenh...@sun.com if ( m_pGeneralPage ) { m_pGeneralPage->Hide(); @@ -218,4 +217,4 @@ namespace bib } // namespace bib -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source extensions/source i18npool/inc i18npool/source sw/source ucb/source vcl/inc vcl/opengl
connectivity/source/drivers/mork/MCatalog.cxx |1 connectivity/source/drivers/mork/MCatalog.hxx |1 extensions/source/propctrlr/submissionhandler.hxx |1 i18npool/inc/breakiterator_unicode.hxx |1 i18npool/source/breakiterator/breakiterator_unicode.cxx | 67 sw/source/core/inc/SwUndoFmt.hxx|2 sw/source/core/undo/SwUndoFmt.cxx |5 - ucb/source/ucp/ftp/ftpcontentprovider.hxx |2 vcl/inc/opengl/x11/gdiimpl.hxx |2 vcl/opengl/x11/gdiimpl.cxx | 18 ++-- 10 files changed, 47 insertions(+), 53 deletions(-) New commits: commit b495eb4dbaf9165414b2082572d96d14dbf38d1f Author: Noel GrandinDate: Fri Nov 18 07:54:04 2016 +0200 loplugin:datamembershadow Change-Id: I8a737a2f22c7be9630a1f7562b4309e687bb85f9 Reviewed-on: https://gerrit.libreoffice.org/30948 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index 27bd345..d8b81ef 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::container; OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) ,m_pConnection(_pCon) -,m_xMetaData(m_pConnection->getMetaData( )) { // osl_atomic_increment( _refCount ); // refreshTables(); diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx index 7598d7f..5f4b824 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -31,7 +31,6 @@ namespace connectivity class OCatalog : public connectivity::sdbcx::OCatalog { OConnection*m_pConnection; // used to get the metadata -css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: // implementation of the pure virtual methods diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 45d29bb..3a43f23 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -68,7 +68,6 @@ namespace pcr class SubmissionPropertyHandler : public EditPropertyHandler_Base, public ::comphelper::OPropertyChangeListener { private: -::osl::Mutexm_aMutex; ::std::unique_ptr< SubmissionHelper > m_pHelper; ::comphelper::OPropertyChangeMultiplexer* m_pPropChangeMultiplexer; diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index ffcb4fe..969f90e 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -73,7 +73,6 @@ public: protected: const sal_Char *cBreakIterator, *lineRule; -Boundary result; // for word break iterator struct BI_Data { diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 76ae209..8c19096 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -258,20 +258,21 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int { loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, nullptr, Text); -result.startPos = icuBI->aBreakIterator->following(nStartPos); -if( result.startPos >= Text.getLength() || result.startPos == BreakIterator::DONE ) -result.endPos = result.startPos; +Boundary rv; +rv.startPos = icuBI->aBreakIterator->following(nStartPos); +if( rv.startPos >= Text.getLength() || rv.startPos == BreakIterator::DONE ) +rv.endPos = result.startPos; else { if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES || rWordType == WordType::DICTIONARY_WORD ) && -u_isWhitespace(Text.iterateCodePoints(, 0)) ) -result.startPos = icuBI->aBreakIterator->following(result.startPos); +u_isWhitespace(Text.iterateCodePoints(, 0)) ) +rv.startPos = icuBI->aBreakIterator->following(rv.startPos); -result.endPos = icuBI->aBreakIterator->following(result.startPos); -if(result.endPos == BreakIterator::DONE) -result.endPos = result.startPos; +rv.endPos = icuBI->aBreakIterator->following(rv.startPos); +if(rv.endPos == BreakIterator::DONE) +rv.endPos = rv.startPos; } -return result; +
[Libreoffice-commits] core.git: connectivity/source extensions/source sd/source sfx2/source
connectivity/source/commontools/dbtools.cxx | 20 +-- extensions/source/propctrlr/stringrepresentation.cxx | 12 +-- sd/source/core/CustomAnimationCloner.cxx |8 +++ sd/source/filter/ppt/pptinanimations.cxx | 12 +-- sfx2/source/control/unoctitm.cxx |8 +++ 5 files changed, 30 insertions(+), 30 deletions(-) New commits: commit 21010f3ea76a98ba8349b7ab3ffd7dcadd6a2d1c Author: Julien Nabet serval2...@yahoo.fr Date: Tue May 6 23:25:13 2014 +0200 Prefer cppu::UnoTypeT::get() to ::getCppuType((T*)0) part4 Change-Id: I8e52c2fd66f8f3291434ee82a745431e11b12caf diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 3ce8bf2..7ebf4a1 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1508,24 +1508,24 @@ bool implUpdateObject(const Reference XRowUpdate _rxUpdatedObject, break; case TypeClass_SEQUENCE: -if (_rValue.getValueType() == ::getCppuType((const Sequence sal_Int8 *)0)) +if (_rValue.getValueType() == cppu::UnoType Sequence sal_Int8 ::get()) _rxUpdatedObject-updateBytes(_nColumnIndex, *(Sequencesal_Int8*)_rValue.getValue()); else bSuccessfullyReRouted = false; break; case TypeClass_STRUCT: -if (_rValue.getValueType() == ::getCppuType((const DateTime*)0)) +if (_rValue.getValueType() == cppu::UnoTypeDateTime::get()) _rxUpdatedObject-updateTimestamp(_nColumnIndex, *(DateTime*)_rValue.getValue()); -else if (_rValue.getValueType() == ::getCppuType((const Date*)0)) +else if (_rValue.getValueType() == cppu::UnoTypeDate::get()) _rxUpdatedObject-updateDate(_nColumnIndex, *(Date*)_rValue.getValue()); -else if (_rValue.getValueType() == ::getCppuType((const Time*)0)) +else if (_rValue.getValueType() == cppu::UnoTypeTime::get()) _rxUpdatedObject-updateTime(_nColumnIndex, *(Time*)_rValue.getValue()); else bSuccessfullyReRouted = false; break; case TypeClass_INTERFACE: -if (_rValue.getValueType() == ::getCppuType(static_castReference XInputStream*(NULL))) +if (_rValue.getValueType() == cppu::UnoTypeReference XInputStream ::get()) { Reference XInputStream xStream; _rValue = xStream; @@ -1613,7 +1613,7 @@ bool implSetObject( const Reference XParameters _rxParameters, break; case TypeClass_SEQUENCE: -if (_rValue.getValueType() == ::getCppuType((const Sequence sal_Int8 *)0)) +if (_rValue.getValueType() == cppu::UnoType Sequence sal_Int8 ::get()) { _rxParameters-setBytes(_nColumnIndex, *(Sequencesal_Int8*)_rValue.getValue()); } @@ -1621,18 +1621,18 @@ bool implSetObject( const Reference XParameters _rxParameters, bSuccessfullyReRouted = false; break; case TypeClass_STRUCT: -if (_rValue.getValueType() == ::getCppuType((const DateTime*)0)) +if (_rValue.getValueType() == cppu::UnoTypeDateTime::get()) _rxParameters-setTimestamp(_nColumnIndex, *(DateTime*)_rValue.getValue()); -else if (_rValue.getValueType() == ::getCppuType((const Date*)0)) +else if (_rValue.getValueType() == cppu::UnoTypeDate::get()) _rxParameters-setDate(_nColumnIndex, *(Date*)_rValue.getValue()); -else if (_rValue.getValueType() == ::getCppuType((const Time*)0)) +else if (_rValue.getValueType() == cppu::UnoTypeTime::get()) _rxParameters-setTime(_nColumnIndex, *(Time*)_rValue.getValue()); else bSuccessfullyReRouted = false; break; case TypeClass_INTERFACE: -if (_rValue.getValueType() == ::getCppuType(static_castReference XInputStream*(NULL))) +if (_rValue.getValueType() == cppu::UnoTypeReference XInputStream ::get()) { Reference XInputStream xStream; _rValue = xStream; diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 10d20fd..25fe129 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -441,7 +441,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any _rValue, // some structs case uno::TypeClass_STRUCT: OSL_FAIL( StringRepresentation::convertGenericValueToString(STRUCT): this is dead code - isn't it? ); -if ( _rValue.getValueType().equals( ::getCppuType( static_cast
[Libreoffice-commits] core.git: connectivity/source extensions/source reportdesign/source svx/source sw/source ucb/source
connectivity/source/commontools/dbtools2.cxx | 10 ++-- extensions/source/abpilot/datasourcehandling.cxx |6 +- reportdesign/source/ui/inc/GeometryHandler.hxx|4 - reportdesign/source/ui/inspection/GeometryHandler.cxx | 40 svx/source/sidebar/nbdtmg.cxx | 29 --- sw/source/core/edit/autofmt.cxx | 44 +- ucb/source/ucp/file/shell.cxx |8 +-- 7 files changed, 67 insertions(+), 74 deletions(-) New commits: commit 8578aabbc45ce3601fc0cfca89d8914c2e2632d3 Author: Tor Lillqvist t...@collabora.com Date: Thu Mar 13 10:32:14 2014 +0200 prefix and postfix are single words Change-Id: I32824c614d070cd4649e18da4a0b91b03bccfaba diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index f6077d25..2dd7676 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -88,7 +88,7 @@ OUString createStandardTypePart(const Reference XPropertySet xColProp,const xColProp-getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) = sAutoIncrementValue; // look if we have to use precisions sal_Bool bUseLiteral = sal_False; -OUString sPreFix,sPostFix,sCreateParams; +OUString sPrefix,sPostfix,sCreateParams; { ReferenceXResultSet xRes = xMetaData-getTypeInfo(); if(xRes.is()) @@ -98,8 +98,8 @@ OUString createStandardTypePart(const Reference XPropertySet xColProp,const { OUString sTypeName2Cmp = xRow-getString(1); sal_Int32 nType = xRow-getShort(2); -sPreFix = xRow-getString (4); -sPostFix = xRow-getString (5); +sPrefix = xRow-getString (4); +sPostfix = xRow-getString (5); sCreateParams = xRow-getString(6); // first identical type will be used if typename is empty if ( sTypeName.isEmpty() nType == nDataType ) @@ -157,9 +157,9 @@ OUString createStandardTypePart(const Reference XPropertySet xColProp,const if ( !aDefault.isEmpty() ) { aSql.append( DEFAULT ); -aSql.append(sPreFix); +aSql.append(sPrefix); aSql.append(aDefault); -aSql.append(sPostFix); +aSql.append(sPostfix); } // if ( aDefault.getLength() ) return aSql.makeStringAndClear(); diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 5c5cfe9..06f743a 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -215,11 +215,11 @@ namespace abp OUString sCheck( _rDataSourceName ); StringBag::const_iterator aPos = m_pImpl-aDataSourceNames.find( sCheck ); -sal_Int32 nPostFix = 1; -while ( ( m_pImpl-aDataSourceNames.end() != aPos ) ( nPostFix 65535 ) ) +sal_Int32 nPostfix = 1; +while ( ( m_pImpl-aDataSourceNames.end() != aPos ) ( nPostfix 65535 ) ) { // there already is a data source with this name sCheck = _rDataSourceName; -sCheck += OUString::number( nPostFix++ ); +sCheck += OUString::number( nPostfix++ ); aPos = m_pImpl-aDataSourceNames.find( sCheck ); } diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index 272d293..de0b379 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -177,10 +177,10 @@ namespace rptui /** get the functions supplier for the set scope, default is the surrounding group. * -* \param _rsNamePostFix the name post fix which canbe used when the scope as name part is needed +* \param _rsNamePostfix the name postfix which can be used when the scope as name part is needed * \return the function supplier */ -::com::sun::star::uno::Reference ::com::sun::star::report::XFunctionsSupplier fillScope_throw(OUString _rsNamePostFix); +::com::sun::star::uno::Reference ::com::sun::star::report::XFunctionsSupplier fillScope_throw(OUString _rsNamePostfix); /** checks if the given function is a default function we know. * diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index f6b6730..325b3a7 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -555,8 +555,8 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString PropertyName, c impl_isCounterFunction_throw(sFunction,m_sScope); else { -
[Libreoffice-commits] core.git: connectivity/source extensions/source filter/source idlc/source idl/source
connectivity/source/commontools/filtermanager.cxx |2 +- connectivity/source/drivers/postgresql/pq_tools.cxx |2 +- extensions/source/plugin/unx/unxmgr.cxx |2 +- filter/source/graphicfilter/idxf/dxfgrprd.cxx |2 +- idl/source/objects/object.cxx |2 +- idl/source/objects/slot.cxx |2 +- idlc/source/idlcproduce.cxx |2 +- idlc/source/options.cxx |2 +- 8 files changed, 8 insertions(+), 8 deletions(-) New commits: commit caab53cf21bc38ead3927941795b3c8a1432589a Author: Jelle van der Waa je...@vdwaa.nl Date: Mon Jun 17 20:32:03 2013 +0200 fdo#43460 connectivity,extensions,filter,idl,idlc: use isEmpty() Change-Id: I78ba286be5aa4d731f734e5eb16adb77c686aad9 Reviewed-on: https://gerrit.libreoffice.org/4325 Reviewed-by: Noel Power noel.po...@suse.com Tested-by: Noel Power noel.po...@suse.com diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 7719a69..7d074df 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -109,7 +109,7 @@ namespace dbtools // void FilterManager::appendFilterComponent( OUStringBuffer io_appendTo, const OUString i_component ) const { -if ( io_appendTo.getLength() 0 ) +if ( !io_appendTo.isEmpty() ) { io_appendTo.insert( 0, sal_Unicode( '(' ) ); io_appendTo.insert( 1, sal_Unicode( ' ' ) ); diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index f4125a1..11e0c30 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -767,7 +767,7 @@ com::sun::star::uno::Sequence Any parseArray( const OUString str ) throw( S } if( brackets == 0 ) { -if( current.getLength() 0 || doubleQuotedValue ) +if( !current.isEmpty() || doubleQuotedValue ) elements.push_back( makeAny( current.makeStringAndClear() ) ); } else diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx index 26a4d10..6da7fe5 100644 --- a/extensions/source/plugin/unx/unxmgr.cxx +++ b/extensions/source/plugin/unx/unxmgr.cxx @@ -116,7 +116,7 @@ static bool CheckPlugin( const OString rPath, list PluginDescription* rDesc } pclose( pResult ); -if( aMIME.getLength() 0 ) +if( !aMIME.isEmpty() ) { OString aLine = aMIME.makeStringAndClear(); diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx index e6a741d..895f88b 100644 --- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx +++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx @@ -68,7 +68,7 @@ OString DXFReadLine(SvStream rIStm) } } -if( !bEnd !rIStm.GetError() aBuf.getLength() ) +if( !bEnd !rIStm.GetError() !aBuf.isEmpty() ) bEnd = sal_True; nOldFilePos += aBuf.getLength(); diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 226788e..b926b26 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -505,7 +505,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList rList, std::vectorsal_uLong SvClassElement * pEle = aClassList[n]; SvMetaClass * pCl = pEle-GetClass(); OStringBuffer rPre(rPrefix); -if( rPre.getLength() pEle-GetPrefix().getLength() ) +if( !rPre.isEmpty() !pEle-GetPrefix().isEmpty() ) rPre.append('.'); rPre.append(pEle-GetPrefix()); diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 5cb3233..e77bd54 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -790,7 +790,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase rBase, aDel = , ; } -if( aOut.getLength() ) +if( !aOut.isEmpty() ) { WriteTab( rOutStm, nTab ); rOutStm aOut.getStr() endl; diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx index 93dc8ba..5eaacbe 100644 --- a/idlc/source/idlcproduce.cxx +++ b/idlc/source/idlcproduce.cxx @@ -67,7 +67,7 @@ static sal_Bool checkOutputPath(const OString completeName) { buffer.append(sysPathName.getToken(0, SEPARATOR, nIndex)); -if ( buffer.getLength() 0 nIndex != -1 ) +if ( !buffer.isEmpty() nIndex != -1 ) { #if defined(SAL_UNX) if (mkdir((char*)buffer.getStr(), 0777) == -1) diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index 375e145..095a971 100644 --- a/idlc/source/options.cxx +++