diff options
Diffstat (limited to 'dbaccess/source/ui/misc/WCopyTable.cxx')
-rw-r--r-- | dbaccess/source/ui/misc/WCopyTable.cxx | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 10b8aae1c28f..7fff204f8404 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,6 +75,7 @@ #include <vcl/waitobj.hxx> #include <functional> +#include <o3tl/compat_functional.hxx> using namespace ::dbaui; using namespace ::com::sun::star::uno; @@ -151,7 +153,7 @@ bool ObjectCopySource::isView() const { ::rtl::OUString sObjectType; OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_TYPE ) >>= sObjectType ); - bIsView = sObjectType.equalsAscii( "VIEW" ); + bIsView = sObjectType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VIEW" ) ); } } catch( const Exception& ) @@ -167,7 +169,7 @@ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObj const ::rtl::OUString aCopyProperties[] = { PROPERTY_FONT, PROPERTY_ROW_HEIGHT, PROPERTY_TEXTCOLOR,PROPERTY_TEXTLINECOLOR,PROPERTY_TEXTEMPHASIS,PROPERTY_TEXTRELIEF }; - for ( size_t i=0; i < sizeof( aCopyProperties ) / sizeof( aCopyProperties[0] ); ++i ) + for ( size_t i=0; i < SAL_N_ELEMENTS( aCopyProperties ); ++i ) { if ( m_xObjectPSI->hasPropertyByName( aCopyProperties[i] ) ) _rxObject->setPropertyValue( aCopyProperties[i], m_xObject->getPropertyValue( aCopyProperties[i] ) ); @@ -194,7 +196,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _ sStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE 0=1")); - for ( i=0; i < sizeof( aProperties ) / sizeof( aProperties[0] ); ++i ) + for ( i=0; i < SAL_N_ELEMENTS( aProperties ); ++i ) { if ( m_xObjectPSI->hasPropertyByName( aProperties[i].first ) ) { @@ -329,7 +331,7 @@ bool NamedTableCopySource::isView() const { DBG_UNHANDLED_EXCEPTION(); } - return sTableType.equalsAscii( "VIEW" ); + return sTableType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VIEW" ) ); } //------------------------------------------------------------------------ @@ -478,14 +480,14 @@ const DummyCopySource& DummyCopySource::Instance() //------------------------------------------------------------------------ ::rtl::OUString DummyCopySource::getQualifiedObjectName() const { - OSL_ENSURE( false, "DummyCopySource::getQualifiedObjectName: not to be called!" ); + OSL_FAIL( "DummyCopySource::getQualifiedObjectName: not to be called!" ); return ::rtl::OUString(); } //------------------------------------------------------------------------ bool DummyCopySource::isView() const { - OSL_ENSURE( false, "DummyCopySource::isView: not to be called!" ); + OSL_FAIL( "DummyCopySource::isView: not to be called!" ); return false; } @@ -507,27 +509,27 @@ Sequence< ::rtl::OUString > DummyCopySource::getColumnNames() const //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DummyCopySource::getPrimaryKeyColumnNames() const { - OSL_ENSURE( false, "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" ); + OSL_FAIL( "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" ); return Sequence< ::rtl::OUString >(); } //------------------------------------------------------------------------ OFieldDescription* DummyCopySource::createFieldDescription( const ::rtl::OUString& /*_rColumnName*/ ) const { - OSL_ENSURE( false, "DummyCopySource::createFieldDescription: not to be called!" ); + OSL_FAIL( "DummyCopySource::createFieldDescription: not to be called!" ); return NULL; } //------------------------------------------------------------------------ ::rtl::OUString DummyCopySource::getSelectStatement() const { - OSL_ENSURE( false, "DummyCopySource::getSelectStatement: not to be called!" ); + OSL_FAIL( "DummyCopySource::getSelectStatement: not to be called!" ); return ::rtl::OUString(); } //------------------------------------------------------------------------ ::utl::SharedUNOComponent< XPreparedStatement > DummyCopySource::getPreparedSelectStatement() const { - OSL_ENSURE( false, "DummyCopySource::getPreparedSelectStatement: not to be called!" ); + OSL_FAIL( "DummyCopySource::getPreparedSelectStatement: not to be called!" ); return ::utl::SharedUNOComponent< XPreparedStatement >(); } @@ -615,8 +617,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const ::rtl::OUString& _rD impl_loadSourceData(); bool bAllowViews = true; - // if the source is a, don't allow creating views #100644# (oj) - // (fs: Hmm? A SELECT * FROM <view> would be created, where #100644# claims this is nonsense. Why? + // if the source is a, don't allow creating views if ( m_rSourceObject.isView() ) bAllowViews = false; // no views if the target connection does not support creating them @@ -930,7 +931,7 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) if ( supportsPrimaryKey() ) { ODatabaseExport::TColumns::iterator aFind = ::std::find_if(m_vDestColumns.begin(),m_vDestColumns.end() - ,::std::compose1(::std::mem_fun(&OFieldDescription::IsPrimaryKey),::std::select2nd<ODatabaseExport::TColumns::value_type>())); + ,::o3tl::compose1(::std::mem_fun(&OFieldDescription::IsPrimaryKey),::o3tl::select2nd<ODatabaseExport::TColumns::value_type>())); if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() ) { @@ -973,7 +974,7 @@ IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) break; default: { - OSL_ENSURE(sal_False, "OCopyTableWizard::ImplOKHdl: invalid creation style!"); + OSL_FAIL("OCopyTableWizard::ImplOKHdl: invalid creation style!"); } } @@ -1024,7 +1025,7 @@ IMPL_LINK( OCopyTableWizard, ImplActivateHdl, WizardDialog*, EMPTYARG ) void OCopyTableWizard::CheckButtons() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::CheckButtons" ); - if(GetCurLevel() == 0) // erste Seite hat kein PrevButton + if(GetCurLevel() == 0) // the first page has no back button { if(m_nPageCount > 1) m_pbNext.Enable(sal_True); @@ -1033,7 +1034,7 @@ void OCopyTableWizard::CheckButtons() m_pbPrev.Enable(sal_False); } - else if(GetCurLevel() == m_nPageCount-1) // letzte Seite hat keinen Next Button + else if(GetCurLevel() == m_nPageCount-1) // the last page has no next button { m_pbNext.Enable(sal_False); m_pbPrev.Enable(sal_True); @@ -1041,14 +1042,13 @@ void OCopyTableWizard::CheckButtons() else { m_pbPrev.Enable(sal_True); - // next has already his state + // next already has its state } } // ----------------------------------------------------------------------- void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::EnableButton" ); -// CheckButtons(); Button* pButton; if(eStyle == WIZARD_NEXT) pButton = &m_pbNext; @@ -1229,7 +1229,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co } else { - OSL_ENSURE(sal_False, "OCopyTableWizard::appendColumns: invalid field name!"); + OSL_FAIL("OCopyTableWizard::appendColumns: invalid field name!"); } } @@ -1376,8 +1376,8 @@ Reference< XPropertySet > OCopyTableWizard::createTable() ODatabaseExport::TPositions::iterator aPosFind = ::std::find_if( m_vColumnPos.begin(), m_vColumnPos.end(), - ::std::compose1( ::std::bind2nd( ::std::equal_to< sal_Int32 >(), nPos ), - ::std::select1st< ODatabaseExport::TPositions::value_type >() + ::o3tl::compose1( ::std::bind2nd( ::std::equal_to< sal_Int32 >(), nPos ), + ::o3tl::select1st< ODatabaseExport::TPositions::value_type >() ) ); @@ -1690,3 +1690,4 @@ void OCopyTableWizard::showError(const Any& _aError) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |