diff options
Diffstat (limited to 'connectivity/source/drivers/evoab')
33 files changed, 279 insertions, 205 deletions
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx index cffc1e4363ef..25e06e2b90c0 100644..100755 --- a/connectivity/source/drivers/evoab/LCatalog.cxx +++ b/connectivity/source/drivers/evoab/LCatalog.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. @@ -53,7 +54,7 @@ void OEvoabCatalog::refreshTables() TStringVector aVector; Sequence< ::rtl::OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), - ::rtl::OUString::createFromAscii("%"),::rtl::OUString::createFromAscii("%"),aTypes); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")),aTypes); if(xResult.is()) { @@ -70,3 +71,4 @@ void OEvoabCatalog::refreshTables() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx index a6b4aa9f6180..b8a205a38c83 100644..100755 --- a/connectivity/source/drivers/evoab/LCatalog.hxx +++ b/connectivity/source/drivers/evoab/LCatalog.hxx @@ -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. @@ -47,3 +48,4 @@ namespace connectivity } #endif // _CONNECTIVITY_EVOAB_LCATALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx index f8fbc2f8e991..7d005bbf5fbe 100644..100755 --- a/connectivity/source/drivers/evoab/LColumnAlias.cxx +++ b/connectivity/source/drivers/evoab/LColumnAlias.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. @@ -42,39 +43,39 @@ using namespace ::com::sun::star::container; static const ::rtl::OUString sProgrammaticNames[] = { - ::rtl::OUString::createFromAscii("FirstName"), - ::rtl::OUString::createFromAscii("LastName"), - ::rtl::OUString::createFromAscii("DisplayName"), - ::rtl::OUString::createFromAscii("NickName"), - ::rtl::OUString::createFromAscii("PrimaryEmail"), - ::rtl::OUString::createFromAscii("SecondEmail"), - ::rtl::OUString::createFromAscii("PreferMailFormat"), - ::rtl::OUString::createFromAscii("WorkPhone"), - ::rtl::OUString::createFromAscii("HomePhone"), - ::rtl::OUString::createFromAscii("FaxNumber"), - ::rtl::OUString::createFromAscii("PagerNumber"), - ::rtl::OUString::createFromAscii("CellularNumber"), - ::rtl::OUString::createFromAscii("HomeAddress"), - ::rtl::OUString::createFromAscii("HomeAddress2"), - ::rtl::OUString::createFromAscii("HomeCity"), - ::rtl::OUString::createFromAscii("HomeState"), - ::rtl::OUString::createFromAscii("HomeZipCode"), - ::rtl::OUString::createFromAscii("HomeCountry"), - ::rtl::OUString::createFromAscii("WorkAddress"), - ::rtl::OUString::createFromAscii("WorkAddress2"), - ::rtl::OUString::createFromAscii("WorkCity"), - ::rtl::OUString::createFromAscii("WorkState"), - ::rtl::OUString::createFromAscii("WorkZipCode"), - ::rtl::OUString::createFromAscii("WorkCountry"), - ::rtl::OUString::createFromAscii("JobTitle"), - ::rtl::OUString::createFromAscii("Department"), - ::rtl::OUString::createFromAscii("Company"), - ::rtl::OUString::createFromAscii("WebPage1"), - ::rtl::OUString::createFromAscii("WebPage2"), - ::rtl::OUString::createFromAscii("BirthYear"), - ::rtl::OUString::createFromAscii("BirthMonth"), - ::rtl::OUString::createFromAscii("BirthDay"), - ::rtl::OUString::createFromAscii("Notes") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstName")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LastName")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NickName")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PrimaryEmail")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SecondEmail")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferMailFormat")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkPhone")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomePhone")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FaxNumber")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PagerNumber")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellularNumber")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeAddress")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeAddress2")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeCity")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeState")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeZipCode")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeCountry")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkAddress")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkAddress2")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkCity")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkState")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkZipCode")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WorkCountry")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JobTitle")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Department")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Company")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WebPage1")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WebPage2")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BirthYear")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BirthMonth")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BirthDay")), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Notes")) }; //------------------------------------------------------------------------------ OColumnAlias::OColumnAlias() @@ -112,7 +113,7 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference< // the config path for our own driver's settings Reference< XPropertySet > xEvoDriverNode = createDriverConfigNode( _rxORB, OEvoabDriver::getImplementationName_Static() ); //Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, mozab::OConnection::getDriverImplementationName() ); - Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver") ); + Reference< XPropertySet > xMozDriverNode = createDriverConfigNode( _rxORB, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.sdbc.MozabDriver")) ); if ( xEvoDriverNode.is() && xMozDriverNode.is() ) { try @@ -120,8 +121,8 @@ void OColumnAlias::setAlias(const ::com::sun::star::uno::Reference< //============================================================= Reference< XNameAccess > xEvoAliasesNode; Reference< XNameAccess > xMozAliasesNode; - xEvoDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii("ColumnAliases") ) >>= xEvoAliasesNode; - xMozDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii("ColumnAliases") ) >>= xMozAliasesNode; + xEvoDriverNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xEvoAliasesNode; + xMozDriverNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnAliases")) ) >>= xMozAliasesNode; OSL_ENSURE( xEvoAliasesNode.is(), "OColumnAlias::setAlias: missing the evolution aliases node!" ); OSL_ENSURE( xMozAliasesNode.is(), "OColumnAlias::setAlias: missing the mozilla aliases node!" ); @@ -230,3 +231,5 @@ void OColumnAlias::setAliasMap() return; } //------------------------------------------------------------------ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx index 374a1d08fedf..419d158fa105 100644..100755 --- a/connectivity/source/drivers/evoab/LColumnAlias.hxx +++ b/connectivity/source/drivers/evoab/LColumnAlias.hxx @@ -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. @@ -111,3 +112,5 @@ namespace connectivity } } #endif // _CONNECTIVITY_EVOAB_LCOLUMNALIAS_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx index 58f8819da872..5d69f28290b9 100644..100755 --- a/connectivity/source/drivers/evoab/LColumns.cxx +++ b/connectivity/source/drivers/evoab/LColumns.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. @@ -45,7 +46,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName) { OEvoabTable* pTable = (OEvoabTable*)m_pTable; - ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); + ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns(); OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; if(aIter != aCols->get().end()) @@ -55,3 +56,4 @@ sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName) // ------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx index 2fe90cc98d66..5be028cdfe2e 100644..100755 --- a/connectivity/source/drivers/evoab/LColumns.hxx +++ b/connectivity/source/drivers/evoab/LColumns.hxx @@ -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. @@ -50,3 +51,4 @@ namespace connectivity } #endif // _CONNECTIVITY_EVOAB_LCOLUMNS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx index f2c3050613e4..2181de964ac4 100644..100755 --- a/connectivity/source/drivers/evoab/LConfigAccess.cxx +++ b/connectivity/source/drivers/evoab/LConfigAccess.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. @@ -29,9 +30,7 @@ #include "precompiled_connectivity.hxx" #include "LConfigAccess.hxx" #include "LDriver.hxx" -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -53,17 +52,17 @@ namespace connectivity //============================================================= // create the config provider Reference< XMultiServiceFactory > xConfigProvider( - _rxORB->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationProvider" ) ), + _rxORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider")) ), UNO_QUERY ); OSL_ENSURE( xConfigProvider.is(), "createDriverConfigNode: could not create the config provider!" ); if ( xConfigProvider.is() ) { - ::rtl::OUString sCompleteNodePath = ::rtl::OUString::createFromAscii ("/org.openoffice.Office.DataAccess/DriverSettings/" ); + ::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM ("/org.openoffice.Office.DataAccess/DriverSettings/" )); sCompleteNodePath += _sDriverImplementationName; //sCompleteNodePath += OEvoabConnection::getDriverImplementationName(); - //sCompleteNodePath += ::rtl::OUString::createFromAscii ("com.sun.star.comp.sdbc.MozabDriver"); + //sCompleteNodePath += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.comp.sdbc.MozabDriver")); EVO_TRACE_STRING("createDriverConfigNode()::sCompleteNodePath = %s\n", sCompleteNodePath ); //========================================================= @@ -71,14 +70,14 @@ namespace connectivity Sequence< Any > aArguments(2); // the path to the node to open aArguments[0] <<= PropertyValue( - ::rtl::OUString::createFromAscii( "nodepath"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")), 0, makeAny( sCompleteNodePath ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - ::rtl::OUString::createFromAscii( "depth"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE @@ -87,7 +86,7 @@ namespace connectivity //========================================================= // create the access Reference< XInterface > xAccess = xConfigProvider->createInstanceWithArguments( - ::rtl::OUString::createFromAscii( "com.sun.star.configuration.ConfigurationAccess" ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), aArguments ); OSL_ENSURE( xAccess.is(), "createDriverConfigNode: invalid access returned (should throw an exception instead)!" ); @@ -143,10 +142,10 @@ namespace connectivity Reference< XPropertySet > xDriverNode = createDriverConfigNode( _rxORB, OEvoabDriver::getImplementationName_Static() ); Reference< XPropertySet > xEvoPrefsNode; if ( xDriverNode.is() ) - xDriverNode->getPropertyValue( ::rtl::OUString::createFromAscii( "EvolutionPreferences" ) ) >>= xEvoPrefsNode; + xDriverNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EvolutionPreferences")) ) >>= xEvoPrefsNode; OSL_ENSURE( xEvoPrefsNode.is(), "getFullPathExportingCommand: could not access the node for the evolution preferences!" ); if ( xEvoPrefsNode.is() ) - xEvoPrefsNode->getPropertyValue( ::rtl::OUString::createFromAscii( "FullPathExportingCommand" ) ) >>= sFullPathExportingCommand; + xEvoPrefsNode->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FullPathExportingCommand")) ) >>= sFullPathExportingCommand; } catch( const Exception& ) { @@ -159,3 +158,5 @@ namespace connectivity } //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx index 319e5a31fdfd..c19c63c00750 100644..100755 --- a/connectivity/source/drivers/evoab/LConfigAccess.hxx +++ b/connectivity/source/drivers/evoab/LConfigAccess.hxx @@ -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. @@ -44,3 +45,5 @@ namespace connectivity } } #endif // _CONNECTIVITY_EVOAB_LCONFIGACCESS_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx index 7b75512fd29d..725f24ff2236 100644..100755 --- a/connectivity/source/drivers/evoab/LConnection.cxx +++ b/connectivity/source/drivers/evoab/LConnection.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. @@ -38,7 +39,7 @@ #include <connectivity/dbcharset.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/processfactory.hxx> -#include <vos/process.hxx> +#include <osl/process.h> #include <tools/debug.hxx> #include "LDebug.hxx" #include "diagnose_ex.h" @@ -48,7 +49,6 @@ using namespace connectivity::evoab; using namespace connectivity::file; -using namespace vos; typedef connectivity::file::OConnection OConnection_B; @@ -63,12 +63,12 @@ using namespace ::com::sun::star::lang; { ::rtl::OUString aExceptionType = aExceptionType_; if( aExceptionType.getLength() == 0 ) - aExceptionType = ::rtl::OUString( ::rtl::OUString::createFromAscii("Unknown" ) ); + aExceptionType = ::rtl::OUString( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unknown")) ); - ::rtl::OUString aTypeLine( ::rtl::OUString::createFromAscii("\nType: " ) ); + ::rtl::OUString aTypeLine( RTL_CONSTASCII_USTRINGPARAM("\nType: ") ); aTypeLine += aExceptionType; - ::rtl::OUString aMessageLine( ::rtl::OUString::createFromAscii("\nMessage: " ) ); + ::rtl::OUString aMessageLine( RTL_CONSTASCII_USTRINGPARAM("\nMessage: ") ); aMessageLine += ::rtl::OUString( e.Message ); ::rtl::OUString aMsg(aTypeLine); @@ -116,33 +116,45 @@ void OEvoabConnection::construct(const ::rtl::OUString& url,const Sequence< Prop ::rtl::OUString aArg2 = ::rtl::OUString::createFromAscii(OEvoabDriver::getEVOAB_CLI_ARG_OUTPUT_FILE_PREFIX()); aArg2 += aWorkingDirPath; aArg2 += getDriver()->getEvoFolderListFileName(); - OArgumentList aArgs(2,&aArg1,&aArg2); + + const sal_uInt32 nArgsCount = 2; + rtl_uString* pPargs[nArgsCount] = { aArg1.pData, aArgs2.pData }; EVO_TRACE_STRING("OEvoabConnection::construct()::aCLICommand = %s\n", aCLICommand ); EVO_TRACE_STRING("OEvoabConnection::construct()::aWorkingDirPath = %s\n", aWorkingDirPath ); EVO_TRACE_STRING("OEvoabConnection::construct()::aArg1 = %s\n", aArg1 ); EVO_TRACE_STRING("OEvoabConnection::construct()::aArg2 = %s\n", aArg2 ); - OProcess aApp( aCLICommand,aWorkingDirPath); - OSL_VERIFY_EQUALS( - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), - OProcess::E_None, - "Error at execute evolution-addressbook-export to get VCards"); + oslProcess aProcess; + if ( osl_Process_E_None != osl_executeProcess( + aCLICommand.pData, + pArgs, + nArgsCount, + osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH, + NULL, + aWorkingDirPath.pData, + NULL, 0, + &aProcess ) ) + { + OSL_TRACE("Error at execute evolution-addressbook-export to get VCards"); + ::dbtools::throwGenericSQLException( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Error at execute evolution-addressbook-export to get VCards")),NULL); + } Sequence<PropertyValue> aDriverParam; ::std::vector<PropertyValue> aParam; - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("EnableSQL92Check"), 0, Any(), PropertyState_DIRECT_VALUE)); + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EnableSQL92Check")), 0, Any(), PropertyState_DIRECT_VALUE)); ::dbtools::OCharsetMap aLookupIanaName; ::dbtools::OCharsetMap::const_iterator aLookup = aLookupIanaName.find(RTL_TEXTENCODING_UTF8); - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("CharSet"), 0, + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharSet")), 0, makeAny((*aLookup).getIanaName()), PropertyState_DIRECT_VALUE)); - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("Extension"), 0, makeAny(getDriver()->getFileExt()), PropertyState_DIRECT_VALUE)); - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("HeaderLine"), 0, makeAny(m_bHeaderLine), PropertyState_DIRECT_VALUE)); - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("FieldDelimiter"), 0, makeAny(::rtl::OUString(&m_cFieldDelimiter,1)), PropertyState_DIRECT_VALUE)); - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("StringDelimiter"), 0, makeAny(::rtl::OUString(&m_cStringDelimiter,1)), PropertyState_DIRECT_VALUE)); - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("DecimalDelimiter"), 0, makeAny(::rtl::OUString(&m_cDecimalDelimiter,1)), PropertyState_DIRECT_VALUE)); - aParam.push_back(PropertyValue(::rtl::OUString::createFromAscii("ThousandDelimiter"), 0, makeAny(::rtl::OUString(&m_cThousandDelimiter,1)), PropertyState_DIRECT_VALUE)); + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extension")), 0, makeAny(getDriver()->getFileExt()), PropertyState_DIRECT_VALUE)); + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HeaderLine")), 0, makeAny(m_bHeaderLine), PropertyState_DIRECT_VALUE)); + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldDelimiter")), 0, makeAny(::rtl::OUString(&m_cFieldDelimiter,1)), PropertyState_DIRECT_VALUE)); + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StringDelimiter")), 0, makeAny(::rtl::OUString(&m_cStringDelimiter,1)), PropertyState_DIRECT_VALUE)); + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DecimalDelimiter")), 0, makeAny(::rtl::OUString(&m_cDecimalDelimiter,1)), PropertyState_DIRECT_VALUE)); + aParam.push_back(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ThousandDelimiter")), 0, makeAny(::rtl::OUString(&m_cThousandDelimiter,1)), PropertyState_DIRECT_VALUE)); // build a new parameter sequence from the original parameters, appended by the new parameters from above PropertyValue *pParams = aParam.empty() ? 0 : &aParam[0]; @@ -265,3 +277,5 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const :: return NULL; } // ------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx index 8ab673855f4f..9d7df3e3d713 100644..100755 --- a/connectivity/source/drivers/evoab/LConnection.hxx +++ b/connectivity/source/drivers/evoab/LConnection.hxx @@ -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. @@ -76,3 +77,5 @@ namespace connectivity } } #endif // _CONNECTIVITY_EVOAB_LCONNECTION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx index 6a07a786d3ce..77821cb6137b 100644..100755 --- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.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. @@ -37,9 +38,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif #include <tools/urlobj.hxx> #include "FDatabaseMetaDataResultSet.hxx" #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -47,15 +46,12 @@ #include <comphelper/types.hxx> #include "LFolderList.hxx" #include "connectivity/CommonTools.hxx" -#include <vos/process.hxx> #include <osl/process.h> #include <tools/debug.hxx> #include <map> #include <vector> -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include "diagnose_ex.h" using namespace ::comphelper; @@ -68,7 +64,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::ucb; using namespace osl; -using namespace vos; namespace connectivity { @@ -101,7 +96,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) ODatabaseMetaDataResultSet::ORow aRow; aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); - aRow.push_back(new ORowSetValueDecorator(::rtl::OUString::createFromAscii("CHAR"))); + aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHAR")))); aRow.push_back(new ORowSetValueDecorator(DataType::CHAR)); aRow.push_back(new ORowSetValueDecorator((sal_Int32)254)); aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue()); @@ -122,60 +117,60 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("VARCHAR")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"))); aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("LONGVARCHAR")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LONGVARCHAR"))); aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR); aRow[3] = new ORowSetValueDecorator((sal_Int32)65535); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DATE")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE"))); aRow[2] = new ORowSetValueDecorator(DataType::DATE); aRow[3] = new ORowSetValueDecorator((sal_Int32)10); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIME")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME"))); aRow[2] = new ORowSetValueDecorator(DataType::TIME); aRow[3] = new ORowSetValueDecorator((sal_Int32)8); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("TIMESTAMP")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"))); aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP); aRow[3] = new ORowSetValueDecorator((sal_Int32)19); aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue(); aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("BOOL")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BOOL"))); aRow[2] = new ORowSetValueDecorator(DataType::BIT); aRow[3] = ODatabaseMetaDataResultSet::get1Value(); aRow[9] = ODatabaseMetaDataResultSet::getBasicValue(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DECIMAL")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"))); aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)15); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("DOUBLE")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"))); aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = ODatabaseMetaDataResultSet::get0Value(); aRows.push_back(aRow); - aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NUMERIC")); + aRow[1] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMERIC"))); aRow[2] = new ORowSetValueDecorator(DataType::NUMERIC); aRow[3] = new ORowSetValueDecorator((sal_Int32)20); aRow[15] = new ORowSetValueDecorator((sal_Int32)20); @@ -259,10 +254,10 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns( switch(sal_Int32(aRow[11]->getValue())) { case ColumnValue::NO_NULLS: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("NO")); + aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO"))); break; case ColumnValue::NULLABLE: - aRow[18] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("YES")); + aRow[18] = new ORowSetValueDecorator(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YES"))); break; default: aRow[18] = new ORowSetValueDecorator(::rtl::OUString()); @@ -299,7 +294,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( // check if any type is given // when no types are given then we have to return all tables e.g. TABLE - static const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE")); + static const ::rtl::OUString aTable(RTL_CONSTASCII_USTRINGPARAM("TABLE")); sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); @@ -359,11 +354,12 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( ::rtl::OUString aArg2 = ::rtl::OUString::createFromAscii(pOEvoabConnection->getDriver()->getEVOAB_CLI_ARG_OUTPUT_FILE_PREFIX()); aArg2 += aWorkingDir; aArg2 += aName; - aArg2 += ::rtl::OUString::createFromAscii("."); + aArg2 += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); aArg2 += ::rtl::OUString(pOEvoabConnection->getExtension()); ::rtl::OUString aArg3 = ::rtl::OUString::createFromAscii(pOEvoabConnection->getDriver()->getEVOAB_CLI_ARG_OUTPUT_FORMAT()); - OArgumentList aArgs(3,&aArg1,&aArg2,&aArg3); + const sal_uInt32 nArgsCount = 3; + rtl_uString *pArgs[nArgsCount] = { aArg1.pData, aArg2.pData, aArg3.pData }; EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aCLICommand = %s\n", aCLICommand ); EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aWorkingDir = %s\n", aWorkingDir ); @@ -371,11 +367,20 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aArg2 = %s\n", aArg2 ); EVO_TRACE_STRING( "OEvoabDatabaseMetaData::getTables()::aArg3 = %s\n", aArg3 ); - OProcess aApp( aCLICommand,aWorkingDir); - OSL_VERIFY_EQUALS( - aApp.execute( (OProcess::TProcessOption)(OProcess::TOption_Hidden | OProcess::TOption_Wait | OProcess::TOption_SearchPath),aArgs), - OProcess::E_None, - "Error at execute evolution-addressbook-exporter to get VCards" ); + oslProcess aProcess; + if ( osl_Process_E_None != osl_executeProcess( + aCLICommand.pData, + pArgs, + nArgsCount, + osl_Process_HIDDEN | osl_Process_WAIT | osl_Process_SEARCHPATH, + NULL, + aWorkingDir.pData, + NULL, 0, + &aProcess ) ) + { + OSL_TRACE("Error at execute evolution-addressbook-export to get VCards"); + throw SQLException(); + } bMoreData = pFolderList->next(); } @@ -389,3 +394,5 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx index 36bd12a1e631..ebd693874818 100644..100755 --- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx @@ -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. @@ -54,3 +55,4 @@ namespace connectivity } #endif // _CONNECTIVITY_EVOAB_LDATABASEMETADATA_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx index 3442d1a09854..b28e06c55b7e 100644..100755 --- a/connectivity/source/drivers/evoab/LDebug.cxx +++ b/connectivity/source/drivers/evoab/LDebug.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. @@ -28,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include <osl/diagnose.h> void evo_traceStringMessage( const sal_Char* _pFormat, const ::rtl::OUString& _rAsciiString ) @@ -40,3 +39,5 @@ void evo_traceStringMessage( const sal_Char* _pFormat, const ::rtl::OUString& _r sByteStringMessage = "<empty>"; OSL_TRACE( _pFormat, sByteStringMessage.getStr() ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx index d48bf733b078..eeb9eed1860f 100644..100755 --- a/connectivity/source/drivers/evoab/LDebug.hxx +++ b/connectivity/source/drivers/evoab/LDebug.hxx @@ -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. @@ -40,3 +41,5 @@ #endif // CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx index d196a27842bf..637203e787d9 100644..100755 --- a/connectivity/source/drivers/evoab/LDriver.cxx +++ b/connectivity/source/drivers/evoab/LDriver.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. @@ -65,8 +66,8 @@ OEvoabDriver::OEvoabDriver(const Reference< XMultiServiceFactory >& _rxFactory) if ( m_aEvoab_CLI_FullPathCommand.getLength() == 0 ) m_aEvoab_CLI_FullPathCommand = ::rtl::OUString::createFromAscii(getEVOAB_CLI_FULLPATHCOMMAND()); - if ( m_aEvoab_CLI_FullPathCommand.copy(0,7) != ::rtl::OUString::createFromAscii("file://") && m_aEvoab_CLI_FullPathCommand.copy(0,1) == ::rtl::OUString::createFromAscii("/")) - m_aEvoab_CLI_FullPathCommand = ::rtl::OUString::createFromAscii("file://") + m_aEvoab_CLI_FullPathCommand; + if ( m_aEvoab_CLI_FullPathCommand.copy(0,7) != ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://")) && m_aEvoab_CLI_FullPathCommand.copy(0,1) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"))) + m_aEvoab_CLI_FullPathCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://")) + m_aEvoab_CLI_FullPathCommand; m_aEvoab_CLI_EffectiveCommand = m_aEvoab_CLI_FullPathCommand; m_aTempDir.EnableKillingFile(); @@ -76,7 +77,7 @@ OEvoabDriver::OEvoabDriver(const Reference< XMultiServiceFactory >& _rxFactory) //------------------------------------------------------------------------------ rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) { - return rtl::OUString::createFromAscii(EVOAB_DRIVER_IMPL_NAME); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(EVOAB_DRIVER_IMPL_NAME)); } //------------------------------------------------------------------ @@ -309,7 +310,7 @@ sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url ) // There isn't any subschema: - but could be just subschema if ( aAddrbookURI.getLength() > 0 ) aAddrbookScheme= aAddrbookURI; - else if(url == ::rtl::OUString::createFromAscii("sdbc:address:") ) + else if(url == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:address:")) ) return sal_True; // special case here else return sal_False; @@ -503,3 +504,5 @@ Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const ::r } // if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx index e708eabb8671..65b15c50cd3f 100644..100755 --- a/connectivity/source/drivers/evoab/LDriver.hxx +++ b/connectivity/source/drivers/evoab/LDriver.hxx @@ -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. @@ -72,8 +73,8 @@ namespace connectivity inline rtl::OUString getEvoFolderListName() const { return m_aFolderListName;} inline rtl::OUString getFileExt() const { return m_aFileExt;} - inline rtl::OUString getEvoFolderListFileName() const { return m_aFolderListName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;} - inline rtl::OUString getEvoVersionFileName() const { return m_aVersionName + ::rtl::OUString::createFromAscii(".") + m_aFileExt;} + inline rtl::OUString getEvoFolderListFileName() const { return m_aFolderListName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + m_aFileExt;} + inline rtl::OUString getEvoVersionFileName() const { return m_aVersionName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + m_aFileExt;} inline rtl::OUString getWorkingDirURL() const { return m_aWorkingDirURL;} inline rtl::OUString getEvoab_CLI_FullPathCommand() const { return m_aEvoab_CLI_FullPathCommand;} inline rtl::OUString getEvoab_CLI_EffectiveCommand() const { return m_aEvoab_CLI_EffectiveCommand;} @@ -113,3 +114,5 @@ namespace connectivity } #endif //_CONNECTIVITY_EVOAB_LDRIVER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index 02d3fb284312..b276b1f06ff0 100644..100755 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.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. @@ -53,9 +54,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <tools/debug.hxx> #include "connectivity/dbexception.hxx" -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include <unotools/syslocale.hxx> using namespace ::comphelper; @@ -93,7 +92,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal // column count xub_StrLen nFieldCount = aHeaderLine.GetTokenCount(pConnection->getFieldDelimiter(),pConnection->getStringDelimiter()); - if(!m_aColumns.isValid()) + if(!m_aColumns.is()) m_aColumns = new OSQLColumns(); else m_aColumns->get().clear(); @@ -158,7 +157,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal for (xub_StrLen j = 0; j < aField2.Len(); j++) { sal_Unicode c = aField2.GetChar(j); - // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen? + // Only digits and decimalpoint and thousands delimiter? if ((!cDecimalDelimiter || c != cDecimalDelimiter) && (!cThousandDelimiter || c != cThousandDelimiter) && !aCharClass.isDigit(aField2,j)) @@ -178,12 +177,12 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal bNumeric = sal_False; if (bNumeric && cThousandDelimiter) { - // Ist der Trenner richtig angegeben? + // Is the delimiter given correctly? String aValue = aField2.GetToken(0,cDecimalDelimiter); for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4) { sal_Unicode c = aValue.GetChar(j); - // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen? + // Only digits, decimalpoint and thousands delimiter? if (c == cThousandDelimiter && j) continue; else @@ -194,7 +193,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal } } - // jetzt koennte es noch ein Datumsfeld sein + // now it might still be a date-field if (!bNumeric) { try @@ -216,12 +215,12 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal if(nPrecision) { eType = DataType::DECIMAL; - aTypeName = ::rtl::OUString::createFromAscii("DECIMAL"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")); } else { eType = DataType::DOUBLE; - aTypeName = ::rtl::OUString::createFromAscii("DOUBLE"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")); } } else @@ -235,21 +234,21 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal { case NUMBERFORMAT_DATE: eType = DataType::DATE; - aTypeName = ::rtl::OUString::createFromAscii("DATE"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")); break; case NUMBERFORMAT_DATETIME: eType = DataType::TIMESTAMP; - aTypeName = ::rtl::OUString::createFromAscii("TIMESTAMP"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")); break; case NUMBERFORMAT_TIME: eType = DataType::TIME; - aTypeName = ::rtl::OUString::createFromAscii("TIME"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")); break; default: eType = DataType::VARCHAR; - nPrecision = 0; // nyi: Daten koennen aber laenger sein! + nPrecision = 0; // nyi: Data can be longer! nScale = 0; - aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")); }; nFlags |= ColumnSearch::CHAR; } @@ -302,8 +301,8 @@ void OEvoabFolderList::construct() Sequence< ::com::sun::star::uno::Any > aArg(1); aArg[0] <<= aAppLocale; - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY); - m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")),UNO_QUERY); + Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")),aArg),UNO_QUERY); + m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))),UNO_QUERY); m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier); INetURLObject aURL; @@ -323,7 +322,7 @@ void OEvoabFolderList::construct() sal_Int32 nSize = m_pFileStream->Tell(); m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN); - // Buffersize abhaengig von der Filegroesse + // Buffersize dependent on the file-size m_pFileStream->SetBufferSize(nSize > 1000000 ? 32768 : nSize > 100000 ? 16384 : nSize > 10000 ? 4096 : 1024); @@ -340,7 +339,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) (_rRow->get())[0] = m_nFilePos; // the "bookmark" OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; - // Felder: + // Fields: xub_StrLen nStartPos = 0; String aStr; OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); @@ -367,7 +366,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) nRes = m_xNumberFormatter->convertStringToNumber(::com::sun::star::util::NumberFormat::ALL,aStr); Reference<XPropertySet> xProp(m_xNumberFormatter->getNumberFormatsSupplier()->getNumberFormatSettings(),UNO_QUERY); com::sun::star::util::Date aDate; - xProp->getPropertyValue(::rtl::OUString::createFromAscii("NullDate")) >>= aDate; + xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate; switch(nType) { @@ -388,7 +387,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) } break; case DataType::DOUBLE: case DataType::INTEGER: - case DataType::DECIMAL: // #99178# OJ + case DataType::DECIMAL: case DataType::NUMERIC: { sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter(); @@ -399,23 +398,22 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) !cDecimalDelimiter && nType == DataType::INTEGER, "FalscherTyp"); - // In Standard-Notation (DezimalPUNKT ohne Tausender-Komma) umwandeln: + // Convert to standard notation (DecimalPOINT without Thousands-comma): for (xub_StrLen j = 0; j < aStr.Len(); ++j) { if (cDecimalDelimiter && aStr.GetChar(j) == cDecimalDelimiter) aStrConverted += '.'; else if ( aStr.GetChar(j) == '.' ) // special case, if decimal seperator isn't '.' we have to vut the string after it - break; // #99189# OJ + break; else if (cThousandDelimiter && aStr.GetChar(j) == cThousandDelimiter) { - // weglassen + // leave out } else aStrConverted += aStr.GetChar(j) ; } double nVal = ::rtl::math::stringToDouble(aStrConverted.GetBuffer(),',','.',NULL,NULL); - // #99178# OJ if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType ) (_rRow->get())[i+1] = String::CreateFromDouble(nVal); else @@ -424,7 +422,7 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) default: { - // Wert als String in Variable der Row uebernehmen + // put value as string in Row variable (_rRow->get())[i+1] = aStr; } break; @@ -444,7 +442,7 @@ sal_Bool OEvoabFolderList::seekRow(IResultSetHelper::Movement eCursorPosition) return sal_False; OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; // ---------------------------------------------------------- - // Positionierung vorbereiten: + // Prepare positioning: //OSL_TRACE("OEvoabFolderList::seekRow()::(before SeekRow,m_pFileStriam Exist)m_aCurrentLine = %d\n", ((OUtoCStr(::rtl::OUString(m_aCurrentLine))) ? (OUtoCStr(::rtl::OUString(m_aCurrentLine))):("NULL")) ); switch(eCursorPosition) @@ -525,7 +523,7 @@ sal_Int32 SAL_CALL OEvoabFolderList::getInt( sal_Int32 _nColumnIndex ) throw(SQL // ----------------------------------------------------------------------------- void OEvoabFolderList::initializeRow(sal_Int32 _nColumnCount) { - if(!m_aRow.isValid()) + if(!m_aRow.is()) { m_aRow = new OValueVector(_nColumnCount); (m_aRow->get())[0].setBound(sal_True); @@ -556,8 +554,10 @@ sal_Bool SAL_CALL OEvoabFolderList::next( ) throw(SQLException, RuntimeExceptio sal_Int32 SAL_CALL OEvoabFolderList::getRow( ) throw(SQLException, RuntimeException) { - sal_Bool bRet = fetchRow(m_aRow,getTableColumns().getBody()); + sal_Bool bRet = fetchRow(m_aRow,*(getTableColumns())); EVO_TRACE_STRING("OEvoabFolderList::getRow()::fetchRow() = %s\n", ::rtl::OUString::valueOf(bRet) ); return bRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx index 16f5d2e2858e..f6cb1ac985ea 100644..100755 --- a/connectivity/source/drivers/evoab/LFolderList.hxx +++ b/connectivity/source/drivers/evoab/LFolderList.hxx @@ -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. @@ -40,8 +41,8 @@ namespace connectivity namespace evoab { //================================================================== - // Ableitung von String mit ueberladenen GetToken/GetTokenCount-Methoden - // Speziell fuer FLAT FILE-Format: Strings koennen gequotet sein + // Derivation of String with overloaded GetToken/GetTokenCount methods + // Especially for FLAT FILE-Format: Strings can be quoted //================================================================== class OEvoabConnection; @@ -54,10 +55,10 @@ namespace connectivity ::std::vector<sal_Int32> m_aScales; QuotedTokenizedString m_aCurrentLine; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xNumberFormatter; - sal_Int32 m_nFilePos; // aktuelle IResultSetHelper::Movement + sal_Int32 m_nFilePos; // current IResultSetHelper::Movement SvStream* m_pFileStream; OEvoabConnection* m_pConnection; - ::vos::ORef<OSQLColumns> m_aColumns; + ::rtl::Reference<OSQLColumns> m_aColumns; OValueRow m_aRow; sal_Bool m_bIsNull; @@ -73,7 +74,7 @@ namespace connectivity OEvoabFolderList( OEvoabConnection* _pConnection); OEvoabConnection* getConnection() const { return m_pConnection;} - ::vos::ORef<OSQLColumns> getTableColumns() const {return m_aColumns;} + ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;} void construct(); // can throw any exception static SvStream* createStream_simpleError( const String& _rFileName, StreamMode _eOpenMode); void initializeRow(sal_Int32 _nColumnCount); @@ -90,3 +91,4 @@ namespace connectivity } #endif // _CONNECTIVITY_EVOAB_LEVOABFOLDERLIST_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx index 790dc16c7c98..3b223ddd943b 100644..100755 --- a/connectivity/source/drivers/evoab/LNoException.cxx +++ b/connectivity/source/drivers/evoab/LNoException.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. @@ -40,40 +41,40 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) return 0; xub_StrLen nTokCount = 1; - sal_Bool bStart = sal_True; // Stehen wir auf dem ersten Zeichen im Token? - sal_Bool bInString = sal_False; // Befinden wir uns INNERHALB eines (cStrDel delimited) String? + sal_Bool bStart = sal_True; // Are we on the fist character of the token? + sal_Bool bInString = sal_False; // Are we within a (cStrDel delimited) string? - // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen + // Search for the first not-matching character (search ends at the end of string) for( xub_StrLen i = 0; i < Len(); i++ ) { if (bStart) { bStart = sal_False; - // Erstes Zeichen ein String-Delimiter? + // First character a string delimiter? if ((*this).GetChar(i) == cStrDel) { - bInString = sal_True; // dann sind wir jetzt INNERHALB des Strings! - continue; // dieses Zeichen ueberlesen! + bInString = sal_True; // then we are within a string! + continue; // read next character! } } if (bInString) { - // Wenn jetzt das String-Delimiter-Zeichen auftritt ... + // If we see the string delimiter ... if ( (*this).GetChar(i) == cStrDel ) { if ((i+1 < Len()) && ((*this).GetChar(i+1) == cStrDel)) { - // Verdoppeltes String-Delimiter-Zeichen: - i++; // kein String-Ende, naechstes Zeichen ueberlesen. + // doubled string-delimiter: + i++; // no end of string, skip next character. } else { - // String-Ende + // end of String bInString = sal_False; } } } else { - // Stimmt das Tokenzeichen ueberein, dann erhoehe TokCount + // if the token character matches, then raise TokCount if ( (*this).GetChar(i) == cTok ) { nTokCount++; @@ -93,51 +94,49 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni xub_StrLen nLen = Len(); if ( nLen ) { - sal_Bool bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // Befinden wir uns INNERHALB eines (cStrDel delimited) String? + sal_Bool bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String? - // Erstes Zeichen ein String-Delimiter? + // Is the first character a String-Delimiter? if (bInString ) - ++nStartPos; // dieses Zeichen ueberlesen! - // Suche bis Stringende nach dem ersten nicht uebereinstimmenden Zeichen + ++nStartPos; // skip the character! + // Search until end of string for the first not-matching character for( xub_StrLen i = nStartPos; i < nLen; ++i ) { if (bInString) { - // Wenn jetzt das String-Delimiter-Zeichen auftritt ... + // If we see the String-Delimiter ... if ( (*this).GetChar(i) == cStrDel ) { if ((i+1 < nLen) && ((*this).GetChar(i+1) == cStrDel)) { - // Verdoppeltes String-Delimiter-Zeichen: - ++i; // kein String-Ende, naechstes Zeichen ueberlesen. - - _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String + // doubled String-Delimiter: + ++i; // no end of String, skip next character + _rStr += (*this).GetChar(i); // Character belongs to Result-String } else { - // String-Ende + // end of String bInString = sal_False; } } else { - _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String + _rStr += (*this).GetChar(i); // Character belongs to Result-String } } else { - // Stimmt das Tokenzeichen ueberein, dann erhoehe nTok + // Does the Token-character match, then raise nTok if ( (*this).GetChar(i) == cTok ) { - // Vorzeitiger Abbruch der Schleife moeglich, denn - // wir haben, was wir wollten. + // Early termination of loop possible, because we found what we were looking for. nStartPos = i+1; break; } else { - _rStr += (*this).GetChar(i); // Zeichen gehoert zum Resultat-String + _rStr += (*this).GetChar(i); // Character belongs to Result-String } } } @@ -174,7 +173,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In return sal_False; OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; // ---------------------------------------------------------- - // Positionierung vorbereiten: + // prepare positioning: //OSL_TRACE("OEvoabTable::(before SeekRow,m_pFileStriam Exist)m_aCurrentLine = %d\n", ((OUtoCStr(::rtl::OUString(m_aCurrentLine))) ? (OUtoCStr(::rtl::OUString(m_aCurrentLine))):("NULL")) ); m_nFilePos = nCurPos; @@ -309,7 +308,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In if (m_pFileStream->IsEof()) return sal_False; - m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG) + m_nFilePos = m_pFileStream->Tell(); // save Byte-Position in the file (at start of line) m_pFileStream->ReadByteStringLine(m_aCurrentLine,pConnection->getTextEncoding()); if (m_pFileStream->IsEof()) return sal_False; @@ -322,3 +321,5 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In return sal_True; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx index 028b26cb37c7..fee0905e29ab 100644..100755 --- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab/LPreparedStatement.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. @@ -41,3 +42,4 @@ OResultSet* OEvoabPreparedStatement::createResultSet() // ------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO(OEvoabPreparedStatement,"com.sun.star.sdbc.driver.evoab.PreparedStatement","com.sun.star.sdbc.PreparedStatement"); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx index 98ababa5e098..700768c686c0 100644..100755 --- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab/LPreparedStatement.hxx @@ -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. @@ -48,3 +49,4 @@ namespace connectivity #endif //_CONNECTIVITY_EVOAB_LPREPAREDSTATEMENT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx index 014d20ab4465..4ff0e701f8a4 100644..100755 --- a/connectivity/source/drivers/evoab/LResultSet.cxx +++ b/connectivity/source/drivers/evoab/LResultSet.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. @@ -44,8 +45,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// using namespace com::sun::star::container; -// using namespace com::sun::star::util; + //------------------------------------------------------------------------------ OEvoabResultSet::OEvoabResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator) : file::OResultSet(pStmt,_aSQLIterator) @@ -56,14 +56,14 @@ OEvoabResultSet::OEvoabResultSet( OStatement_Base* pStmt,connectivity::OSQLParse // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.evoab.ResultSet"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.evoab.ResultSet")); } // ------------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException) { Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.ResultSet"); - aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.ResultSet"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.ResultSet")); + aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.ResultSet")); return aSupported; } // ------------------------------------------------------------------------- @@ -188,3 +188,4 @@ void SAL_CALL OEvoabResultSet::release() throw() } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx index dc92169ec923..ebd64292e911 100644..100755 --- a/connectivity/source/drivers/evoab/LResultSet.hxx +++ b/connectivity/source/drivers/evoab/LResultSet.hxx @@ -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. @@ -79,3 +80,4 @@ namespace connectivity } #endif //_CONNECTIVITY_EVOAB_LRESULTSET_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx index 29a19e9168eb..b0f7016c5e72 100644..100755 --- a/connectivity/source/drivers/evoab/LServices.cxx +++ b/connectivity/source/drivers/evoab/LServices.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. @@ -85,7 +86,6 @@ struct ProviderRequest }; //--------------------------------------------------------------------------------------- - extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, @@ -121,3 +121,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( return pRet; }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx index aacd54a590ba..a6350f11139b 100644..100755 --- a/connectivity/source/drivers/evoab/LStatement.cxx +++ b/connectivity/source/drivers/evoab/LStatement.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. @@ -41,3 +42,4 @@ OResultSet* OEvoabStatement::createResultSet() // ------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO(OEvoabStatement,"com.sun.star.sdbc.driver.evoab.Statement","com.sun.star.sdbc.Statement"); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx index 1e3b7fd6d10d..a870c4722034 100644..100755 --- a/connectivity/source/drivers/evoab/LStatement.hxx +++ b/connectivity/source/drivers/evoab/LStatement.hxx @@ -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. @@ -47,3 +48,5 @@ namespace connectivity } #endif //_CONNECTIVITY_EVOAB_LSTATEMENT_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index c1a41e91acf2..70df1622e8b1 100644..100755 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.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. @@ -33,9 +34,6 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ -//#include <com/sun/star/sdbc/XRow.hpp> -#endif #include <svl/converter.hxx> #include "LConnection.hxx" #include "LColumns.hxx" @@ -54,9 +52,7 @@ #include "connectivity/dbconversion.hxx" #include <comphelper/types.hxx> #include <unotools/syslocale.hxx> -#ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" -#endif #include <map> using namespace ::comphelper; @@ -104,7 +100,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) // column count xub_StrLen nFieldCount = aHeaderLine.GetTokenCount(pConnection->getFieldDelimiter(),pConnection->getStringDelimiter()); - if(!m_aColumns.isValid()) + if(!m_aColumns.is()) m_aColumns = new OSQLColumns(); else m_aColumns->get().clear(); @@ -182,7 +178,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) for (xub_StrLen j = 0; j < aField2.Len(); j++) { sal_Unicode c = aField2.GetChar(j); - // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen? + // only digits, decimalpoint and thousands-delimiter if ((!cDecimalDelimiter || c != cDecimalDelimiter) && (!cThousandDelimiter || c != cThousandDelimiter) && !aCharClass.isDigit(aField2,j)) @@ -202,12 +198,12 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) bNumeric = sal_False; if (bNumeric && cThousandDelimiter) { - // Ist der Trenner richtig angegeben? + // is the delimiter given correctly String aValue = aField2.GetToken(0,cDecimalDelimiter); for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4) { sal_Unicode c = aValue.GetChar(j); - // nur Ziffern und Dezimalpunkt und Tausender-Trennzeichen? + // only digits, decimalpoint and thousands-delimiter? if (c == cThousandDelimiter && j) continue; else @@ -218,7 +214,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) } } - // jetzt koennte es noch ein Datumsfeld sein + // Now it might still be a Date-field if (!bNumeric) { try @@ -240,12 +236,12 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) if(nPrecision) { eType = DataType::DECIMAL; - aTypeName = ::rtl::OUString::createFromAscii("DECIMAL"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DECIMAL")); } else { eType = DataType::DOUBLE; - aTypeName = ::rtl::OUString::createFromAscii("DOUBLE"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOUBLE")); } } else @@ -259,21 +255,21 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) { case NUMBERFORMAT_DATE: eType = DataType::DATE; - aTypeName = ::rtl::OUString::createFromAscii("DATE"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")); break; case NUMBERFORMAT_DATETIME: eType = DataType::TIMESTAMP; - aTypeName = ::rtl::OUString::createFromAscii("TIMESTAMP"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP")); break; case NUMBERFORMAT_TIME: eType = DataType::TIME; - aTypeName = ::rtl::OUString::createFromAscii("TIME"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")); break; default: eType = DataType::VARCHAR; - nPrecision = 0; // nyi: Daten koennen aber laenger sein! + nPrecision = 0; // nyi: Data can be longer nScale = 0; - aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")); }; nFlags |= ColumnSearch::CHAR; } @@ -342,8 +338,8 @@ void OEvoabTable::construct() Sequence< ::com::sun::star::uno::Any > aArg(1); aArg[0] <<= aAppLocale; - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY); - m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.util.NumberFormatter")),UNO_QUERY); + Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatsSupplier")),aArg),UNO_QUERY); + m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(m_pConnection->getDriver()->getFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.NumberFormatter"))),UNO_QUERY); m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier); INetURLObject aURL; @@ -366,7 +362,7 @@ void OEvoabTable::construct() sal_Int32 nSize = m_pFileStream->Tell(); m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN); - // Buffersize abhaengig von der Filegroesse + // Buffer size is dependent on the file-size m_pFileStream->SetBufferSize(nSize > 1000000 ? 32768 : nSize > 100000 ? 16384 : nSize > 10000 ? 4096 : 1024); @@ -517,7 +513,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa return sal_True; OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; - // Felder: + // Fields: xub_StrLen nStartPos = 0; String aStr; OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); @@ -530,7 +526,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa (_rRow->get())[i+1]->setNull(); else { - // Laengen je nach Datentyp: + // Lengths for each data-type: sal_Int32 nLen, nType = 0; if(bIsTable) @@ -556,7 +552,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa nRes = m_xNumberFormatter->convertStringToNumber(::com::sun::star::util::NumberFormat::ALL,aStr); Reference<XPropertySet> xProp(m_xNumberFormatter->getNumberFormatsSupplier()->getNumberFormatSettings(),UNO_QUERY); com::sun::star::util::Date aDate; - xProp->getPropertyValue(::rtl::OUString::createFromAscii("NullDate")) >>= aDate; + xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= aDate; switch(nType) { @@ -577,7 +573,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa } break; case DataType::DOUBLE: case DataType::INTEGER: - case DataType::DECIMAL: // #99178# OJ + case DataType::DECIMAL: case DataType::NUMERIC: { sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter(); @@ -588,23 +584,22 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa !cDecimalDelimiter && nType == DataType::INTEGER, "FalscherTyp"); - // In Standard-Notation (DezimalPUNKT ohne Tausender-Komma) umwandeln: + // Convert to standard-notation (DecimalPOINT without Thousands-comma): for (xub_StrLen j = 0; j < aStr.Len(); ++j) { if (cDecimalDelimiter && aStr.GetChar(j) == cDecimalDelimiter) aStrConverted += '.'; else if ( aStr.GetChar(j) == '.' ) // special case, if decimal seperator isn't '.' we have to vut the string after it - break; // #99189# OJ + break; else if (cThousandDelimiter && aStr.GetChar(j) == cThousandDelimiter) { - // weglassen + // leave out } else aStrConverted += aStr.GetChar(j) ; } double nVal = ::rtl::math::stringToDouble(aStrConverted.GetBuffer(),',','.',NULL,NULL); - // #99178# OJ if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType ) *(_rRow->get())[i+1] = ORowSetValue(String::CreateFromDouble(nVal)); else @@ -613,7 +608,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa default: { - // Wert als String in Variable der Row uebernehmen + // Copy Value as String in Row-variable *(_rRow->get())[i+1] = ORowSetValue(aStr); } break; @@ -676,7 +671,7 @@ sal_Bool OEvoabTable::setColumnAliases() sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(); ::rtl::OUString aTypeName; - aTypeName = ::rtl::OUString::createFromAscii("VARCHAR"); + aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR")); sdbcx::OColumn* pColumn = new sdbcx::OColumn(sColumnFinalName,aTypeName,::rtl::OUString(), ColumnValue::NULLABLE, m_aPrecisions[i], @@ -722,7 +717,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In return sal_False; OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; // ---------------------------------------------------------- - // Positionierung vorbereiten: + // prepare positioning: //OSL_TRACE("OEvoabTable::(before SeekRow,m_pFileStriam Exist)m_aCurrentLine = %d\n", ((OUtoCStr(::rtl::OUString(m_aCurrentLine))) ? (OUtoCStr(::rtl::OUString(m_aCurrentLine))):("NULL")) ); m_nFilePos = nCurPos; @@ -855,7 +850,7 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In if (m_pFileStream->IsEof()) return sal_False; - m_nFilePos = m_pFileStream->Tell(); // Byte-Position in der Datei merken (am ZeilenANFANG) + m_nFilePos = m_pFileStream->Tell(); // save Byte-Position in the file (at start of line) m_pFileStream->ReadByteStringLine(m_aCurrentLine,pConnection->getTextEncoding()); if (m_pFileStream->IsEof()) return sal_False; @@ -868,3 +863,5 @@ sal_Bool OEvoabTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In return sal_True; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx index 6261aec2d0ac..998086be4985 100644..100755 --- a/connectivity/source/drivers/evoab/LTable.hxx +++ b/connectivity/source/drivers/evoab/LTable.hxx @@ -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. @@ -98,3 +99,4 @@ namespace connectivity } #endif // _CONNECTIVITY_EVOAB_LTABLE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx index da880e8793c9..26b5009683c6 100644..100755 --- a/connectivity/source/drivers/evoab/LTables.cxx +++ b/connectivity/source/drivers/evoab/LTables.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. @@ -53,10 +54,11 @@ namespace starutil = ::com::sun::star::util; sdbcx::ObjectType OEvoabTables::createObject(const ::rtl::OUString& _rName) { OEvoabTable* pRet = new OEvoabTable(this,(OEvoabConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(), - _rName,::rtl::OUString::createFromAscii("TABLE")); + _rName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TABLE"))); sdbcx::ObjectType xRet = pRet; pRet->construct(); return xRet; } // ------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx index 6180493db49e..ef2c3f838da3 100644..100755 --- a/connectivity/source/drivers/evoab/LTables.hxx +++ b/connectivity/source/drivers/evoab/LTables.hxx @@ -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. @@ -50,3 +51,4 @@ namespace connectivity } #endif // _CONNECTIVITY_EVOAB_LTABLES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/evoab.xml b/connectivity/source/drivers/evoab/evoab.xml index 8ed16719ae0e..f2bafcffdada 100644..100755 --- a/connectivity/source/drivers/evoab/evoab.xml +++ b/connectivity/source/drivers/evoab/evoab.xml @@ -17,12 +17,10 @@ <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> - <project-build-dependency>vos</project-build-dependency> <runtime-module-dependency>file</runtime-module-dependency> <runtime-module-dependency>cppuhelper</runtime-module-dependency> <runtime-module-dependency>cppu</runtime-module-dependency> <runtime-module-dependency>sal</runtime-module-dependency> - <runtime-module-dependency>vos</runtime-module-dependency> <runtime-module-dependency>osl</runtime-module-dependency> <runtime-module-dependency>svtools-light1</runtime-module-dependency> <runtime-module-dependency>svtools</runtime-module-dependency> diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp index f0e1c69934bc..f0e1c69934bc 100644..100755 --- a/connectivity/source/drivers/evoab/exports.dxp +++ b/connectivity/source/drivers/evoab/exports.dxp diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk index c1dbc21cdf1e..82e0ce4b70b0 100644..100755 --- a/connectivity/source/drivers/evoab/makefile.mk +++ b/connectivity/source/drivers/evoab/makefile.mk @@ -33,6 +33,7 @@ TARGET=evoab VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- + .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ .ENDIF @@ -69,18 +70,18 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- -#SHL1TARGET=$(TARGET)$(DLLPOSTFIX) + SHL1TARGET= $(EVOAB_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ - $(VOSLIB) \ $(TOOLSLIB) \ $(SVTOOLLIB) \ $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ $(SALLIB) \ + $(SALHELPERLIB) \ $(DBTOOLSLIB) \ $(DBFILELIB) \ $(COMPHELPERLIB) @@ -100,5 +101,7 @@ DEF1NAME= $(SHL1TARGET) dummy: @echo "Nothing to build for GUI $(GUI)" .ENDIF + # --- Targets ---------------------------------- + .INCLUDE : $(PRJ)$/target.pmk |