From a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 9 Feb 2016 18:16:42 +1100 Subject: Remove excess newlines A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- ucbhelper/source/client/content.cxx | 25 ------- ucbhelper/source/client/proxydecider.cxx | 14 ---- .../source/provider/cancelcommandexecution.cxx | 1 - ucbhelper/source/provider/contentidentifier.cxx | 15 ---- ucbhelper/source/provider/contentinfo.cxx | 19 ----- ucbhelper/source/provider/fd_inputstream.cxx | 6 -- ucbhelper/source/provider/interactionrequest.cxx | 81 ---------------------- ucbhelper/source/provider/propertyvalueset.cxx | 17 ----- ucbhelper/source/provider/registerucb.cxx | 2 - ucbhelper/source/provider/resultset.cxx | 37 ---------- ucbhelper/source/provider/resultsethelper.cxx | 14 ---- ucbhelper/source/provider/resultsetmetadata.cxx | 8 --- 12 files changed, 239 deletions(-) (limited to 'ucbhelper') diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 6a5b09f71896..aa5dc9685d3d 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -126,14 +126,9 @@ void EmptyInputStream::closeInput() } - - - // class ContentEventListener_Impl. - - class ContentEventListener_Impl : public cppu::OWeakObject, public XContentEventListener { @@ -161,13 +156,9 @@ public: }; - - // class Content_Impl. - - class Content_Impl : public salhelper::SimpleReferenceObject { friend class ContentEventListener_Impl; @@ -306,13 +297,9 @@ static Reference< XContent > getContentNoThrow( } - - // Content Implementation. - - Content::Content() : m_xImpl( new Content_Impl ) { @@ -1069,7 +1056,6 @@ bool Content::isFolder() } - SAL_WNOUNREACHABLE_CODE_PUSH bool Content::isDocument() @@ -1121,8 +1107,6 @@ void Content::unlock() // Content_Impl Implementation. - - Content_Impl::Content_Impl( const Reference< XComponentContext >& rCtx, const Reference< XContent >& rContent, const Reference< XCommandEnvironment >& rEnv ) @@ -1337,15 +1321,9 @@ void Content_Impl::inserted() } - - // ContentEventListener_Impl Implementation. - - - - // XInterface methods. void SAL_CALL ContentEventListener_Impl::acquire() @@ -1373,7 +1351,6 @@ css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno // XContentEventListener methods. - // virtual void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) throw( RuntimeException, std::exception ) @@ -1397,11 +1374,9 @@ void SAL_CALL ContentEventListener_Impl::contentEvent( const ContentEvent& evt ) } - // XEventListenr methods. - // virtual void SAL_CALL ContentEventListener_Impl::disposing( const EventObject& Source ) throw( RuntimeException, std::exception ) diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index b51e88988ef1..1ce21f7e98de 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -74,7 +74,6 @@ public: typedef std::pair< WildCard, WildCard > NoProxyListEntry; - class HostnameCache { typedef std::pair< OUString, OUString > HostListEntry; @@ -156,13 +155,9 @@ private: }; - - // WildCard Implementation. - - bool WildCard::Matches( const OUString& rString ) const { OString aString @@ -287,13 +282,9 @@ bool getConfigInt32Value( } - - // InternetProxyDecider_Impl Implementation. - - InternetProxyDecider_Impl::InternetProxyDecider_Impl( const uno::Reference< uno::XComponentContext >& rxContext ) : m_nProxyType( 0 ), @@ -529,7 +520,6 @@ const InternetProxyServer & InternetProxyDecider_Impl::getProxy( // in: staroffice-doc.germany.sun.com -> full: xyz.germany.sun.com - if ( !shouldUseProxy( aFullyQualifiedHost, nPort, true ) ) return m_aEmptyProxy; } @@ -777,13 +767,9 @@ void InternetProxyDecider_Impl::setNoProxyList( } // namespace proxydecider_impl - - // InternetProxyDecider Implementation. - - InternetProxyDecider::InternetProxyDecider( const uno::Reference< uno::XComponentContext>& rxContext ) : m_pImpl( new proxydecider_impl::InternetProxyDecider_Impl( rxContext ) ) diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index fecfb5d8a2ab..db1de0cc53d4 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -80,7 +80,6 @@ void cancelCommandExecution( const uno::Any & rException, } - void cancelCommandExecution( const ucb::IOErrorCode eError, const uno::Sequence< uno::Any > & rArgs, const uno::Reference< diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx index 63124536080d..24240278073a 100644 --- a/ucbhelper/source/provider/contentidentifier.cxx +++ b/ucbhelper/source/provider/contentidentifier.cxx @@ -38,13 +38,9 @@ namespace ucbhelper { - - // struct ContentIdentifier_Impl. - - struct ContentIdentifier_Impl { OUString m_aContentId; @@ -54,11 +50,9 @@ struct ContentIdentifier_Impl }; - // ContentIdentifier_Impl Implementation. - ContentIdentifier_Impl::ContentIdentifier_Impl(const OUString& rURL ) { // Normalize URL scheme ( it's case insensitive ). @@ -75,11 +69,9 @@ ContentIdentifier_Impl::ContentIdentifier_Impl(const OUString& rURL ) } - // ContentIdentifier Implementation. - ContentIdentifier::ContentIdentifier( const OUString& rURL ) : m_pImpl( new ContentIdentifier_Impl( rURL ) ) { @@ -92,12 +84,9 @@ ContentIdentifier::~ContentIdentifier() } - // XInterface methods. - - // virtual void SAL_CALL ContentIdentifier::acquire() throw() { @@ -125,11 +114,9 @@ ContentIdentifier::queryInterface( const Type & rType ) } - // XTypeProvider methods. - // virtual Sequence< sal_Int8 > SAL_CALL ContentIdentifier::getImplementationId() @@ -160,11 +147,9 @@ ContentIdentifier::getTypes() } - // XContentIdentifier methods. - // virtual OUString SAL_CALL ContentIdentifier::getContentIdentifier() throw( RuntimeException, std::exception ) diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 4b3987ccd3bd..daeccdfcfb7e 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -33,13 +33,9 @@ using namespace com::sun::star; - - // PropertySetInfo Implementation. - - namespace ucbhelper { PropertySetInfo::PropertySetInfo( @@ -59,7 +55,6 @@ PropertySetInfo::~PropertySetInfo() } - // XInterface methods. void SAL_CALL PropertySetInfo::acquire() @@ -93,7 +88,6 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo, // XPropertySetInfo methods. - // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() throw( uno::RuntimeException, std::exception ) @@ -182,11 +176,9 @@ sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( } - // Non-Interface methods. - void PropertySetInfo::reset() { osl::MutexGuard aGuard( m_aMutex ); @@ -218,13 +210,9 @@ bool PropertySetInfo::queryProperty( } - - // CommandProcessorInfo Implementation. - - CommandProcessorInfo::CommandProcessorInfo( const uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ) @@ -242,7 +230,6 @@ CommandProcessorInfo::~CommandProcessorInfo() } - // XInterface methods. @@ -271,17 +258,14 @@ css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const css::uno::Typ // XTypeProvider methods. - XTYPEPROVIDER_IMPL_2( CommandProcessorInfo, lang::XTypeProvider, css::ucb::XCommandInfo ); - // XCommandInfo methods. - // virtual uno::Sequence< css::ucb::CommandInfo > SAL_CALL CommandProcessorInfo::getCommands() @@ -364,11 +348,9 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) } - // Non-Interface methods. - void CommandProcessorInfo::reset() { osl::MutexGuard aGuard( m_aMutex ); @@ -377,7 +359,6 @@ void CommandProcessorInfo::reset() } - bool CommandProcessorInfo::queryCommand( const OUString& rName, css::ucb::CommandInfo& rCommand ) diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx index f4f708501cbb..948cc913ba84 100644 --- a/ucbhelper/source/provider/fd_inputstream.cxx +++ b/ucbhelper/source/provider/fd_inputstream.cxx @@ -93,7 +93,6 @@ namespace ucbhelper } - void SAL_CALL FdInputStream::skipBytes(sal_Int32 nBytesToSkip) throw(NotConnectedException, BufferSizeExceededException, @@ -109,7 +108,6 @@ namespace ucbhelper } - sal_Int32 SAL_CALL FdInputStream::available() throw(NotConnectedException, IOException, @@ -119,7 +117,6 @@ namespace ucbhelper } - void SAL_CALL FdInputStream::closeInput() throw(NotConnectedException, IOException, @@ -131,7 +128,6 @@ namespace ucbhelper } - void SAL_CALL FdInputStream::seek(sal_Int64 location) throw( IllegalArgumentException, IOException, @@ -146,7 +142,6 @@ namespace ucbhelper } - sal_Int64 SAL_CALL FdInputStream::getPosition( void ) @@ -163,7 +158,6 @@ namespace ucbhelper } - sal_Int64 SAL_CALL FdInputStream::getLength( void ) throw( diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index b3bf575d3e63..5df31a75c0aa 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; using namespace ucbhelper; - - // InteractionRequest Implementation. - - namespace ucbhelper { @@ -106,11 +102,9 @@ void InteractionRequest::setSelection( } - // XInterface methods. - // virtual void SAL_CALL InteractionRequest::acquire() throw() @@ -140,11 +134,9 @@ InteractionRequest::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -173,11 +165,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRequest::getTypes() } - // XInteractionRequest methods. - // virtual uno::Any SAL_CALL InteractionRequest::getRequest() throw( uno::RuntimeException, std::exception ) @@ -230,19 +220,12 @@ void InteractionContinuation::recordSelection() } - - // InteractionAbort Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionAbort::acquire() throw() @@ -274,11 +257,9 @@ InteractionAbort::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -307,11 +288,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionAbort::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionAbort::select() throw( uno::RuntimeException, std::exception ) @@ -320,19 +299,12 @@ void SAL_CALL InteractionAbort::select() } - - // InteractionRetry Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionRetry::acquire() throw() @@ -364,11 +336,9 @@ InteractionRetry::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -397,11 +367,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionRetry::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionRetry::select() throw( uno::RuntimeException, std::exception ) @@ -410,19 +378,12 @@ void SAL_CALL InteractionRetry::select() } - - // InteractionApprove Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionApprove::acquire() throw() @@ -454,11 +415,9 @@ InteractionApprove::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -487,11 +446,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionApprove::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionApprove::select() throw( uno::RuntimeException, std::exception ) @@ -500,19 +457,12 @@ void SAL_CALL InteractionApprove::select() } - - // InteractionDisapprove Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionDisapprove::acquire() throw() @@ -544,11 +494,9 @@ InteractionDisapprove::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId() throw( uno::RuntimeException, std::exception ) @@ -577,11 +525,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionDisapprove::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionDisapprove::select() throw( uno::RuntimeException, std::exception ) @@ -590,19 +536,12 @@ void SAL_CALL InteractionDisapprove::select() } - - // InteractionSupplyAuthentication Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionSupplyAuthentication::acquire() throw() @@ -635,11 +574,9 @@ InteractionSupplyAuthentication::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyAuthentication::getImplementationId() @@ -669,11 +606,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyAuthentication::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionSupplyAuthentication::select() throw( uno::RuntimeException, std::exception ) @@ -682,11 +617,9 @@ void SAL_CALL InteractionSupplyAuthentication::select() } - // XInteractionSupplyAuthentication methods. - // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canSetRealm() @@ -816,11 +749,9 @@ void SAL_CALL InteractionSupplyAuthentication::setRememberAccount( } - // XInteractionSupplyAuthentication2 methods. - // virtual sal_Bool SAL_CALL InteractionSupplyAuthentication::canUseSystemCredentials( @@ -842,20 +773,12 @@ void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials( } - - - // InteractionReplaceExistingData Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionReplaceExistingData::acquire() throw() @@ -887,11 +810,9 @@ InteractionReplaceExistingData::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionReplaceExistingData::getImplementationId() @@ -921,11 +842,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionReplaceExistingData::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionReplaceExistingData::select() throw( uno::RuntimeException, std::exception ) diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 9756dc24136e..142e14282b7e 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -48,11 +48,9 @@ namespace ucbhelper_impl { - // PropertyValue. - const sal_uInt32 NO_VALUE_SET = 0x00000000; const sal_uInt32 STRING_VALUE_SET = 0x00000001; const sal_uInt32 BOOLEAN_VALUE_SET = 0x00000002; @@ -127,11 +125,9 @@ class PropertyValues : public std::vector< ucbhelper_impl::PropertyValue > {}; } // namespace ucbhelper - // Welcome to the macro hell... - #define GETVALUE_IMPL_TYPE( _type_, _type_name_, _member_name_, _cppu_type_ ) \ \ osl::MutexGuard aGuard( m_aMutex ); \ @@ -236,14 +232,9 @@ class PropertyValues : public std::vector< ucbhelper_impl::PropertyValue > {}; namespace ucbhelper { - - // PropertyValueSet Implementation. - - - PropertyValueSet::PropertyValueSet( const Reference< XComponentContext >& rxContext ) : m_xContext( rxContext ), @@ -262,7 +253,6 @@ PropertyValueSet::~PropertyValueSet() } - // XInterface methods. void SAL_CALL PropertyValueSet::acquire() throw() @@ -290,18 +280,15 @@ css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( PropertyValueSet, XTypeProvider, XRow, XColumnLocate ); - // XRow methods. - // virtual sal_Bool SAL_CALL PropertyValueSet::wasNull() throw( SQLException, RuntimeException, std::exception ) @@ -593,11 +580,9 @@ Reference< XArray > SAL_CALL PropertyValueSet::getArray( sal_Int32 columnIndex ) } - // XColumnLocate methods. - // virtual sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName ) throw( SQLException, RuntimeException, std::exception ) @@ -617,11 +602,9 @@ sal_Int32 SAL_CALL PropertyValueSet::findColumn( const OUString& columnName ) } - // Non-interface methods. - const Reference< XTypeConverter >& PropertyValueSet::getTypeConverter() { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx index d13a7295c1f3..edd19b47d950 100644 --- a/ucbhelper/source/provider/registerucb.cxx +++ b/ucbhelper/source/provider/registerucb.cxx @@ -34,11 +34,9 @@ using namespace com::sun::star; namespace ucbhelper { - // registerAtUcb - bool registerAtUcb( uno::Reference< ucb::XContentProviderManager > const & rManager, diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 48a360961229..eccb3b503974 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -32,7 +32,6 @@ using namespace com::sun::star; - namespace ucbhelper_impl { @@ -76,11 +75,9 @@ static const PropertyInfo aPropertyTable[] = #define RESULTSET_PROPERTY_COUNT 2 - // class PropertySetInfo - class PropertySetInfo : public cppu::OWeakObject, public lang::XTypeProvider, @@ -140,11 +137,9 @@ namespace ucbhelper { - // struct ResultSet_Impl. - struct ResultSet_Impl { uno::Reference< uno::XComponentContext > m_xContext; @@ -193,13 +188,9 @@ inline ResultSet_Impl::~ResultSet_Impl() } - - // ResultSet Implementation. - - ResultSet::ResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const uno::Sequence< beans::Property >& rProperties, @@ -231,7 +222,6 @@ ResultSet::~ResultSet() } - // XInterface methods. void SAL_CALL ResultSet::acquire() @@ -266,7 +256,6 @@ css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType ) // XTypeProvider methods. - XTYPEPROVIDER_IMPL_9( ResultSet, lang::XTypeProvider, lang::XServiceInfo, @@ -279,21 +268,17 @@ XTYPEPROVIDER_IMPL_9( ResultSet, beans::XPropertySet ); - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( ResultSet, OUString("ResultSet"), RESULTSET_SERVICE_NAME ); - // XComponent methods. - // virtual void SAL_CALL ResultSet::dispose() throw( uno::RuntimeException, std::exception ) @@ -346,11 +331,9 @@ void SAL_CALL ResultSet::removeEventListener( } - // XResultSetMetaDataSupplier methods. - // virtual uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -365,11 +348,9 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSet::getMetaData() } - // XResultSet methods. - // virtual sal_Bool SAL_CALL ResultSet::next() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -767,11 +748,9 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSet::getStatement() } - // XRow methods. - // virtual sal_Bool SAL_CALL ResultSet::wasNull() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -1244,11 +1223,9 @@ ResultSet::getArray( sal_Int32 columnIndex ) } - // XCloseable methods. - // virtual void SAL_CALL ResultSet::close() throw( sdbc::SQLException, uno::RuntimeException, std::exception ) @@ -1258,11 +1235,9 @@ void SAL_CALL ResultSet::close() } - // XContentAccess methods. - // virtual OUString SAL_CALL ResultSet::queryContentIdentifierString() throw( uno::RuntimeException, std::exception ) @@ -1300,11 +1275,9 @@ ResultSet::queryContent() } - // XPropertySet methods. - // virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSet::getPropertySetInfo() @@ -1450,11 +1423,9 @@ void SAL_CALL ResultSet::removeVetoableChangeListener( } - // Non-interface methods. - void ResultSet::propertyChanged( const beans::PropertyChangeEvent& rEvt ) { if ( !m_pImpl->m_pPropertyChangeListeners ) @@ -1537,13 +1508,9 @@ ResultSet::getEnvironment() namespace ucbhelper_impl { - - // PropertySetInfo Implementation. - - PropertySetInfo::PropertySetInfo( const PropertyInfo* pProps, sal_Int32 nProps ) @@ -1577,7 +1544,6 @@ PropertySetInfo::~PropertySetInfo() } - // XInterface methods. void SAL_CALL PropertySetInfo::acquire() throw() @@ -1605,17 +1571,14 @@ css::uno::Any SAL_CALL PropertySetInfo::queryInterface( // XTypeProvider methods. - XTYPEPROVIDER_IMPL_2( PropertySetInfo, lang::XTypeProvider, beans::XPropertySetInfo ); - // XPropertySetInfo methods. - // virtual uno::Sequence< beans::Property > SAL_CALL PropertySetInfo::getProperties() throw( uno::RuntimeException, std::exception ) diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 4ed6a51fce54..98a3a09545f9 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -39,13 +39,9 @@ using namespace com::sun::star; - - // ResultSetImplHelper Implementation. - - namespace ucbhelper { @@ -68,7 +64,6 @@ ResultSetImplHelper::~ResultSetImplHelper() } - // XInterface methods. void SAL_CALL ResultSetImplHelper::acquire() throw() @@ -97,29 +92,24 @@ css::uno::Any SAL_CALL ResultSetImplHelper::queryInterface( const css::uno::Type // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( ResultSetImplHelper, lang::XTypeProvider, lang::XServiceInfo, css::ucb::XDynamicResultSet ); - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( ResultSetImplHelper, OUString( "ResultSetImplHelper" ), DYNAMICRESULTSET_SERVICE_NAME ); - // XComponent methods. - // virtual void SAL_CALL ResultSetImplHelper::dispose() throw( uno::RuntimeException, std::exception ) @@ -162,11 +152,9 @@ void SAL_CALL ResultSetImplHelper::removeEventListener( } - // XDynamicResultSet methods. - // virtual uno::Reference< sdbc::XResultSet > SAL_CALL ResultSetImplHelper::getStaticResultSet() @@ -274,11 +262,9 @@ void SAL_CALL ResultSetImplHelper::connectToCache( } - // Non-interface methods. - void ResultSetImplHelper::init( bool bStatic ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index e75b8d9c29c3..792000905b2d 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -75,13 +75,9 @@ using namespace ucbhelper_impl; namespace ucbhelper { - - // ResultSetMetaData Implementation. - - ResultSetMetaData::ResultSetMetaData( const Reference< XComponentContext >& rxContext, const Sequence< Property >& rProps, @@ -114,7 +110,6 @@ ResultSetMetaData::~ResultSetMetaData() } - // XInterface methods. void SAL_CALL ResultSetMetaData::acquire() @@ -142,17 +137,14 @@ css::uno::Any SAL_CALL ResultSetMetaData::queryInterface( const css::uno::Type & // XTypeProvider methods. - XTYPEPROVIDER_IMPL_2( ResultSetMetaData, XTypeProvider, XResultSetMetaData ); - // XResultSetMetaData methods. - // virtual sal_Int32 SAL_CALL ResultSetMetaData::getColumnCount() throw( SQLException, RuntimeException, std::exception ) -- cgit v1.2.3