summaryrefslogtreecommitdiffstats
path: root/ucb/source/ucp/file
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/file')
-rw-r--r--ucb/source/ucp/file/bc.cxx18
-rw-r--r--ucb/source/ucp/file/bc.hxx18
-rw-r--r--ucb/source/ucp/file/filinl.hxx16
-rw-r--r--ucb/source/ucp/file/filinpstr.hxx4
-rw-r--r--ucb/source/ucp/file/filnot.cxx4
-rw-r--r--ucb/source/ucp/file/filnot.hxx4
-rw-r--r--ucb/source/ucp/file/filrset.cxx2
-rw-r--r--ucb/source/ucp/file/filrset.hxx6
-rw-r--r--ucb/source/ucp/file/filstr.cxx2
-rw-r--r--ucb/source/ucp/file/filstr.hxx6
-rw-r--r--ucb/source/ucp/file/filtask.cxx80
-rw-r--r--ucb/source/ucp/file/filtask.hxx110
-rw-r--r--ucb/source/ucp/file/prov.cxx4
-rw-r--r--ucb/source/ucp/file/prov.hxx4
14 files changed, 139 insertions, 139 deletions
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index b975159895cc..9f9203166d2a 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -702,7 +702,7 @@ BaseContent::setParent(
// Private Methods
-Reference< XCommandInfo > SAL_CALL
+Reference< XCommandInfo >
BaseContent::getCommandInfo()
{
if( m_nState & Deleted )
@@ -712,7 +712,7 @@ BaseContent::getCommandInfo()
}
-Reference< beans::XPropertySetInfo > SAL_CALL
+Reference< beans::XPropertySetInfo >
BaseContent::getPropertySetInfo()
{
if( m_nState & Deleted )
@@ -721,7 +721,7 @@ BaseContent::getPropertySetInfo()
return m_pMyShell->info_p( m_aUncPath );
}
-Reference< sdbc::XRow > SAL_CALL
+Reference< sdbc::XRow >
BaseContent::getPropertyValues(
sal_Int32 nMyCommandIdentifier,
const Sequence< beans::Property >& PropertySet )
@@ -773,7 +773,7 @@ BaseContent::getPropertyValues(
}
-Sequence< Any > SAL_CALL
+Sequence< Any >
BaseContent::setPropertyValues(
sal_Int32 nMyCommandIdentifier,
const Sequence< beans::PropertyValue >& Values )
@@ -908,7 +908,7 @@ BaseContent::setPropertyValues(
}
-Reference< XDynamicResultSet > SAL_CALL
+Reference< XDynamicResultSet >
BaseContent::open(
sal_Int32 nMyCommandIdentifier,
const OpenCommandArgument2& aCommandArgument )
@@ -984,7 +984,7 @@ BaseContent::open(
}
-void SAL_CALL
+void
BaseContent::deleteContent( sal_Int32 nMyCommandIdentifier )
{
if( m_nState & Deleted )
@@ -998,7 +998,7 @@ BaseContent::deleteContent( sal_Int32 nMyCommandIdentifier )
}
-void SAL_CALL
+void
BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
const TransferInfo& aTransferInfo )
{
@@ -1068,7 +1068,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
}
-void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
+void BaseContent::insert( sal_Int32 nMyCommandIdentifier,
const InsertCommandArgument& aInsertArgument )
{
if( m_nState & FullFeatured )
@@ -1185,7 +1185,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
}
-void SAL_CALL BaseContent::endTask( sal_Int32 CommandId )
+void BaseContent::endTask( sal_Int32 CommandId )
{
// This is the only function allowed to throw an exception
m_pMyShell->endTask( CommandId,m_aUncPath,this );
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 92c52389c4a7..09ed60c34e37 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -240,42 +240,42 @@ namespace fileaccess {
// Private Methods
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL
+ css::uno::Reference< css::ucb::XCommandInfo >
getCommandInfo();
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+ css::uno::Reference< css::beans::XPropertySetInfo >
getPropertySetInfo();
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::sdbc::XRow > SAL_CALL
+ css::uno::Reference< css::sdbc::XRow >
getPropertyValues(
sal_Int32 nMyCommandIdentifier,
const css::uno::Sequence< css::beans::Property >& PropertySet );
- css::uno::Sequence< css::uno::Any > SAL_CALL
+ css::uno::Sequence< css::uno::Any >
setPropertyValues(
sal_Int32 nMyCommandIdentifier,
const css::uno::Sequence< css::beans::PropertyValue >& Values );
- css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL
+ css::uno::Reference< css::ucb::XDynamicResultSet >
open(
sal_Int32 nMyCommandIdentifier,
const css::ucb::OpenCommandArgument2& aCommandArgument );
- void SAL_CALL
+ void
deleteContent( sal_Int32 nMyCommandIdentifier );
- void SAL_CALL
+ void
transfer( sal_Int32 nMyCommandIdentifier,
const css::ucb::TransferInfo& aTransferInfo );
- void SAL_CALL
+ void
insert( sal_Int32 nMyCommandIdentifier,
const css::ucb::InsertCommandArgument& aInsertArgument );
- void SAL_CALL endTask( sal_Int32 CommandId );
+ void endTask( sal_Int32 CommandId );
friend class ContentEventNotifier;
};
diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index 5292515ab883..ffa5ed19ac70 100644
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.hxx
@@ -19,35 +19,35 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
#define INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
-inline const bool& SAL_CALL TaskManager::MyProperty::IsNative() const
+inline const bool& TaskManager::MyProperty::IsNative() const
{
return isNative;
}
-inline const sal_Int32& SAL_CALL TaskManager::MyProperty::getHandle() const
+inline const sal_Int32& TaskManager::MyProperty::getHandle() const
{
return Handle;
}
-inline const css::uno::Type& SAL_CALL TaskManager::MyProperty::getType() const
+inline const css::uno::Type& TaskManager::MyProperty::getType() const
{
return Typ;
}
-inline const css::uno::Any& SAL_CALL TaskManager::MyProperty::getValue() const
+inline const css::uno::Any& TaskManager::MyProperty::getValue() const
{
return Value;
}
-inline const css::beans::PropertyState& SAL_CALL TaskManager::MyProperty::getState() const
+inline const css::beans::PropertyState& TaskManager::MyProperty::getState() const
{
return State;
}
-inline const sal_Int16& SAL_CALL TaskManager::MyProperty::getAttributes() const
+inline const sal_Int16& TaskManager::MyProperty::getAttributes() const
{
return Attributes;
}
-inline void SAL_CALL TaskManager::MyProperty::setValue( const css::uno::Any& theValue ) const
+inline void TaskManager::MyProperty::setValue( const css::uno::Any& theValue ) const
{
const_cast<MyProperty*>(this)->Value = theValue;
}
-inline void SAL_CALL TaskManager::MyProperty::setState( const css::beans::PropertyState& theState ) const
+inline void TaskManager::MyProperty::setState( const css::beans::PropertyState& theState ) const
{
const_cast<MyProperty*>(this)->State = theState;
}
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 4e2c622e82b9..92cfb12f134a 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -50,8 +50,8 @@ namespace fileaccess {
* Returns an error code as given by filerror.hxx
*/
- sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;}
- sal_Int32 SAL_CALL getMinorError() { return m_nMinorErrorCode;}
+ sal_Int32 CtorSuccess() { return m_nErrorCode;}
+ sal_Int32 getMinorError() { return m_nMinorErrorCode;}
// XTypeProvider
diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx
index 9587755866ad..de5168617d19 100644
--- a/ucb/source/ucp/file/filnot.cxx
+++ b/ucb/source/ucp/file/filnot.cxx
@@ -154,7 +154,7 @@ PropertySetInfoChangeNotifier::PropertySetInfoChangeNotifier(
}
-void SAL_CALL
+void
PropertySetInfoChangeNotifier::notifyPropertyAdded( const OUString & aPropertyName )
{
beans::PropertySetInfoChangeEvent aEvt( m_xCreatorContent,
@@ -171,7 +171,7 @@ PropertySetInfoChangeNotifier::notifyPropertyAdded( const OUString & aPropertyNa
}
-void SAL_CALL
+void
PropertySetInfoChangeNotifier::notifyPropertyRemoved( const OUString & aPropertyName )
{
beans::PropertySetInfoChangeEvent aEvt( m_xCreatorContent,
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index c1f9555cba15..4a03080ab75d 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -72,8 +72,8 @@ namespace fileaccess {
const css::uno::Reference< css::ucb::XContent >& xCreatorContent,
const std::vector< css::uno::Reference< css::uno::XInterface > >& sListeners );
- void SAL_CALL notifyPropertyAdded( const OUString & aPropertyName );
- void SAL_CALL notifyPropertyRemoved( const OUString & aPropertyName );
+ void notifyPropertyAdded( const OUString & aPropertyName );
+ void notifyPropertyRemoved( const OUString & aPropertyName );
};
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index 653ba85777c3..81dd63afaea8 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -202,7 +202,7 @@ void XResultSet_impl::isFinalChanged()
}
-bool SAL_CALL
+bool
XResultSet_impl::OneMore()
{
if( ! m_nIsOpen )
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 3c2769ac2ecb..87faa5dff7b7 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -86,8 +86,8 @@ class XResultSet_impl : public Notifier,
return nullptr;
}
- sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;}
- sal_Int32 SAL_CALL getMinorError() { return m_nMinorErrorCode;}
+ sal_Int32 CtorSuccess() { return m_nErrorCode;}
+ sal_Int32 getMinorError() { return m_nMinorErrorCode;}
// XEventListener
virtual void SAL_CALL
@@ -453,7 +453,7 @@ class XResultSet_impl : public Notifier,
// Methods
/// @throws css::sdbc::SQLException
/// @throws css::uno::RuntimeException
- bool SAL_CALL OneMore();
+ bool OneMore();
void rowCountChanged();
void isFinalChanged();
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 68c40a2cb6f3..40dd928da6b6 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -189,7 +189,7 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData )
}
-void SAL_CALL
+void
XStream_impl::closeStream()
{
if( m_nIsOpen )
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index f04968f14214..adad07239928 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -55,8 +55,8 @@ class XStream_impl : public cppu::WeakImplHelper<
* Returns an error code as given by filerror.hxx
*/
- sal_Int32 SAL_CALL CtorSuccess() { return m_nErrorCode;}
- sal_Int32 SAL_CALL getMinorError() { return m_nMinorErrorCode;}
+ sal_Int32 CtorSuccess() { return m_nErrorCode;}
+ sal_Int32 getMinorError() { return m_nMinorErrorCode;}
virtual ~XStream_impl() override;
@@ -139,7 +139,7 @@ class XStream_impl : public cppu::WeakImplHelper<
/// @throws css::io::NotConnectedException
/// @throws css::io::IOException
/// @throws css::uno::RuntimeException
- void SAL_CALL
+ void
closeStream();
};
diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 9b49b26c5be7..738628a8e495 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -398,7 +398,7 @@ TaskManager::~TaskManager()
}
-void SAL_CALL
+void
TaskManager::startTask(
sal_Int32 CommandId,
const uno::Reference< XCommandEnvironment >& xCommandEnv )
@@ -413,7 +413,7 @@ TaskManager::startTask(
}
-void SAL_CALL
+void
TaskManager::endTask( sal_Int32 CommandId,
const OUString& aUncPath,
BaseContent* pContent)
@@ -443,7 +443,7 @@ TaskManager::endTask( sal_Int32 CommandId,
}
-void SAL_CALL
+void
TaskManager::abort( sal_Int32 CommandId )
{
if( CommandId )
@@ -458,7 +458,7 @@ TaskManager::abort( sal_Int32 CommandId )
}
-void SAL_CALL TaskManager::clearError( sal_Int32 CommandId )
+void TaskManager::clearError( sal_Int32 CommandId )
{
osl::MutexGuard aGuard( m_aMutex );
TaskMap::iterator it = m_aTaskMap.find( CommandId );
@@ -467,7 +467,7 @@ void SAL_CALL TaskManager::clearError( sal_Int32 CommandId )
}
-void SAL_CALL TaskManager::retrieveError( sal_Int32 CommandId,
+void TaskManager::retrieveError( sal_Int32 CommandId,
sal_Int32 &ErrorCode,
sal_Int32 &minorCode)
{
@@ -481,7 +481,7 @@ void SAL_CALL TaskManager::retrieveError( sal_Int32 CommandId,
}
-void SAL_CALL TaskManager::installError( sal_Int32 CommandId,
+void TaskManager::installError( sal_Int32 CommandId,
sal_Int32 ErrorCode,
sal_Int32 MinorCode )
{
@@ -492,7 +492,7 @@ void SAL_CALL TaskManager::installError( sal_Int32 CommandId,
}
-sal_Int32 SAL_CALL
+sal_Int32
TaskManager::getCommandId()
{
osl::MutexGuard aGuard( m_aMutex );
@@ -500,7 +500,7 @@ TaskManager::getCommandId()
}
-void SAL_CALL TaskManager::handleTask(
+void TaskManager::handleTask(
sal_Int32 CommandId,
const uno::Reference< task::XInteractionRequest >& request )
{
@@ -527,7 +527,7 @@ void SAL_CALL TaskManager::handleTask(
// to URL aUnqPath
-void SAL_CALL
+void
TaskManager::registerNotifier( const OUString& aUnqPath, Notifier* pNotifier )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -550,7 +550,7 @@ TaskManager::registerNotifier( const OUString& aUnqPath, Notifier* pNotifier )
}
-void SAL_CALL
+void
TaskManager::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -577,7 +577,7 @@ TaskManager::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier )
// The default value and the attributes are input
-void SAL_CALL
+void
TaskManager::associate( const OUString& aUnqPath,
const OUString& PropertyName,
const uno::Any& DefaultValue,
@@ -616,7 +616,7 @@ TaskManager::associate( const OUString& aUnqPath,
}
-void SAL_CALL
+void
TaskManager::deassociate( const OUString& aUnqPath,
const OUString& PropertyName )
{
@@ -670,7 +670,7 @@ TaskManager::deassociate( const OUString& aUnqPath,
// URL aUnqPath into the XOutputStream
-void SAL_CALL TaskManager::page( sal_Int32 CommandId,
+void TaskManager::page( sal_Int32 CommandId,
const OUString& aUnqPath,
const uno::Reference< io::XOutputStream >& xOutputStream )
{
@@ -757,7 +757,7 @@ void SAL_CALL TaskManager::page( sal_Int32 CommandId,
// Given a file URL aUnqPath, this methods returns a XInputStream which reads from the open file.
-uno::Reference< io::XInputStream > SAL_CALL
+uno::Reference< io::XInputStream >
TaskManager::open( sal_Int32 CommandId,
const OUString& aUnqPath,
bool bLock )
@@ -790,7 +790,7 @@ TaskManager::open( sal_Int32 CommandId,
// to read and write from/to the file.
-uno::Reference< io::XStream > SAL_CALL
+uno::Reference< io::XStream >
TaskManager::open_rw( sal_Int32 CommandId,
const OUString& aUnqPath,
bool bLock )
@@ -822,7 +822,7 @@ TaskManager::open_rw( sal_Int32 CommandId,
// to file URL aUnqPath
-uno::Reference< XDynamicResultSet > SAL_CALL
+uno::Reference< XDynamicResultSet >
TaskManager::ls( sal_Int32 CommandId,
const OUString& aUnqPath,
const sal_Int32 OpenMode,
@@ -854,7 +854,7 @@ TaskManager::ls( sal_Int32 CommandId,
/*********************************************************************************/
// Info for commands
-uno::Reference< XCommandInfo > SAL_CALL
+uno::Reference< XCommandInfo >
TaskManager::info_c()
{
XCommandInfo_impl* p = new XCommandInfo_impl( this );
@@ -869,7 +869,7 @@ TaskManager::info_c()
/*********************************************************************************/
// Info for the properties
-uno::Reference< beans::XPropertySetInfo > SAL_CALL
+uno::Reference< beans::XPropertySetInfo >
TaskManager::info_p( const OUString& aUnqPath )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -887,7 +887,7 @@ TaskManager::info_p( const OUString& aUnqPath )
// Sets the values of the properties belonging to fileURL aUnqPath
-uno::Sequence< uno::Any > SAL_CALL
+uno::Sequence< uno::Any >
TaskManager::setv( const OUString& aUnqPath,
const uno::Sequence< beans::PropertyValue >& values )
{
@@ -1118,7 +1118,7 @@ TaskManager::setv( const OUString& aUnqPath,
// Returns an XRow object containing the values in the requested order.
-uno::Reference< sdbc::XRow > SAL_CALL
+uno::Reference< sdbc::XRow >
TaskManager::getv( sal_Int32 CommandId,
const OUString& aUnqPath,
const uno::Sequence< beans::Property >& properties )
@@ -1184,7 +1184,7 @@ TaskManager::getv( sal_Int32 CommandId,
// Moves the content belonging to fileURL srcUnqPath to fileURL dstUnqPath.
-void SAL_CALL
+void
TaskManager::move( sal_Int32 CommandId,
const OUString& srcUnqPath,
const OUString& dstUnqPathIn,
@@ -1392,7 +1392,7 @@ bool getType(
}
-void SAL_CALL
+void
TaskManager::copy(
sal_Int32 CommandId,
const OUString& srcUnqPath,
@@ -1564,7 +1564,7 @@ TaskManager::copy(
// Return: success of operation
-bool SAL_CALL
+bool
TaskManager::remove( sal_Int32 CommandId,
const OUString& aUnqPath,
FileUrlType IsWhat,
@@ -1726,7 +1726,7 @@ TaskManager::remove( sal_Int32 CommandId,
// Return:: success of operation
-bool SAL_CALL
+bool
TaskManager::mkdir( sal_Int32 CommandId,
const OUString& rUnqPath,
bool OverWrite )
@@ -1786,7 +1786,7 @@ TaskManager::mkdir( sal_Int32 CommandId,
// Return:: success of operation
-bool SAL_CALL
+bool
TaskManager::mkfil( sal_Int32 CommandId,
const OUString& aUnqPath,
bool Overwrite,
@@ -1817,7 +1817,7 @@ TaskManager::mkfil( sal_Int32 CommandId,
// Return:: success of operation
-bool SAL_CALL
+bool
TaskManager::write( sal_Int32 CommandId,
const OUString& aUnqPath,
bool OverWrite,
@@ -1977,7 +1977,7 @@ TaskManager::write( sal_Int32 CommandId,
/*********************************************************************************/
-void SAL_CALL TaskManager::insertDefaultProperties( const OUString& aUnqPath )
+void TaskManager::insertDefaultProperties( const OUString& aUnqPath )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -2040,7 +2040,7 @@ bool SAL_CALL TaskManager::getUrlFromUnq( const OUString& Unq,OUString& Url )
// Helper function for public copy
-osl::FileBase::RC SAL_CALL
+osl::FileBase::RC
TaskManager::copy_recursive( const OUString& srcUnqPath,
const OUString& dstUnqPath,
FileUrlType TypeToCopy,
@@ -2112,7 +2112,7 @@ TaskManager::copy_recursive( const OUString& srcUnqPath,
// returns success of the operation
-bool SAL_CALL TaskManager::ensuredir( sal_Int32 CommandId,
+bool TaskManager::ensuredir( sal_Int32 CommandId,
const OUString& rUnqPath,
sal_Int32 errorCode )
{
@@ -2198,7 +2198,7 @@ bool SAL_CALL TaskManager::ensuredir( sal_Int32 CommandId,
// osl::DirectoryItem::getFileStatus fills the required fields.
-void SAL_CALL
+void
TaskManager::getMaskFromProperties(
sal_Int32& n_Mask,
const uno::Sequence< beans::Property >& seq )
@@ -2241,7 +2241,7 @@ TaskManager::getMaskFromProperties(
// The Properties are stored under the url belonging to it->first.
-void SAL_CALL
+void
TaskManager::load( const ContentMap::iterator& it, bool create )
{
if( ! it->second.properties )
@@ -2299,7 +2299,7 @@ TaskManager::load( const ContentMap::iterator& it, bool create )
// setting of file properties which properties have changed without filestat
-void SAL_CALL
+void
TaskManager::commit( const TaskManager::ContentMap::iterator& it,
const osl::FileStatus& aFileStatus )
{
@@ -2519,7 +2519,7 @@ TaskManager::commit( const TaskManager::ContentMap::iterator& it,
// directoryitem, which is returned by osl::DirectoryItem::getNextItem()
-bool SAL_CALL
+bool
TaskManager::getv(
Notifier* pNotifier,
const uno::Sequence< beans::Property >& properties,
@@ -2604,7 +2604,7 @@ TaskManager::getv(
// EventListener
-std::vector< ContentEventNotifier* >* SAL_CALL
+std::vector< ContentEventNotifier* >*
TaskManager::getContentEventListeners( const OUString& aName )
{
std::vector< ContentEventNotifier* >* p = new std::vector< ContentEventNotifier* >;
@@ -2627,7 +2627,7 @@ TaskManager::getContentEventListeners( const OUString& aName )
}
-std::vector< ContentEventNotifier* >* SAL_CALL
+std::vector< ContentEventNotifier* >*
TaskManager::getContentDeletedEventListeners( const OUString& aName )
{
std::vector< ContentEventNotifier* >* p = new std::vector< ContentEventNotifier* >;
@@ -2693,7 +2693,7 @@ TaskManager::notifyContentRemoved( std::vector< ContentEventNotifier* >* listene
}
-std::vector< PropertySetInfoChangeNotifier* >* SAL_CALL
+std::vector< PropertySetInfoChangeNotifier* >*
TaskManager::getPropertySetListeners( const OUString& aName )
{
std::vector< PropertySetInfoChangeNotifier* >* p = new std::vector< PropertySetInfoChangeNotifier* >;
@@ -2746,7 +2746,7 @@ TaskManager::notifyPropertyRemoved( std::vector< PropertySetInfoChangeNotifier*
}
-std::vector< std::vector< ContentEventNotifier* >* >* SAL_CALL
+std::vector< std::vector< ContentEventNotifier* >* >*
TaskManager::getContentExchangedEventListeners( const OUString& aOldPrefix,
const OUString& aNewPrefix,
bool withChildren )
@@ -2862,7 +2862,7 @@ TaskManager::notifyContentExchanged( std::vector< std::vector< ContentEventNotif
}
-std::vector< PropertyChangeNotifier* >* SAL_CALL
+std::vector< PropertyChangeNotifier* >*
TaskManager::getPropertyChangeNotifier( const OUString& aName )
{
std::vector< PropertyChangeNotifier* >* p = new std::vector< PropertyChangeNotifier* >;
@@ -2903,7 +2903,7 @@ void SAL_CALL TaskManager::notifyPropertyChanges( std::vector< PropertyChangeNot
/* remove persistent propertyset */
/********************************************************************************/
-void SAL_CALL
+void
TaskManager::erasePersistentSet( const OUString& aUnqPath,
bool withChildren )
{
@@ -2963,7 +2963,7 @@ TaskManager::erasePersistentSet( const OUString& aUnqPath,
/********************************************************************************/
-void SAL_CALL
+void
TaskManager::copyPersistentSet( const OUString& srcUnqPath,
const OUString& dstUnqPath,
bool withChildren )
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index a08355744d26..73d85afaeca1 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -107,7 +107,7 @@ namespace fileaccess
{
}
- void SAL_CALL abort()
+ void abort()
{
m_bAbort = true;
}
@@ -128,24 +128,24 @@ namespace fileaccess
m_nMinorCode = TASKHANDLER_NO_ERROR;
}
- void SAL_CALL installError( sal_Int32 nErrorCode,
+ void installError( sal_Int32 nErrorCode,
sal_Int32 nMinorCode )
{
m_nErrorCode = nErrorCode;
m_nMinorCode = nMinorCode;
}
- sal_Int32 SAL_CALL getInstalledError()
+ sal_Int32 getInstalledError()
{
return m_nErrorCode;
}
- sal_Int32 SAL_CALL getMinorErrorCode()
+ sal_Int32 getMinorErrorCode()
{
return m_nMinorCode;
}
- css::uno::Reference< css::task::XInteractionHandler > const & SAL_CALL
+ css::uno::Reference< css::task::XInteractionHandler > const &
getInteractionHandler()
{
if( ! m_xInteractionHandler.is() && m_xCommandEnvironment.is() )
@@ -154,7 +154,7 @@ namespace fileaccess
return m_xInteractionHandler;
}
- const css::uno::Reference< css::ucb::XCommandEnvironment >& SAL_CALL
+ const css::uno::Reference< css::ucb::XCommandEnvironment >&
getCommandEnvironment()
{
return m_xCommandEnvironment;
@@ -193,17 +193,17 @@ namespace fileaccess
sal_Int16 theAttributes );
~MyProperty();
- inline const bool& SAL_CALL IsNative() const;
- const OUString& SAL_CALL getPropertyName() const { return PropertyName; }
- inline const sal_Int32& SAL_CALL getHandle() const;
- inline const css::uno::Type& SAL_CALL getType() const;
- inline const css::uno::Any& SAL_CALL getValue() const;
- inline const css::beans::PropertyState& SAL_CALL getState() const;
- inline const sal_Int16& SAL_CALL getAttributes() const;
+ inline const bool& IsNative() const;
+ const OUString& getPropertyName() const { return PropertyName; }
+ inline const sal_Int32& getHandle() const;
+ inline const css::uno::Type& getType() const;
+ inline const css::uno::Any& getValue() const;
+ inline const css::beans::PropertyState& getState() const;
+ inline const sal_Int16& getAttributes() const;
// The set* functions are declared const, because the key of "this" stays intact
- inline void SAL_CALL setValue( const css::uno::Any& theValue ) const;
- inline void SAL_CALL setState( const css::beans::PropertyState& theState ) const;
+ inline void setValue( const css::uno::Any& theValue ) const;
+ inline void setState( const css::beans::PropertyState& theState ) const;
};
struct eMyProperty
@@ -250,12 +250,12 @@ namespace fileaccess
~TaskManager();
/// @throws css::ucb::DuplicateCommandIdentifierException
- void SAL_CALL startTask(
+ void startTask(
sal_Int32 CommandId,
const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv );
- sal_Int32 SAL_CALL getCommandId();
- void SAL_CALL abort( sal_Int32 CommandId );
+ sal_Int32 getCommandId();
+ void abort( sal_Int32 CommandId );
/**
@@ -264,11 +264,11 @@ namespace fileaccess
* The minor code refines the information given in ErrorCode.
*/
- void SAL_CALL installError( sal_Int32 CommandId,
+ void installError( sal_Int32 CommandId,
sal_Int32 ErrorCode,
sal_Int32 minorCode = TASKHANDLER_NO_ERROR );
- void SAL_CALL retrieveError( sal_Int32 CommandId,
+ void retrieveError( sal_Int32 CommandId,
sal_Int32 &ErrorCode,
sal_Int32 &minorCode);
@@ -277,7 +277,7 @@ namespace fileaccess
* "endTask" throws in case an error code is set the corresponding exception.
*/
- void SAL_CALL endTask( sal_Int32 CommandId,
+ void endTask( sal_Int32 CommandId,
// the physical URL of the object
const OUString& aUnqPath,
BaseContent* pContent);
@@ -287,23 +287,23 @@ namespace fileaccess
* Handles an interactionrequest
*/
- void SAL_CALL handleTask( sal_Int32 CommandId,
+ void handleTask( sal_Int32 CommandId,
const css::uno::Reference< css::task::XInteractionRequest >& request );
/**
* Clears any error which are set on the commandid
*/
- void SAL_CALL clearError( sal_Int32 );
+ void clearError( sal_Int32 );
/**
* This two methods register and deregister a change listener for the content belonging
* to URL aUnqPath
*/
- void SAL_CALL registerNotifier( const OUString& aUnqPath,Notifier* pNotifier );
+ void registerNotifier( const OUString& aUnqPath,Notifier* pNotifier );
- void SAL_CALL deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier );
+ void deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier );
/**
@@ -316,7 +316,7 @@ namespace fileaccess
* @throws css::uno::RuntimeException
*/
- void SAL_CALL associate( const OUString& UnqPath,
+ void associate( const OUString& UnqPath,
const OUString& PropertyName,
const css::uno::Any& DefaultValue,
const sal_Int16 Attributes );
@@ -324,7 +324,7 @@ namespace fileaccess
/// @throws css::beans::UnknownPropertyException
/// @throws css::beans::NotRemoveableException
/// @throws css::uno::RuntimeException
- void SAL_CALL deassociate( const OUString& UnqPath,
+ void deassociate( const OUString& UnqPath,
const OUString& PropertyName );
@@ -337,7 +337,7 @@ namespace fileaccess
* URL aUnqPath into the XOutputStream
*/
- void SAL_CALL page( sal_Int32 CommandId,
+ void page( sal_Int32 CommandId,
const OUString& aUnqPath,
const css::uno::Reference< css::io::XOutputStream >& xOutputStream );
@@ -346,7 +346,7 @@ namespace fileaccess
* Given a file URL aUnqPath, this methods returns a XInputStream which reads from the open file.
*/
- css::uno::Reference< css::io::XInputStream > SAL_CALL
+ css::uno::Reference< css::io::XInputStream >
open( sal_Int32 CommandId,
const OUString& aUnqPath,
bool bLock );
@@ -357,7 +357,7 @@ namespace fileaccess
* to read and write from/to the file.
*/
- css::uno::Reference< css::io::XStream > SAL_CALL
+ css::uno::Reference< css::io::XStream >
open_rw( sal_Int32 CommandId,
const OUString& aUnqPath,
bool bLock );
@@ -368,7 +368,7 @@ namespace fileaccess
* to file URL aUnqPath
*/
- css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL
+ css::uno::Reference< css::ucb::XDynamicResultSet >
ls( sal_Int32 CommandId,
const OUString& aUnqPath,
const sal_Int32 OpenMode,
@@ -381,11 +381,11 @@ namespace fileaccess
*/
// Info for commands
- css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL
+ css::uno::Reference< css::ucb::XCommandInfo >
info_c();
// Info for the properties
- css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
+ css::uno::Reference< css::beans::XPropertySetInfo >
info_p( const OUString& aUnqPath );
@@ -393,7 +393,7 @@ namespace fileaccess
* Sets the values of the properties belonging to fileURL aUnqPath
*/
- css::uno::Sequence< css::uno::Any > SAL_CALL
+ css::uno::Sequence< css::uno::Any >
setv( const OUString& aUnqPath,
const css::uno::Sequence< css::beans::PropertyValue >& values );
@@ -403,7 +403,7 @@ namespace fileaccess
* Returns an XRow object containing the values in the requested order.
*/
- css::uno::Reference< css::sdbc::XRow > SAL_CALL
+ css::uno::Reference< css::sdbc::XRow >
getv( sal_Int32 CommandId,
const OUString& aUnqPath,
const css::uno::Sequence< css::beans::Property >& properties );
@@ -417,7 +417,7 @@ namespace fileaccess
* Moves the content belonging to fileURL srcUnqPath to fileURL dstUnqPath( files and directories )
*/
- void SAL_CALL
+ void
move( sal_Int32 CommandId,
const OUString& srcUnqPath, // Full file(folder)-path
const OUString& dstUnqPath, // Path to the destination-directory
@@ -427,7 +427,7 @@ namespace fileaccess
* Copies the content belonging to fileURL srcUnqPath to fileURL dstUnqPath ( files and directories )
*/
- void SAL_CALL
+ void
copy( sal_Int32 CommandId, // See "move"
const OUString& srcUnqPath,
const OUString& dstUnqPath,
@@ -439,7 +439,7 @@ namespace fileaccess
* Deletes the content belonging to fileURL aUnqPath( recursively in case of directory )
*/
- bool SAL_CALL
+ bool
remove( sal_Int32 CommandId,
const OUString& aUnqPath,
FileUrlType eTypeToMove = FileUrlType::Unknown,
@@ -455,7 +455,7 @@ namespace fileaccess
* Return:: success of operation
*/
- bool SAL_CALL
+ bool
mkdir( sal_Int32 CommandId,
const OUString& aDirectoryName,
bool OverWrite );
@@ -467,7 +467,7 @@ namespace fileaccess
* Return:: success of operation
*/
- bool SAL_CALL
+ bool
mkfil( sal_Int32 CommandId,
const OUString& aFileName,
bool OverWrite,
@@ -479,14 +479,14 @@ namespace fileaccess
* The content of aInputStream becomes the content of the file
* Return:: success of operation
*/
- bool SAL_CALL
+ bool
write( sal_Int32 CommandId,
const OUString& aUnqPath,
bool OverWrite,
const css::uno::Reference< css::io::XInputStream >& aInputStream );
- void SAL_CALL insertDefaultProperties( const OUString& aUnqPath );
+ void insertDefaultProperties( const OUString& aUnqPath );
css::uno::Sequence< css::ucb::ContentInfo >
queryCreatableContentsInfo();
@@ -515,21 +515,21 @@ namespace fileaccess
/* get eventListeners */
/********************************************************************************/
- std::vector< ContentEventNotifier* >* SAL_CALL
+ std::vector< ContentEventNotifier* >*
getContentEventListeners( const OUString& aName );
- std::vector< ContentEventNotifier* >* SAL_CALL
+ std::vector< ContentEventNotifier* >*
getContentDeletedEventListeners( const OUString& aName );
- std::vector< std::vector< ContentEventNotifier* >* >* SAL_CALL
+ std::vector< std::vector< ContentEventNotifier* >* >*
getContentExchangedEventListeners( const OUString& aOldPrefix,
const OUString& aNewPrefix,
bool withChildren );
- std::vector< PropertyChangeNotifier* >* SAL_CALL
+ std::vector< PropertyChangeNotifier* >*
getPropertyChangeNotifier( const OUString& aName );
- std::vector< PropertySetInfoChangeNotifier* >* SAL_CALL
+ std::vector< PropertySetInfoChangeNotifier* >*
getPropertySetListeners( const OUString& aName );
@@ -567,7 +567,7 @@ namespace fileaccess
/* remove persistent propertyset */
/********************************************************************************/
- void SAL_CALL erasePersistentSet( const OUString& aUnqPath,
+ void erasePersistentSet( const OUString& aUnqPath,
bool withChildren = false );
/********************************************************************************/
@@ -575,7 +575,7 @@ namespace fileaccess
/* from srcUnqPath to dstUnqPath */
/********************************************************************************/
- void SAL_CALL copyPersistentSet( const OUString& srcUnqPath,
+ void copyPersistentSet( const OUString& srcUnqPath,
const OUString& dstUnqPath,
bool withChildren );
@@ -583,7 +583,7 @@ namespace fileaccess
// Special optimized method for getting the properties of a directoryitem, which
// is returned by osl::DirectoryItem::getNextItem()
- bool SAL_CALL
+ bool
getv( Notifier* pNotifier,
const css::uno::Sequence< css::beans::Property >& properties,
osl::DirectoryItem& DirItem,
@@ -597,7 +597,7 @@ namespace fileaccess
* The Properties are stored under the url belonging to it->first.
*/
- void SAL_CALL load( const TaskManager::ContentMap::iterator& it,
+ void load( const TaskManager::ContentMap::iterator& it,
bool create );
/**
@@ -606,7 +606,7 @@ namespace fileaccess
* setting of file properties which properties have changed without filestat
*/
- void SAL_CALL
+ void
commit(
const TaskManager::ContentMap::iterator& it,
const osl::FileStatus& aFileStatus );
@@ -617,7 +617,7 @@ namespace fileaccess
* osl::DirectoryItem::getFileStatus fills the required fields.
*/
- void SAL_CALL
+ void
getMaskFromProperties(
sal_Int32& n_Mask,
const css::uno::Sequence< css::beans::Property >& seq );
@@ -625,7 +625,7 @@ namespace fileaccess
// Helper function for public copy
- osl::FileBase::RC SAL_CALL
+ osl::FileBase::RC
copy_recursive(
const OUString& srcUnqPath,
const OUString& dstUnqPath,
@@ -639,7 +639,7 @@ namespace fileaccess
// The call determines the errorCode, which should be used to install
// any error
- bool SAL_CALL
+ bool
ensuredir( sal_Int32 CommandId,
const OUString& aDirectoryName,
sal_Int32 errorCode );
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index c0ce411df4e0..281ab149e67a 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -96,7 +96,7 @@ FileProvider::~FileProvider()
}
// XInitialization
-void SAL_CALL FileProvider::init()
+void FileProvider::init()
{
if( ! m_pMyShell )
m_pMyShell.reset( new TaskManager( m_xContext, this, true ) );
@@ -352,7 +352,7 @@ XPropertySetInfoImpl2::hasPropertyByName(
}
-void SAL_CALL FileProvider::initProperties()
+void FileProvider::initProperties()
{
osl::MutexGuard aGuard( m_aMutex );
if( ! m_xPropertySetInfo.is() )
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 0090cc6be607..9b336a108bce 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -152,12 +152,12 @@ namespace fileaccess {
private:
// methods
- void SAL_CALL init();
+ void init();
// Members
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- void SAL_CALL initProperties();
+ void initProperties();
osl::Mutex m_aMutex;
OUString m_HostName;
OUString m_HomeDirectory;
generated by cgit (git 2.34.1) at 2024-06-23 02:12:47 +0000