diff options
Diffstat (limited to 'ucb/source/cacher/cachedcontentresultset.cxx')
-rwxr-xr-x[-rw-r--r--] | ucb/source/cacher/cachedcontentresultset.cxx | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index e5c879448338..c4e2f8bb113e 100644..100755 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.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. @@ -46,7 +47,8 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; using namespace com::sun::star::util; using namespace cppu; -using namespace rtl; + +using ::rtl::OUString; #define COMSUNSTARUCBCCRS_DEFAULT_FETCH_SIZE 256 #define COMSUNSTARUCBCCRS_DEFAULT_FETCH_DIRECTION FetchDirection::FORWARD @@ -308,7 +310,7 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache return rRow[nColumnIndex-1]; } -const rtl::OUString& SAL_CALL CachedContentResultSet::CCRS_Cache +const OUString& SAL_CALL CachedContentResultSet::CCRS_Cache ::getContentIdentifierString( sal_Int32 nRow ) throw( com::sun::star::uno::RuntimeException ) { @@ -317,12 +319,12 @@ const rtl::OUString& SAL_CALL CachedContentResultSet::CCRS_Cache if( m_xContentIdentifierMapping.is() && !isRowMapped( nRow ) ) { Any& rRow = getRowAny( nRow ); - rtl::OUString aValue; + OUString aValue; rRow >>= aValue; rRow <<= m_xContentIdentifierMapping->mapContentIdentifierString( aValue ); remindMapped( nRow ); } - return (* reinterpret_cast< const rtl::OUString * > + return (* reinterpret_cast< const OUString * > (getRowAny( nRow ).getValue() )); } catch( SQLException ) @@ -395,10 +397,10 @@ class CCRS_PropertySetInfo : m_pProperties; //some helping variables ( names for my special properties ) - static rtl::OUString m_aPropertyNameForCount; - static rtl::OUString m_aPropertyNameForFinalCount; - static rtl::OUString m_aPropertyNameForFetchSize; - static rtl::OUString m_aPropertyNameForFetchDirection; + static OUString m_aPropertyNameForCount; + static OUString m_aPropertyNameForFinalCount; + static OUString m_aPropertyNameForFetchSize; + static OUString m_aPropertyNameForFetchDirection; long m_nFetchSizePropertyHandle; long m_nFetchDirectionPropertyHandle; @@ -409,13 +411,13 @@ private: sal_Bool SAL_CALL impl_queryProperty( - const rtl::OUString& rName + const OUString& rName , com::sun::star::beans::Property& rProp ) const; sal_Int32 SAL_CALL - impl_getPos( const rtl::OUString& rName ) const; + impl_getPos( const OUString& rName ) const; static sal_Bool SAL_CALL - impl_isMyPropertyName( const rtl::OUString& rName ); + impl_isMyPropertyName( const OUString& rName ); public: CCRS_PropertySetInfo( Reference< @@ -435,18 +437,18 @@ public: throw( RuntimeException ); virtual com::sun::star::beans::Property SAL_CALL - getPropertyByName( const rtl::OUString& aName ) + getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ); virtual sal_Bool SAL_CALL - hasPropertyByName( const rtl::OUString& Name ) + hasPropertyByName( const OUString& Name ) throw( RuntimeException ); }; -OUString CCRS_PropertySetInfo::m_aPropertyNameForCount( OUString::createFromAscii( "RowCount" ) ); -OUString CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( OUString::createFromAscii( "IsRowCountFinal" ) ); -OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( OUString::createFromAscii( "FetchSize" ) ); -OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( OUString::createFromAscii( "FetchDirection" ) ); +OUString CCRS_PropertySetInfo::m_aPropertyNameForCount( RTL_CONSTASCII_USTRINGPARAM("RowCount") ); +OUString CCRS_PropertySetInfo::m_aPropertyNameForFinalCount( RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal") ); +OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchSize( RTL_CONSTASCII_USTRINGPARAM("FetchSize") ); +OUString CCRS_PropertySetInfo::m_aPropertyNameForFetchDirection( RTL_CONSTASCII_USTRINGPARAM("FetchDirection") ); CCRS_PropertySetInfo::CCRS_PropertySetInfo( Reference< XPropertySetInfo > xInfo ) @@ -555,7 +557,7 @@ Sequence< Property > SAL_CALL CCRS_PropertySetInfo //virtual Property SAL_CALL CCRS_PropertySetInfo - ::getPropertyByName( const rtl::OUString& aName ) + ::getPropertyByName( const OUString& aName ) throw( UnknownPropertyException, RuntimeException ) { if ( !aName.getLength() ) @@ -570,7 +572,7 @@ Property SAL_CALL CCRS_PropertySetInfo //virtual sal_Bool SAL_CALL CCRS_PropertySetInfo - ::hasPropertyByName( const rtl::OUString& Name ) + ::hasPropertyByName( const OUString& Name ) throw( RuntimeException ) { return ( impl_getPos( Name ) != -1 ); @@ -971,10 +973,10 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet //-------------------------------------------------------------------------- XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet, - OUString::createFromAscii( - "com.sun.star.comp.ucb.CachedContentResultSet" ), - OUString::createFromAscii( - CACHED_CONTENT_RESULTSET_SERVICE_NAME ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedContentResultSet" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_CONTENT_RESULTSET_SERVICE_NAME )) ); //-------------------------------------------------------------------------- // XPropertySet methods. ( inherited ) @@ -1928,7 +1930,7 @@ sal_Bool SAL_CALL CachedContentResultSet } //virtual -rtl::OUString SAL_CALL CachedContentResultSet +OUString SAL_CALL CachedContentResultSet ::getString( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) @@ -2150,8 +2152,8 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter() m_bTriedToGetTypeConverter = sal_True; m_xTypeConverter = Reference< XTypeConverter >( m_xSMgr->createInstance( - OUString::createFromAscii( - "com.sun.star.script.Converter" ) ), + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.script.Converter" )) ), UNO_QUERY ); OSL_ENSURE( m_xTypeConverter.is(), @@ -2200,10 +2202,10 @@ XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory, //-------------------------------------------------------------------------- XSERVICEINFO_IMPL_1( CachedContentResultSetFactory, - OUString::createFromAscii( - "com.sun.star.comp.ucb.CachedContentResultSetFactory" ), - OUString::createFromAscii( - CACHED_CONTENT_RESULTSET_FACTORY_NAME ) ); + OUString(RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.comp.ucb.CachedContentResultSetFactory" )), + OUString(RTL_CONSTASCII_USTRINGPARAM( + CACHED_CONTENT_RESULTSET_FACTORY_NAME )) ); //-------------------------------------------------------------------------- // Service factory implementation. @@ -2227,3 +2229,4 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory return xRet; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |