diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:38:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 07:31:08 -0600 |
commit | 060ab521fa0d5d6b9fcb97eab4718c04e8aec944 (patch) | |
tree | 398b92af90dbe2130f45969d2fd86a0922c0e2b9 /ucb/source/ucp/file | |
parent | fdo#75526: sdk: install URE library symlinks / import libs again (diff) | |
download | core-060ab521fa0d5d6b9fcb97eab4718c04e8aec944.tar.gz core-060ab521fa0d5d6b9fcb97eab4718c04e8aec944.zip |
Remove visual noise from ucb
Conflicts:
ucb/source/ucp/webdav/webdavdatasupplier.cxx
ucb/source/ucp/webdav/webdavresponseparser.cxx
Change-Id: I96b69f4867bbaaf42c3d5fd159cbb3e4fe80a4db
Reviewed-on: https://gerrit.libreoffice.org/8329
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'ucb/source/ucp/file')
-rw-r--r-- | ucb/source/ucp/file/bc.cxx | 48 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinpstr.cxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/file/filinsreq.cxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 10 | ||||
-rw-r--r-- | ucb/source/ucp/file/filstr.cxx | 8 | ||||
-rw-r--r-- | ucb/source/ucp/file/prov.cxx | 24 | ||||
-rw-r--r-- | ucb/source/ucp/file/shell.cxx | 68 | ||||
-rw-r--r-- | ucb/source/ucp/file/shell.hxx | 4 |
8 files changed, 89 insertions, 89 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 738aaf039360..e5b92482203e 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -76,7 +76,7 @@ public: /* */ /****************************************************************************************/ -//////////////////////////////////////////////////////////////////////////////// + // Private Constructor for just inserted Contents BaseContent::BaseContent( shell* pMyShell, @@ -97,7 +97,7 @@ BaseContent::BaseContent( shell* pMyShell, } -//////////////////////////////////////////////////////////////////////////////// + // Constructor for full featured Contents BaseContent::BaseContent( shell* pMyShell, @@ -134,9 +134,9 @@ BaseContent::~BaseContent( ) } -////////////////////////////////////////////////////////////////////////// + // XInterface -////////////////////////////////////////////////////////////////////////// + void SAL_CALL BaseContent::acquire( void ) @@ -175,9 +175,9 @@ BaseContent::queryInterface( const Type& rType ) -////////////////////////////////////////////////////////////////////////////////////////// + // XComponent -//////////////////////////////////////////////////////////////////////////////////////// + void SAL_CALL BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener ) @@ -253,9 +253,9 @@ BaseContent::dispose() -////////////////////////////////////////////////////////////////////////////////////////// + // XServiceInfo -////////////////////////////////////////////////////////////////////////////////////////// + OUString SAL_CALL BaseContent::getImplementationName() @@ -289,9 +289,9 @@ BaseContent::getSupportedServiceNames() -////////////////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_10( BaseContent, lang::XComponent, @@ -306,9 +306,9 @@ XTYPEPROVIDER_IMPL_10( BaseContent, beans::XPropertySetInfoChangeNotifier ) -////////////////////////////////////////////////////////////////////////////////////////// + // XCommandProcessor -////////////////////////////////////////////////////////////////////////////////////////// + sal_Int32 SAL_CALL BaseContent::createCommandIdentifier( void ) @@ -493,9 +493,9 @@ BaseContent::removePropertiesChangeListener( const Sequence< OUString >& Propert } -///////////////////////////////////////////////////////////////////////////////////////// + // XContent -///////////////////////////////////////////////////////////////////////////////////////// + Reference< ucb::XContentIdentifier > SAL_CALL BaseContent::getIdentifier() @@ -584,9 +584,9 @@ BaseContent::removeContentEventListener( -//////////////////////////////////////////////////////////////////////////////// + // XPropertyContainer -//////////////////////////////////////////////////////////////////////////////// + void SAL_CALL @@ -622,9 +622,9 @@ BaseContent::removeProperty( m_pMyShell->deassociate( m_aUncPath, Name ); } -//////////////////////////////////////////////////////////////////////////////// + // XContentCreator -//////////////////////////////////////////////////////////////////////////////// + Sequence< ContentInfo > SAL_CALL BaseContent::queryCreatableContentsInfo( @@ -696,9 +696,9 @@ BaseContent::createNewContent( } -//////////////////////////////////////////////////////////////////////////////// + // XPropertySetInfoChangeNotifier -//////////////////////////////////////////////////////////////////////////////// + void SAL_CALL @@ -726,9 +726,9 @@ BaseContent::removePropertySetInfoChangeListener( } -//////////////////////////////////////////////////////////////////////////////// + // XChild -//////////////////////////////////////////////////////////////////////////////// + Reference< XInterface > SAL_CALL BaseContent::getParent( @@ -767,9 +767,9 @@ BaseContent::setParent( } -////////////////////////////////////////////////////////////////////////////////////////// + // Private Methods -////////////////////////////////////////////////////////////////////////////////////////// + Reference< XCommandInfo > SAL_CALL diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 15e0edb3ed1a..568909a7d323 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -86,9 +86,9 @@ sal_Int32 SAL_CALL XInputStream_impl::getMinorError() } -////////////////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_3( XInputStream_impl, diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 49a7dac823d7..8809360d3e39 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -67,9 +67,9 @@ XInteractionSupplyNameImpl::queryInterface( const Type& rType ) } -////////////////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_2( XInteractionSupplyNameImpl, XTypeProvider, @@ -106,9 +106,9 @@ XInteractionAbortImpl::queryInterface( const Type& rType ) } -////////////////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_2( XInteractionAbortImpl, XTypeProvider, @@ -166,9 +166,9 @@ XInteractionRequestImpl::queryInterface( const Type& rType ) } -////////////////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_2( XInteractionRequestImpl, XTypeProvider, diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index da370c4b617c..ae0878958279 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -661,7 +661,7 @@ XResultSet_impl::getStaticResultSet() return uno::Reference< sdbc::XResultSet >( this ); } -//========================================================================= + // virtual void SAL_CALL XResultSet_impl::setListener( @@ -676,9 +676,9 @@ XResultSet_impl::setListener( m_xListener = Listener; - ////////////////////////////////////////////////////////////////////// + // Create "welcome event" and send it to listener. - ////////////////////////////////////////////////////////////////////// + // Note: We only have the implementation for a static result set at the // moment (src590). The dynamic result sets passed to the listener @@ -701,7 +701,7 @@ XResultSet_impl::setListener( static_cast< cppu::OWeakObject * >( this ), aActions ) ); } -//========================================================================= + // virtual void SAL_CALL XResultSet_impl::connectToCache( @@ -741,7 +741,7 @@ XResultSet_impl::connectToCache( throw ucb::ServiceNotFoundException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >() ); } -//========================================================================= + // virtual sal_Int16 SAL_CALL XResultSet_impl::getCapabilities() diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 4f731d5a7617..2fa7da6822bb 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -76,9 +76,9 @@ XStream_impl::release( } -////////////////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_7( XStream_impl, @@ -186,9 +186,9 @@ void SAL_CALL XStream_impl::truncate(void) -//=========================================================================== + // XStream_impl private non interface methods -//=========================================================================== + sal_Int32 SAL_CALL XStream_impl::readBytes( diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 1945b5e0a020..60b79bda9e5f 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star::container; #define THROW_WHERE "" #endif -//========================================================================= + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { @@ -55,9 +55,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( reinterpret_cast< XMultiServiceFactory * >( pServiceManager ) ); Reference< XSingleServiceFactory > xFactory; - ////////////////////////////////////////////////////////////////////// + // File Content Provider. - ////////////////////////////////////////////////////////////////////// + if ( fileaccess::shell::getImplementationName_static(). equalsAscii( pImplName ) ) @@ -65,7 +65,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( xFactory = FileProvider::createServiceFactory( xSMgr ); } - ////////////////////////////////////////////////////////////////////// + if ( xFactory.is() ) { @@ -100,9 +100,9 @@ FileProvider::~FileProvider() } -////////////////////////////////////////////////////////////////////////// + // XInterface -////////////////////////////////////////////////////////////////////////// + void SAL_CALL FileProvider::acquire( @@ -139,7 +139,7 @@ FileProvider::queryInterface( return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -/////////////////////////////////////////////////////////////////////////////// + // XInitialization void SAL_CALL FileProvider::init() @@ -166,8 +166,8 @@ FileProvider::initialize( } -//////////////////////////////////////////////////////////////////////////////// -// + + // XTypeProvider methods. @@ -181,7 +181,7 @@ XTYPEPROVIDER_IMPL_7( FileProvider, XContentProvider ) -//////////////////////////////////////////////////////////////////////////////// + // XServiceInfo methods. OUString SAL_CALL @@ -256,9 +256,9 @@ FileProvider::CreateInstance( -//////////////////////////////////////////////////////////////////////////////// + // XContent -//////////////////////////////////////////////////////////////////////////////// + Reference< XContent > SAL_CALL diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 12bd57abcf52..63fb3887d812 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -115,7 +115,7 @@ shell::UnqPathData::~UnqPathData() -//////////////////////////////////////////////////////////////////////////////////////// + @@ -413,10 +413,10 @@ shell::~shell() /* */ /*********************************************************************************/ -// + // This two methods register and deregister a change listener for the content belonging // to URL aUnqPath -// + void SAL_CALL shell::registerNotifier( const OUString& aUnqPath, Notifier* pNotifier ) @@ -464,11 +464,11 @@ shell::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) /* de/associate-Implementation */ /* */ /*********************************************************************************/ -// + // Used to associate and deassociate a new property with // the content belonging to URL UnqPath. // The default value and the attributes are input -// + void SAL_CALL shell::associate( const OUString& aUnqPath, @@ -568,10 +568,10 @@ shell::deassociate( const OUString& aUnqPath, /* page-Implementation */ /* */ /*********************************************************************************/ -// + // Given an xOutputStream, this method writes the content of the file belonging to // URL aUnqPath into the XOutputStream -// + void SAL_CALL shell::page( sal_Int32 CommandId, @@ -659,9 +659,9 @@ void SAL_CALL shell::page( sal_Int32 CommandId, /* open-Implementation */ /* */ /*********************************************************************************/ -// + // Given a file URL aUnqPath, this methods returns a XInputStream which reads from the open file. -// + uno::Reference< io::XInputStream > SAL_CALL @@ -695,10 +695,10 @@ shell::open( sal_Int32 CommandId, /* open for read/write access-Implementation */ /* */ /*********************************************************************************/ -// + // Given a file URL aUnqPath, this methods returns a XStream which can be used // to read and write from/to the file. -// + uno::Reference< io::XStream > SAL_CALL @@ -730,10 +730,10 @@ shell::open_rw( sal_Int32 CommandId, /* ls-Implementation */ /* */ /*********************************************************************************/ -// + // This method returns the result set containing the children of the directory belonging // to file URL aUnqPath -// + uno::Reference< XDynamicResultSet > SAL_CALL @@ -806,9 +806,9 @@ shell::info_p( const OUString& aUnqPath ) /* setv-Implementation */ /* */ /*********************************************************************************/ -// + // Sets the values of the properties belonging to fileURL aUnqPath -// + uno::Sequence< uno::Any > SAL_CALL @@ -1041,10 +1041,10 @@ shell::setv( const OUString& aUnqPath, /* getv-Implementation */ /* */ /*********************************************************************************/ -// + // Reads the values of the properties belonging to fileURL aUnqPath; // Returns an XRow object containing the values in the requested order. -// + uno::Reference< sdbc::XRow > SAL_CALL @@ -1110,9 +1110,9 @@ shell::getv( sal_Int32 CommandId, /* move-implementation */ /* */ /********************************************************************************/ -// + // Moves the content belonging to fileURL srcUnqPath to fileURL dstUnqPath. -// + void SAL_CALL shell::move( sal_Int32 CommandId, @@ -1125,7 +1125,7 @@ shell::move( sal_Int32 CommandId, // srcUnqPath and dstUnqPathIn are equal if( srcUnqPath == dstUnqPathIn ) return; - // + osl::FileBase::RC nError; OUString dstUnqPath( dstUnqPathIn ); @@ -1296,9 +1296,9 @@ shell::move( sal_Int32 CommandId, /* copy-implementation */ /* */ /********************************************************************************/ -// + // Copies the content belonging to fileURL srcUnqPath to fileURL dstUnqPath ( files and directories ) -// + namespace { @@ -1493,10 +1493,10 @@ shell::copy( /* remove-implementation */ /* */ /********************************************************************************/ -// + // Deletes the content belonging to fileURL aUnqPath( recursively in case of directory ) // Return: success of operation -// + sal_Bool SAL_CALL @@ -1658,10 +1658,10 @@ shell::remove( sal_Int32 CommandId, /* mkdir-implementation */ /* */ /********************************************************************************/ -// + // Creates new directory with given URL, recursively if necessary // Return:: success of operation -// + sal_Bool SAL_CALL shell::mkdir( sal_Int32 CommandId, @@ -1718,11 +1718,11 @@ shell::mkdir( sal_Int32 CommandId, /* mkfil-implementation */ /* */ /********************************************************************************/ -// + // Creates new file with given URL. // The content of aInputStream becomes the content of the file // Return:: success of operation -// + sal_Bool SAL_CALL shell::mkfil( sal_Int32 CommandId, @@ -1750,11 +1750,11 @@ shell::mkfil( sal_Int32 CommandId, /* write-implementation */ /* */ /********************************************************************************/ -// + // writes to the file with given URL. // The content of aInputStream becomes the content of the file // Return:: success of operation -// + sal_Bool SAL_CALL shell::write( sal_Int32 CommandId, @@ -2149,11 +2149,11 @@ sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, -// + // Given a sequence of properties seq, this method determines the mask // used to instantiate a osl::FileStatus, so that a call to // osl::DirectoryItem::getFileStatus fills the required fields. -// + void SAL_CALL @@ -2195,10 +2195,10 @@ shell::getMaskFromProperties( /* load-Implementation */ /* */ /*********************************************************************************/ -// + // Load the properties from configuration, if create == true create them. // The Properties are stored under the url belonging to it->first. -// + void SAL_CALL shell::load( const ContentMap::iterator& it, sal_Bool create ) diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 7228fbba2d01..8fe5644728bb 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -197,10 +197,10 @@ namespace fileaccess { - // + // Every method having a command id is not allowed to throw anything, // but instead must install every error code in the task handler - // + /** |