diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /ucb | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'ucb')
21 files changed, 583 insertions, 583 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 0c692fd70242..2bfcf9bcfc87 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -107,11 +107,11 @@ template<typename T> T CachedContentResultSet::rowOriginGet( return aRet; } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // CCRS_Cache methoeds. -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + CachedContentResultSet::CCRS_Cache::CCRS_Cache( const Reference< XContentIdentifierMapping > & xMapping ) @@ -364,11 +364,11 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache } } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class CCRS_PropertySetInfo -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + class CCRS_PropertySetInfo : public cppu::OWeakObject, @@ -513,26 +513,26 @@ CCRS_PropertySetInfo::~CCRS_PropertySetInfo() delete m_pProperties; } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + //list all interfaces inclusive baseclasses of interfaces XINTERFACE_IMPL_2( CCRS_PropertySetInfo , XTypeProvider , XPropertySetInfo ); -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + //list all interfaces exclusive baseclasses XTYPEPROVIDER_IMPL_2( CCRS_PropertySetInfo , XTypeProvider , XPropertySetInfo ); -//-------------------------------------------------------------------------- + // XPropertySetInfo methods. -//-------------------------------------------------------------------------- + //virtual Sequence< Property > SAL_CALL CCRS_PropertySetInfo ::getProperties() throw( RuntimeException ) @@ -563,9 +563,9 @@ sal_Bool SAL_CALL CCRS_PropertySetInfo return ( impl_getPos( Name ) != -1 ); } -//-------------------------------------------------------------------------- + // impl_ methods. -//-------------------------------------------------------------------------- + sal_Int32 SAL_CALL CCRS_PropertySetInfo ::impl_getPos( const OUString& rName ) const @@ -635,11 +635,11 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo return nHandle; } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class CachedContentResultSet -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + CachedContentResultSet::CachedContentResultSet( const Reference< XComponentContext > & rxContext @@ -691,9 +691,9 @@ CachedContentResultSet::~CachedContentResultSet() //do not delete m_pMyPropSetInfo, cause it is hold via reference }; -//-------------------------------------------------------------------------- + // impl_ methods. -//-------------------------------------------------------------------------- + sal_Bool SAL_CALL CachedContentResultSet ::applyPositionToOrigin( sal_Int32 nRow ) @@ -701,7 +701,7 @@ sal_Bool SAL_CALL CachedContentResultSet RuntimeException ) { impl_EnsureNotDisposed(); - //------------------------------------------------------------------------- + /** @returns <TRUE/> if the cursor is on a valid row; <FALSE/> if it is off @@ -802,11 +802,11 @@ sal_Bool SAL_CALL CachedContentResultSet return sal_True; }; -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + //define for fetching data -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + #define FETCH_XXX( aCache, fetchInterface, fetchMethod ) \ sal_Bool bDirection = !!( \ @@ -911,9 +911,9 @@ void SAL_CALL CachedContentResultSet m_xPropertySetInfo = m_xMyPropertySetInfo; } -//-------------------------------------------------------------------------- + // XInterface methods. ( inherited ) -//-------------------------------------------------------------------------- + XINTERFACE_COMMON_IMPL( CachedContentResultSet ) Any SAL_CALL CachedContentResultSet @@ -933,9 +933,9 @@ Any SAL_CALL CachedContentResultSet return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + //list all interfaces exclusive baseclasses XTYPEPROVIDER_IMPL_11( CachedContentResultSet , XTypeProvider @@ -953,9 +953,9 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet , XResultSet , XRow ); -//-------------------------------------------------------------------------- + // XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet, OUString( @@ -963,9 +963,9 @@ XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet, OUString( CACHED_CONTENT_RESULTSET_SERVICE_NAME ) ); -//-------------------------------------------------------------------------- + // XPropertySet methods. ( inherited ) -//-------------------------------------------------------------------------- + // virtual void SAL_CALL CachedContentResultSet @@ -1079,7 +1079,7 @@ void SAL_CALL CachedContentResultSet } } -//-------------------------------------------------------------------------- + // virtual Any SAL_CALL CachedContentResultSet ::getPropertyValue( const OUString& rPropertyName ) @@ -1139,9 +1139,9 @@ Any SAL_CALL CachedContentResultSet return aValue; } -//-------------------------------------------------------------------------- + // own methods. ( inherited ) -//-------------------------------------------------------------------------- + //virtual void SAL_CALL CachedContentResultSet @@ -1168,7 +1168,7 @@ void SAL_CALL CachedContentResultSet PropertyChangeEvent aEvt( rEvt ); aEvt.Source = static_cast< XPropertySet * >( this ); aEvt.Further = sal_False; - //--------- + if( CCRS_PropertySetInfo ::impl_isMyPropertyName( rEvt.PropertyName ) ) @@ -1211,7 +1211,7 @@ void SAL_CALL CachedContentResultSet return; } - //----------- + impl_notifyPropertyChangeListeners( aEvt ); } @@ -1239,9 +1239,9 @@ void SAL_CALL CachedContentResultSet impl_notifyVetoableChangeListeners( aEvt ); } -//-------------------------------------------------------------------------- + // XContentAccess methods. ( inherited ) ( -- position dependent ) -//-------------------------------------------------------------------------- + #define XCONTENTACCESS_queryXXX( queryXXX, XXX, TYPE ) \ impl_EnsureNotDisposed(); \ @@ -1277,7 +1277,7 @@ if( !m_aCache##XXX.hasRow( nRow ) ) \ } \ return m_aCache##XXX.get##XXX( nRow ); -//-------------------------------------------------------------------------- + // virtual OUString SAL_CALL CachedContentResultSet ::queryContentIdentifierString() @@ -1286,7 +1286,7 @@ OUString SAL_CALL CachedContentResultSet XCONTENTACCESS_queryXXX( queryContentIdentifierString, ContentIdentifierString, OUString ) } -//-------------------------------------------------------------------------- + // virtual Reference< XContentIdentifier > SAL_CALL CachedContentResultSet ::queryContentIdentifier() @@ -1295,7 +1295,7 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet XCONTENTACCESS_queryXXX( queryContentIdentifier, ContentIdentifier, Reference< XContentIdentifier > ) } -//-------------------------------------------------------------------------- + // virtual Reference< XContent > SAL_CALL CachedContentResultSet ::queryContent() @@ -1304,9 +1304,9 @@ Reference< XContent > SAL_CALL CachedContentResultSet XCONTENTACCESS_queryXXX( queryContent, Content, Reference< XContent > ) } -//----------------------------------------------------------------- + // XResultSet methods. ( inherited ) -//----------------------------------------------------------------- + //virtual sal_Bool SAL_CALL CachedContentResultSet @@ -1889,9 +1889,9 @@ Reference< XInterface > SAL_CALL CachedContentResultSet return Reference< XInterface >(); } -//----------------------------------------------------------------- + // XRow methods. ( inherited ) -//----------------------------------------------------------------- + //virtual sal_Bool SAL_CALL CachedContentResultSet @@ -2134,9 +2134,9 @@ Reference< XArray > SAL_CALL CachedContentResultSet &css::sdbc::XRow::getArray, columnIndex); } -//----------------------------------------------------------------- + // Type Converter Support -//----------------------------------------------------------------- + const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter() { @@ -2154,11 +2154,11 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter() return m_xTypeConverter; } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class CachedContentResultSetFactory -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + CachedContentResultSetFactory::CachedContentResultSetFactory( const Reference< XComponentContext > & rxContext ) @@ -2170,41 +2170,41 @@ CachedContentResultSetFactory::~CachedContentResultSetFactory() { } -//-------------------------------------------------------------------------- + // CachedContentResultSetFactory XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_IMPL_3( CachedContentResultSetFactory, XTypeProvider, XServiceInfo, XCachedContentResultSetFactory ); -//-------------------------------------------------------------------------- + // CachedContentResultSetFactory XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory, XTypeProvider, XServiceInfo, XCachedContentResultSetFactory ); -//-------------------------------------------------------------------------- + // CachedContentResultSetFactory XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_IMPL_1_CTX( CachedContentResultSetFactory, OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ), OUString( CACHED_CONTENT_RESULTSET_FACTORY_NAME ) ); -//-------------------------------------------------------------------------- + // Service factory implementation. -//-------------------------------------------------------------------------- + ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetFactory ); -//-------------------------------------------------------------------------- + // CachedContentResultSetFactory XCachedContentResultSetFactory methods. -//-------------------------------------------------------------------------- + //virtual Reference< XResultSet > SAL_CALL CachedContentResultSetFactory diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 23b986353e52..719973099d9e 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -51,9 +51,9 @@ CachedContentResultSetStub::~CachedContentResultSetStub() impl_deinit(); } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_COMMON_IMPL( CachedContentResultSetStub ) Any SAL_CALL CachedContentResultSetStub @@ -76,9 +76,9 @@ Any SAL_CALL CachedContentResultSetStub return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -//-------------------------------------------------------------------------- + // own methods. ( inherited ) -//-------------------------------------------------------------------------- + //virtual void SAL_CALL CachedContentResultSetStub @@ -122,9 +122,9 @@ void SAL_CALL CachedContentResultSetStub impl_notifyVetoableChangeListeners( aEvt ); } -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_COMMON_IMPL( CachedContentResultSetStub ) //list all interfaces exclusive baseclasses @@ -157,17 +157,17 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub return *pTypes; } -//-------------------------------------------------------------------------- + // XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub, OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" ), OUString( CACHED_CRS_STUB_SERVICE_NAME ) ); -//----------------------------------------------------------------- + // XFetchProvider methods. -//----------------------------------------------------------------- + #define FETCH_XXX( impl_loadRow, loadInterface ) \ impl_EnsureNotDisposed(); \ @@ -422,9 +422,9 @@ void SAL_CALL CachedContentResultSetStub } } -//----------------------------------------------------------------- + // XFetchProviderForContentAccess methods. -//----------------------------------------------------------------- + void SAL_CALL CachedContentResultSetStub ::impl_getCurrentContentIdentifierString( Any& rAny @@ -480,11 +480,11 @@ FetchResult SAL_CALL CachedContentResultSetStub FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin ); } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class CachedContentResultSetStubFactory -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + CachedContentResultSetStubFactory::CachedContentResultSetStubFactory( const Reference< XMultiServiceFactory > & rSMgr ) @@ -496,41 +496,41 @@ CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory() { } -//-------------------------------------------------------------------------- + // CachedContentResultSetStubFactory XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_IMPL_3( CachedContentResultSetStubFactory, XTypeProvider, XServiceInfo, XCachedContentResultSetStubFactory ); -//-------------------------------------------------------------------------- + // CachedContentResultSetStubFactory XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory, XTypeProvider, XServiceInfo, XCachedContentResultSetStubFactory ); -//-------------------------------------------------------------------------- + // CachedContentResultSetStubFactory XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory, OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ), OUString( CACHED_CRS_STUB_FACTORY_NAME ) ); -//-------------------------------------------------------------------------- + // Service factory implementation. -//-------------------------------------------------------------------------- + ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetStubFactory ); -//-------------------------------------------------------------------------- + // CachedContentResultSetStubFactory XCachedContentResultSetStubFactory methods. -//-------------------------------------------------------------------------- + //virtual Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index ab6d880bdb21..ab9467825fd7 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -73,9 +73,9 @@ void SAL_CALL CachedDynamicResultSet m_xMyResultTwo = xCache; } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_COMMON_IMPL( CachedDynamicResultSet ) Any SAL_CALL CachedDynamicResultSet @@ -95,9 +95,9 @@ Any SAL_CALL CachedDynamicResultSet return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + //list all interfaces exclusive baseclasses XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet , XTypeProvider @@ -106,17 +106,17 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet , XSourceInitialization ); -//-------------------------------------------------------------------------- + // XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet, OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" ), OUString( CACHED_DRS_SERVICE_NAME ) ); -//-------------------------------------------------------------------------- + // own methds. ( inherited ) -//-------------------------------------------------------------------------- + //virtual void SAL_CALL CachedDynamicResultSet ::impl_disposing( const EventObject& Source ) @@ -126,11 +126,11 @@ void SAL_CALL CachedDynamicResultSet m_xContentIdentifierMapping.clear(); } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class CachedDynamicResultSetFactory -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + CachedDynamicResultSetFactory::CachedDynamicResultSetFactory( const Reference< XComponentContext > & xContext ) @@ -142,41 +142,41 @@ CachedDynamicResultSetFactory::~CachedDynamicResultSetFactory() { } -//-------------------------------------------------------------------------- + // CachedDynamicResultSetFactory XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_IMPL_3( CachedDynamicResultSetFactory, XTypeProvider, XServiceInfo, XCachedDynamicResultSetFactory ); -//-------------------------------------------------------------------------- + // CachedDynamicResultSetFactory XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory, XTypeProvider, XServiceInfo, XCachedDynamicResultSetFactory ); -//-------------------------------------------------------------------------- + // CachedDynamicResultSetFactory XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_IMPL_1_CTX( CachedDynamicResultSetFactory, OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ), OUString( CACHED_DRS_FACTORY_NAME ) ); -//-------------------------------------------------------------------------- + // Service factory implementation. -//-------------------------------------------------------------------------- + ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetFactory ); -//-------------------------------------------------------------------------- + // CachedDynamicResultSetFactory XCachedDynamicResultSetFactory methods. -//-------------------------------------------------------------------------- + //virtual Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetFactory diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index c370a59cdc37..fb7dbe5daa02 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -74,9 +74,9 @@ void SAL_CALL CachedDynamicResultSetStub m_xMyResultTwo = xStub; } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_COMMON_IMPL( CachedDynamicResultSetStub ) Any SAL_CALL CachedDynamicResultSetStub @@ -96,9 +96,9 @@ Any SAL_CALL CachedDynamicResultSetStub return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + //list all interfaces exclusive baseclasses XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub , XTypeProvider @@ -108,19 +108,19 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub , XSourceInitialization ); -//-------------------------------------------------------------------------- + // XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub, OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ), OUString( CACHED_DRS_STUB_SERVICE_NAME ) ); -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class CachedDynamicResultSetStubFactory -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + CachedDynamicResultSetStubFactory::CachedDynamicResultSetStubFactory( const Reference< XComponentContext > & rxContext ) @@ -132,41 +132,41 @@ CachedDynamicResultSetStubFactory::~CachedDynamicResultSetStubFactory() { } -//-------------------------------------------------------------------------- + // CachedDynamicResultSetStubFactory XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_IMPL_3( CachedDynamicResultSetStubFactory, XTypeProvider, XServiceInfo, XCachedDynamicResultSetStubFactory ); -//-------------------------------------------------------------------------- + // CachedDynamicResultSetStubFactory XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory, XTypeProvider, XServiceInfo, XCachedDynamicResultSetStubFactory ); -//-------------------------------------------------------------------------- + // CachedDynamicResultSetStubFactory XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_IMPL_1_CTX( CachedDynamicResultSetStubFactory, OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ), OUString( CACHED_DRS_STUB_FACTORY_NAME ) ); -//-------------------------------------------------------------------------- + // Service factory implementation. -//-------------------------------------------------------------------------- + ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetStubFactory ); -//-------------------------------------------------------------------------- + // CachedDynamicResultSetStubFactory XCachedDynamicResultSetStubFactory methods. -//-------------------------------------------------------------------------- + //virtual Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetStubFactory diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 14fa320cc8d9..19826e66412a 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -36,11 +36,11 @@ using namespace com::sun::star::util; using namespace cppu; -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class ContentResultSetWrapper -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + ContentResultSetWrapper::ContentResultSetWrapper( Reference< XResultSet > xOrigin ) @@ -335,9 +335,9 @@ sal_Bool SAL_CALL ContentResultSetWrapper */ } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + //list all interfaces inclusive baseclasses of interfaces QUERYINTERFACE_IMPL_START( ContentResultSetWrapper ) @@ -352,9 +352,9 @@ QUERYINTERFACE_IMPL_START( ContentResultSetWrapper ) QUERYINTERFACE_IMPL_END -//-------------------------------------------------------------------------- + // XComponent methods. -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::dispose() throw( RuntimeException ) @@ -428,7 +428,7 @@ void SAL_CALL ContentResultSetWrapper m_bInDispose = sal_False; } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::addEventListener( const Reference< XEventListener >& Listener ) @@ -444,7 +444,7 @@ void SAL_CALL ContentResultSetWrapper m_pDisposeEventListeners->addInterface( Listener ); } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::removeEventListener( const Reference< XEventListener >& Listener ) @@ -457,9 +457,9 @@ void SAL_CALL ContentResultSetWrapper m_pDisposeEventListeners->removeInterface( Listener ); } -//-------------------------------------------------------------------------- + //XCloseable methods. -//-------------------------------------------------------------------------- + //virtual void SAL_CALL ContentResultSetWrapper ::close() @@ -470,9 +470,9 @@ void SAL_CALL ContentResultSetWrapper dispose(); } -//-------------------------------------------------------------------------- + //XResultSetMetaDataSupplier methods. -//-------------------------------------------------------------------------- + //virtual Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper ::getMetaData() @@ -503,9 +503,9 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper } -//-------------------------------------------------------------------------- + // XPropertySet methods. -//-------------------------------------------------------------------------- + // virtual Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper ::getPropertySetInfo() throw( RuntimeException ) @@ -519,7 +519,7 @@ Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper impl_initPropertySetInfo(); return m_xPropertySetInfo; } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) @@ -539,7 +539,7 @@ void SAL_CALL ContentResultSetWrapper m_xPropertySetOrigin->setPropertyValue( rPropertyName, rValue ); } -//-------------------------------------------------------------------------- + // virtual Any SAL_CALL ContentResultSetWrapper ::getPropertyValue( const OUString& rPropertyName ) @@ -557,7 +557,7 @@ Any SAL_CALL ContentResultSetWrapper return m_xPropertySetOrigin->getPropertyValue( rPropertyName ); } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::addPropertyChangeListener( @@ -609,7 +609,7 @@ void SAL_CALL ContentResultSetWrapper } } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::addVetoableChangeListener( @@ -660,7 +660,7 @@ void SAL_CALL ContentResultSetWrapper } } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::removePropertyChangeListener( @@ -719,7 +719,7 @@ void SAL_CALL ContentResultSetWrapper } } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL ContentResultSetWrapper ::removeVetoableChangeListener( @@ -778,9 +778,9 @@ void SAL_CALL ContentResultSetWrapper } } -//-------------------------------------------------------------------------- + // own methods. -//-------------------------------------------------------------------------- + //virtual void SAL_CALL ContentResultSetWrapper @@ -835,9 +835,9 @@ void SAL_CALL ContentResultSetWrapper impl_notifyVetoableChangeListeners( aEvt ); } -//-------------------------------------------------------------------------- + // XContentAccess methods. ( -- position dependent ) -//-------------------------------------------------------------------------- + // virtual OUString SAL_CALL ContentResultSetWrapper @@ -854,7 +854,7 @@ OUString SAL_CALL ContentResultSetWrapper return m_xContentAccessOrigin->queryContentIdentifierString(); } -//-------------------------------------------------------------------------- + // virtual Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper ::queryContentIdentifier() @@ -870,7 +870,7 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper return m_xContentAccessOrigin->queryContentIdentifier(); } -//-------------------------------------------------------------------------- + // virtual Reference< XContent > SAL_CALL ContentResultSetWrapper ::queryContent() @@ -886,9 +886,9 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper return m_xContentAccessOrigin->queryContent(); } -//----------------------------------------------------------------- + // XResultSet methods. -//----------------------------------------------------------------- + //virtual sal_Bool SAL_CALL ContentResultSetWrapper @@ -1174,9 +1174,9 @@ Reference< XInterface > SAL_CALL ContentResultSetWrapper return Reference< XInterface >(); } -//----------------------------------------------------------------- + // XRow methods. -//----------------------------------------------------------------- + #define XROW_GETXXX( getXXX ) \ impl_EnsureNotDisposed(); \ @@ -1389,11 +1389,11 @@ Reference< XArray > SAL_CALL ContentResultSetWrapper XROW_GETXXX( getArray ); } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class ContentResultSetWrapperListener -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + ContentResultSetWrapperListener::ContentResultSetWrapperListener( ContentResultSetWrapper* pOwner ) @@ -1405,9 +1405,9 @@ ContentResultSetWrapperListener::~ContentResultSetWrapperListener() { } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + //list all interfaces inclusive baseclasses of interfaces XINTERFACE_COMMON_IMPL( ContentResultSetWrapperListener ) QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener ) @@ -1420,9 +1420,9 @@ QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener ) QUERYINTERFACE_IMPL_END -//-------------------------------------------------------------------------- + //XEventListener methods. -//-------------------------------------------------------------------------- + //virtual void SAL_CALL ContentResultSetWrapperListener @@ -1433,9 +1433,9 @@ void SAL_CALL ContentResultSetWrapperListener m_pOwner->impl_disposing( rEventObject ); } -//-------------------------------------------------------------------------- + //XPropertyChangeListener methods. -//-------------------------------------------------------------------------- + //virtual void SAL_CALL ContentResultSetWrapperListener @@ -1446,9 +1446,9 @@ void SAL_CALL ContentResultSetWrapperListener m_pOwner->impl_propertyChange( rEvt ); } -//-------------------------------------------------------------------------- + //XVetoableChangeListener methods. -//-------------------------------------------------------------------------- + //virtual void SAL_CALL ContentResultSetWrapperListener ::vetoableChange( const PropertyChangeEvent& rEvt ) diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index e50863fc2c90..dc96206bdf13 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -33,11 +33,11 @@ using namespace com::sun::star::uno; using namespace cppu; -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class DynamicResultSetWrapper -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + DynamicResultSetWrapper::DynamicResultSetWrapper( Reference< XDynamicResultSet > xOrigin @@ -121,9 +121,9 @@ void SAL_CALL DynamicResultSetWrapper m_xMyResultTwo = xResultSet; } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + //list all interfaces inclusive baseclasses of interfaces QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper ) (static_cast< XComponent* >(this)) //base of XDynamicResultSet @@ -131,9 +131,9 @@ QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper ) , (static_cast< XSourceInitialization* >(this)) QUERYINTERFACE_IMPL_END -//-------------------------------------------------------------------------- + // XComponent methods. -//-------------------------------------------------------------------------- + // virtual void SAL_CALL DynamicResultSetWrapper ::dispose() throw( RuntimeException ) @@ -169,7 +169,7 @@ void SAL_CALL DynamicResultSetWrapper m_bInDispose = sal_False; } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL DynamicResultSetWrapper ::addEventListener( const Reference< XEventListener >& Listener ) @@ -185,7 +185,7 @@ void SAL_CALL DynamicResultSetWrapper m_pDisposeEventListeners->addInterface( Listener ); } -//-------------------------------------------------------------------------- + // virtual void SAL_CALL DynamicResultSetWrapper ::removeEventListener( const Reference< XEventListener >& Listener ) @@ -198,9 +198,9 @@ void SAL_CALL DynamicResultSetWrapper m_pDisposeEventListeners->removeInterface( Listener ); } -//-------------------------------------------------------------------------- + // own methods -//-------------------------------------------------------------------------- + //virtual void SAL_CALL DynamicResultSetWrapper @@ -287,9 +287,9 @@ void SAL_CALL DynamicResultSetWrapper */ } -//-------------------------------------------------------------------------- + // XSourceInitialization -//-------------------------------------------------------------------------- + //virtual void SAL_CALL DynamicResultSetWrapper ::setSource( const Reference< XInterface > & Source ) @@ -329,9 +329,9 @@ void SAL_CALL DynamicResultSetWrapper m_aSourceSet.set(); } -//-------------------------------------------------------------------------- + // XDynamicResultSet -//-------------------------------------------------------------------------- + //virtual Reference< XResultSet > SAL_CALL DynamicResultSetWrapper ::getStaticResultSet() @@ -447,11 +447,11 @@ sal_Int16 SAL_CALL DynamicResultSetWrapper return xSource->getCapabilities(); } -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // class DynamicResultSetWrapperListener -//-------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + DynamicResultSetWrapperListener::DynamicResultSetWrapperListener( DynamicResultSetWrapper* pOwner ) @@ -465,18 +465,18 @@ DynamicResultSetWrapperListener::~DynamicResultSetWrapperListener() } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + //list all interfaces inclusive baseclasses of interfaces XINTERFACE_IMPL_2( DynamicResultSetWrapperListener , XDynamicResultSetListener , XEventListener //base of XDynamicResultSetListener ); -//-------------------------------------------------------------------------- + // XDynamicResultSetListener methods: -//-------------------------------------------------------------------------- + //virtual void SAL_CALL DynamicResultSetWrapperListener ::disposing( const EventObject& rEventObject ) @@ -499,9 +499,9 @@ void SAL_CALL DynamicResultSetWrapperListener m_pOwner->impl_notify( Changes ); } -//-------------------------------------------------------------------------- + // own methods: -//-------------------------------------------------------------------------- + void SAL_CALL DynamicResultSetWrapperListener ::impl_OwnerDies() diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 88cdcab084e5..ef1e7895727d 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -27,7 +27,7 @@ #include <com/sun/star/ucb/CachedDynamicResultSetStubFactory.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> -//----------------------------------------------------------------------------- + using namespace com::sun::star::beans; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; @@ -85,7 +85,7 @@ SortedDynamicResultSet::SortedDynamicResultSet( mbStatic = sal_False; } -//-------------------------------------------------------------------------- + SortedDynamicResultSet::~SortedDynamicResultSet() { mpOwnListener->impl_OwnerDies(); @@ -101,9 +101,9 @@ SortedDynamicResultSet::~SortedDynamicResultSet() mpTwo = NULL; } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_IMPL_4( SortedDynamicResultSet, XTypeProvider, @@ -111,26 +111,26 @@ XINTERFACE_IMPL_4( SortedDynamicResultSet, XComponent, /* base class of XDynamicResultSet */ XDynamicResultSet ); -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet, XTypeProvider, XServiceInfo, XDynamicResultSet ); -//-------------------------------------------------------------------------- + // XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet, OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" ), OUString( DYNAMIC_RESULTSET_SERVICE_NAME ) ); -//-------------------------------------------------------------------------- + // XComponent methods. -//-------------------------------------------------------------------------- + void SAL_CALL SortedDynamicResultSet::dispose() throw( RuntimeException ) { @@ -152,7 +152,7 @@ void SAL_CALL SortedDynamicResultSet::dispose() mbUseOne = sal_True; } -//-------------------------------------------------------------------------- + void SAL_CALL SortedDynamicResultSet::addEventListener( const Reference< XEventListener >& Listener ) throw( RuntimeException ) @@ -166,7 +166,7 @@ void SAL_CALL SortedDynamicResultSet::addEventListener( mpDisposeEventListeners->addInterface( Listener ); } -//-------------------------------------------------------------------------- + void SAL_CALL SortedDynamicResultSet::removeEventListener( const Reference< XEventListener >& Listener ) throw( RuntimeException ) @@ -177,9 +177,9 @@ void SAL_CALL SortedDynamicResultSet::removeEventListener( mpDisposeEventListeners->removeInterface( Listener ); } -//-------------------------------------------------------------------------- + // XDynamicResultSet methods. -// ------------------------------------------------------------------------------ + Reference< XResultSet > SAL_CALL SortedDynamicResultSet::getStaticResultSet() throw( ListenerAlreadySetException, RuntimeException ) @@ -201,7 +201,7 @@ SortedDynamicResultSet::getStaticResultSet() return mxOne; } -// ------------------------------------------------------------------------------ + void SAL_CALL SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener >& Listener ) throw( ListenerAlreadySetException, RuntimeException ) @@ -219,7 +219,7 @@ SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener mxOriginal->setListener( mxOwnListener ); } -// ------------------------------------------------------------------------------ + void SAL_CALL SortedDynamicResultSet::connectToCache( const Reference< XDynamicResultSet > & xCache ) @@ -256,7 +256,7 @@ SortedDynamicResultSet::connectToCache( throw ServiceNotFoundException(); } -// ------------------------------------------------------------------------------ + sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities() throw( RuntimeException ) @@ -273,9 +273,9 @@ SortedDynamicResultSet::getCapabilities() return nCaps; } -//-------------------------------------------------------------------------- + // XDynamicResultSetListener methods. -// ------------------------------------------------------------------------------ + /** In the first notify-call the listener gets the two <type>XResultSet</type>s and has to hold them. The <type>XResultSet</type>s @@ -421,9 +421,9 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) pCurSet->CheckProperties( nOldCount, bWasFinal ); } -//----------------------------------------------------------------- + // XEventListener -//----------------------------------------------------------------- + void SAL_CALL SortedDynamicResultSet::impl_disposing( const EventObject& ) throw( RuntimeException ) @@ -432,9 +432,9 @@ SortedDynamicResultSet::impl_disposing( const EventObject& ) mxOriginal.clear(); } -// ------------------------------------------------------------------------------ + // private methods -// ------------------------------------------------------------------------------ + void SortedDynamicResultSet::SendNotify() { long nCount = maActions.Count(); @@ -470,46 +470,46 @@ SortedDynamicResultSetFactory::SortedDynamicResultSetFactory( m_xContext = rxContext; } -//-------------------------------------------------------------------------- + SortedDynamicResultSetFactory::~SortedDynamicResultSetFactory() { } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_IMPL_3( SortedDynamicResultSetFactory, XTypeProvider, XServiceInfo, XSortedDynamicResultSetFactory ); -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory, XTypeProvider, XServiceInfo, XSortedDynamicResultSetFactory ); -//-------------------------------------------------------------------------- + // XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_IMPL_1_CTX( SortedDynamicResultSetFactory, OUString( "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ), OUString( DYNAMIC_RESULTSET_FACTORY_NAME ) ); -//-------------------------------------------------------------------------- + // Service factory implementation. -//-------------------------------------------------------------------------- + ONE_INSTANCE_SERVICE_FACTORY_IMPL( SortedDynamicResultSetFactory ); -//-------------------------------------------------------------------------- + // SortedDynamicResultSetFactory methods. -//-------------------------------------------------------------------------- + Reference< XDynamicResultSet > SAL_CALL SortedDynamicResultSetFactory::createSortedDynamicResultSet( const Reference< XDynamicResultSet > & Source, @@ -539,7 +539,7 @@ void EventList::Clear() maData.clear(); } -//-------------------------------------------------------------------------- + void EventList::AddEvent( sal_IntPtr nType, sal_IntPtr nPos, sal_IntPtr nCount ) { ListAction *pAction = new ListAction; @@ -562,22 +562,22 @@ SortedDynamicResultSetListener::SortedDynamicResultSetListener( mpOwner = mOwner; } -//----------------------------------------------------------------- + SortedDynamicResultSetListener::~SortedDynamicResultSetListener() { } -//----------------------------------------------------------------- + // XInterface methods. -//----------------------------------------------------------------- + XINTERFACE_IMPL_2( SortedDynamicResultSetListener, XEventListener, /* base class of XDynamicResultSetListener */ XDynamicResultSetListener ); -//----------------------------------------------------------------- + // XEventListener ( base of XDynamicResultSetListener ) -//----------------------------------------------------------------- + void SAL_CALL SortedDynamicResultSetListener::disposing( const EventObject& Source ) throw( RuntimeException ) @@ -588,9 +588,9 @@ SortedDynamicResultSetListener::disposing( const EventObject& Source ) mpOwner->impl_disposing( Source ); } -//----------------------------------------------------------------- + // XDynamicResultSetListener -//----------------------------------------------------------------- + void SAL_CALL SortedDynamicResultSetListener::notify( const ListEvent& Changes ) throw( RuntimeException ) @@ -601,9 +601,9 @@ SortedDynamicResultSetListener::notify( const ListEvent& Changes ) mpOwner->impl_notify( Changes ); } -//----------------------------------------------------------------- + // own methods: -//----------------------------------------------------------------- + void SAL_CALL SortedDynamicResultSetListener::impl_OwnerDies() { diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 25a94d83147d..ca09eae5643a 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/ucb/XAnyCompareFactory.hpp> #include <osl/diagnose.h> -//----------------------------------------------------------------------------- + using namespace com::sun::star::beans; using namespace com::sun::star::container; using namespace com::sun::star::io; @@ -73,7 +73,7 @@ struct SortInfo Reference < XAnyCompare > mxCompareFunction; }; -//----------------------------------------------------------------------------- + struct SortListData { @@ -176,7 +176,7 @@ SortedResultSet::SortedResultSet( Reference< XResultSet > aResult ) mbIsCopy = sal_False; } -//-------------------------------------------------------------------------- + SortedResultSet::~SortedResultSet() { mxOriginal.clear(); @@ -202,9 +202,9 @@ SortedResultSet::~SortedResultSet() delete mpVetoChangeListeners; } -//-------------------------------------------------------------------------- + // XInterface methods. -//-------------------------------------------------------------------------- + XINTERFACE_IMPL_9( SortedResultSet, XTypeProvider, @@ -217,9 +217,9 @@ XINTERFACE_IMPL_9( SortedResultSet, XResultSetMetaDataSupplier, XPropertySet ); -//-------------------------------------------------------------------------- + // XTypeProvider methods. -//-------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_9( SortedResultSet, XTypeProvider, @@ -232,17 +232,17 @@ XTYPEPROVIDER_IMPL_9( SortedResultSet, XResultSetMetaDataSupplier, XPropertySet ); -//-------------------------------------------------------------------------- + // XServiceInfo methods. -//-------------------------------------------------------------------------- + XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet, OUString( "com.sun.star.comp.ucb.SortedResultSet" ), OUString( RESULTSET_SERVICE_NAME ) ); -//-------------------------------------------------------------------------- + // XComponent methods. -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::dispose() throw( RuntimeException ) { @@ -273,7 +273,7 @@ void SAL_CALL SortedResultSet::dispose() mxOther.clear(); } -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::addEventListener( const Reference< XEventListener >& Listener ) throw( RuntimeException ) @@ -287,7 +287,7 @@ void SAL_CALL SortedResultSet::addEventListener( mpDisposeEventListeners->addInterface( Listener ); } -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::removeEventListener( const Reference< XEventListener >& Listener ) throw( RuntimeException ) @@ -298,9 +298,9 @@ void SAL_CALL SortedResultSet::removeEventListener( mpDisposeEventListeners->removeInterface( Listener ); } -//-------------------------------------------------------------------------- + // XContentAccess methods. -//-------------------------------------------------------------------------- + OUString SAL_CALL SortedResultSet::queryContentIdentifierString() @@ -310,7 +310,7 @@ SortedResultSet::queryContentIdentifierString() return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifierString(); } -//-------------------------------------------------------------------------- + Reference< XContentIdentifier > SAL_CALL SortedResultSet::queryContentIdentifier() throw( RuntimeException ) @@ -319,7 +319,7 @@ SortedResultSet::queryContentIdentifier() return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifier(); } -//-------------------------------------------------------------------------- + Reference< XContent > SAL_CALL SortedResultSet::queryContent() throw( RuntimeException ) @@ -329,9 +329,9 @@ SortedResultSet::queryContent() } -//-------------------------------------------------------------------------- + // XResultSet methods. -//-------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::next() throw ( SQLException, RuntimeException ) { @@ -354,7 +354,7 @@ sal_Bool SAL_CALL SortedResultSet::next() return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::isBeforeFirst() throw ( SQLException, RuntimeException ) { @@ -364,7 +364,7 @@ sal_Bool SAL_CALL SortedResultSet::isBeforeFirst() return sal_True; } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::isAfterLast() throw ( SQLException, RuntimeException ) { @@ -374,7 +374,7 @@ sal_Bool SAL_CALL SortedResultSet::isAfterLast() return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::isFirst() throw ( SQLException, RuntimeException ) { @@ -384,7 +384,7 @@ sal_Bool SAL_CALL SortedResultSet::isFirst() return sal_False; } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::isLast() throw ( SQLException, RuntimeException ) { @@ -394,7 +394,7 @@ sal_Bool SAL_CALL SortedResultSet::isLast() return sal_False; } -//------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::beforeFirst() throw ( SQLException, RuntimeException ) { @@ -403,7 +403,7 @@ void SAL_CALL SortedResultSet::beforeFirst() mxOriginal->beforeFirst(); } -//------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::afterLast() throw ( SQLException, RuntimeException ) { @@ -412,7 +412,7 @@ void SAL_CALL SortedResultSet::afterLast() mxOriginal->afterLast(); } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::first() throw ( SQLException, RuntimeException ) { @@ -431,7 +431,7 @@ sal_Bool SAL_CALL SortedResultSet::first() } } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::last() throw ( SQLException, RuntimeException ) { @@ -450,14 +450,14 @@ sal_Bool SAL_CALL SortedResultSet::last() } } -//------------------------------------------------------------------------- + sal_Int32 SAL_CALL SortedResultSet::getRow() throw ( SQLException, RuntimeException ) { return mnCurEntry; } -//------------------------------------------------------------------------- + /** moves the cursor to the given row number in the result set. <p>If the row number is positive, the cursor moves to the given row @@ -524,7 +524,7 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row ) } } -//------------------------------------------------------------------------- + /** moves the cursor a relative number of rows, either positive or negative. <p> @@ -579,7 +579,7 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows ) } } -//------------------------------------------------------------------------- + /** moves the cursor to the previous row in the result set. <p>Note: <code>previous()</code> is not the same as @@ -612,7 +612,7 @@ sal_Bool SAL_CALL SortedResultSet::previous() return sal_False; } -//------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::refreshRow() throw ( SQLException, RuntimeException ) { @@ -626,7 +626,7 @@ void SAL_CALL SortedResultSet::refreshRow() mxOriginal->refreshRow(); } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::rowUpdated() throw ( SQLException, RuntimeException ) { @@ -640,7 +640,7 @@ sal_Bool SAL_CALL SortedResultSet::rowUpdated() return mxOriginal->rowUpdated(); } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::rowInserted() throw ( SQLException, RuntimeException ) { @@ -654,7 +654,7 @@ sal_Bool SAL_CALL SortedResultSet::rowInserted() return mxOriginal->rowInserted(); } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::rowDeleted() throw ( SQLException, RuntimeException ) { @@ -668,7 +668,7 @@ sal_Bool SAL_CALL SortedResultSet::rowDeleted() return mxOriginal->rowDeleted(); } -//------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL SortedResultSet::getStatement() throw ( SQLException, RuntimeException ) { @@ -682,9 +682,9 @@ Reference< XInterface > SAL_CALL SortedResultSet::getStatement() return mxOriginal->getStatement(); } -//-------------------------------------------------------------------------- + // XRow methods. -//-------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::wasNull() throw( SQLException, RuntimeException ) @@ -693,7 +693,7 @@ sal_Bool SAL_CALL SortedResultSet::wasNull() return Reference< XRow >::query(mxOriginal)->wasNull(); } -//------------------------------------------------------------------------- + OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -701,7 +701,7 @@ OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getString( columnIndex ); } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -709,7 +709,7 @@ sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getBoolean( columnIndex ); } -//------------------------------------------------------------------------- + sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -717,7 +717,7 @@ sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getByte( columnIndex ); } -//------------------------------------------------------------------------- + sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -725,14 +725,14 @@ sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getShort( columnIndex ); } -//------------------------------------------------------------------------- + sal_Int32 SAL_CALL SortedResultSet::getInt( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getInt( columnIndex ); } -//------------------------------------------------------------------------- + sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -740,7 +740,7 @@ sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getLong( columnIndex ); } -//------------------------------------------------------------------------- + float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -748,7 +748,7 @@ float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getFloat( columnIndex ); } -//------------------------------------------------------------------------- + double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -756,7 +756,7 @@ double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getDouble( columnIndex ); } -//------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -764,7 +764,7 @@ Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getBytes( columnIndex ); } -//------------------------------------------------------------------------- + Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -772,7 +772,7 @@ Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getDate( columnIndex ); } -//------------------------------------------------------------------------- + Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -780,7 +780,7 @@ Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getTime( columnIndex ); } -//------------------------------------------------------------------------- + DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -788,7 +788,7 @@ DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getTimestamp( columnIndex ); } -//------------------------------------------------------------------------- + Reference< XInputStream > SAL_CALL SortedResultSet::getBinaryStream( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) @@ -797,7 +797,7 @@ SortedResultSet::getBinaryStream( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getBinaryStream( columnIndex ); } -//------------------------------------------------------------------------- + Reference< XInputStream > SAL_CALL SortedResultSet::getCharacterStream( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) @@ -806,7 +806,7 @@ SortedResultSet::getCharacterStream( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getCharacterStream( columnIndex ); } -//------------------------------------------------------------------------- + Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& typeMap ) throw( SQLException, RuntimeException ) @@ -816,7 +816,7 @@ Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex, typeMap); } -//------------------------------------------------------------------------- + Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -824,7 +824,7 @@ Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getRef( columnIndex ); } -//------------------------------------------------------------------------- + Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -832,7 +832,7 @@ Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getBlob( columnIndex ); } -//------------------------------------------------------------------------- + Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -840,7 +840,7 @@ Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex ) return Reference< XRow >::query(mxOriginal)->getClob( columnIndex ); } -//------------------------------------------------------------------------- + Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) throw( SQLException, RuntimeException ) { @@ -849,9 +849,9 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) } -//-------------------------------------------------------------------------- + // XCloseable methods. -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::close() throw( SQLException, RuntimeException ) @@ -860,9 +860,9 @@ void SAL_CALL SortedResultSet::close() Reference< XCloseable >::query(mxOriginal)->close(); } -//-------------------------------------------------------------------------- + // XResultSetMetaDataSupplier methods. -//-------------------------------------------------------------------------- + Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() throw( SQLException, RuntimeException ) @@ -872,9 +872,9 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() } -//-------------------------------------------------------------------------- + // XPropertySet methods. -//-------------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL SortedResultSet::getPropertySetInfo() throw( RuntimeException ) @@ -890,7 +890,7 @@ SortedResultSet::getPropertySetInfo() throw( RuntimeException ) return Reference< XPropertySetInfo >( mpPropSetInfo ); } -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::setPropertyValue( const OUString& PropertyName, const Any& ) @@ -909,7 +909,7 @@ void SAL_CALL SortedResultSet::setPropertyValue( throw UnknownPropertyException(); } -//-------------------------------------------------------------------------- + Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName ) throw( UnknownPropertyException, WrappedTargetException, @@ -950,7 +950,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName ) return aRet; } -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::addPropertyChangeListener( const OUString& PropertyName, const Reference< XPropertyChangeListener >& Listener ) @@ -967,7 +967,7 @@ void SAL_CALL SortedResultSet::addPropertyChangeListener( mpPropChangeListeners->addInterface( PropertyName, Listener ); } -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::removePropertyChangeListener( const OUString& PropertyName, const Reference< XPropertyChangeListener >& Listener ) @@ -981,7 +981,7 @@ void SAL_CALL SortedResultSet::removePropertyChangeListener( mpPropChangeListeners->removeInterface( PropertyName, Listener ); } -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& Listener ) @@ -998,7 +998,7 @@ void SAL_CALL SortedResultSet::addVetoableChangeListener( mpVetoChangeListeners->addInterface( PropertyName, Listener ); } -//-------------------------------------------------------------------------- + void SAL_CALL SortedResultSet::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& Listener ) @@ -1012,9 +1012,9 @@ void SAL_CALL SortedResultSet::removeVetoableChangeListener( mpVetoChangeListeners->removeInterface( PropertyName, Listener ); } -//-------------------------------------------------------------------------- + // private methods -//-------------------------------------------------------------------------- + sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne, Reference < XResultSet > xResultTwo, sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo, @@ -1229,7 +1229,7 @@ sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne, return nCompare; } -//-------------------------------------------------------------------------- + sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne, Reference < XResultSet > xResultTwo, sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo ) @@ -1271,7 +1271,7 @@ sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne, return nCompare; } -//-------------------------------------------------------------------------- + sal_IntPtr SortedResultSet::Compare( SortListData *pOne, SortListData *pTwo ) throw( SQLException, RuntimeException ) @@ -1310,7 +1310,7 @@ sal_IntPtr SortedResultSet::Compare( SortListData *pOne, return nCompare; } -//-------------------------------------------------------------------------- + sal_IntPtr SortedResultSet::FindPos( SortListData *pEntry, sal_IntPtr _nStart, sal_IntPtr _nEnd ) throw( SQLException, RuntimeException ) @@ -1345,7 +1345,7 @@ sal_IntPtr SortedResultSet::FindPos( SortListData *pEntry, return nMid+1; } -//-------------------------------------------------------------------------- + void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -1383,11 +1383,11 @@ void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt ) } } -//------------------------------------------------------------------------- -//-------------------------------------------------------------------------- + + // public methods -//-------------------------------------------------------------------------- + void SortedResultSet::CopyData( SortedResultSet *pSource ) { @@ -1421,7 +1421,7 @@ void SortedResultSet::CopyData( SortedResultSet *pSource ) } } -//-------------------------------------------------------------------------- + void SortedResultSet::Initialize( const Sequence < NumberedSortingInfo > &xSortInfo, const Reference< XAnyCompareFactory > &xCompFactory ) @@ -1469,7 +1469,7 @@ void SortedResultSet::Initialize( mnCount = maS2O.Count() - 1; } -//-------------------------------------------------------------------------- + void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -1509,7 +1509,7 @@ void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal catch (const WrappedTargetException&) {} } -//------------------------------------------------------------------------- + void SortedResultSet::InsertNew( sal_IntPtr nPos, sal_IntPtr nCount ) { // for all entries in the msS20-list, which are >= nPos, increase by nCount @@ -1540,7 +1540,7 @@ void SortedResultSet::InsertNew( sal_IntPtr nPos, sal_IntPtr nCount ) mnCount += nCount; } -//------------------------------------------------------------------------- + void SortedResultSet::Remove( sal_IntPtr nPos, sal_IntPtr nCount, EventList *pEvents ) { sal_uInt32 i, j; @@ -1594,7 +1594,7 @@ void SortedResultSet::Remove( sal_IntPtr nPos, sal_IntPtr nCount, EventList *pEv mnCount -= nCount; } -//------------------------------------------------------------------------- + void SortedResultSet::Move( sal_IntPtr nPos, sal_IntPtr nCount, sal_IntPtr nOffset ) { if ( !nOffset ) @@ -1672,7 +1672,7 @@ void SortedResultSet::Move( sal_IntPtr nPos, sal_IntPtr nCount, sal_IntPtr nOffs delete [] pTmpArr; } -//-------------------------------------------------------------------------- + void SortedResultSet::BuildSortInfo( Reference< XResultSet > aResult, const Sequence < NumberedSortingInfo > &xSortInfo, @@ -1723,7 +1723,7 @@ void SortedResultSet::BuildSortInfo( } } -//------------------------------------------------------------------------- + void SortedResultSet::SetChanged( sal_IntPtr nPos, sal_IntPtr nCount ) { for ( sal_IntPtr i=0; i<nCount; i++ ) @@ -1742,7 +1742,7 @@ void SortedResultSet::SetChanged( sal_IntPtr nPos, sal_IntPtr nCount ) } } -//------------------------------------------------------------------------- + void SortedResultSet::ResortModified( EventList* pList ) { sal_uInt32 i, j; @@ -1813,7 +1813,7 @@ void SortedResultSet::ResortModified( EventList* pList ) maModList.Clear(); } -//------------------------------------------------------------------------- + void SortedResultSet::ResortNew( EventList* pList ) { sal_IntPtr i, j, nNewPos, nVal; @@ -1847,11 +1847,11 @@ void SortedResultSet::ResortNew( EventList* pList ) } } -//------------------------------------------------------------------------- + // // SortListData // -//------------------------------------------------------------------------- + SortListData::SortListData( sal_IntPtr nPos, sal_Bool bModified ) { mbModified = bModified; @@ -1872,7 +1872,7 @@ void SortedEntryList::Clear() maData.clear(); } -//------------------------------------------------------------------------- + void SortedEntryList::Insert( SortListData *pEntry, sal_IntPtr nPos ) { if ( nPos < (sal_IntPtr) maData.size() ) @@ -1881,7 +1881,7 @@ void SortedEntryList::Insert( SortListData *pEntry, sal_IntPtr nPos ) maData.push_back( pEntry ); } -//------------------------------------------------------------------------- + SortListData* SortedEntryList::Remove( sal_IntPtr nPos ) { SortListData *pData; @@ -1897,7 +1897,7 @@ SortListData* SortedEntryList::Remove( sal_IntPtr nPos ) return pData; } -//------------------------------------------------------------------------- + SortListData* SortedEntryList::GetData( sal_IntPtr nPos ) { SortListData *pData; @@ -1910,7 +1910,7 @@ SortListData* SortedEntryList::GetData( sal_IntPtr nPos ) return pData; } -//------------------------------------------------------------------------- + sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const { SortListData *pData; @@ -1935,9 +1935,9 @@ sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const } } -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- -//------------------------------------------------------------------------- + + + void SimpleList::Remove( sal_uInt32 nPos ) { if ( nPos < (sal_uInt32) maData.size() ) @@ -1946,7 +1946,7 @@ void SimpleList::Remove( sal_uInt32 nPos ) } } -//------------------------------------------------------------------------- + void SimpleList::Remove( void* pData ) { sal_Bool bFound = sal_False; @@ -1965,7 +1965,7 @@ void SimpleList::Remove( void* pData ) maData.erase( maData.begin() + i ); } -//------------------------------------------------------------------------- + void SimpleList::Insert( void* pData, sal_uInt32 nPos ) { if ( nPos < (sal_uInt32) maData.size() ) @@ -1974,7 +1974,7 @@ void SimpleList::Insert( void* pData, sal_uInt32 nPos ) maData.push_back( pData ); } -//------------------------------------------------------------------------- + void* SimpleList::GetObject( sal_uInt32 nPos ) const { if ( nPos < (sal_uInt32) maData.size() ) @@ -1983,18 +1983,18 @@ void* SimpleList::GetObject( sal_uInt32 nPos ) const return NULL; } -//------------------------------------------------------------------------- + void SimpleList::Replace( void* pData, sal_uInt32 nPos ) { if ( nPos < (sal_uInt32) maData.size() ) maData[ nPos ] = pData; } -//------------------------------------------------------------------------- + // // class SRSPropertySetInfo. // -//------------------------------------------------------------------------- + SRSPropertySetInfo::SRSPropertySetInfo() { @@ -2009,36 +2009,36 @@ SRSPropertySetInfo::SRSPropertySetInfo() maProps[1].Attributes = -1; } -//------------------------------------------------------------------------- + SRSPropertySetInfo::~SRSPropertySetInfo() {} -//------------------------------------------------------------------------- + // XInterface methods. -//------------------------------------------------------------------------- + XINTERFACE_IMPL_2( SRSPropertySetInfo, XTypeProvider, XPropertySetInfo ); -//------------------------------------------------------------------------- + // XTypeProvider methods. -//------------------------------------------------------------------------- + XTYPEPROVIDER_IMPL_2( SRSPropertySetInfo, XTypeProvider, XPropertySetInfo ); -//------------------------------------------------------------------------- + // XPropertySetInfo methods. -//------------------------------------------------------------------------- + Sequence< Property > SAL_CALL SRSPropertySetInfo::getProperties() throw( RuntimeException ) { return Sequence < Property > ( maProps, 2 ); } -//------------------------------------------------------------------------- + Property SAL_CALL SRSPropertySetInfo::getPropertyByName( const OUString& Name ) throw( UnknownPropertyException, RuntimeException ) @@ -2051,7 +2051,7 @@ SRSPropertySetInfo::getPropertyByName( const OUString& Name ) throw UnknownPropertyException(); } -//------------------------------------------------------------------------- + sal_Bool SAL_CALL SRSPropertySetInfo::hasPropertyByName( const OUString& Name ) throw( RuntimeException ) diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 384133e3945e..ae4b4847fb8a 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -89,7 +89,7 @@ public: throw (uno::RuntimeException); }; -//______________________________________________________________________________ + inline void ExpandContentProviderImpl::check() const { // xxx todo guard? @@ -104,12 +104,12 @@ inline void ExpandContentProviderImpl::check() const } } -//______________________________________________________________________________ + ExpandContentProviderImpl::~ExpandContentProviderImpl() throw () { } -//______________________________________________________________________________ + void ExpandContentProviderImpl::disposing() { } @@ -140,7 +140,7 @@ static uno::Sequence< OUString > SAL_CALL supportedServices() } // XServiceInfo -//______________________________________________________________________________ + OUString ExpandContentProviderImpl::getImplementationName() throw (uno::RuntimeException) { @@ -148,7 +148,7 @@ OUString ExpandContentProviderImpl::getImplementationName() return implName(); } -//______________________________________________________________________________ + uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames() throw (uno::RuntimeException) { @@ -183,7 +183,7 @@ OUString ExpandContentProviderImpl::expandUri( } // XContentProvider -//______________________________________________________________________________ + uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) throw (ucb::IllegalIdentifierException, uno::RuntimeException) @@ -204,7 +204,7 @@ uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent( } } -//______________________________________________________________________________ + sal_Int32 ExpandContentProviderImpl::compareContentIds( uno::Reference< ucb::XContentIdentifier > const & xId1, uno::Reference< ucb::XContentIdentifier > const & xId2 ) diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 2e5b7658a717..2b9a16f96781 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -100,7 +100,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); @@ -112,7 +112,7 @@ namespace ucb { namespace ucp { namespace ext return aComposer.makeStringAndClear(); } - //-------------------------------------------------------------------------------------------------------------- + struct SelectPropertyName : public ::std::unary_function< Property, OUString > { const OUString& operator()( const Property& i_rProperty ) const @@ -125,7 +125,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= Content //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + Content::Content( const Reference< XComponentContext >& rxContext, ::ucbhelper::ContentProviderImplHelper* i_pProvider, const Reference< XContentIdentifier >& i_rIdentifier ) :Content_Base( rxContext, i_pProvider, i_rIdentifier ) @@ -169,18 +169,18 @@ namespace ucb { namespace ucp { namespace ext } } - //------------------------------------------------------------------------------------------------------------------ + Content::~Content() { } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) { return OUString( "org.openoffice.comp.ucp.ext.Content" ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aServiceNames(2); @@ -189,14 +189,14 @@ namespace ucb { namespace ucp { namespace ext return aServiceNames; } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL Content::getContentType() throw( RuntimeException ) { impl_determineContentType(); return *m_aContentType; } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* CommandId */, const Reference< XCommandEnvironment >& i_rEvironment ) throw( Exception, CommandAbortedException, RuntimeException ) { @@ -288,25 +288,25 @@ namespace ucb { namespace ucp { namespace ext return aRet; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException ) { } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::encodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::encode( i_rIdentifier, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::decodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::decode( i_rIdentifier, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } - //------------------------------------------------------------------------------------------------------------------ + bool Content::denotesRootContent( const OUString& i_rContentIdentifier ) { const OUString sRootURL( ContentProvider::getRootURL() ); @@ -323,7 +323,7 @@ namespace ucb { namespace ucp { namespace ext return false; } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::getParentURL() { const OUString sRootURL( ContentProvider::getRootURL() ); @@ -389,7 +389,7 @@ namespace ucb { namespace ucp { namespace ext return OUString(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XRow > Content::getArtificialNodePropertyValues( const Reference< XComponentContext >& rxContext, const Sequence< Property >& i_rProperties, const OUString& i_rTitle ) { @@ -458,7 +458,7 @@ namespace ucb { namespace ucp { namespace ext return Reference< XRow >( xRow.get() ); } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::getPhysicalURL() const { ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", OUString() ); @@ -472,7 +472,7 @@ namespace ucb { namespace ucp { namespace ext return lcl_compose( sPackageLocation, m_sPathIntoExtension ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XRow > Content::getPropertyValues( const Sequence< Property >& i_rProperties, const Reference< XCommandEnvironment >& i_rEnv ) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -518,7 +518,7 @@ namespace ucb { namespace ucp { namespace ext return NULL; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Any > Content::setPropertyValues( const Sequence< PropertyValue >& i_rValues, const Reference< XCommandEnvironment >& /* xEnv */) { ::osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -542,7 +542,7 @@ namespace ucb { namespace ucp { namespace ext return aRet; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< CommandInfo > Content::getCommands( const Reference< XCommandEnvironment > & /*xEnv*/ ) { sal_uInt32 nCommandCount = 5; @@ -586,7 +586,7 @@ namespace ucb { namespace ucp { namespace ext return Sequence< CommandInfo >( aCommandInfoTable, nCommandCount ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Property > Content::getProperties( const Reference< XCommandEnvironment > & /*xEnv*/ ) { static const Property aProperties[] = @@ -619,7 +619,7 @@ namespace ucb { namespace ucp { namespace ext return Sequence< Property >( aProperties, sizeof( aProperties ) / sizeof( aProperties[0] ) ); } - //------------------------------------------------------------------------------------------------------------------ + bool Content::impl_isFolder() { if ( !!m_aIsFolder ) @@ -641,7 +641,7 @@ namespace ucb { namespace ucp { namespace ext return *m_aIsFolder; } - //------------------------------------------------------------------------------------------------------------------ + void Content::impl_determineContentType() { if ( !!m_aContentType ) diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 3c2d80ef34ca..20e9409ef68d 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -98,7 +98,7 @@ namespace ucb { namespace ucp { namespace ext ~DataSupplier_Impl(); }; - //------------------------------------------------------------------------------------------------------------------ + DataSupplier_Impl::~DataSupplier_Impl() { } @@ -124,7 +124,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= DataSupplier //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DataSupplier::DataSupplier( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent, const sal_Int32 i_nOpenMode ) @@ -132,7 +132,7 @@ namespace ucb { namespace ucp { namespace ext { } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::fetchData() { try @@ -195,12 +195,12 @@ namespace ucb { namespace ucp { namespace ext } } - //------------------------------------------------------------------------------------------------------------------ + DataSupplier::~DataSupplier() { } - //------------------------------------------------------------------------------------------------------------------ + OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -216,7 +216,7 @@ namespace ucb { namespace ucp { namespace ext return OUString(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -239,7 +239,7 @@ namespace ucb { namespace ucp { namespace ext return Reference< XContentIdentifier >(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XContent > DataSupplier::queryContent( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -271,7 +271,7 @@ namespace ucb { namespace ucp { namespace ext return Reference< XContent >(); } - //------------------------------------------------------------------------------------------------------------------ + bool DataSupplier::getResult( sal_uInt32 i_nIndex ) { ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -283,26 +283,26 @@ namespace ucb { namespace ucp { namespace ext return false; } - //------------------------------------------------------------------------------------------------------------------ + sal_uInt32 DataSupplier::totalCount() { ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); return m_pImpl->m_aResults.size(); } - //------------------------------------------------------------------------------------------------------------------ + sal_uInt32 DataSupplier::currentCount() { return m_pImpl->m_aResults.size(); } - //------------------------------------------------------------------------------------------------------------------ + bool DataSupplier::isCountFinal() { return true; } - //------------------------------------------------------------------------------------------------------------------ + Reference< XRow > DataSupplier::queryPropertyValues( sal_uInt32 i_nIndex ) { ::osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -343,7 +343,7 @@ namespace ucb { namespace ucp { namespace ext return xRow; } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::releasePropertyValues( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -352,12 +352,12 @@ namespace ucb { namespace ucp { namespace ext m_pImpl->m_aResults[ i_nIndex ].xRow.clear(); } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::close() { } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::validate() throw( ResultSetException ) { } diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 66d3e4b72535..05b83dcaae25 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -50,30 +50,30 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= ContentProvider //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ContentProvider::ContentProvider( const Reference< XComponentContext >& rxContext ) :ContentProvider_Base( rxContext ) { } - //------------------------------------------------------------------------------------------------------------------ + ContentProvider::~ContentProvider() { } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) { return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aServiceNames(2); @@ -82,31 +82,31 @@ namespace ucb { namespace ucp { namespace ext return aServiceNames; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XInterface > ContentProvider::Create( const Reference< XComponentContext >& i_rContext ) { return *( new ContentProvider( i_rContext ) ); } - //------------------------------------------------------------------------------------------------------------------ + OUString ContentProvider::getRootURL() { return OUString( "vnd.sun.star.extension://" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString ContentProvider::getArtificialNodeContentType() { return OUString( "application/vnd.sun.star.extension-content" ); } - //------------------------------------------------------------------------------------------------------------------ + namespace { void lcl_ensureAndTransfer( OUString& io_rIdentifierFragment, OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) @@ -118,7 +118,7 @@ namespace ucb { namespace ucp { namespace ext } } - //------------------------------------------------------------------------------------------------------------------ + Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier >& i_rIdentifier ) throw( IllegalIdentifierException, RuntimeException ) { diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx index 432f2a014507..415e0ceab799 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.cxx +++ b/ucb/source/ucp/ext/ucpext_resultset.cxx @@ -49,7 +49,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= ResultSet //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ResultSet::ResultSet( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent, const OpenCommandArgument2& i_rCommand, const Reference< XCommandEnvironment >& i_rEnv ) :ResultSetImplHelper( rxContext, i_rCommand ) @@ -58,7 +58,7 @@ namespace ucb { namespace ucp { namespace ext { } - //------------------------------------------------------------------------------------------------------------------ + void ResultSet::initStatic() { ::rtl::Reference< DataSupplier > pDataSupplier( new DataSupplier( @@ -75,7 +75,7 @@ namespace ucb { namespace ucp { namespace ext pDataSupplier->fetchData(); } - //------------------------------------------------------------------------------------------------------------------ + void ResultSet::initDynamic() { initStatic(); diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index bbb64b4815b8..8b2388fdb920 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -59,7 +59,7 @@ namespace ucb { namespace ucp { namespace ext extern "C" { - //------------------------------------------------------------------------------------------------------------------ + SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx index 080d484dfb47..8fc6898bea7b 100644 --- a/ucb/source/ucp/gvfs/gvfs_stream.cxx +++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx @@ -61,9 +61,9 @@ Any Stream::queryInterface( const Type &type ) return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type ); } -// ------------------------------------------------------------------- + // XStream -// ------------------------------------------------------------------- + com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL Stream::getInputStream( ) @@ -87,9 +87,9 @@ Stream::getOutputStream( ) return Reference< XOutputStream >( this ); } -// ------------------------------------------------------------------- + // XInputStream -// ------------------------------------------------------------------- + sal_Int32 SAL_CALL Stream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) @@ -184,9 +184,9 @@ void SAL_CALL Stream::closeInput( void ) closeStream(); } -// ------------------------------------------------------------------- + // XSeekable -// ------------------------------------------------------------------- + void SAL_CALL Stream::seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, @@ -236,9 +236,9 @@ sal_Int64 SAL_CALL Stream::getLength() } } -// ------------------------------------------------------------------- + // XTruncate -// ------------------------------------------------------------------- + void SAL_CALL Stream::truncate( void ) throw( com::sun::star::io::IOException, @@ -250,9 +250,9 @@ void SAL_CALL Stream::truncate( void ) throwOnError( gnome_vfs_truncate_handle( m_handle, 0 ) ); } -// ------------------------------------------------------------------- + // XOutputStream -// ------------------------------------------------------------------- + void SAL_CALL Stream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) throw( com::sun::star::io::NotConnectedException, @@ -298,9 +298,9 @@ void SAL_CALL Stream::closeOutput( void ) closeStream(); } -// ------------------------------------------------------------------- + // Misc. -// ------------------------------------------------------------------- + void Stream::closeStream( void ) throw( ::com::sun::star::io::NotConnectedException, diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 7d29a241dcb9..be216215127d 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -47,7 +47,7 @@ const OUString DAVProperties::SUPPORTEDLOCK = const OUString DAVProperties::EXECUTABLE = OUString( "http://apache.org/dav/props/executable" ); -// ------------------------------------------------------------------- + // static void DAVProperties::createSerfPropName( const OUString & rFullName, SerfPropName & rName ) @@ -107,7 +107,7 @@ void DAVProperties::createSerfPropName( const OUString & rFullName, } } -// ------------------------------------------------------------------- + // static void DAVProperties::createUCBPropName( const char * nspace, const char * name, @@ -170,7 +170,7 @@ void DAVProperties::createUCBPropName( const char * nspace, } } -// ------------------------------------------------------------------- + // static bool DAVProperties::isUCBDeadProperty( const SerfPropName & rName ) { diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 4276900b3820..94aaa0b6892b 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -27,26 +27,26 @@ using namespace com::sun::star::uno; using namespace http_dav_ucp; -// ------------------------------------------------------------------- + // Constructor -// ------------------------------------------------------------------- + SerfInputStream::SerfInputStream( void ) : mLen( 0 ), mPos( 0 ) { } -// ------------------------------------------------------------------- + // Destructor -// ------------------------------------------------------------------- + SerfInputStream::~SerfInputStream( void ) { } -// ------------------------------------------------------------------- + // AddToStream // Allows the caller to add some data to the "end" of the stream -// ------------------------------------------------------------------- + void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen ) { mInputBuffer.realloc( sal::static_int_cast<sal_Int32>(mLen) + inLen ); @@ -54,9 +54,9 @@ void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen ) mLen += inLen; } -// ------------------------------------------------------------------- + // queryInterface -// ------------------------------------------------------------------- + Any SerfInputStream::queryInterface( const Type &type ) throw( RuntimeException ) { @@ -66,10 +66,10 @@ Any SerfInputStream::queryInterface( const Type &type ) return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type ); } -// ------------------------------------------------------------------- + // readBytes // "Reads" the specified number of bytes from the stream -// ------------------------------------------------------------------- + sal_Int32 SAL_CALL SerfInputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw( ::com::sun::star::io::NotConnectedException, @@ -96,9 +96,9 @@ sal_Int32 SAL_CALL SerfInputStream::readBytes( return theBytes2Read; } -// ------------------------------------------------------------------- + // readSomeBytes -// ------------------------------------------------------------------- + sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw( ::com::sun::star::io::NotConnectedException, @@ -110,10 +110,10 @@ sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( return readBytes( aData, nMaxBytesToRead ); } -// ------------------------------------------------------------------- + // skipBytes // Moves the current stream position forward -// ------------------------------------------------------------------- + void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, @@ -125,10 +125,10 @@ void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) mPos = mLen; } -// ------------------------------------------------------------------- + // available // Returns the number of unread bytes currently remaining on the stream -// ------------------------------------------------------------------- + sal_Int32 SAL_CALL SerfInputStream::available( ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, @@ -137,9 +137,9 @@ sal_Int32 SAL_CALL SerfInputStream::available( ) return sal::static_int_cast<sal_Int32>(mLen - mPos); } -// ------------------------------------------------------------------- + // closeInput -// ------------------------------------------------------------------- + void SAL_CALL SerfInputStream::closeInput( void ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, @@ -147,9 +147,9 @@ void SAL_CALL SerfInputStream::closeInput( void ) { } -// ------------------------------------------------------------------- + // seek -// ------------------------------------------------------------------- + void SAL_CALL SerfInputStream::seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, @@ -164,9 +164,9 @@ void SAL_CALL SerfInputStream::seek( sal_Int64 location ) throw ::com::sun::star::lang::IllegalArgumentException(); } -// ------------------------------------------------------------------- + // getPosition -// ------------------------------------------------------------------- + sal_Int64 SAL_CALL SerfInputStream::getPosition() throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) @@ -174,9 +174,9 @@ sal_Int64 SAL_CALL SerfInputStream::getPosition() return mPos; } -// ------------------------------------------------------------------- + // getLength -// ------------------------------------------------------------------- + sal_Int64 SAL_CALL SerfInputStream::getLength() throw( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ) diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx index 80dcd60ca0cd..7cf3cdf6157d 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.cxx +++ b/ucb/source/ucp/webdav/SerfLockStore.cxx @@ -48,7 +48,7 @@ protected: } // namespace http_dav_ucp -// ------------------------------------------------------------------- + void TickerThread::run() { OSL_TRACE( "TickerThread: start." ); @@ -74,7 +74,7 @@ void TickerThread::run() OSL_TRACE( "TickerThread: stop." ); } -// ------------------------------------------------------------------- + SerfLockStore::SerfLockStore() : m_pSerfLockStore( ne_lockstore_create() ), m_pTickerThread( 0 ) @@ -82,7 +82,7 @@ SerfLockStore::SerfLockStore() OSL_ENSURE( m_pSerfLockStore, "Unable to create neon lock store!" ); } -// ------------------------------------------------------------------- + SerfLockStore::~SerfLockStore() { stopTicker(); @@ -107,7 +107,7 @@ SerfLockStore::~SerfLockStore() ne_lockstore_destroy( m_pSerfLockStore ); } -// ------------------------------------------------------------------- + void SerfLockStore::startTicker() { osl::MutexGuard aGuard( m_aMutex ); @@ -119,7 +119,7 @@ void SerfLockStore::startTicker() } } -// ------------------------------------------------------------------- + void SerfLockStore::stopTicker() { osl::MutexGuard aGuard( m_aMutex ); @@ -133,7 +133,7 @@ void SerfLockStore::stopTicker() } } -// ------------------------------------------------------------------- + void SerfLockStore::registerSession( HttpSession * pHttpSession ) { osl::MutexGuard aGuard( m_aMutex ); @@ -141,7 +141,7 @@ void SerfLockStore::registerSession( HttpSession * pHttpSession ) ne_lockstore_register( m_pSerfLockStore, pHttpSession ); } -// ------------------------------------------------------------------- + SerfLock * SerfLockStore::findByUri( OUString const & rUri ) { osl::MutexGuard aGuard( m_aMutex ); @@ -152,7 +152,7 @@ SerfLock * SerfLockStore::findByUri( OUString const & rUri ) return ne_lockstore_findbyuri( m_pSerfLockStore, &aUri ); } -// ------------------------------------------------------------------- + void SerfLockStore::addLock( SerfLock * pLock, rtl::Reference< SerfSession > const & xSession, sal_Int32 nLastChanceToSendRefreshRequest ) @@ -166,7 +166,7 @@ void SerfLockStore::addLock( SerfLock * pLock, startTicker(); } -// ------------------------------------------------------------------- + void SerfLockStore::updateLock( SerfLock * pLock, sal_Int32 nLastChanceToSendRefreshRequest ) { @@ -183,7 +183,7 @@ void SerfLockStore::updateLock( SerfLock * pLock, } } -// ------------------------------------------------------------------- + void SerfLockStore::removeLock( SerfLock * pLock ) { osl::MutexGuard aGuard( m_aMutex ); @@ -195,7 +195,7 @@ void SerfLockStore::removeLock( SerfLock * pLock ) stopTicker(); } -// ------------------------------------------------------------------- + void SerfLockStore::refreshLocks() { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index bb8c6e17d4da..b83689070d84 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -54,13 +54,13 @@ using namespace com::sun::star; using namespace http_dav_ucp; -// ------------------------------------------------------------------- + // static members! //SerfLockStore SerfSession::m_aSerfLockStore; -// ------------------------------------------------------------------- + // Constructor -// ------------------------------------------------------------------- + SerfSession::SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, const OUString& inUri, @@ -84,9 +84,9 @@ SerfSession::SerfSession( m_pSerfBucket_Alloc = serf_bucket_allocator_create( getAprPool(), NULL, NULL ); } -// ------------------------------------------------------------------- + // Destructor -// ------------------------------------------------------------------- + SerfSession::~SerfSession( ) { if ( m_pSerfConnection ) @@ -96,7 +96,7 @@ SerfSession::~SerfSession( ) } } -// ------------------------------------------------------------------- + void SerfSession::Init( const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -105,7 +105,7 @@ void SerfSession::Init( const DAVRequestEnvironment & rEnv ) Init(); } -// ------------------------------------------------------------------- + void SerfSession::Init() throw ( DAVException ) { @@ -220,7 +220,7 @@ char* SerfSession::getHostinfo() } -// ------------------------------------------------------------------- + // virtual sal_Bool SerfSession::CanUse( const OUString & inUri ) { @@ -241,7 +241,7 @@ sal_Bool SerfSession::CanUse( const OUString & inUri ) return sal_False; } -// ------------------------------------------------------------------- + // virtual sal_Bool SerfSession::UsesProxy() { @@ -346,7 +346,7 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA } namespace { - // ------------------------------------------------------------------- + // Helper function OUString GetHostnamePart( const OUString& _rRawString ) { @@ -601,9 +601,9 @@ SerfRequestProcessor* SerfSession::createReqProc( const OUString & inPath ) m_bUseChunkedEncoding ); } -// ------------------------------------------------------------------- + // PROPFIND - allprop & named -// ------------------------------------------------------------------- + void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, const std::vector< OUString > & inPropNames, @@ -632,9 +632,9 @@ void SerfSession::PROPFIND( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // PROPFIND - propnames -// ------------------------------------------------------------------- + void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, @@ -661,9 +661,9 @@ void SerfSession::PROPFIND( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // PROPPATCH -// ------------------------------------------------------------------- + void SerfSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) @@ -681,9 +681,9 @@ void SerfSession::PROPPATCH( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // HEAD -// ------------------------------------------------------------------- + void SerfSession::HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, @@ -709,9 +709,9 @@ void SerfSession::HEAD( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // GET -// ------------------------------------------------------------------- + uno::Reference< io::XInputStream > SerfSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) @@ -732,9 +732,9 @@ SerfSession::GET( const OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -// ------------------------------------------------------------------- + // GET -// ------------------------------------------------------------------- + void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) @@ -752,9 +752,9 @@ void SerfSession::GET( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // GET -// ------------------------------------------------------------------- + uno::Reference< io::XInputStream > SerfSession::GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, @@ -782,9 +782,9 @@ SerfSession::GET( const OUString & inPath, } -// ------------------------------------------------------------------- + // GET -// ------------------------------------------------------------------- + void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const std::vector< OUString > & inHeaderNames, @@ -808,9 +808,9 @@ void SerfSession::GET( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // PUT -// ------------------------------------------------------------------- + void SerfSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) @@ -832,9 +832,9 @@ void SerfSession::PUT( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // POST -// ------------------------------------------------------------------- + uno::Reference< io::XInputStream > SerfSession::POST( const OUString & inPath, const OUString & rContentType, @@ -867,9 +867,9 @@ SerfSession::POST( const OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -// ------------------------------------------------------------------- + // POST -// ------------------------------------------------------------------- + void SerfSession::POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, @@ -900,9 +900,9 @@ void SerfSession::POST( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // MKCOL -// ------------------------------------------------------------------- + void SerfSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -918,9 +918,9 @@ void SerfSession::MKCOL( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // COPY -// ------------------------------------------------------------------- + void SerfSession::COPY( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, @@ -941,9 +941,9 @@ void SerfSession::COPY( const OUString & inSourceURL, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // MOVE -// ------------------------------------------------------------------- + void SerfSession::MOVE( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, @@ -964,9 +964,9 @@ void SerfSession::MOVE( const OUString & inSourceURL, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + // DESTROY -// ------------------------------------------------------------------- + void SerfSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -982,7 +982,7 @@ void SerfSession::DESTROY( const OUString & inPath, HandleError( aReqProc ); } -// ------------------------------------------------------------------- + /* namespace { @@ -1013,9 +1013,9 @@ namespace } // namespace */ -// ------------------------------------------------------------------- + // LOCK (set new lock) -// ------------------------------------------------------------------- + void SerfSession::LOCK( const OUString & inPath, ucb::Lock & /*rLock*/, const DAVRequestEnvironment & rEnv ) @@ -1112,9 +1112,9 @@ void SerfSession::LOCK( const OUString & inPath, */ } -// ------------------------------------------------------------------- + // LOCK (refresh existing lock) -// ------------------------------------------------------------------- + sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/, sal_Int64 nTimeout, const DAVRequestEnvironment & /*rEnv*/ ) @@ -1153,9 +1153,9 @@ sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/, */ } -// ------------------------------------------------------------------- + // LOCK (refresh existing lock) -// ------------------------------------------------------------------- + bool SerfSession::LOCK( SerfLock * /*pLock*/, sal_Int32 & /*rlastChanceToSendRefreshRequest*/ ) { @@ -1184,9 +1184,9 @@ bool SerfSession::LOCK( SerfLock * /*pLock*/, */ } -// ------------------------------------------------------------------- + // UNLOCK -// ------------------------------------------------------------------- + void SerfSession::UNLOCK( const OUString & /*inPath*/, const DAVRequestEnvironment & /*rEnv*/ ) throw ( DAVException ) @@ -1220,9 +1220,9 @@ void SerfSession::UNLOCK( const OUString & /*inPath*/, */ } -// ------------------------------------------------------------------- + // UNLOCK -// ------------------------------------------------------------------- + bool SerfSession::UNLOCK( SerfLock * /*pLock*/ ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -1242,7 +1242,7 @@ bool SerfSession::UNLOCK( SerfLock * /*pLock*/ ) */ } -// ------------------------------------------------------------------- + void SerfSession::abort() throw ( DAVException ) { @@ -1254,7 +1254,7 @@ void SerfSession::abort() // ne_close_connection( m_pHttpSession ); } -// ------------------------------------------------------------------- + const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const { if ( m_aUri.GetScheme() == "http" || m_aUri.GetScheme() == "https" ) @@ -1273,7 +1273,7 @@ const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const } /* -// ------------------------------------------------------------------- + namespace { bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, @@ -1295,7 +1295,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, } // namespace */ -// ------------------------------------------------------------------- + bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/, const DAVRequestEnvironment & /*rEnv*/ ) { @@ -1363,10 +1363,10 @@ bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/, */ } -// ------------------------------------------------------------------- + // HandleError // Common Error Handler -// ------------------------------------------------------------------- + void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc ) throw ( DAVException ) { @@ -1483,7 +1483,7 @@ void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc */ } -// ------------------------------------------------------------------- + // static bool SerfSession::getDataFromInputStream( @@ -1573,7 +1573,7 @@ SerfSession::getDataFromInputStream( return false; } -// --------------------------------------------------------------------- + sal_Bool SerfSession::isDomainMatch( OUString certHostName ) { @@ -1595,7 +1595,7 @@ SerfSession::isDomainMatch( OUString certHostName ) } /* -// --------------------------------------------------------------------- + OUString SerfSession::makeAbsoluteURL( OUString const & rURL ) const { try diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index a49c46e8bba6..75d2d94f5463 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -29,9 +29,9 @@ using namespace http_dav_ucp; -// ------------------------------------------------------------------- + // Constructor -// ------------------------------------------------------------------- + namespace { diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 6a7a6016aea8..f9dbb1c72a33 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -93,7 +93,7 @@ public: void Append( const String &rLine ); }; -//------------------------------------------------------------------------- + void MyOutWindow::Append( const String &rLine ) { OUString aLine( rLine ); @@ -138,13 +138,13 @@ public: void print( const OUString& rText ); }; -//------------------------------------------------------------------------- + void MessagePrinter::print( const sal_Char* pText ) { print( OUString::createFromAscii(pText) ); } -//------------------------------------------------------------------------- + void MessagePrinter::print( const OUString& rText ) { SolarMutexGuard aGuard; @@ -376,7 +376,7 @@ public: // static OUString Ucb::m_aProtocol; -//------------------------------------------------------------------------- + // static OUString Ucb::getUnoURL() { @@ -390,7 +390,7 @@ OUString Ucb::getUnoURL() return aUnoURL; } -//------------------------------------------------------------------------- + Ucb::Ucb( uno::Reference< lang::XMultiServiceFactory >& rxFactory, OUString const & rConfigurationKey1, OUString const & rConfigurationKey2 ) @@ -401,12 +401,12 @@ Ucb::Ucb( uno::Reference< lang::XMultiServiceFactory >& rxFactory, { } -//------------------------------------------------------------------------- + Ucb::~Ucb() { } -//------------------------------------------------------------------------- + sal_Bool Ucb::init() { if ( m_bInited ) @@ -451,7 +451,7 @@ sal_Bool Ucb::init() return m_bInited; } -//------------------------------------------------------------------------- + uno::Reference< ucb::XContentIdentifierFactory > Ucb::getContentIdentifierFactory() { @@ -465,7 +465,7 @@ Ucb::getContentIdentifierFactory() return m_xIdFac; } -//------------------------------------------------------------------------- + uno::Reference< ucb::XContentProvider > Ucb::getContentProvider() { if ( !m_xProv.is() ) @@ -517,7 +517,7 @@ public: { return m_xProgressHandler; } }; -//------------------------------------------------------------------------- + UcbTaskEnvironment::UcbTaskEnvironment( const uno::Reference< task::XInteractionHandler >& rxInteractionHandler, @@ -528,17 +528,17 @@ UcbTaskEnvironment::UcbTaskEnvironment( { } -//------------------------------------------------------------------------- + // virtual UcbTaskEnvironment::~UcbTaskEnvironment() { } -//---------------------------------------------------------------------------- + // // XInterface methods // -//---------------------------------------------------------------------------- + // virtual uno::Any SAL_CALL @@ -550,7 +550,7 @@ UcbTaskEnvironment::queryInterface( const uno::Type & rType ) return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -//---------------------------------------------------------------------------- + // virtual void SAL_CALL UcbTaskEnvironment::acquire() throw() @@ -558,7 +558,7 @@ void SAL_CALL UcbTaskEnvironment::acquire() OWeakObject::acquire(); } -//---------------------------------------------------------------------------- + // virtual void SAL_CALL UcbTaskEnvironment::release() throw() @@ -594,7 +594,7 @@ public: bool bPrint = true ); }; -//------------------------------------------------------------------------- + UcbCommandProcessor::UcbCommandProcessor( Ucb& rUCB, const uno::Reference< ucb::XCommandProcessor >& @@ -614,13 +614,13 @@ UcbCommandProcessor::UcbCommandProcessor( Ucb& rUCB, } } -//---------------------------------------------------------------------------- + // virtual UcbCommandProcessor::~UcbCommandProcessor() { } -//---------------------------------------------------------------------------- + uno::Any UcbCommandProcessor::executeCommand( const OUString& rName, const uno::Any& rArgument, bool bPrint ) @@ -783,7 +783,7 @@ public: throw( uno::RuntimeException ); }; -//------------------------------------------------------------------------- + UcbContent::UcbContent( Ucb& rUCB, uno::Reference< ucb::XContent >& rxContent, MyOutWindow* pOutEdit) @@ -795,13 +795,13 @@ UcbContent::UcbContent( Ucb& rUCB, { } -//---------------------------------------------------------------------------- + // virtual UcbContent::~UcbContent() { } -//------------------------------------------------------------------------- + // static UcbContent* UcbContent::create( Ucb& rUCB, const OUString& rURL, MyOutWindow* pOutEdit ) @@ -861,7 +861,7 @@ UcbContent* UcbContent::create( return pNew; } -//------------------------------------------------------------------------- + const OUString UcbContent::getURL() const { uno::Reference< ucb::XContentIdentifier > xId( @@ -872,14 +872,14 @@ const OUString UcbContent::getURL() const return OUString(); } -//------------------------------------------------------------------------- + const OUString UcbContent::getType() const { const OUString aType( m_xContent->getContentType() ); return aType; } -//------------------------------------------------------------------------- + void UcbContent::dispose() { uno::Reference< lang::XComponent > xComponent( m_xContent, uno::UNO_QUERY ); @@ -887,7 +887,7 @@ void UcbContent::dispose() xComponent->dispose(); } -//---------------------------------------------------------------------------- + void UcbContent::open( const OUString & rName, const OUString& rInput, bool bPrint, bool bTiming, bool bSort, OpenStack * pStack, sal_uInt32 nLevel, @@ -1144,7 +1144,7 @@ void UcbContent::open( const OUString & rName, const OUString& rInput, } } -//---------------------------------------------------------------------------- + void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, sal_Int32 nFetchSize ) { @@ -1219,7 +1219,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort, } } -//---------------------------------------------------------------------------- + void UcbContent::transfer( const OUString& rSourceURL, sal_Bool bMove ) { if ( bMove ) @@ -1282,7 +1282,7 @@ void UcbContent::transfer( const OUString& rSourceURL, sal_Bool bMove ) #endif } -//---------------------------------------------------------------------------- + void UcbContent::destroy() { print( "Deleting content..." ); @@ -1294,7 +1294,7 @@ void UcbContent::destroy() // executeCommand( OUString("flush"), Any() ); } -//------------------------------------------------------------------------- + uno::Sequence< ucb::CommandInfo > UcbContent::getCommands() { uno::Any aResult = executeCommand( @@ -1322,7 +1322,7 @@ uno::Sequence< ucb::CommandInfo > UcbContent::getCommands() return uno::Sequence< ucb::CommandInfo >(); } -//------------------------------------------------------------------------- + uno::Sequence< beans::Property > UcbContent::getProperties() { uno::Any aResult = executeCommand( @@ -1349,7 +1349,7 @@ uno::Sequence< beans::Property > UcbContent::getProperties() return uno::Sequence< beans::Property >(); } -//---------------------------------------------------------------------------- + uno::Any UcbContent::getPropertyValue( const OUString& rName ) { uno::Sequence< beans::Property > aProps( 1 ); @@ -1375,7 +1375,7 @@ uno::Any UcbContent::getPropertyValue( const OUString& rName ) return uno::Any(); } -//---------------------------------------------------------------------------- + OUString UcbContent::getStringPropertyValue( const OUString& rName ) { uno::Any aAny = getPropertyValue( rName ); @@ -1394,7 +1394,7 @@ OUString UcbContent::getStringPropertyValue( const OUString& rName ) return OUString(); } -//---------------------------------------------------------------------------- + void UcbContent::setPropertyValue( const OUString& rName, const uno::Any& rValue ) { @@ -1415,7 +1415,7 @@ void UcbContent::setPropertyValue( const OUString& rName, // executeCommand( OUString("flush"), Any() ); } -//---------------------------------------------------------------------------- + void UcbContent::setStringPropertyValue( const OUString& rName, const OUString& rValue ) { @@ -1427,7 +1427,7 @@ void UcbContent::setStringPropertyValue( const OUString& rName, print( aText ); } -//---------------------------------------------------------------------------- + void UcbContent::addProperty( const OUString& rName, const uno::Any& rValue ) { @@ -1465,7 +1465,7 @@ void UcbContent::addProperty( const OUString& rName, print( "Adding property failed. No XPropertyContainer!" ); } -//---------------------------------------------------------------------------- + void UcbContent::addStringProperty( const OUString& rName, const OUString& rValue ) { @@ -1474,7 +1474,7 @@ void UcbContent::addStringProperty( addProperty( rName, aValue ); } -//---------------------------------------------------------------------------- + void UcbContent::removeProperty( const OUString& rName ) { uno::Reference< beans::XPropertyContainer > xContainer( m_xContent, @@ -1501,11 +1501,11 @@ void UcbContent::removeProperty( const OUString& rName ) print( "Removing property failed. No XPropertyContainer!" ); } -//---------------------------------------------------------------------------- + // // XInterface methods // -//---------------------------------------------------------------------------- + // virtual uno::Any SAL_CALL UcbContent::queryInterface( const uno::Type & rType ) @@ -1520,7 +1520,7 @@ uno::Any SAL_CALL UcbContent::queryInterface( const uno::Type & rType ) return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -//---------------------------------------------------------------------------- + // virtual void SAL_CALL UcbContent::acquire() throw() @@ -1528,7 +1528,7 @@ void SAL_CALL UcbContent::acquire() OWeakObject::acquire(); } -//---------------------------------------------------------------------------- + // virtual void SAL_CALL UcbContent::release() throw() @@ -1536,11 +1536,11 @@ void SAL_CALL UcbContent::release() OWeakObject::release(); } -//---------------------------------------------------------------------------- + // // XEventListener methods. // -//---------------------------------------------------------------------------- + // virtual void SAL_CALL UcbContent::disposing( const lang::EventObject& /*Source*/ ) @@ -1549,11 +1549,11 @@ void SAL_CALL UcbContent::disposing( const lang::EventObject& /*Source*/ ) print ( "Content: disposing..." ); } -//---------------------------------------------------------------------------- + // // XContentEventListener methods, // -//---------------------------------------------------------------------------- + // virtual void SAL_CALL UcbContent::contentEvent( const ucb::ContentEvent& evt ) @@ -1611,11 +1611,11 @@ void SAL_CALL UcbContent::contentEvent( const ucb::ContentEvent& evt ) } } -//---------------------------------------------------------------------------- + // // XPropertiesChangeListener methods. // -//---------------------------------------------------------------------------- + // virtual void SAL_CALL UcbContent::propertiesChange( @@ -1668,7 +1668,7 @@ void SAL_CALL UcbContent::propertiesChange( #define MYWIN_ITEMID_ONLINE 24 #define MYWIN_ITEMID_REORGANIZE 25 -//------------------------------------------------------------------------- + class MyWin : public WorkWindow { private: @@ -1697,7 +1697,7 @@ public: void print( const sal_Char* pText ); }; -//------------------------------------------------------------------------- + MyWin::MyWin( Window *pParent, WinBits nWinStyle, uno::Reference< lang::XMultiServiceFactory >& rxFactory, OUString const & rConfigurationKey1, @@ -1873,7 +1873,7 @@ MyWin::MyWin( Window *pParent, WinBits nWinStyle, m_aUCB.setOutEdit( m_pOutEdit ); } -//------------------------------------------------------------------------- + // virtual MyWin::~MyWin() { @@ -1888,7 +1888,7 @@ MyWin::~MyWin() delete m_pOutEdit; } -//------------------------------------------------------------------------- + void MyWin::Resize() { Size aWinSize = GetOutputSizePixel(); @@ -1904,13 +1904,13 @@ void MyWin::Resize() Point( 0, nBoxH + nBoxH ), Size ( nWinW, nWinH - ( nBoxH + nBoxH ) ) ); } -//------------------------------------------------------------------------- + void MyWin::print( const sal_Char* pText ) { print( OUString.createFromAscii( pText ) ); } -//------------------------------------------------------------------------- + void MyWin::print( const OUString& rText ) { SolarMutexGuard aGuard; @@ -1922,7 +1922,7 @@ void MyWin::print( const OUString& rText ) } } -//------------------------------------------------------------------------- + IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) { USHORT nItemId = pToolBox->GetCurItemId(); @@ -2240,7 +2240,7 @@ public: MyApp aMyApp; -//------------------------------------------------------------------------- + // virtual void MyApp::Main() { |