diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-04 14:20:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-05 07:32:46 +0100 |
| commit | 9a06b99d2f53bd8d0a9ab0936efed9924a2abb88 (patch) | |
| tree | 544f3e51a3978bd234a1c9fcdbf12d9b84352da4 | |
| parent | eaf89e477af94bd3977aca17d72dd442c7604e63 (diff) | |
loplugin:salcall fix non-virtual methods
first, since those are safer to change than virtual methods
Change-Id: Ie3b624019d75ee2b793cee33b3c5f64e994e8bfe
Reviewed-on: https://gerrit.libreoffice.org/45798
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
252 files changed, 840 insertions, 849 deletions
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index f61986d62592..167c48c35cc7 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -441,7 +441,7 @@ void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt ) SetRectFromProps(); } -void SAL_CALL DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt ) +void DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt ) { // get old name OUString aOldName; @@ -1100,7 +1100,7 @@ void DlgEdObj::EndListening(bool bRemoveListener) } } -void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt ) +void DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt ) { if (isListening()) { @@ -1156,7 +1156,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& } } -void SAL_CALL DlgEdObj::_elementInserted() +void DlgEdObj::_elementInserted() { if (isListening()) { @@ -1165,7 +1165,7 @@ void SAL_CALL DlgEdObj::_elementInserted() } } -void SAL_CALL DlgEdObj::_elementReplaced() +void DlgEdObj::_elementReplaced() { if (isListening()) { @@ -1174,7 +1174,7 @@ void SAL_CALL DlgEdObj::_elementReplaced() } } -void SAL_CALL DlgEdObj::_elementRemoved() +void DlgEdObj::_elementRemoved() { if (isListening()) { diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 86a2f715350f..c59e69c22289 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -117,21 +117,21 @@ public: virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt ); /// @throws css::container::NoSuchElementException /// @throws css::uno::RuntimeException - void SAL_CALL NameChange( const css::beans::PropertyChangeEvent& evt ); + void NameChange( const css::beans::PropertyChangeEvent& evt ); /// @throws css::uno::RuntimeException - void SAL_CALL TabIndexChange( const css::beans::PropertyChangeEvent& evt ); + void TabIndexChange( const css::beans::PropertyChangeEvent& evt ); // PropertyChangeListener /// @throws css::uno::RuntimeException - void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt); + void _propertyChange(const css::beans::PropertyChangeEvent& evt); // ContainerListener /// @throws css::uno::RuntimeException - void SAL_CALL _elementInserted(); + void _elementInserted(); /// @throws css::uno::RuntimeException - void SAL_CALL _elementReplaced(); + void _elementReplaced(); /// @throws css::uno::RuntimeException - void SAL_CALL _elementRemoved(); + void _elementRemoved(); virtual void SetLayer(SdrLayerID nLayer) override; void MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 203660ae6ff0..f1cca76f44d5 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -332,7 +332,7 @@ protected: const css::uno::Reference< css::embed::XStorage >& xStorage, bool bComplete ); - void SAL_CALL initializeFromDocument( const css::uno::Reference< css::document::XStorageBasedDocument >& _rxDocument ); + void initializeFromDocument( const css::uno::Reference< css::document::XStorageBasedDocument >& _rxDocument ); // OEventListenerAdapter virtual void _disposing( const css::lang::EventObject& _rSource ) override; diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 4010259771c4..b5853950aeef 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -2642,7 +2642,7 @@ void SAL_CALL SfxLibraryContainer::initialize( const Sequence< Any >& _rArgument throw IllegalArgumentException(); } -void SAL_CALL SfxLibraryContainer::initializeFromDocument( const Reference< XStorageBasedDocument >& _rxDocument ) +void SfxLibraryContainer::initializeFromDocument( const Reference< XStorageBasedDocument >& _rxDocument ) { // check whether this is a valid OfficeDocument, and obtain the document's root storage Reference< XStorage > xDocStorage; diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx index 0773b59021f8..36860c0830f7 100644 --- a/canvas/source/cairo/cairo_canvashelper.hxx +++ b/canvas/source/cairo/cairo_canvashelper.hxx @@ -154,7 +154,7 @@ namespace cairocanvas const css::uno::Sequence< css::rendering::Texture >& textures, const css::uno::Reference< css::geometry::XMapping2D >& xMapping ); - css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL + css::uno::Reference< css::rendering::XCanvasFont > createFont( const css::rendering::XCanvas* pCanvas, const css::rendering::FontRequest& fontRequest, const css::uno::Sequence< css::beans::PropertyValue >& extraFontProperties, diff --git a/canvas/source/opengl/ogl_canvashelper.hxx b/canvas/source/opengl/ogl_canvashelper.hxx index fdc8698c9173..afdceb74458d 100644 --- a/canvas/source/opengl/ogl_canvashelper.hxx +++ b/canvas/source/opengl/ogl_canvashelper.hxx @@ -137,7 +137,7 @@ namespace oglcanvas const css::uno::Reference< css::geometry::XMapping2D >& xMapping ); - css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL + css::uno::Reference< css::rendering::XCanvasFont > createFont( const css::rendering::XCanvas* pCanvas, const css::rendering::FontRequest& fontRequest, const css::uno::Sequence< diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index d13c672dccd9..063e3fc6a72b 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -187,13 +187,13 @@ private: impl_getCurrentController(); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_notifyModifiedListeners(); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_notifyCloseListeners(); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_notifyStorageChangeListeners(); void impl_store( diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 4c25a63c63f1..055f3a94fe50 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -261,7 +261,7 @@ uno::Reference< frame::XController > ChartModel::impl_getCurrentController() return uno::Reference< frame::XController > (); } -void SAL_CALL ChartModel::impl_notifyCloseListeners() +void ChartModel::impl_notifyCloseListeners() { ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer .getContainer( cppu::UnoType<util::XCloseListener>::get()); diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 213d87f42f9d..946569312380 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -637,7 +637,7 @@ void ChartModel::impl_loadGraphics( } // util::XModifiable -void SAL_CALL ChartModel::impl_notifyModifiedListeners() +void ChartModel::impl_notifyModifiedListeners() { { MutexGuard aGuard( m_aModelMutex ); @@ -772,7 +772,7 @@ Reference< embed::XStorage > SAL_CALL ChartModel::getDocumentStorage() return m_xStorage; } -void SAL_CALL ChartModel::impl_notifyStorageChangeListeners() +void ChartModel::impl_notifyStorageChangeListeners() { ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer .getContainer( cppu::UnoType<document::XStorageChangeListener>::get()); diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index b06adcdfbda6..aacb8971c967 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -415,7 +415,7 @@ void SAL_CALL ChartTypeTemplate::applyStyle( } } -void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram >& xDiagram ) +void ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram >& xDiagram ) { // apply chart-type specific styles, like "symbols on" for example Sequence< Sequence< Reference< XDataSeries > > > aNewSeriesSeq( diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 6dacf519101c..3567066d6066 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -107,7 +107,7 @@ protected: const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; /// @throws css::uno::RuntimeException - void SAL_CALL applyStyles( + void applyStyles( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); // ____ XServiceName ____ diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index ab01665afcf3..7be140511702 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -39,7 +39,7 @@ namespace comphelper } - bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) + bool OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -50,7 +50,7 @@ namespace comphelper } - Point SAL_CALL OCommonAccessibleComponent::getLocation( ) + Point OCommonAccessibleComponent::getLocation( ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -58,7 +58,7 @@ namespace comphelper } - Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen( ) + Point OCommonAccessibleComponent::getLocationOnScreen( ) { OExternalLockGuard aGuard( this ); @@ -78,7 +78,7 @@ namespace comphelper } - Size SAL_CALL OCommonAccessibleComponent::getSize( ) + Size OCommonAccessibleComponent::getSize( ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -86,7 +86,7 @@ namespace comphelper } - Rectangle SAL_CALL OCommonAccessibleComponent::getBounds( ) + Rectangle OCommonAccessibleComponent::getBounds( ) { OExternalLockGuard aGuard( this ); return implGetBounds(); diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index c19079226207..967c1b079e48 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -36,31 +36,31 @@ namespace comphelper OCommonAccessibleSelection::~OCommonAccessibleSelection() {} - void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) + void OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) { implSelect( nChildIndex, true ); } - bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) + bool OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) { return implIsSelected( nChildIndex ); } - void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( ) + void OCommonAccessibleSelection::clearAccessibleSelection( ) { implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false ); } - void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( ) + void OCommonAccessibleSelection::selectAllAccessibleChildren( ) { implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true ); } - sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) + sal_Int32 OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) { sal_Int32 nRet = 0; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); @@ -78,7 +78,7 @@ namespace comphelper } - Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) + Reference< XAccessible > OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { Reference< XAccessible > xRet; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); @@ -96,7 +96,7 @@ namespace comphelper } - void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) + void OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { implSelect( nSelectedChildIndex, false ); } diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 956657a33910..4c797105ce4f 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -174,7 +174,7 @@ namespace comphelper sal_Bool bVetoable, bool bIgnoreRuntimeExceptionsWhileFiring) override; - void SAL_CALL setModifiedImpl( bool bModified, + void setModifiedImpl( bool bModified, bool bIgnoreRuntimeExceptionsWhileFiring); /** finds a free property handle diff --git a/compilerplugins/clang/salcall.cxx b/compilerplugins/clang/salcall.cxx index 2c34f8281b96..071e3a87841a 100644 --- a/compilerplugins/clang/salcall.cxx +++ b/compilerplugins/clang/salcall.cxx @@ -202,13 +202,13 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl) } } - if (!bDeclIsSalCall) + if (!bCanonicalDeclIsSalCall) return true; // @TODO For now, I am ignore free functions, since those are most likely to have their address taken. - // I'll do these later. They are harder to verify since MSVC does not verify when assigning to function pointers + // I'll do them later. They are harder to verify since MSVC does not verify when assigning to function pointers // that the calling convention of the function matches the calling convention of the function pointer! - if (!methodDecl || methodDecl->isStatic()) + if (!methodDecl || methodDecl->isStatic() || methodDecl->isVirtual()) return true; // can only check when we have a definition since this is the most likely time @@ -234,21 +234,6 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl) return true; } - // some base classes are overridden by sub-classes which override both the base-class and an UNO class - if (recordDecl) - { - if (loplugin::DeclCheck(recordDecl) - .Class("OProxyAggregation") - .Namespace("comphelper") - .GlobalNamespace() - || loplugin::DeclCheck(recordDecl) - .Class("OComponentProxyAggregationHelper") - .Namespace("comphelper") - .GlobalNamespace() - || loplugin::DeclCheck(recordDecl).Class("SvxShapeMaster").GlobalNamespace()) - return true; - } - if (methodDecl) { for (auto iter = methodDecl->begin_overridden_methods(); @@ -260,7 +245,6 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl) } } - /* bool bOK = rewrite(rewriteLoc); if (bOK && canonicalDecl != decl) { @@ -269,13 +253,12 @@ bool SalCall::VisitFunctionDecl(FunctionDecl const* decl) if (bOK) return true; - //std::cout << "xxx:" << std::string(p1, leftBracket - p1) << std::endl; report(DiagnosticsEngine::Warning, "SAL_CALL unnecessary here", rewriteLoc) << decl->getSourceRange(); if (canonicalDecl != decl) report(DiagnosticsEngine::Warning, "SAL_CALL unnecessary here", rewriteCanonicalLoc) << canonicalDecl->getSourceRange(); -*/ + return true; } @@ -333,8 +316,12 @@ bool SalCall::rewrite(SourceLocation locBegin) { if (!rewriter) return false; + if (!locBegin.isValid()) + return false; auto locEnd = locBegin.getLocWithOffset(8); + if (!locEnd.isValid()) + return false; SourceRange range(locBegin, locEnd); @@ -368,7 +355,7 @@ bool SalCall::checkOverlap(SourceRange range) } #endif -static loplugin::Plugin::Registration<SalCall> reg("salcall", true); +static loplugin::Plugin::Registration<SalCall> reg("salcall", false); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/compilerplugins/clang/test/salcall.cxx b/compilerplugins/clang/test/salcall.cxx index 3b05530e8097..92172ab9e3df 100644 --- a/compilerplugins/clang/test/salcall.cxx +++ b/compilerplugins/clang/test/salcall.cxx @@ -11,10 +11,11 @@ class Class1 { - void SAL_CALL method1(); // xxexpected-error {{SAL_CALL unnecessary here [loplugin:salcall]}} + void SAL_CALL method1(); // expected-error {{SAL_CALL unnecessary here [loplugin:salcall]}} }; -void SAL_CALL Class1::method1() { -} // xxexpected-error {{SAL_CALL unnecessary here [loplugin:salcall]}} +void SAL_CALL Class1::method1() +{ // expected-error@-1 {{SAL_CALL unnecessary here [loplugin:salcall]}} +} class Class2 { @@ -22,12 +23,15 @@ class Class2 }; void SAL_CALL Class2::method1() {} // expected-note {{SAL_CALL inconsistency [loplugin:salcall]}} +// comment this out because it seems to generate a warning in some internal buffer of clang that I can't annotate +#if 0 // no warning, this appears to be legal class Class3 { - void SAL_CALL method1(); + void SAL_CALL method1(); // expected-error {{SAL_CALL unnecessary here [loplugin:salcall]}} }; void Class3::method1() {} +#endif // no warning, normal case for reference class Class4 diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 8185b34ce2eb..25e45cd94946 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -245,7 +245,7 @@ namespace param } - void SAL_CALL ParameterWrapper::dispose() + void ParameterWrapper::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx index 2e7d6244c052..50d706e55f18 100644 --- a/connectivity/source/commontools/warningscontainer.cxx +++ b/connectivity/source/commontools/warningscontainer.cxx @@ -74,7 +74,7 @@ namespace dbtools } - Any SAL_CALL WarningsContainer::getWarnings( ) const + Any WarningsContainer::getWarnings( ) const { Any aAllWarnings; if ( m_xExternalWarnings.is() ) @@ -87,7 +87,7 @@ namespace dbtools } - void SAL_CALL WarningsContainer::clearWarnings( ) + void WarningsContainer::clearWarnings( ) { if ( m_xExternalWarnings.is() ) m_xExternalWarnings->clearWarnings(); diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index cfa16ca44e2a..d6d1c8f3ee13 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -151,7 +151,7 @@ m_xDriverNode.clear(); m_xDriver.clear(); } -Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) +Reference< XConnection > OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) { MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index b23db6005fa4..a678dd352de9 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -139,7 +139,7 @@ namespace connectivity void clear(bool _bDispose); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ); + css::uno::Reference< css::sdbc::XConnection > getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ); // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XPropertyChangeListener diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 3629bfebdb5d..8361e29c8faa 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -2317,7 +2317,7 @@ namespace } } -void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) +void ODbaseTable::renameImpl( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index abb0c03b8be0..7a515d46a536 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -278,7 +278,7 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) } } -void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex) +void OResultSet::checkColumnIndex(sal_Int32 nIndex) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -292,7 +292,7 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex) } } -void SAL_CALL OResultSet::checkRowIndex() +void OResultSet::checkRowIndex() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index 75b0d6fcd60d..a7142451c54b 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -115,10 +115,10 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL checkColumnIndex( sal_Int32 index ); + void checkColumnIndex( sal_Int32 index ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL checkRowIndex(); + void checkRowIndex(); // you can't delete objects of this type virtual ~OResultSet() override; diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 3f861f6045a3..95718217d445 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -353,7 +353,7 @@ void OConnection::disposing() m_xCatalog.clear(); } -Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() +Reference< XTablesSupplier > OConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XTablesSupplier > xTab = m_xCatalog; diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index f83f265f5780..3c2b2f179b10 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -92,7 +92,7 @@ namespace connectivity // Added to enable me to use SQLInterpreter which requires an // XNameAccess i/f to access tables. - css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); + css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); void throwSQLException( const ErrorDescriptor& _rError, const css::uno::Reference< css::uno::XInterface >& _rxContext ); void throwSQLException( const char* pErrorResourceId, const css::uno::Reference< css::uno::XInterface >& _rxContext ); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 585d0bc61d9a..09d3c0d229c4 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -49,7 +49,7 @@ ODatabaseMetaData::~ODatabaseMetaData() } -ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( +ODatabaseMetaDataResultSet::ORows& ODatabaseMetaData::getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) { diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index cda03805e0b1..edad3a74aeaf 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -29,7 +29,7 @@ namespace connectivity m_pMetaDataHelper; /// @throws css::sdbc::SQLException - ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ); + ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ); protected: virtual ~ODatabaseMetaData() override; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 1312926f6d1d..9234bdc39a36 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -1037,7 +1037,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) return 0; } -void SAL_CALL OResultSet::executeQuery() +void OResultSet::executeQuery() { ResultSetEntryGuard aGuard( *this ); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 5c040c9aabeb..da287247c653 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -279,7 +279,7 @@ public: // MozAddressbook Specific methods /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL executeQuery(); + void executeQuery(); void setTable(OTable* _rTable); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index 9918180a473f..a9f447739a4b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -78,7 +78,7 @@ namespace connectivity /// @throws css::uno::RuntimeException OUString getDefaultProfile( css::mozilla::MozillaProductType product ); /// @throws css::uno::RuntimeException - bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ); + bool getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ); private: ProductStruct m_ProductProfileList[4]; void LoadProductsInfo(); diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 9fa3499a1218..962a66a48f63 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -133,7 +133,7 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::container::ElementExistException /// @throws css::uno::RuntimeException - void SAL_CALL renameImpl( const OUString& newName ); + void renameImpl( const OUString& newName ); void throwInvalidColumnType(const char* pErrorId, const OUString& _sColumnName); protected: diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 4bdf0a6d6d8e..74e167eb336c 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -64,8 +64,8 @@ public: Mapping(Mapping && other): _pMapping(other._pMapping) { other._pMapping = nullptr; } inline ~Mapping(); - inline Mapping & SAL_CALL operator = ( uno_Mapping * pMapping ); - Mapping & SAL_CALL operator = ( const Mapping & rMapping ) + inline Mapping & operator = ( uno_Mapping * pMapping ); + Mapping & operator = ( const Mapping & rMapping ) { return operator = ( rMapping._pMapping ); } Mapping & operator =(Mapping && other) { if (_pMapping != nullptr) { @@ -75,9 +75,9 @@ public: other._pMapping = nullptr; return *this; } - uno_Mapping * SAL_CALL get() const + uno_Mapping * get() const { return _pMapping; } - bool SAL_CALL is() const + bool is() const { return (_pMapping != nullptr); } }; diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index acbbb94a4551..fb2ccfdfe5d7 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -76,7 +76,7 @@ public: /// Called from the weak object if the reference count goes to zero. /// /// @throws css::uno::RuntimeException - void SAL_CALL dispose(); + void dispose(); private: virtual ~OWeakConnectionPoint() {} @@ -109,7 +109,7 @@ void SAL_CALL OWeakConnectionPoint::release() throw() delete this; } -void SAL_CALL OWeakConnectionPoint::dispose() +void OWeakConnectionPoint::dispose() { std::vector<Reference<XReference>> aCopy; { // only hold the mutex while we access the field diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index d72643385d87..45262f53d5d3 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -198,7 +198,7 @@ namespace dbaccess virtual bool SAL_CALL previous( ) override; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL ensureRowForData( ); + void ensureRowForData( ); virtual void SAL_CALL refreshRow( ) override; // css::sdbcx::XRowLocate virtual css::uno::Any SAL_CALL getBookmark() override; diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 48643a9c4892..766eafdcb725 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -623,7 +623,7 @@ void ODatabaseModelImpl::reset() } } -void SAL_CALL ODatabaseModelImpl::disposing( const css::lang::EventObject& Source ) +void ODatabaseModelImpl::disposing( const css::lang::EventObject& Source ) { Reference<XConnection> xCon(Source.Source,UNO_QUERY); if ( xCon.is() ) @@ -975,12 +975,12 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership() return xModel; } -void SAL_CALL ODatabaseModelImpl::acquire() +void ODatabaseModelImpl::acquire() { osl_atomic_increment(&m_refCount); } -void SAL_CALL ODatabaseModelImpl::release() +void ODatabaseModelImpl::release() { if ( osl_atomic_decrement(&m_refCount) == 0 ) { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 2e5d452b616c..eeeb9850f68e 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -119,7 +119,7 @@ protected: FlushNotificationAdapter( const Reference< XFlushable >& _rxBroadcaster, const Reference< XFlushListener >& _rxListener ); virtual ~FlushNotificationAdapter() override; - void SAL_CALL impl_dispose(); + void impl_dispose(); protected: // XFlushListener @@ -147,7 +147,7 @@ FlushNotificationAdapter::~FlushNotificationAdapter() { } -void SAL_CALL FlushNotificationAdapter::impl_dispose() +void FlushNotificationAdapter::impl_dispose() { Reference< XFlushListener > xKeepAlive( this ); @@ -1021,7 +1021,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithComp return connectWithCompletion(_rxHandler,true); } -Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated ) +Reference< XConnection > ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,bool _bIsolated ) { ModelMethodGuard aGuard( *this ); diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index c513064a2dd5..7d6401922271 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -202,10 +202,10 @@ private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , bool _bIsolated); + css::uno::Reference< css::sdbc::XConnection > getConnection( const OUString& user, const OUString& password , bool _bIsolated); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Reference< css::sdbc::XConnection > SAL_CALL connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated); + css::uno::Reference< css::sdbc::XConnection > connectWithCompletion( const css::uno::Reference< css::task::XInteractionHandler >& handler , bool _bIsolated); protected: using ::cppu::OPropertySetHelper::getFastPropertyValue; diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index aebd2df2600f..de566166743e 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -54,7 +54,7 @@ using namespace ::cppu; #define DISPATCH_RELOAD 5 // the OSL_ENSURE in CTOR has to be changed too, when adding new defines -void SAL_CALL OInterceptor::dispose() +void OInterceptor::dispose() { EventObject aEvt( *this ); diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 39ed7fc428e5..cfb83676f5ab 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -45,7 +45,7 @@ public: explicit OInterceptor( ODocumentDefinition* _pContentHolder ); /// @throws css::uno::RuntimeException - void SAL_CALL dispose(); + void dispose(); //XDispatch virtual void SAL_CALL diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx index 7a4931557bab..bf74d41adb08 100644 --- a/dbaccess/source/core/inc/ModelImpl.hxx +++ b/dbaccess/source/core/inc/ModelImpl.hxx @@ -277,7 +277,7 @@ public: // XEventListener /// @throws css::uno::RuntimeException - void SAL_CALL disposing( const css::lang::EventObject& Source ); + void disposing( const css::lang::EventObject& Source ); void setModified( bool bModified ); @@ -369,9 +369,9 @@ public: const ::comphelper::SharedMutex& getSharedMutex() const { return m_aMutex; } - void SAL_CALL acquire(); + void acquire(); - void SAL_CALL release(); + void release(); /// returns a all known data source settings, including their default values static const AsciiPropertyValue* getDefaultDataSourceSettings(); diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index f5ffe6996d49..f3002a88d163 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -173,7 +173,7 @@ public: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) override; OUString getDeployPath( ActivePackages::Data const & data ); - css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_( + css::uno::Reference<css::deployment::XPackage> getDeployedPackage_( OUString const & id, OUString const & fileName, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); css::uno::Reference<css::deployment::XPackage> getDeployedPackage_( diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index 20271ea17aab..2a405b5a0e74 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -88,7 +88,7 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) return m_ParameterMap.find( aName )->second; } -void SAL_CALL CMimeContentType::init( const OUString& aCntType ) +void CMimeContentType::init( const OUString& aCntType ) { if ( aCntType.isEmpty( ) ) throw IllegalArgumentException( ); @@ -99,7 +99,7 @@ void SAL_CALL CMimeContentType::init( const OUString& aCntType ) type(); } -void SAL_CALL CMimeContentType::getSym() +void CMimeContentType::getSym() { if ( m_nPos < m_ContentType.getLength( ) ) { @@ -111,7 +111,7 @@ void SAL_CALL CMimeContentType::getSym() m_nxtSym = OUString( ); } -void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb ) +void CMimeContentType::acceptSym( const OUString& pSymTlb ) { if ( pSymTlb.indexOf( m_nxtSym ) < 0 ) throw IllegalArgumentException( ); @@ -119,13 +119,13 @@ void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb ) getSym(); } -void SAL_CALL CMimeContentType::skipSpaces() +void CMimeContentType::skipSpaces() { while (m_nxtSym == SPACE) getSym( ); } -void SAL_CALL CMimeContentType::type() +void CMimeContentType::type() { skipSpaces( ); @@ -154,7 +154,7 @@ void SAL_CALL CMimeContentType::type() subtype( ); } -void SAL_CALL CMimeContentType::subtype() +void CMimeContentType::subtype() { skipSpaces( ); @@ -180,7 +180,7 @@ void SAL_CALL CMimeContentType::subtype() trailer(); } -void SAL_CALL CMimeContentType::trailer() +void CMimeContentType::trailer() { OUString sToken(TOKEN); while( !m_nxtSym.isEmpty( ) ) @@ -221,7 +221,7 @@ void SAL_CALL CMimeContentType::trailer() } } -OUString SAL_CALL CMimeContentType::pName( ) +OUString CMimeContentType::pName( ) { OUString pname; @@ -240,7 +240,7 @@ OUString SAL_CALL CMimeContentType::pName( ) return pname; } -OUString SAL_CALL CMimeContentType::pValue( ) +OUString CMimeContentType::pValue( ) { OUString pvalue; @@ -274,7 +274,7 @@ OUString SAL_CALL CMimeContentType::pValue( ) // '";' (quote sign followed by semicolon) and '" ' (quote sign followed // by space) -OUString SAL_CALL CMimeContentType::quotedPValue( ) +OUString CMimeContentType::quotedPValue( ) { OUString pvalue; bool bAfterQuoteSign = false; @@ -301,7 +301,7 @@ OUString SAL_CALL CMimeContentType::quotedPValue( ) return pvalue; } -OUString SAL_CALL CMimeContentType::nonquotedPValue( ) +OUString CMimeContentType::nonquotedPValue( ) { OUString pvalue; @@ -320,7 +320,7 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( ) return pvalue; } -void SAL_CALL CMimeContentType::comment() +void CMimeContentType::comment() { while ( !m_nxtSym.isEmpty( ) ) { diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx index 45a80bbed66c..61e9594b2ba8 100644 --- a/dtrans/source/cnttype/mcnttype.hxx +++ b/dtrans/source/cnttype/mcnttype.hxx @@ -48,18 +48,18 @@ public: private: /// @throws css::lang::IllegalArgumentException - void SAL_CALL init( const OUString& aCntType ); - void SAL_CALL getSym(); - void SAL_CALL acceptSym( const OUString& pSymTlb ); - void SAL_CALL skipSpaces(); - void SAL_CALL type(); - void SAL_CALL subtype(); - void SAL_CALL trailer(); - OUString SAL_CALL pName( ); - OUString SAL_CALL pValue( ); - OUString SAL_CALL quotedPValue( ); - OUString SAL_CALL nonquotedPValue( ); - void SAL_CALL comment(); + void init( const OUString& aCntType ); + void getSym(); + void acceptSym( const OUString& pSymTlb ); + void skipSpaces(); + void type(); + void subtype(); + void trailer(); + OUString pName( ); + OUString pValue( ); + OUString quotedPValue( ); + OUString nonquotedPValue( ); + void comment(); static bool SAL_CALL isInRange( const OUString& aChr, const OUString& aRange ); private: diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index 78307abe011d..9f744e3270a0 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -421,7 +421,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName _setPropertyValue( PropertyName, aValue ); } -void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara ) +void SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -592,7 +592,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property return _getPropertyValue( PropertyName ); } -uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara ) +uno::Any SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -752,7 +752,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUStr _setPropertyValues( aPropertyNames, aValues ); } -void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) +void SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -876,7 +876,7 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const return _getPropertyValues( aPropertyNames ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) +uno::Sequence< uno::Any > SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -937,7 +937,7 @@ static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE EE_CHAR_UNDERLINE, EE_CHAR_WEIGHT, EE_CHAR_STRIKEOUT, EE_CHAR_CASEMAP, EE_CHAR_WLM, 0 }; -beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara) +beans::PropertyState SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara) { if ( pMap ) { @@ -1028,7 +1028,7 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt throw beans::UnknownPropertyException(); } -beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */) +beans::PropertyState SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */) { SolarMutexGuard aGuard; diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 38f5a92c6be8..a68e2aa956ce 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -147,7 +147,7 @@ namespace pcr <type scope="css::inspection">XPropertyControlContext</type> methods will throw a <type scope="css::lang">DisposedException</type>. */ - void SAL_CALL dispose(); + void dispose(); /** sets the notification mode, so that notifications received from the controls are forwarded to our OBrowserListBox either synchronously or asynchronously @@ -207,7 +207,7 @@ namespace pcr } - void SAL_CALL PropertyControlContext_Impl::dispose() + void PropertyControlContext_Impl::dispose() { SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) @@ -918,7 +918,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) + void OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) { DBG_TESTSOLARMUTEX(); @@ -934,7 +934,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) + void OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) { DBG_TESTSOLARMUTEX(); @@ -956,7 +956,7 @@ namespace pcr } - void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) + void OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) { DBG_TESTSOLARMUTEX(); diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 9ec019fe9c64..d5a2aa64e85e 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -144,11 +144,11 @@ namespace pcr void CommitModified( ); /// @throws css::uno::RuntimeException - void SAL_CALL focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); + void focusGained( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); /// @throws css::uno::RuntimeException - void SAL_CALL valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); + void valueChanged( const css::uno::Reference< css::inspection::XPropertyControl >& Control ); /// @throws css::uno::RuntimeException - void SAL_CALL activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ); + void activateNextControl( const css::uno::Reference< css::inspection::XPropertyControl >& CurrentControl ); private: // IButtonClickListener diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index c84593501edc..be480faa8846 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -47,12 +47,12 @@ namespace pcr { } - void SAL_CALL CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) + void CommonBehaviourControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) { m_xContext = _controlcontext; } - void SAL_CALL CommonBehaviourControlHelper::notifyModifiedValue( ) + void CommonBehaviourControlHelper::notifyModifiedValue( ) { if ( isModified() && m_xContext.is() ) { diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index ed2261b598ba..b6c0add791e1 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -75,15 +75,15 @@ namespace pcr // XPropertyControl /// @throws css::uno::RuntimeException - ::sal_Int16 SAL_CALL getControlType() { return m_nControlType; } + ::sal_Int16 getControlType() { return m_nControlType; } /// @throws css::uno::RuntimeException - const css::uno::Reference< css::inspection::XPropertyControlContext >& SAL_CALL getControlContext() { return m_xContext; } + const css::uno::Reference< css::inspection::XPropertyControlContext >& getControlContext() { return m_xContext; } /// @throws css::uno::RuntimeException - void SAL_CALL setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ); + void setControlContext( const css::uno::Reference< css::inspection::XPropertyControlContext >& _controlcontext ); /// @throws css::uno::RuntimeException - bool SAL_CALL isModified( ) { return m_bModified; } + bool isModified( ) { return m_bModified; } /// @throws css::uno::RuntimeException - void SAL_CALL notifyModifiedValue( ); + void notifyModifiedValue( ); /** (fail-safe) wrapper around calling our context's activateNextControl */ diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index c6a1c32a7ea7..86e6bb8f670a 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -711,14 +711,14 @@ namespace pcr } - void SAL_CALL ComposedPropertyUIUpdate::suspendAutoFire() + void ComposedPropertyUIUpdate::suspendAutoFire() { impl_checkDisposed(); osl_atomic_increment( &m_nSuspendCounter ); } - void SAL_CALL ComposedPropertyUIUpdate::resumeAutoFire() + void ComposedPropertyUIUpdate::resumeAutoFire() { impl_checkDisposed(); if ( 0 == osl_atomic_decrement( &m_nSuspendCounter ) ) @@ -747,7 +747,7 @@ namespace pcr } - void SAL_CALL ComposedPropertyUIUpdate::dispose() + void ComposedPropertyUIUpdate::dispose() { if ( impl_isDisposed() ) return; diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index c38c405a334c..805ed2cf5583 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -118,13 +118,13 @@ namespace pcr @seealso resumeAutoFire */ - void SAL_CALL suspendAutoFire(); + void suspendAutoFire(); /** Suspends automatic firing of UI changes @seealso suspendAutoFire */ - void SAL_CALL resumeAutoFire(); + void resumeAutoFire(); /** disposes the instance, so it becomes non-functional. @@ -132,7 +132,7 @@ namespace pcr the latter will also be disposed, so that if anybody still holds a reference to them and tries to operate them will get a DisposedException. */ - void SAL_CALL dispose(); + void dispose(); /** invokes m_pPropertyCheck to check whether a given property should be handled */ diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx index e307908be99c..36f6bc6da996 100644 --- a/filter/source/t602/t602filter.cxx +++ b/filter/source/t602/t602filter.cxx @@ -231,7 +231,7 @@ void T602ImportFilter::inschr(unsigned char ch) inschrdef(ch); } -bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) +bool T602ImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) { Reset602(); @@ -438,7 +438,7 @@ bool SAL_CALL T602ImportFilter::importImpl( const Sequence< css::beans::Property return true; } -bool SAL_CALL T602ImportFilter::test() +bool T602ImportFilter::test() { Reset602(); Read602(); diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx index 1b407ed996e9..63bd0335614f 100644 --- a/filter/source/t602/t602filter.hxx +++ b/filter/source/t602/t602filter.hxx @@ -221,7 +221,7 @@ private: void wrtfnt(); /// @throws css::uno::RuntimeException - bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); + bool importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); public: explicit T602ImportFilter(const css::uno::Reference<css::lang::XMultiServiceFactory > &r ); @@ -247,7 +247,7 @@ private: virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; - bool SAL_CALL test(); + bool test(); }; /// @throws css::uno::RuntimeException diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx index 892cb3989593..ffe7684c7431 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx @@ -59,7 +59,7 @@ using namespace com::sun::star::xml; using namespace com::sun::star::xml::sax; using namespace ::com::sun::star::task; -bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) +bool XmlFilterAdaptor::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) { OUString udConvertClass = msUserData[0]; const OUString sXMLImportService = msUserData[2]; @@ -171,7 +171,7 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< css::beans::Property return true; } -bool SAL_CALL XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) +bool XmlFilterAdaptor::exportImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) { OUString udConvertClass = msUserData[0]; diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx index b33af42f9c16..a0512a34d864 100644 --- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx +++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx @@ -58,10 +58,10 @@ class XmlFilterAdaptor final : public cppu::WeakImplHelper FilterType meType; /// @throws css::uno::RuntimeException - bool SAL_CALL exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); + bool exportImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); /// @throws css::uno::RuntimeException - bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); + bool importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); public: diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx index e65820b1fd99..7ef53fea7137 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.hxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx @@ -59,10 +59,10 @@ namespace XSLT { public: Reader(LibXSLTTransformer* transformer); - int SAL_CALL read(char * buffer, int len); - int SAL_CALL write(const char * buffer, int len); + int read(char * buffer, int len); + int write(const char * buffer, int len); void forceStateStopped(); - int SAL_CALL closeOutput(); + int closeOutput(); private: virtual ~Reader() override; @@ -156,19 +156,19 @@ namespace XSLT virtual void SAL_CALL initialize(const Sequence<Any>& params) override; - void SAL_CALL + void done(); - void SAL_CALL + void error(const OUString& msg); - const OString& SAL_CALL + const OString& getStyleSheetURL() { return m_styleSheetURL; } - const ::std::map<const char*, OString>& SAL_CALL + const ::std::map<const char*, OString>& getParameters() { return m_parameters; } - const css::uno::Reference<css::uno::XComponentContext>& SAL_CALL + const css::uno::Reference<css::uno::XComponentContext>& getComponentContext() { return m_xContext; } diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 8162e2df978b..afb7eb0f6009 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -51,13 +51,13 @@ using namespace ::com::sun::star::embed; namespace XSLT { - Reference<XStream> SAL_CALL OleHandler::createTempFile() { + Reference<XStream> OleHandler::createTempFile() { Reference<XStream> tempFile( TempFile::create(m_xContext), UNO_QUERY); OSL_ASSERT(tempFile.is()); return tempFile; } - void SAL_CALL OleHandler::ensureCreateRootStorage() + void OleHandler::ensureCreateRootStorage() { if (m_storage == nullptr || m_rootStream == nullptr) { @@ -72,7 +72,7 @@ namespace XSLT } } - void SAL_CALL OleHandler::initRootStorageFromBase64(const OString& content) + void OleHandler::initRootStorageFromBase64(const OString& content) { Sequence<sal_Int8> oleData; ::sax::Converter::decodeBase64(oleData, OStringToOUString( @@ -94,7 +94,7 @@ namespace XSLT m_storage = cont; } - OString SAL_CALL + OString OleHandler::encodeSubStorage(const OUString& streamName) { if (!m_storage->hasByName(streamName)) @@ -146,7 +146,7 @@ namespace XSLT return OUStringToOString(buf.toString(), RTL_TEXTENCODING_UTF8); } - void SAL_CALL + void OleHandler::insertByName(const OUString& streamName, const OString& content) { if ( streamName == "oledata.mso" ) @@ -161,7 +161,7 @@ namespace XSLT } const OString - SAL_CALL OleHandler::getByName(const OUString& streamName) + OleHandler::getByName(const OUString& streamName) { if ( streamName == "oledata.mso" ) { @@ -181,7 +181,7 @@ namespace XSLT return encodeSubStorage(streamName); } - void SAL_CALL + void OleHandler::insertSubStorage(const OUString& streamName, const OString& content) { //decode the base64 string diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx index af8dac9fc97c..4a1871f229c1 100644 --- a/filter/source/xsltfilter/OleHandler.hxx +++ b/filter/source/xsltfilter/OleHandler.hxx @@ -67,8 +67,8 @@ namespace XSLT if (m_tcontext) m_tcontext->_private = nullptr; } - void SAL_CALL insertByName(const OUString& streamName, const OString& content); - const OString SAL_CALL getByName(const OUString& streamName); + void insertByName(const OUString& streamName, const OString& content); + const OString getByName(const OUString& streamName); void registercontext(xsltTransformContextPtr context) { assert(context); @@ -82,11 +82,11 @@ namespace XSLT css::uno::Reference<XStream> m_rootStream; xsltTransformContextPtr m_tcontext; - void SAL_CALL ensureCreateRootStorage(); - OString SAL_CALL encodeSubStorage(const OUString& streamName); - void SAL_CALL insertSubStorage(const OUString& streamName, const OString& content); - void SAL_CALL initRootStorageFromBase64(const OString& content); - css::uno::Reference<XStream> SAL_CALL createTempFile(); + void ensureCreateRootStorage(); + OString encodeSubStorage(const OUString& streamName); + void insertSubStorage(const OUString& streamName, const OString& content); + void initRootStorageFromBase64(const OString& content); + css::uno::Reference<XStream> createTempFile(); }; } diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 32d5c4db1e94..ed6bfae0daa6 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -466,7 +466,7 @@ Reference< XCloneable > SAL_CALL OGridColumn::createClone( ) // XPersistObject -void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream) +void OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream) { // 1. Write the UnoControl Reference<XMarkableStream> xMark(_rxOutStream, UNO_QUERY); @@ -514,7 +514,7 @@ void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStr } -void SAL_CALL OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream) +void OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream) { // 1. Read the UnoControl sal_Int32 nLen = _rxInStream->readLong(); diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index 26b6aec61cbd..66a61056ac7e 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -85,8 +85,8 @@ public: virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) override; // XPersistObject - void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); - void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); + void write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); + void read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); // XPropertySet virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override = 0; diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 3790e4f5d6b7..a98b91b51a57 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -84,8 +84,8 @@ public: protected: // new properties common to all edit models should be handled with the following two methods - void SAL_CALL readCommonEditProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); - void SAL_CALL writeCommonEditProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); + void readCommonEditProperties(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream); + void writeCommonEditProperties(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream); void defaultCommonEditProperties(); virtual sal_uInt16 getPersistenceFlags() const; diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index b73b96c3a0e0..fe1121c660c5 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -51,14 +51,14 @@ namespace frm } - void SAL_CALL OErrorBroadcaster::disposing() + void OErrorBroadcaster::disposing() { EventObject aDisposeEvent( static_cast< XSQLErrorBroadcaster* >( this ) ); m_aErrorListeners.disposeAndClear( aDisposeEvent ); } - void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription ) + void OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription ) { Any aError; if ( !_rContextDescription.isEmpty() ) @@ -70,7 +70,7 @@ namespace frm } - void SAL_CALL OErrorBroadcaster::onError( const css::sdb::SQLErrorEvent& _rError ) + void OErrorBroadcaster::onError( const css::sdb::SQLErrorEvent& _rError ) { if ( m_aErrorListeners.getLength() ) { diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx index 0f445900a85f..b60bfcecce0f 100644 --- a/forms/source/component/errorbroadcaster.hxx +++ b/forms/source/component/errorbroadcaster.hxx @@ -44,10 +44,10 @@ namespace frm explicit OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper ); virtual ~OErrorBroadcaster( ); - void SAL_CALL disposing(); + void disposing(); - void SAL_CALL onError( const css::sdbc::SQLException& _rException, const OUString& _rContextDescription ); - void SAL_CALL onError( const css::sdb::SQLErrorEvent& _rException ); + void onError( const css::sdbc::SQLException& _rException, const OUString& _rContextDescription ); + void onError( const css::sdb::SQLErrorEvent& _rException ); protected: // XSQLErrorBroadcaster diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index f3299dea6499..5e79a5c65995 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -37,7 +37,7 @@ namespace frm } - void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) + void ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { if ( !_rxInterceptor.is() ) { @@ -60,7 +60,7 @@ namespace frm } - void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) + void ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) { if ( !_rxInterceptor.is() ) { diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index 529ba5f1f81a..89f2e7a6ad66 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -52,7 +52,7 @@ namespace frm } - void SAL_CALL OFormNavigationHelper::dispose( ) + void OFormNavigationHelper::dispose( ) { m_pFeatureInterception->dispose(); disconnectDispatchers(); diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index 80d3a2cab8f0..f89af1d1827a 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -61,12 +61,12 @@ namespace frm // XDispatchProviderInterception /// @throws css::uno::RuntimeException - void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ); + void registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ); /// @throws css::uno::RuntimeException - void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ); + void releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ); // XComponent - void SAL_CALL dispose(); + void dispose(); /** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags */ diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index b0f8663075fe..e1068f7bb526 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -79,7 +79,7 @@ namespace frm // XComponent /// @throws css::uno::RuntimeException - void SAL_CALL dispose( ); + void dispose( ); // XDispatchProviderInterception virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) override; diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx index e3d86b3673a7..0e93500ad1a2 100644 --- a/forms/source/inc/propertybaghelper.hxx +++ b/forms/source/inc/propertybaghelper.hxx @@ -76,7 +76,7 @@ namespace frm void removeProperty( const OUString& _rName ); // XPropertyAccess equivalent - css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues(); + css::uno::Sequence< css::beans::PropertyValue > getPropertyValues(); void setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& _rProps ); // forwards to m_aDynamicProperties diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index a01b63e261e9..caa384796e7e 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -216,14 +216,14 @@ class StatusIndicatorFactory : public ::cppu::WeakImplHelper< const OUString& sText , sal_Int32 nRange); - void SAL_CALL reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - void SAL_CALL end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); + void end(const css::uno::Reference< css::task::XStatusIndicator >& xChild); - void SAL_CALL setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild, const OUString& sText ); - void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, + void setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild, sal_Int32 nValue); // specials diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 369a11d9afe6..79166fb8c87f 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -85,10 +85,10 @@ class DispatchRecorder // private functions private: - void SAL_CALL implts_recordMacro( const OUString& aURL, + void implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, bool bAsComment, OUStringBuffer& ); - void SAL_CALL AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ); + void AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ); }; // class DispatcRecorder diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 58a8be553c8a..a01e102df934 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -282,7 +282,7 @@ class Desktop : private cppu::BaseMutex, // we need this wrapped terminate()-call to terminate even the QuickStarter // non-virtual and non-UNO for now /// @throws css::uno::RuntimeException - bool SAL_CALL terminateQuickstarterToo(); + bool terminateQuickstarterToo(); // protected methods diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index db960358c8ab..5efc22b30fdb 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -87,7 +87,7 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper< virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override; private: - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + ::cppu::IPropertyArrayHelper& getInfoHelper(); const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); void copyItemContainer( const std::vector< css::uno::Sequence< css::beans::PropertyValue > >& rSourceVector ); diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index 051373c3d92a..fe02406cd39f 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -84,7 +84,7 @@ public: } /// This has to be called after when the instance is acquire()'d. - void SAL_CALL fillCache(); + void fillCache(); private: /** helper to listen for configuration changes without ownership cycle problems */ diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index efe3167c81a9..d1e45af96492 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -263,7 +263,7 @@ Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle ) throw UnknownPropertyException(); } -::cppu::IPropertyArrayHelper& SAL_CALL ConstItemContainer::getInfoHelper() +::cppu::IPropertyArrayHelper& ConstItemContainer::getInfoHelper() { // Define static member to give structure of properties to baseclass "OPropertySetHelper". // "impl_getStaticPropertyDescriptor" is a non exported and static function, who will define a static propertytable. diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 2446e02b8368..5832f55d3f0c 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -157,7 +157,7 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() return sScript; } -void SAL_CALL DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ) +void DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUStringBuffer& aArgumentBuffer ) { // if value == bool if (aValue.getValueTypeClass() == css::uno::TypeClass_STRUCT ) @@ -284,7 +284,7 @@ void SAL_CALL DispatchRecorder::AppendToBuffer( const css::uno::Any& aValue, OUS } } -void SAL_CALL DispatchRecorder::implts_recordMacro( const OUString& aURL, +void DispatchRecorder::implts_recordMacro( const OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments, bool bAsComment, OUStringBuffer& aScriptBuffer ) { diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 119dd5d69697..5fc7a7fc4ce7 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -386,7 +386,7 @@ namespace }; } -bool SAL_CALL Desktop::terminateQuickstarterToo() +bool Desktop::terminateQuickstarterToo() { QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher); m_bSession = true; diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 1c5df528a6bb..3d58fe9bd32c 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -108,7 +108,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( } -css::uno::Any SAL_CALL DispatchHelper::executeDispatch( +css::uno::Any DispatchHelper::executeDispatch( const css::uno::Reference< css::frame::XDispatch >& xDispatch , const css::util::URL& aURL , bool SyncronFlag , diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 5998d7902ccb..17efc5d0386a 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -306,10 +306,10 @@ public: private: - void SAL_CALL impl_setPropertyValue(sal_Int32 nHandle, + void impl_setPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue); - css::uno::Any SAL_CALL impl_getPropertyValue(sal_Int32 nHandle); + css::uno::Any impl_getPropertyValue(sal_Int32 nHandle); /** set a new owner for this helper. * @@ -331,11 +331,11 @@ private: * The owner of this class has to be sure, that every new property does * not clash with any existing one. */ - void SAL_CALL impl_addPropertyInfo(const css::beans::Property& aProperty); + void impl_addPropertyInfo(const css::beans::Property& aProperty); /** mark the object as "dead". */ - void SAL_CALL impl_disablePropertySet(); + void impl_disablePropertySet(); bool impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent); @@ -2701,7 +2701,7 @@ sal_Int16 SAL_CALL Frame::resetActionLocks() return nCurrentLocks; } -void SAL_CALL Frame::impl_setPropertyValue(sal_Int32 nHandle, +void Frame::impl_setPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) { @@ -2758,7 +2758,7 @@ void SAL_CALL Frame::impl_setPropertyValue(sal_Int32 nHandle, } } -css::uno::Any SAL_CALL Frame::impl_getPropertyValue(sal_Int32 nHandle) +css::uno::Any Frame::impl_getPropertyValue(sal_Int32 nHandle) { /* There is no need to lock any mutex here. Because we share the solar mutex with our base class. And we said to our base class: "don't release it on calling us" .-) @@ -2809,7 +2809,7 @@ void Frame::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::un m_xBroadcaster = xBroadcaster; } -void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty) +void Frame::impl_addPropertyInfo(const css::beans::Property& aProperty) { SolarMutexGuard g; @@ -2820,7 +2820,7 @@ void SAL_CALL Frame::impl_addPropertyInfo(const css::beans::Property& aProperty) m_lProps[aProperty.Name] = aProperty; } -void SAL_CALL Frame::impl_disablePropertySet() +void Frame::impl_disablePropertySet() { SolarMutexGuard g; diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index bd199b6891b1..ab76bdca2e76 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -92,7 +92,7 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa virtual void SAL_CALL disposing( const EventObject& aEvent ) override; protected: - css::uno::Any SAL_CALL getByNameImpl( const OUString& aName ); + css::uno::Any getByNameImpl( const OUString& aName ); struct CmdToInfoMap { @@ -208,7 +208,7 @@ ConfigurationAccess_UICommand::~ConfigurationAccess_UICommand() } // XNameAccess -Any SAL_CALL ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL ) +Any ConfigurationAccess_UICommand::getByNameImpl( const OUString& rCommandURL ) { static sal_Int32 nRequests = 0; diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index c23316df620a..fa9a1fcf8f8c 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -86,7 +86,7 @@ public: */ virtual sal_Bool SAL_CALL filter(const Sequence< PropertyValue >& aDescriptor) override; virtual void SAL_CALL cancel() override {} - void SAL_CALL setDocumentHandler(Reference< XDocumentHandler > const & xHandler) + void setDocumentHandler(Reference< XDocumentHandler > const & xHandler) { m_rxDocumentHandler = xHandler; } diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index a357db248712..0b71496e44eb 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -122,9 +122,9 @@ private: css::uno::Reference < css::uno::XComponentContext > m_xContext; /// @throws css::uno::RuntimeException - bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName ); + bool createLocaleSpecificBreakIterator( const OUString& aLocaleName ); /// @throws css::uno::RuntimeException - css::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale ); + css::uno::Reference < XBreakIterator > getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale ); }; diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 171b1bbfc6de..f34412d0eac4 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -97,7 +97,7 @@ protected: BI_Data words[4]; // 4 is css::i18n::WordType enumeration size /// @throws css::uno::RuntimeException - void SAL_CALL loadICUBreakIterator(const css::lang::Locale& rLocale, + void loadICUBreakIterator(const css::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText); public: diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 15a591f37429..34befe25e21e 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -51,7 +51,7 @@ public: // Constructors Calendar_gregorian(); Calendar_gregorian(const Era *_eraArray); - void SAL_CALL init(const Era *_eraArray); + void init(const Era *_eraArray); /** * Destructor diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index 290418152622..36d37c69e4fc 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -74,7 +74,7 @@ private: css::lang::Locale aLocale; OUString aName; css::uno::Reference < XCharacterClassification > xCI; - bool SAL_CALL equals(const css::lang::Locale& rLocale) { + bool equals(const css::lang::Locale& rLocale) { return aLocale.Language == rLocale.Language && aLocale.Country == rLocale.Country && aLocale.Variant == rLocale.Variant; @@ -87,8 +87,8 @@ private: css::uno::Reference < XCharacterClassification > xUCI; /// @throws css::uno::RuntimeException - css::uno::Reference < XCharacterClassification > const & SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale); - bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale); + css::uno::Reference < XCharacterClassification > const & getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale); + bool createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale); }; diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index 47641a25f3a5..534690897731 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -81,7 +81,7 @@ private: css::uno::Reference < XCollator > xC; lookupTableItem(const css::lang::Locale& rLocale, const OUString& _algorithm, const OUString& _service, css::uno::Reference < XCollator > const & _xC) : aLocale(rLocale), algorithm(_algorithm), service(_service), xC(_xC) {} - bool SAL_CALL equals(const css::lang::Locale& rLocale, const OUString& _algorithm) { + bool equals(const css::lang::Locale& rLocale, const OUString& _algorithm) { return aLocale.Language == rLocale.Language && aLocale.Country == rLocale.Country && aLocale.Variant == rLocale.Variant && @@ -97,10 +97,10 @@ private: css::uno::Reference < css::i18n::XLocaleData5 > mxLocaleData; /// @throws css::uno::RuntimeException - bool SAL_CALL createCollator(const css::lang::Locale& rLocale, const OUString& serviceName, + bool createCollator(const css::lang::Locale& rLocale, const OUString& serviceName, const OUString& rSortAlgorithm); /// @throws css::uno::RuntimeException - void SAL_CALL loadCachedCollator(const css::lang::Locale& rLocale, const OUString& rSortAlgorithm); + void loadCachedCollator(const css::lang::Locale& rLocale, const OUString& rSortAlgorithm); }; } diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 33d71d95d8a6..1320b7e41a73 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -77,9 +77,9 @@ private: css::uno::Reference < css::container::XHierarchicalNameAccess > xHierarchicalNameAccess; rtl::Reference<TransliterationImpl> translit; /// @throws css::uno::RuntimeException - OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index ); + OUString makeNumberingIdentifier( sal_Int16 index ); /// @throws css::uno::RuntimeException - bool SAL_CALL isScriptFlagEnabled(const OUString& aName ); + bool isScriptFlagEnabled(const OUString& aName ); }; } diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index 2194e4fd1c2a..088ca721630c 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.hxx @@ -77,9 +77,9 @@ private: css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > xIES; css::uno::Reference < css::uno::XComponentContext > m_xContext; /// @throws css::uno::RuntimeException - bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name); + bool createLocaleSpecificIndexEntrySupplier(const OUString& name); /// @throws css::uno::RuntimeException - css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL getLocaleSpecificIndexEntrySupplier( + css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > const & getLocaleSpecificIndexEntrySupplier( const css::lang::Locale& rLocale, const OUString& rSortAlgorithm); css::lang::Locale aLocale; diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index e272f43e3252..9eb2044506c4 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -87,7 +87,7 @@ protected: OUString aAlgorithm; /// @throws css::uno::RuntimeException - const OUString& SAL_CALL getEntry( const OUString& IndexEntry, + const OUString& getEntry( const OUString& IndexEntry, const OUString& PhoneticEntry, const css::lang::Locale& rLocale ); }; diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index 094113a8ca74..e31ea6240d64 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.hxx @@ -69,7 +69,7 @@ private: css::uno::Reference < css::uno::XComponentContext > m_xContext; /// @throws css::uno::RuntimeException - css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char const * rLanguage); + css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& getInputSequenceChecker(sal_Char const * rLanguage); static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar); }; diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 4a83d44375b2..8014b682cf99 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -90,20 +90,20 @@ public: virtual css::uno::Sequence< css::i18n::FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) override; virtual css::uno::Sequence< css::i18n::Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) override; /// @throws css::uno::RuntimeException - OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ); + OUString getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ); virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) override; virtual css::i18n::ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) override; virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) override ; /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) ; + css::uno::Sequence< OUString > getBreakIteratorRules( const css::lang::Locale& rLocale ) ; virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() override; virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) override; virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) override; /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale ); + css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > getContinuousNumberingLevels( const css::lang::Locale& rLocale ); /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Reference< css::container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale ); + css::uno::Sequence< css::uno::Reference< css::container::XIndexAccess > > getOutlineNumberingLevels( const css::lang::Locale& rLocale ); // XLocaleData4 virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) override; @@ -113,23 +113,23 @@ public: // following methods are used by indexentry service /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const css::lang::Locale& rLocale ); + css::uno::Sequence< OUString > getIndexAlgorithm( const css::lang::Locale& rLocale ); /// @throws css::uno::RuntimeException - OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale ); + OUString getDefaultIndexAlgorithm( const css::lang::Locale& rLocale ); /// @throws css::uno::RuntimeException - OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ); + OUString getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ); /// @throws css::uno::RuntimeException - OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ); + OUString getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ); /// @throws css::uno::RuntimeException - css::uno::Sequence< css::i18n::UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale ); + css::uno::Sequence< css::i18n::UnicodeScript > getUnicodeScripts( const css::lang::Locale& rLocale ); /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ); + css::uno::Sequence< OUString > getFollowPageWords( const css::lang::Locale& rLocale ); /// @throws css::uno::RuntimeException - bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale ); + bool hasPhonetic( const css::lang::Locale& rLocale ); /// @throws css::uno::RuntimeException - bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ); + bool isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ); /// @throws css::uno::RuntimeException - OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale ); + OUString getHangingCharacters( const css::lang::Locale& rLocale ); //XServiceInfo virtual OUString SAL_CALL getImplementationName() override; @@ -142,9 +142,9 @@ private: OUString ref_name; /// @throws css::uno::RuntimeException - oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ); - sal_Unicode ** SAL_CALL getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount); - sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm); + oslGenericFunction getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ); + sal_Unicode ** getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount); + sal_Unicode ** getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm); /// @throws css::uno::RuntimeException css::uno::Sequence< css::i18n::CalendarItem2 > & getCalendarItemByName(const OUString& name, diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 0fe10c4218d1..e248a1812004 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.hxx @@ -59,11 +59,11 @@ public: // following methods are not for XNativeNumberSupplier, they are for calling from transliterations /// @throws css::uno::RuntimeException - OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, + OUString getNativeNumberString( const OUString& aNumberString, const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode, css::uno::Sequence< sal_Int32 >& offset ); /// @throws css::uno::RuntimeException - sal_Unicode SAL_CALL getNativeNumberChar( const sal_Unicode inChar, + sal_Unicode getNativeNumberChar( const sal_Unicode inChar, const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) ; private: diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index 7ed51742292d..d573cc1128ce 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -31,7 +31,7 @@ protected: oslModule hModule; #endif sal_uInt16 **idx; - const sal_Unicode* SAL_CALL getPronounce(const sal_Unicode ch); + const sal_Unicode* getPronounce(const sal_Unicode ch); public: #ifndef DISABLE_DYNLOADING diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 8b5c9fa9a20e..98e16ca623f2 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -71,7 +71,7 @@ private: protected: #ifndef DISABLE_DYNLOADING oslModule hModule; - oslGenericFunction SAL_CALL getFunctionBySymbol(const sal_Char* func); + oslGenericFunction getFunctionBySymbol(const sal_Char* func); #endif }; @@ -115,7 +115,7 @@ private: css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL; sal_Int32 maxLeftLength; sal_Int32 maxRightLength; - css::uno::Sequence< OUString > SAL_CALL + css::uno::Sequence< OUString > getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toHanja); }; @@ -153,9 +153,9 @@ public: private: // user defined dictionary list css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL; - OUString SAL_CALL getWordConversion(const OUString& aText, + OUString getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, css::uno::Sequence <sal_Int32>& offset); - rtl:: OUString SAL_CALL getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions); + rtl:: OUString getCharConversion(const rtl:: OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions); css::lang::Locale aLocale; }; diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx index 43642ef97452..222e5911dce2 100644 --- a/i18npool/inc/textconversionImpl.hxx +++ b/i18npool/inc/textconversionImpl.hxx @@ -69,7 +69,7 @@ private: css::uno::Reference < css::uno::XComponentContext > m_xContext; /// @throws css::lang::NoSupportException - void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale ); + void getLocaleSpecificTextConversion( const css::lang::Locale& rLocale ); }; } // i18npool diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index 0d70de37bfd2..6012d41490d8 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -91,7 +91,7 @@ private: css::uno::Reference< css::i18n::XExtendedTransliteration > caseignore; /// @throws css::uno::RuntimeException - bool SAL_CALL loadModuleByName( const OUString& implName, + bool loadModuleByName( const OUString& implName, css::uno::Reference<css::i18n::XExtendedTransliteration> & body, const css::lang::Locale& rLocale); void clear(); @@ -101,7 +101,7 @@ private: css::uno::Reference< css::i18n::XExtendedTransliteration >& body ); /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > SAL_CALL getRange( + css::uno::Sequence< OUString > getRange( const css::uno::Sequence< OUString > &inStrs, sal_Int32 length, const sal_Int16 _nCascade); }; diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index dd3d90209e93..b1ab5b423dbf 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.hxx @@ -49,7 +49,7 @@ protected: bool recycleSymbol; private: /// @throws css::uno::RuntimeException - OUString SAL_CALL + OUString transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ); }; diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index d0f39a19b43c..5e9d2d7971ba 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.hxx @@ -71,7 +71,7 @@ class Transliteration_casemapping : public Transliteration_body { public: Transliteration_casemapping(); - void SAL_CALL setMappingType(const MappingType rMappingType, const css::lang::Locale& rLocale ); + void setMappingType(const MappingType rMappingType, const css::lang::Locale& rLocale ); }; class Transliteration_togglecase : public Transliteration_body diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx index cd49d57c65ab..c16dfca46f6c 100644 --- a/i18npool/inc/transliteration_caseignore.hxx +++ b/i18npool/inc/transliteration_caseignore.hxx @@ -50,7 +50,7 @@ public: private: /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL compare( + sal_Int32 compare( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2); diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index 24ca264e708b..1ac3fd64af53 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -527,7 +527,7 @@ sal_Int16 BreakIteratorImpl::getScriptClass(sal_uInt32 currentChar) return nRet; } -bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) +bool BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUString& aLocaleName) { // to share service between same Language but different Country code, like zh_CN and zh_TW for (lookupTableItem* listItem : lookupTable) { @@ -567,7 +567,7 @@ bool SAL_CALL BreakIteratorImpl::createLocaleSpecificBreakIterator(const OUStrin return false; } -Reference < XBreakIterator > SAL_CALL +Reference < XBreakIterator > BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) { if (xBI.is() && rLocale == aLocale) diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index b4ca111179c1..3ed048b02253 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -77,7 +77,7 @@ class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator }; // loading ICU breakiterator on demand. -void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale, +void BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Locale& rLocale, sal_Int16 rBreakType, sal_Int16 nWordType, const sal_Char *rule, const OUString& rText) { bool bNewBreak = false; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index 522a2cf8a077..4d6d0ff279b3 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -140,7 +140,7 @@ Calendar_gregorian::Calendar_gregorian(const Era *_earArray) { init(_earArray); } -void SAL_CALL +void Calendar_gregorian::init(const Era *_eraArray) { cCalendar = "com.sun.star.i18n.Calendar_gregorian"; diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 849251e65213..8e925653e9ab 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -124,7 +124,7 @@ ParseResult SAL_CALL CharacterClassificationImpl::parsePredefinedToken( contCharTokenType, userDefinedCharactersCont); } -bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassification(const OUString& serviceName, const Locale& rLocale) +bool CharacterClassificationImpl::createLocaleSpecificCharacterClassification(const OUString& serviceName, const Locale& rLocale) { // to share service between same Language but different Country code, like zh_CN and zh_SG for (size_t l = 0; l < lookupTable.size(); l++) { @@ -149,7 +149,7 @@ bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassifi return false; } -Reference < XCharacterClassification > const & SAL_CALL +Reference < XCharacterClassification > const & CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Locale& rLocale) { // reuse instance if locale didn't change diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index fd9b1f1bb053..1f6de90d125e 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -140,7 +140,7 @@ CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) return option_int; } -bool SAL_CALL +bool CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& serviceName, const OUString& rSortAlgorithm) { for (size_t l = 0; l < lookupTable.size(); l++) { @@ -164,7 +164,7 @@ CollatorImpl::createCollator(const lang::Locale& rLocale, const OUString& servic return false; } -void SAL_CALL +void CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm) { for (lookupTableItem* i : lookupTable) { diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index f898d6fde3e3..861d58f8e7cc 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -975,7 +975,7 @@ OUString DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index) } } -bool SAL_CALL +bool DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) { if (! xHierarchicalNameAccess.is()) { diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index d467b5b708b9..7acb0069da32 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -93,7 +93,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexE getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm ); } -bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) +bool IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const OUString& name) { Reference < XInterface > xI = m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.i18n.IndexEntrySupplier_" + name, m_xContext); @@ -105,7 +105,7 @@ bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const O return false; } -Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL +Reference < css::i18n::XExtendedIndexEntrySupplier > const & IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) { if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language && diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index 5bc149041a40..39d68f78c8f7 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx @@ -98,7 +98,7 @@ OUString SAL_CALL IndexEntrySupplier_Common::getIndexFollowPageWord( sal_Bool, throw RuntimeException(); } -const OUString& SAL_CALL +const OUString& IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry, const OUString& PhoneticEntry, const lang::Locale& rLocale ) { diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 24964521ae1e..155423b5ec1f 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -106,7 +106,7 @@ InputSequenceCheckerImpl::getLanguageByScripType(sal_Unicode cChar, sal_Unicode return nullptr; } -Reference< XExtendedInputSequenceChecker >& SAL_CALL +Reference< XExtendedInputSequenceChecker >& InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char const * rLanguage) { if (cachedItem && cachedItem->aLanguage == rLanguage) { diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index e84f2b6282e7..64c619466dfa 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -480,7 +480,7 @@ public: lcl_LookupTableHelper(); ~lcl_LookupTableHelper(); - oslGenericFunction SAL_CALL getFunctionSymbolByName( + oslGenericFunction getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction, LocaleDataLookupTableItem** pOutCachedItem ); @@ -514,7 +514,7 @@ lcl_LookupTableHelper::~lcl_LookupTableHelper() maLookupTable.clear(); } -oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName( +oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName( const OUString& localeName, const sal_Char* pFunction, LocaleDataLookupTableItem** pOutCachedItem ) { @@ -936,7 +936,7 @@ LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) #define COLLATOR_OFFSET_RULE 2 #define COLLATOR_ELEMENTS 3 -OUString SAL_CALL +OUString LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getCollatorImplementation" )); @@ -1013,7 +1013,7 @@ LocaleDataImpl::getSearchOptions( const Locale& rLocale ) } } -sal_Unicode ** SAL_CALL +sal_Unicode ** LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getIndexAlgorithm" )); @@ -1023,7 +1023,7 @@ LocaleDataImpl::getIndexArray(const Locale& rLocale, sal_Int16& indexCount) return nullptr; } -Sequence< OUString > SAL_CALL +Sequence< OUString > LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) { sal_Int16 indexCount = 0; @@ -1042,7 +1042,7 @@ LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale ) } } -OUString SAL_CALL +OUString LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) { sal_Int16 indexCount = 0; @@ -1057,7 +1057,7 @@ LocaleDataImpl::getDefaultIndexAlgorithm( const Locale& rLocale ) return OUString(); } -bool SAL_CALL +bool LocaleDataImpl::hasPhonetic( const Locale& rLocale ) { sal_Int16 indexCount = 0; @@ -1072,7 +1072,7 @@ LocaleDataImpl::hasPhonetic( const Locale& rLocale ) return false; } -sal_Unicode ** SAL_CALL +sal_Unicode ** LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& algorithm) { sal_Int16 indexCount = 0; @@ -1086,28 +1086,28 @@ LocaleDataImpl::getIndexArrayForAlgorithm(const Locale& rLocale, const OUString& return nullptr; } -bool SAL_CALL +bool LocaleDataImpl::isPhonetic( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray && indexArray[4][0]; } -OUString SAL_CALL +OUString LocaleDataImpl::getIndexKeysByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray ? "0-9"+OUString(indexArray[2]) : OUString(); } -OUString SAL_CALL +OUString LocaleDataImpl::getIndexModuleByAlgorithm( const Locale& rLocale, const OUString& algorithm ) { sal_Unicode **indexArray = getIndexArrayForAlgorithm(rLocale, algorithm); return indexArray ? OUString(indexArray[1]) : OUString(); } -Sequence< UnicodeScript > SAL_CALL +Sequence< UnicodeScript > LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getUnicodeScripts" )); @@ -1127,7 +1127,7 @@ LocaleDataImpl::getUnicodeScripts( const Locale& rLocale ) } } -Sequence< OUString > SAL_CALL +Sequence< OUString > LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getFollowPageWords" )); @@ -1212,7 +1212,7 @@ LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) } } -OUString SAL_CALL +OUString LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getForbiddenCharacters" )); @@ -1226,7 +1226,7 @@ LocaleDataImpl::getHangingCharacters( const Locale& rLocale ) return OUString(); } -Sequence< OUString > SAL_CALL +Sequence< OUString > LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) { MyFunc_Type func = reinterpret_cast<MyFunc_Type>(getFunctionSymbol( rLocale, "getBreakIteratorRules" )); @@ -1270,7 +1270,7 @@ LocaleDataImpl::getReservedWord( const Locale& rLocale ) } -Sequence< Sequence<beans::PropertyValue> > SAL_CALL +Sequence< Sequence<beans::PropertyValue> > LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) { // load symbol @@ -1376,7 +1376,7 @@ public: virtual sal_Bool SAL_CALL hasElements( ) override; }; -Sequence< Reference<container::XIndexAccess> > SAL_CALL +Sequence< Reference<container::XIndexAccess> > LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) { // load symbol @@ -1448,7 +1448,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const lang::Locale& rLocale ) // helper functions -oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction ) +oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, const sal_Char* pFunction ) { lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get(); diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index d90518063a13..f3b2b6786324 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -523,7 +523,7 @@ static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale) return -1; } -OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, +OUString NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset) { if (!isValidNatNum(rLocale, nNativeNumberMode)) @@ -615,7 +615,7 @@ OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUStr return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, offset); } -sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) +sal_Unicode NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) { if (nNativeNumberMode == NativeNumberMode::NATNUM0) { // Ascii for (const auto & i : NumberChar) diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index 3ddc7cb8de61..6f9c3d189cf4 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -124,7 +124,7 @@ class TextSearch: public cppu::WeakImplHelper bool checkCTLStart, checkCTLEnd; /// @throws css::uno::RuntimeException - bool SAL_CALL isCellStart(const OUString& searchStr, sal_Int32 nPos); + bool isCellStart(const OUString& searchStr, sal_Int32 nPos); public: explicit TextSearch( diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx index 002ba056cdb1..fe5ac7eba6be 100644 --- a/i18npool/source/textconversion/textconversion.cxx +++ b/i18npool/source/textconversion/textconversion.cxx @@ -59,7 +59,7 @@ static void* nullFunc() return nullptr; } -oslGenericFunction SAL_CALL +oslGenericFunction TextConversionService::getFunctionBySymbol(const sal_Char* func) { if (hModule) diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx index 2237fef42820..7a9d02942ca8 100644 --- a/i18npool/source/textconversion/textconversionImpl.cxx +++ b/i18npool/source/textconversion/textconversionImpl.cxx @@ -73,7 +73,7 @@ TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTex return xTC->interactiveConversion(rLocale, nTextConversionType, nTextConversionOptions); } -void SAL_CALL +void TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) { if (rLocale != aLocale) { diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index 23fabd706df1..64be16109db5 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -120,7 +120,7 @@ const sal_Unicode* getHanja2HangulData(); #endif -Sequence< OUString > SAL_CALL +Sequence< OUString > TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toHanja) { sal_Unicode ch; diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index f9a938137580..e856b225c917 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -77,7 +77,7 @@ const sal_uInt16 *getSTC_WordEntry_S2T(); #endif -OUString SAL_CALL +OUString TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions) { const sal_Unicode *Data; @@ -114,7 +114,7 @@ TextConversion_zh::getCharConversion(const OUString& aText, sal_Int32 nStartPos, return OUString(newStr, SAL_NO_ACQUIRE); //take ownership } -OUString SAL_CALL +OUString TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, bool toSChinese, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset) { sal_Int32 dictLen = 0; diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index be3c1f5815b1..e9322a6adc01 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -35,7 +35,7 @@ sal_Int16 SAL_CALL TextToPronounce_zh::getType() return TransliterationType::ONE_TO_ONE| TransliterationType::IGNORE; } -const sal_Unicode* SAL_CALL +const sal_Unicode* TextToPronounce_zh::getPronounce(const sal_Unicode ch) { static const sal_Unicode emptyString[]={0}; diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 456b8793c1ab..ea3e84075784 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -500,7 +500,7 @@ TransliterationImpl::equals( #define MaxOutput 2 -Sequence< OUString > SAL_CALL +Sequence< OUString > TransliterationImpl::getRange(const Sequence< OUString > &inStrs, const sal_Int32 length, sal_Int16 _numCascade) { @@ -610,7 +610,7 @@ void TransliterationImpl::loadBody( OUString const &implName, Reference<XExtende body = lastTransBody.Body; } -bool SAL_CALL +bool TransliterationImpl::loadModuleByName( const OUString& implName, Reference<XExtendedTransliteration>& body, const Locale& rLocale) { diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx index 98d245ada181..5d1a92e467c7 100644 --- a/i18npool/source/transliteration/transliteration_Numeric.cxx +++ b/i18npool/source/transliteration/transliteration_Numeric.cxx @@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL #define isNumber(c) ((c) >= 0x30 && (c) <= 0x39) #define NUMBER_ZERO 0x30 -OUString SAL_CALL +OUString transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) { diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index baafc85acb17..ea5682daec4f 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -216,7 +216,7 @@ Transliteration_casemapping::Transliteration_casemapping() implementationName = "com.sun.star.i18n.Transliteration.Transliteration_casemapping"; } -void SAL_CALL +void Transliteration_casemapping::setMappingType( const MappingType rMappingType, const Locale& rLocale ) { nMappingType = rMappingType; diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index 705734d05626..6242aa7be12d 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -113,7 +113,7 @@ Transliteration_caseignore::compareString( return compare(str1, 0, str1.getLength(), nMatch1, str2, 0, str2.getLength(), nMatch2); } -sal_Int32 SAL_CALL +sal_Int32 Transliteration_caseignore::compare( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx index e7ac2fa157a6..963bea96bf17 100644 --- a/include/comphelper/accessiblecomponenthelper.hxx +++ b/include/comphelper/accessiblecomponenthelper.hxx @@ -57,15 +57,15 @@ namespace comphelper @throws css::uno::RuntimeException */ - bool SAL_CALL containsPoint( const css::awt::Point& aPoint ); + bool containsPoint( const css::awt::Point& aPoint ); /// @throws css::uno::RuntimeException - css::awt::Point SAL_CALL getLocation( ); + css::awt::Point getLocation( ); /// @throws css::uno::RuntimeException - css::awt::Point SAL_CALL getLocationOnScreen( ); + css::awt::Point getLocationOnScreen( ); /// @throws css::uno::RuntimeException - css::awt::Size SAL_CALL getSize( ); + css::awt::Size getSize( ); /// @throws css::uno::RuntimeException - css::awt::Rectangle SAL_CALL getBounds( ); + css::awt::Rectangle getBounds( ); }; diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx index d96347f51bb8..c4e060e2b664 100644 --- a/include/comphelper/accessibleselectionhelper.hxx +++ b/include/comphelper/accessibleselectionhelper.hxx @@ -71,22 +71,22 @@ namespace comphelper @throws css::lang::IndexOutOfBoundsException @throws css::uno::RuntimeException */ - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ); + void selectAccessibleChild( sal_Int32 nChildIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ); + bool isAccessibleChildSelected( sal_Int32 nChildIndex ); /// @throws css::uno::RuntimeException - void SAL_CALL clearAccessibleSelection( ); + void clearAccessibleSelection( ); /// @throws css::uno::RuntimeException - void SAL_CALL selectAllAccessibleChildren( ); + void selectAllAccessibleChildren( ); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ); + sal_Int32 getSelectedAccessibleChildCount( ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ); + css::uno::Reference< css::accessibility::XAccessible > getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::uno::RuntimeException - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ); + void deselectAccessibleChild( sal_Int32 nSelectedChildIndex ); }; diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index e522448132cd..60fe555efb87 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -69,23 +69,23 @@ namespace comphelper @throws css::lang::IndexOutOfBoundsException @throws css::uno::RuntimeException */ - OUString SAL_CALL getSelectedText(); + OUString getSelectedText(); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getSelectionStart(); + sal_Int32 getSelectionStart(); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getSelectionEnd(); + sal_Int32 getSelectionEnd(); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ); + css::accessibility::TextSegment getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ); + css::accessibility::TextSegment getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ); /// @throws css::lang::IndexOutOfBoundsException /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ); + css::accessibility::TextSegment getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ); public: diff --git a/include/comphelper/interfacecontainer2.hxx b/include/comphelper/interfacecontainer2.hxx index 4439dbfc5da6..d65cb78c0a25 100644 --- a/include/comphelper/interfacecontainer2.hxx +++ b/include/comphelper/interfacecontainer2.hxx @@ -88,20 +88,20 @@ public: ~OInterfaceIteratorHelper2(); /** Return true, if there are more elements in the iterator. */ - bool SAL_CALL hasMoreElements() const + bool hasMoreElements() const { return nRemain != 0; } /** Return the next element of the iterator. Calling this method if hasMoreElements() has returned false, is an error. Cast the returned pointer to the */ - css::uno::XInterface * SAL_CALL next(); + css::uno::XInterface * next(); /** Removes the current element (the last one returned by next()) from the underlying container. Calling this method before next() has been called or calling it twice with no next() inbetween is an error. */ - void SAL_CALL remove(); + void remove(); private: OInterfaceContainerHelper2 & rCont; @@ -152,12 +152,12 @@ public: Return the number of Elements in the container. Only useful if you have acquired the mutex. */ - sal_Int32 SAL_CALL getLength() const; + sal_Int32 getLength() const; /** Return all interfaces added to this container. **/ - std::vector< css::uno::Reference< css::uno::XInterface > > SAL_CALL getElements() const; + std::vector< css::uno::Reference< css::uno::XInterface > > getElements() const; /** Inserts an element into the container. The position is not specified, thus it is not specified in which order events are fired. @@ -175,7 +175,7 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL addInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace ); + sal_Int32 addInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace ); /** Removes an element from the container. It uses interface equality to remove the interface. @param rxIFace @@ -183,16 +183,16 @@ public: @return the new count of elements in the container */ - sal_Int32 SAL_CALL removeInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace ); + sal_Int32 removeInterface( const css::uno::Reference< css::uno::XInterface > & rxIFace ); /** Call disposing on all object in the container that support XEventListener. Than clear the container. */ - void SAL_CALL disposeAndClear( const css::lang::EventObject & rEvt ); + void disposeAndClear( const css::lang::EventObject & rEvt ); /** Clears the container without calling disposing(). */ - void SAL_CALL clear(); + void clear(); /** Executes a functor for each contained listener of specified type, e.g. <code>forEach<awt::XPaintListener>(...</code>. diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index cf2790a88ae6..2cbd8bb89bcb 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -104,7 +104,7 @@ namespace param virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; // pseudo-XComponent - void SAL_CALL dispose(); + void dispose(); protected: virtual ~ParameterWrapper() override; diff --git a/include/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx index 978c9892ed95..1a57ed058f95 100644 --- a/include/connectivity/warningscontainer.hxx +++ b/include/connectivity/warningscontainer.hxx @@ -67,8 +67,8 @@ namespace dbtools void appendWarning(const css::sdb::SQLContext& _rContext); // XWarningsSupplier equivalents - css::uno::Any SAL_CALL getWarnings( ) const; - void SAL_CALL clearWarnings( ); + css::uno::Any getWarnings( ) const; + void clearWarnings( ); }; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 321fa2ad5826..87953d7df413 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -261,35 +261,35 @@ protected: /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 ); + void _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ); + css::uno::Any _getPropertyValue( const OUString& PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::PropertyVetoException /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void SAL_CALL _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 ); + void _setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues, sal_Int32 nPara = -1 ); /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Any > SAL_CALL _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ); + css::uno::Sequence< css::uno::Any > _getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState SAL_CALL _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ); + css::beans::PropertyState _getPropertyState( const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ); + css::beans::PropertyState _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::uno::Sequence< css::beans::PropertyState > SAL_CALL _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ); + css::uno::Sequence< css::beans::PropertyState > _getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ); // returns true if property found or false if unknown property static bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, css::beans::PropertyState& rState); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ); + void _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ); diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx index c4f58b5a2976..283cf2d34dc8 100644 --- a/include/framework/dispatchhelper.hxx +++ b/include/framework/dispatchhelper.hxx @@ -98,7 +98,7 @@ class FWE_DLLPUBLIC DispatchHelper : public ::cppu::WeakImplHelper< css::lang::X // not a public XDispatchHelper-method, need in sfx2/source/control/statcach.cxx for extensions /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL executeDispatch( + css::uno::Any executeDispatch( const css::uno::Reference< css::frame::XDispatch >& xDispatch , const css::util::URL& aURL , bool SyncronFlag , diff --git a/include/package/Deflater.hxx b/include/package/Deflater.hxx index dc2e6df699af..9d88997f5be6 100644 --- a/include/package/Deflater.hxx +++ b/include/package/Deflater.hxx @@ -43,15 +43,15 @@ class DLLPUBLIC_PACKAGE Deflater final public: ~Deflater(); Deflater(sal_Int32 nSetLevel, bool bNowrap); - void SAL_CALL setInputSegment( const css::uno::Sequence< sal_Int8 >& rBuffer ); - bool SAL_CALL needsInput( ); - void SAL_CALL finish( ); - bool SAL_CALL finished( ) { return bFinished;} - sal_Int32 SAL_CALL doDeflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - sal_Int64 SAL_CALL getTotalIn( ); - sal_Int64 SAL_CALL getTotalOut( ); - void SAL_CALL reset( ); - void SAL_CALL end( ); + void setInputSegment( const css::uno::Sequence< sal_Int8 >& rBuffer ); + bool needsInput( ); + void finish( ); + bool finished( ) { return bFinished;} + sal_Int32 doDeflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); + sal_Int64 getTotalIn( ); + sal_Int64 getTotalOut( ); + void reset( ); + void end( ); }; } diff --git a/include/package/Inflater.hxx b/include/package/Inflater.hxx index c978c8a8c918..ebec98734f3f 100644 --- a/include/package/Inflater.hxx +++ b/include/package/Inflater.hxx @@ -40,11 +40,11 @@ class DLLPUBLIC_PACKAGE Inflater final public: Inflater(bool bNoWrap); ~Inflater(); - void SAL_CALL setInput( const css::uno::Sequence< sal_Int8 >& rBuffer ); - bool SAL_CALL needsDictionary( ) { return bNeedDict;} - bool SAL_CALL finished( ) { return bFinished;} - sal_Int32 SAL_CALL doInflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); - void SAL_CALL end( ); + void setInput( const css::uno::Sequence< sal_Int8 >& rBuffer ); + bool needsDictionary( ) { return bNeedDict;} + bool finished( ) { return bFinished;} + sal_Int32 doInflateSegment( css::uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ); + void end( ); sal_Int32 getLastInflateError() { return nLastInflateError; } }; diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx index dde4bce872ec..4e2a1c17738a 100644 --- a/include/sax/tools/documenthandleradapter.hxx +++ b/include/sax/tools/documenthandleradapter.hxx @@ -81,12 +81,12 @@ namespace sax ; protected: - void SAL_CALL + void setDelegate(const css::uno::Reference< css::xml::sax::XDocumentHandler >& delegate) { m_handler = delegate; } - const css::uno::Reference< css::xml::sax::XDocumentHandler >& SAL_CALL + const css::uno::Reference< css::xml::sax::XDocumentHandler >& getDelegate() { return m_handler; @@ -191,12 +191,12 @@ namespace sax { } - void SAL_CALL + void setDelegate(const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& delegate) { m_handler = delegate; } - const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& SAL_CALL + const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& getDelegate() { return m_handler; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 9fd312f87123..d05ab0e24cdb 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -202,14 +202,14 @@ public: const css::uno::Reference < css::ui::dialogs::XFilePicker3 >& GetFilePicker() const; // XFilePickerListener methods - void SAL_CALL FileSelectionChanged(); - void SAL_CALL DirectoryChanged(); + void FileSelectionChanged(); + void DirectoryChanged(); virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); - void SAL_CALL DialogSizeChanged(); + void DialogSizeChanged(); static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent ); // XDialogClosedListener methods - void SAL_CALL DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent ); + void DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent ); /** sets help ids for the controls in the dialog @param _pControlId diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index a9768ade13fa..7f64e5a393d2 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -134,11 +134,11 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override; void setMasterSlaveCommand( bool bSet ); /// @throws css::uno::RuntimeException - void SAL_CALL dispatch( const css::util::URL& aURL, + void dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ); /// @throws css::uno::RuntimeException - void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL); + void addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL); void UnBindController(); SfxDispatcher* GetDispatcher(); void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame); diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx index 5e47c7e076ef..2f814bdfa920 100644 --- a/include/svtools/accessibleruler.hxx +++ b/include/svtools/accessibleruler.hxx @@ -67,7 +67,7 @@ public: const css::uno::Reference< css::accessibility::XAccessible>& rxParent, Ruler& rRepresentation, const ::rtl::OUString& rName ); /// @throws css::uno::RuntimeException - bool SAL_CALL + bool isVisible(); //===== XAccessible ===================================================== diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index f9ee89f0cec9..ff4b62f04313 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -100,7 +100,7 @@ namespace svt void throwIfDisposed(); /** helper method to cause statusChanged is called once for the given command url */ - void SAL_CALL updateCommand( const OUString& rCommandURL ); + void updateCommand( const OUString& rCommandURL ); /** this function is called upon disposing the component */ diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 5b20b105ef1e..cfac0bebfe03 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -83,8 +83,8 @@ public: const AccessibleShapeTreeInfo& rShapeTreeInfo); virtual ~AccessibleControlShape( ) override; - const css::uno::Reference< css::beans::XPropertySet >& SAL_CALL GetControlModel( ) { return m_xControlModel;} ; - AccessibleControlShape* SAL_CALL GetLabeledByControlShape(); + const css::uno::Reference< css::beans::XPropertySet >& GetControlModel( ) { return m_xControlModel;} ; + AccessibleControlShape* GetLabeledByControlShape(); private: //--- XAccessibleComponent ------------------------------- diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx index 3a8f04f523ee..d80050375e68 100644 --- a/include/svx/AccessibleTextHelper.hxx +++ b/include/svx/AccessibleTextHelper.hxx @@ -350,7 +350,7 @@ namespace accessibility @attention Don't call with locked mutexes. You may hold the solar mutex, but this method acquires it anyway. */ - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL GetAt( const css::awt::Point& aPoint ); + css::uno::Reference< css::accessibility::XAccessible > GetAt( const css::awt::Point& aPoint ); private: diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index f82899aca673..d85c639a46c1 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -109,7 +109,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ) override; // css::beans::XPropertyChangeListener - void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt); + void propertyChange(const css::beans::PropertyChangeEvent& evt); // css::form::XPositioningListener void positioned(); diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 7f6b618e8f25..e9475788c84a 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -148,7 +148,7 @@ protected: css::uno::Any GetAnyForItem( SfxItemSet const & aSet, const SfxItemPropertySimpleEntry* pMap ) const; - bool SAL_CALL SetFillAttribute( sal_Int32 nWID, const OUString& rName ); + bool SetFillAttribute( sal_Int32 nWID, const OUString& rName ); /** called from the XActionLockable interface methods on initial locking */ virtual void lock(); @@ -228,34 +228,34 @@ public: // access methods for master objects /// @throws css::uno::RuntimeException - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL _getPropertySetInfo( ); + css::uno::Reference< css::beans::XPropertySetInfo > _getPropertySetInfo( ); /// @throws css::beans::UnknownPropertyException /// @throws css::beans::PropertyVetoException /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void SAL_CALL _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ); + void _setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL _getPropertyValue( const OUString& PropertyName ); + css::uno::Any _getPropertyValue( const OUString& PropertyName ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - css::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName ); + css::beans::PropertyState _getPropertyState( const OUString& PropertyName ); /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - void SAL_CALL _setPropertyToDefault( const OUString& PropertyName ); + void _setPropertyToDefault( const OUString& PropertyName ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL _getPropertyDefault( const OUString& aPropertyName ); + css::uno::Any _getPropertyDefault( const OUString& aPropertyName ); /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames(); + css::uno::Sequence< OUString > _getSupportedServiceNames(); /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Type > SAL_CALL _getTypes( ); + css::uno::Sequence< css::uno::Type > _getTypes( ); void setMaster( SvxShapeMaster* pMaster ); diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 81b6a45e6766..b6b9250a8b84 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -659,9 +659,9 @@ public: // why isn't this part of the XScrollbar? /// @throws css::uno::RuntimeException - void SAL_CALL setMinimum( sal_Int32 n ); + void setMinimum( sal_Int32 n ); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getMinimum( ); + sal_Int32 getMinimum( ); // css::awt::VclWindowPeer void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 5481797ff4b5..1645b81089f0 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -548,7 +548,7 @@ public: // XAuthFallback virtual void SAL_CALL setCode( const OUString& code ) override; /// @throws css::uno::RuntimeException - const OUString& SAL_CALL getCode() const; + const OUString& getCode() const; }; diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index e7bac7bcb071..92ac0ed3b2a4 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -50,33 +50,33 @@ public: @param xElem element reference */ - void SAL_CALL addSubElement( + void addSubElement( css::uno::Reference< css::xml::sax::XAttributeList > const & xElem ); /** Gets sub element of given index. The index follows order in which sub elements were added. @param nIndex index of sub element */ - css::uno::Reference< css::xml::sax::XAttributeList > SAL_CALL getSubElement( sal_Int32 nIndex ); + css::uno::Reference< css::xml::sax::XAttributeList > getSubElement( sal_Int32 nIndex ); /** Adds an attribute to elements. @param rAttrName qname of attribute @param rValue value string of element */ - void SAL_CALL addAttribute( OUString const & rAttrName, OUString const & rValue ); + void addAttribute( OUString const & rAttrName, OUString const & rValue ); /** Dumps out element (and all sub elements). @param xOut document handler to be written to */ - void SAL_CALL dump( + void dump( css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut ); /** Dumps out sub elements (and all further sub elements). @param xOut document handler to be written to */ - void SAL_CALL dumpSubElements( + void dumpSubElements( css::uno::Reference< css::xml::sax::XDocumentHandler > const & xOut ); // XAttributeList diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx index 531e6e2c1dfe..a6d3418352d7 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx @@ -48,7 +48,7 @@ using com::sun::star::xml::sax::XDocumentHandler; // W o r d P r o static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f }; -bool SAL_CALL LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) +bool LotusWordProImportFilter::importImpl( const Sequence< css::beans::PropertyValue >& aDescriptor ) { sal_Int32 nLength = aDescriptor.getLength(); diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx index b1dad02a331f..50129e94d76b 100644 --- a/lotuswordpro/source/filter/LotusWordProImportFilter.hxx +++ b/lotuswordpro/source/filter/LotusWordProImportFilter.hxx @@ -46,7 +46,7 @@ class LotusWordProImportFilter final : public cppu::WeakImplHelper css::uno::Reference< css::lang::XComponent > mxDoc; /// @throws css::uno::RuntimeException - bool SAL_CALL importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); + bool importImpl( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ); public: explicit LotusWordProImportFilter( const css::uno::Reference< css::uno::XComponentContext > &rxContext) diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 60a8e1e9f0e5..7a8e0c379596 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -51,18 +51,18 @@ public: /// @throws css::io::BufferSizeExceededException /// @throws css::io::IOException /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ); + sal_Int32 readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ); // XSeekable /// @throws css::lang::IllegalArgumentException /// @throws css::io::IOException /// @throws css::uno::RuntimeException - void SAL_CALL seek( sal_Int64 location ); + void seek( sal_Int64 location ); /// @throws css::io::IOException /// @throws css::uno::RuntimeException - sal_Int64 SAL_CALL getPosition( ); + sal_Int64 getPosition( ); /// @throws css::io::IOException /// @throws css::uno::RuntimeException - sal_Int64 SAL_CALL getLength( ); + sal_Int64 getLength( ); sal_uInt16 ReadUInt16(); sal_uInt32 ReadUInt32(); diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index 778756475414..e19ed60d99c3 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -33,15 +33,15 @@ public: ~CRC32(); /// @throws css::uno::RuntimeException - sal_Int64 SAL_CALL updateStream (css::uno::Reference < css::io::XInputStream > const & xStream); + sal_Int64 updateStream (css::uno::Reference < css::io::XInputStream > const & xStream); /// @throws css::uno::RuntimeException - void SAL_CALL updateSegment(const css::uno::Sequence< sal_Int8 > &b, sal_Int32 len); + void updateSegment(const css::uno::Sequence< sal_Int8 > &b, sal_Int32 len); /// @throws css::uno::RuntimeException - void SAL_CALL update(const css::uno::Sequence< sal_Int8 > &b); + void update(const css::uno::Sequence< sal_Int8 > &b); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getValue(); + sal_Int32 getValue(); /// @throws css::uno::RuntimeException - void SAL_CALL reset(); + void reset(); }; #endif diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx index c84ae2ce2410..07e8a5848617 100644 --- a/package/inc/ZipEnumeration.hxx +++ b/package/inc/ZipEnumeration.hxx @@ -26,8 +26,8 @@ class ZipEnumeration final EntryHash &rEntryHash; EntryHash::const_iterator aIterator; public: - bool SAL_CALL hasMoreElements(); - const ZipEntry * SAL_CALL nextElement(); + bool hasMoreElements(); + const ZipEntry * nextElement(); ZipEnumeration( EntryHash &rNewEntryHash ); ~ZipEnumeration(); }; diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index d8f6903e35ac..4620b5da64f2 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -75,7 +75,7 @@ private: css::uno::Reference< css::io::XInputStream > const & GetOwnSeekStream(); /// get raw data using unbuffered stream /// @throws css::uno::RuntimeException - css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData(); + css::uno::Reference< css::io::XInputStream > getRawData(); public: bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;} diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 56bc3d48e3bd..cbcceece39ea 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -1817,7 +1817,7 @@ OStorage::~OStorage() } } -void SAL_CALL OStorage::InternalDispose( bool bNotifyImpl ) +void OStorage::InternalDispose( bool bNotifyImpl ) { if ( !m_pImpl ) { diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index 532088359184..262b317e4def 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -318,7 +318,7 @@ public: virtual ~OStorage() override; - void SAL_CALL InternalDispose( bool bNotifyImpl ); + void InternalDispose( bool bNotifyImpl ); void ChildIsDisposed( const css::uno::Reference< css::uno::XInterface >& xChild ); diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx index 89e22c368851..9552c53f7111 100644 --- a/package/source/zipapi/ByteGrabber.cxx +++ b/package/source/zipapi/ByteGrabber.cxx @@ -53,7 +53,7 @@ void ByteGrabber::setInputStream (const uno::Reference < io::XInputStream >& xNe } // XInputStream chained -sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData, +sal_Int32 ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -61,7 +61,7 @@ sal_Int32 SAL_CALL ByteGrabber::readBytes( uno::Sequence< sal_Int8 >& aData, } // XSeekable chained... -void SAL_CALL ByteGrabber::seek( sal_Int64 location ) +void ByteGrabber::seek( sal_Int64 location ) { ::osl::MutexGuard aGuard( m_aMutex ); if (!xSeek.is() ) @@ -75,7 +75,7 @@ void SAL_CALL ByteGrabber::seek( sal_Int64 location ) xSeek->seek( location ); } -sal_Int64 SAL_CALL ByteGrabber::getPosition( ) +sal_Int64 ByteGrabber::getPosition( ) { ::osl::MutexGuard aGuard( m_aMutex ); if (!xSeek.is() ) @@ -84,7 +84,7 @@ sal_Int64 SAL_CALL ByteGrabber::getPosition( ) return xSeek->getPosition(); } -sal_Int64 SAL_CALL ByteGrabber::getLength( ) +sal_Int64 ByteGrabber::getLength( ) { ::osl::MutexGuard aGuard( m_aMutex ); if (!xSeek.is() ) diff --git a/package/source/zipapi/CRC32.cxx b/package/source/zipapi/CRC32.cxx index 0476f663e916..a38d7562cf17 100644 --- a/package/source/zipapi/CRC32.cxx +++ b/package/source/zipapi/CRC32.cxx @@ -35,28 +35,28 @@ CRC32::CRC32() CRC32::~CRC32() { } -void SAL_CALL CRC32::reset() +void CRC32::reset() { nCRC=0; } -sal_Int32 SAL_CALL CRC32::getValue() +sal_Int32 CRC32::getValue() { return nCRC & 0xFFFFFFFFL; } /** Update CRC32 with specified sequence of bytes */ -void SAL_CALL CRC32::updateSegment(const Sequence< sal_Int8 > &b, sal_Int32 len) +void CRC32::updateSegment(const Sequence< sal_Int8 > &b, sal_Int32 len) { nCRC = rtl_crc32(nCRC, b.getConstArray(), len ); } /** Update CRC32 with specified sequence of bytes */ -void SAL_CALL CRC32::update(const Sequence< sal_Int8 > &b) +void CRC32::update(const Sequence< sal_Int8 > &b) { nCRC = rtl_crc32(nCRC, b.getConstArray(),b.getLength()); } -sal_Int64 SAL_CALL CRC32::updateStream( Reference < XInputStream > const & xStream ) +sal_Int64 CRC32::updateStream( Reference < XInputStream > const & xStream ) { sal_Int32 nLength; sal_Int64 nTotal = 0; diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index e1694d293ca9..e2f0e7ebd374 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -93,35 +93,35 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence < sal_Int8 > &rBuffer, sal_Int } } -void SAL_CALL Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffer ) +void Deflater::setInputSegment( const uno::Sequence< sal_Int8 >& rBuffer ) { sInBuffer = rBuffer; nOffset = 0; nLength = rBuffer.getLength(); } -bool SAL_CALL Deflater::needsInput( ) +bool Deflater::needsInput( ) { return nLength <=0; } -void SAL_CALL Deflater::finish( ) +void Deflater::finish( ) { bFinish = true; } -sal_Int32 SAL_CALL Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) +sal_Int32 Deflater::doDeflateSegment( uno::Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) { OSL_ASSERT( !(nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength())); return doDeflateBytes(rBuffer, nNewOffset, nNewLength); } -sal_Int64 SAL_CALL Deflater::getTotalIn( ) +sal_Int64 Deflater::getTotalIn( ) { return pStream->total_in; // FIXME64: zlib doesn't look 64bit clean here } -sal_Int64 SAL_CALL Deflater::getTotalOut( ) +sal_Int64 Deflater::getTotalOut( ) { return pStream->total_out; // FIXME64: zlib doesn't look 64bit clean here } -void SAL_CALL Deflater::reset( ) +void Deflater::reset( ) { #if !defined Z_PREFIX deflateReset(pStream); @@ -132,7 +132,7 @@ void SAL_CALL Deflater::reset( ) bFinished = false; nOffset = nLength = 0; } -void SAL_CALL Deflater::end( ) +void Deflater::end( ) { if (pStream != nullptr) { diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index eb6cc734e769..a059eb1418de 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -59,7 +59,7 @@ Inflater::~Inflater() end(); } -void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer ) +void Inflater::setInput( const Sequence< sal_Int8 >& rBuffer ) { sInBuffer = rBuffer; nOffset = 0; @@ -67,7 +67,7 @@ void SAL_CALL Inflater::setInput( const Sequence< sal_Int8 >& rBuffer ) } -sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) +sal_Int32 Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sal_Int32 nNewOffset, sal_Int32 nNewLength ) { if (nNewOffset < 0 || nNewLength < 0 || nNewOffset + nNewLength > rBuffer.getLength()) { @@ -76,7 +76,7 @@ sal_Int32 SAL_CALL Inflater::doInflateSegment( Sequence< sal_Int8 >& rBuffer, sa return doInflateBytes(rBuffer, nNewOffset, nNewLength); } -void SAL_CALL Inflater::end( ) +void Inflater::end( ) { if (pStream != nullptr) { diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx index 5417406db379..7f3c42485876 100644 --- a/package/source/zipapi/MemoryByteGrabber.hxx +++ b/package/source/zipapi/MemoryByteGrabber.hxx @@ -44,7 +44,7 @@ public: /// @throws css::io::BufferSizeExceededException /// @throws css::io::IOException /// @throws css::uno::RuntimeException - void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) + void skipBytes( sal_Int32 nBytesToSkip ) { mnCurrent += nBytesToSkip; } diff --git a/package/source/zipapi/ZipEnumeration.cxx b/package/source/zipapi/ZipEnumeration.cxx index f5093f6f69d2..794ac1a7b9fc 100644 --- a/package/source/zipapi/ZipEnumeration.cxx +++ b/package/source/zipapi/ZipEnumeration.cxx @@ -29,12 +29,12 @@ ZipEnumeration::ZipEnumeration( EntryHash & rNewEntryHash) ZipEnumeration::~ZipEnumeration() { } -bool SAL_CALL ZipEnumeration::hasMoreElements() +bool ZipEnumeration::hasMoreElements() { return (aIterator != rEntryHash.end()); } -const ZipEntry* SAL_CALL ZipEnumeration::nextElement() +const ZipEntry* ZipEnumeration::nextElement() { if (aIterator != rEntryHash.end()) return &((*aIterator++).second); diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 160dfa8d310f..c555b1f0bfbc 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -937,7 +937,7 @@ void SAL_CALL ZipPackageStream::setInputStream( const uno::Reference< io::XInput m_nStreamMode = PACKAGE_STREAM_DETECT; } -uno::Reference< io::XInputStream > SAL_CALL ZipPackageStream::getRawData() +uno::Reference< io::XInputStream > ZipPackageStream::getRawData() { try { diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 27820b907cab..2fcc6af56f93 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -265,7 +265,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive return createDocumentAlive(_frame,false); } -uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) +uno::Reference< frame::XModel > OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) { uno::Reference< frame::XModel > xModel; OUString sOutputName = getNewOutputName(); // starts implicite the report generator diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index e2d76c9c5bf6..9653e454986b 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -121,7 +121,7 @@ namespace reportdesign /// @throws css::lang::IllegalArgumentException /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - css::uno::Reference< css::frame::XModel > SAL_CALL createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ,bool _bHidden) ; + css::uno::Reference< css::frame::XModel > createDocumentAlive( const css::uno::Reference< css::frame::XFrame >& _frame ,bool _bHidden) ; virtual css::util::URL SAL_CALL createDocument( ) override ; virtual void SAL_CALL interrupt( ) override ; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 624496ff6698..675c99cb4e21 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -114,9 +114,9 @@ public: // XContainerListener /// @throws css::uno::RuntimeException - void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent); + void elementInserted(const css::container::ContainerEvent& rEvent); /// @throws css::uno::RuntimeException - void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent); + void elementRemoved(const css::container::ContainerEvent& rEvent); virtual Size GetOptimalSize() const override; @@ -600,7 +600,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const // XContainerListener -void SAL_CALL OFieldExpressionControl::elementInserted(const container::ContainerEvent& evt) +void OFieldExpressionControl::elementInserted(const container::ContainerEvent& evt) { if ( m_bIgnoreEvent ) return; @@ -640,7 +640,7 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe } } -void SAL_CALL OFieldExpressionControl::elementRemoved(const container::ContainerEvent& evt) +void OFieldExpressionControl::elementRemoved(const container::ContainerEvent& evt) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/salhelper/source/timer.cxx b/salhelper/source/timer.cxx index f3dcc508a0a2..3d60f34fbc4c 100644 --- a/salhelper/source/timer.cxx +++ b/salhelper/source/timer.cxx @@ -34,13 +34,13 @@ public: virtual ~TimerManager() override; /// register timer - void SAL_CALL registerTimer(salhelper::Timer* pTimer); + void registerTimer(salhelper::Timer* pTimer); /// unregister timer - void SAL_CALL unregisterTimer(salhelper::Timer const * pTimer); + void unregisterTimer(salhelper::Timer const * pTimer); /// lookup timer - bool SAL_CALL lookupTimer(const salhelper::Timer* pTimer); + bool lookupTimer(const salhelper::Timer* pTimer); /// retrieves the "Singleton" TimerManager Instance static TimerManager* SAL_CALL getTimerManager(); @@ -50,7 +50,7 @@ protected: virtual void SAL_CALL run() override; /// Checking and triggering of a timer event - void SAL_CALL checkForTimeout(); + void checkForTimeout(); /// cleanup Method virtual void SAL_CALL onTerminated() override; diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index b96effe84d87..a7a5ac2d76f9 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -300,7 +300,7 @@ bool ScAccessibleCellBase::IsEditable( return bEditable; } -OUString SAL_CALL ScAccessibleCellBase::GetNote() +OUString ScAccessibleCellBase::GetNote() { SolarMutexGuard aGuard; IsObjectValid(); @@ -346,7 +346,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote() return sNote; } -OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() +OUString ScAccessibleCellBase::getShadowAttrs() { SolarMutexGuard aGuard; IsObjectValid(); @@ -426,7 +426,7 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() return sShadowAttrs; } -OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() +OUString ScAccessibleCellBase::getBorderAttrs() { SolarMutexGuard aGuard; IsObjectValid(); @@ -575,7 +575,7 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() } //end of cell attributes -OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote() +OUString ScAccessibleCellBase::GetAllDisplayNote() { OUString strNote; OUString strTrackText; diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index c2d9d31c09f1..a8057a10be71 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -183,7 +183,7 @@ awt::Size SAL_CALL ScAccessibleContextBase::getSize( ) return AWTSize(GetBoundingBox().GetSize()); } -bool SAL_CALL ScAccessibleContextBase::isShowing( ) +bool ScAccessibleContextBase::isShowing( ) { SolarMutexGuard aGuard; IsObjectValid(); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index d9dde2fb2b08..45c074797c9a 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -121,14 +121,14 @@ private: const css::uno::Reference<css::accessibility::XAccessibleStateSet>& rxParentStates); protected: /// @throw css::uno::RuntimeException - OUString SAL_CALL GetNote(); + OUString GetNote(); /// @throw css::uno::RuntimeException - OUString SAL_CALL GetAllDisplayNote(); + OUString GetAllDisplayNote(); /// @throw css::uno::RuntimeException - OUString SAL_CALL getShadowAttrs(); + OUString getShadowAttrs(); /// @throw css::uno::RuntimeException - OUString SAL_CALL getBorderAttrs(); + OUString getBorderAttrs(); public: const ScAddress& GetCellAddress() const { return maCellAddress; } }; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 10970150bf91..f6c832e98d08 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -78,7 +78,7 @@ protected: public: /// @throws css::uno::RuntimeException - bool SAL_CALL isShowing( ); + bool isShowing( ); /// @throws css::uno::RuntimeException virtual bool SAL_CALL isVisible(); diff --git a/sc/source/ui/vba/vbacomment.cxx b/sc/source/ui/vba/vbacomment.cxx index bc39a9c6b2dd..b27e73a34733 100644 --- a/sc/source/ui/vba/vbacomment.cxx +++ b/sc/source/ui/vba/vbacomment.cxx @@ -54,7 +54,7 @@ ScVbaComment::ScVbaComment( // private helper functions -uno::Reference< sheet::XSheetAnnotation > SAL_CALL +uno::Reference< sheet::XSheetAnnotation > ScVbaComment::getAnnotation() { uno::Reference< table::XCell > xCell( mxRange->getCellByPosition(0, 0), uno::UNO_QUERY_THROW ); @@ -62,7 +62,7 @@ ScVbaComment::getAnnotation() return uno::Reference< sheet::XSheetAnnotation > ( xAnnoAnchor->getAnnotation(), uno::UNO_QUERY_THROW ); } -uno::Reference< sheet::XSheetAnnotations > SAL_CALL +uno::Reference< sheet::XSheetAnnotations > ScVbaComment::getAnnotations() { uno::Reference< sheet::XSheetCellRange > xSheetCellRange(mxRange, ::uno::UNO_QUERY_THROW ); @@ -72,7 +72,7 @@ ScVbaComment::getAnnotations() return uno::Reference< sheet::XSheetAnnotations > ( xAnnosSupp->getAnnotations(), uno::UNO_QUERY_THROW ); } -sal_Int32 SAL_CALL +sal_Int32 ScVbaComment::getAnnotationIndex() { uno::Reference< sheet::XSheetAnnotations > xAnnos = getAnnotations(); @@ -97,7 +97,7 @@ ScVbaComment::getAnnotationIndex() return aIndex; } -uno::Reference< excel::XComment > SAL_CALL +uno::Reference< excel::XComment > ScVbaComment::getCommentByIndex( sal_Int32 Index ) { uno::Reference< container::XIndexAccess > xIndexAccess( getAnnotations(), uno::UNO_QUERY_THROW ); diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 3ee4d4550e27..b430d962ecdf 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -38,13 +38,13 @@ class ScVbaComment : public ScVbaComment_BASE private: /// @throws css::uno::RuntimeException - css::uno::Reference< css::sheet::XSheetAnnotation > SAL_CALL getAnnotation(); + css::uno::Reference< css::sheet::XSheetAnnotation > getAnnotation(); /// @throws css::uno::RuntimeException - css::uno::Reference< css::sheet::XSheetAnnotations > SAL_CALL getAnnotations(); + css::uno::Reference< css::sheet::XSheetAnnotations > getAnnotations(); /// @throws css::uno::RuntimeException - sal_Int32 SAL_CALL getAnnotationIndex(); + sal_Int32 getAnnotationIndex(); /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XComment > SAL_CALL getCommentByIndex( sal_Int32 Index ); + css::uno::Reference< ov::excel::XComment > getCommentByIndex( sal_Int32 Index ); public: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index da401f40d5f2..700338be7282 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -38,7 +38,7 @@ class ScVbaGlobals : public ScVbaGlobals_BASE { css::uno::Reference< ov::excel::XApplication > mxApplication; /// @throws css::uno::RuntimeException - css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication(); + css::uno::Reference< ov::excel::XApplication > const & getApplication(); public: ScVbaGlobals( css::uno::Sequence< css::uno::Any > const& aArgs, diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index f6288debde61..a5081da60a7d 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -106,7 +106,7 @@ namespace dlgprov // XDialogProvider / XDialogProvider2 impl method /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::uno::Reference < css::awt::XControl > SAL_CALL createDialogImpl( + css::uno::Reference < css::awt::XControl > createDialogImpl( const OUString& URL, const css::uno::Reference< css::uno::XInterface >& xHandler, const css::uno::Reference< css::awt::XWindowPeer >& xParent, diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 12a7310ed765..3ecfa641358f 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -136,7 +136,7 @@ protected: //=== Impl methods for ...ForLocale methods === /// @throws css::resource::MissingResourceException - OUString SAL_CALL implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ); + OUString implResolveString( const OUString& ResourceID, LocaleItem* pLocaleItem ); bool implHasEntryForId( const OUString& ResourceID, LocaleItem* pLocaleItem ); css::uno::Sequence< OUString > implGetResourceIDs( LocaleItem* pLocaleItem ); void implSetString( const OUString& ResourceID, @@ -207,7 +207,7 @@ protected: /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void SAL_CALL implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments ); + void implInitializeCommonParameters( const css::uno::Sequence< css::uno::Any >& aArguments ); // Scan locale properties files virtual void implScanLocales(); diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx index 32c89a9bbe30..6906ffa2112e 100644 --- a/sd/inc/textapi.hxx +++ b/sd/inc/textapi.hxx @@ -43,7 +43,7 @@ public: virtual ~TextApiObject() throw() override; /// @throws css::uno::RuntimeException - void SAL_CALL dispose(); + void dispose(); OutlinerParaObject* CreateText(); void SetText( OutlinerParaObject const & rText ); diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx index 9f442b469710..0e40f8504af6 100644 --- a/sd/source/core/text/textapi.cxx +++ b/sd/source/core/text/textapi.cxx @@ -147,7 +147,7 @@ rtl::Reference< TextApiObject > TextApiObject::create( SdDrawDocument* pDoc ) return xRet; } -void SAL_CALL TextApiObject::dispose() +void TextApiObject::dispose() { if( mpSource ) { diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 95ee8c096d23..4dddb8e702f8 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -2677,7 +2677,7 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) setUsePen( true ); // enable pen mode, update color } -void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) +void SlideshowImpl::setEraseAllInk(bool bEraseAllInk) { if( bEraseAllInk ) { diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 978ab77e596f..171e4cd1d6bf 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -181,7 +181,7 @@ public: virtual double SAL_CALL getPenWidth() override; virtual void SAL_CALL setPenWidth( double dStrokeWidth ) override; /// @throws css::uno::RuntimeException - void SAL_CALL setEraseAllInk( bool bEraseAllInk ); + void setEraseAllInk( bool bEraseAllInk ); virtual sal_Bool SAL_CALL isRunning( ) override; virtual ::sal_Int32 SAL_CALL getSlideCount( ) override; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) override; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 201b6e44e979..433db37cda52 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -252,7 +252,7 @@ void SAL_CALL SlideShowView::disposing( const lang::EventObject& ) } } -void SAL_CALL SlideShowView::paint( const awt::PaintEvent& e ) +void SlideShowView::paint( const awt::PaintEvent& e ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index c92b170c3bf4..777ddeb7e232 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -181,7 +181,7 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& ) override; /// @throws css::uno::RuntimeException - void SAL_CALL paint( const css::awt::PaintEvent& e ); + void paint( const css::awt::PaintEvent& e ); // XSlideShowView methods virtual css::uno::Reference< css::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) override; diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index 938ee61c8b2c..d1f1199ff7e7 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -89,7 +89,7 @@ SfxFilterListener::~SfxFilterListener() { } -void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) +void SfxFilterListener::refreshed( const lang::EventObject& aSource ) { SolarMutexGuard aGuard; uno::Reference< util::XRefreshable > xContainer( aSource.Source, uno::UNO_QUERY ); @@ -102,7 +102,7 @@ void SAL_CALL SfxFilterListener::refreshed( const lang::EventObject& aSource ) } } -void SAL_CALL SfxFilterListener::disposing( const lang::EventObject& aSource ) +void SfxFilterListener::disposing( const lang::EventObject& aSource ) { SolarMutexGuard aGuard; uno::Reference< util::XRefreshable > xNotifier( aSource.Source, uno::UNO_QUERY ); diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx index bf4d348a0e44..29f0c3bb88fe 100644 --- a/sfx2/source/bastyp/fltlst.hxx +++ b/sfx2/source/bastyp/fltlst.hxx @@ -42,10 +42,10 @@ class SfxFilterListener final public: // XRefreshListener /// @throws css::uno::RuntimeException - void SAL_CALL refreshed( const css::lang::EventObject& aSource ); + void refreshed( const css::lang::EventObject& aSource ); // XEventListener /// @throws css::uno::RuntimeException - void SAL_CALL disposing( const css::lang::EventObject& aSource ); + void disposing( const css::lang::EventObject& aSource ); }; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 115cc0eebd16..af1df14d68a8 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -609,7 +609,7 @@ void collectUIInformation(const util::URL& rURL) } -void SAL_CALL SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, +void SfxDispatchController_Impl::dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) { @@ -831,7 +831,7 @@ SfxDispatcher* SfxDispatchController_Impl::GetDispatcher() return pDispatcher; } -void SAL_CALL SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) +void SfxDispatchController_Impl::addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & aListener, const css::util::URL& aURL) { SolarMutexGuard aGuard; if ( !pDispatch ) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 3393046a66bd..486cfcbbe8e7 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2572,12 +2572,12 @@ const uno::Reference < XFilePicker3 >& FileDialogHelper::GetFilePicker() const } // XFilePickerListener Methods -void SAL_CALL FileDialogHelper::FileSelectionChanged() +void FileDialogHelper::FileSelectionChanged() { mpImpl->handleFileSelectionChanged(); } -void SAL_CALL FileDialogHelper::DirectoryChanged() +void FileDialogHelper::DirectoryChanged() { mpImpl->handleDirectoryChanged(); } @@ -2592,12 +2592,12 @@ void SAL_CALL FileDialogHelper::ControlStateChanged( const FilePickerEvent& aEve mpImpl->handleControlStateChanged( aEvent ); } -void SAL_CALL FileDialogHelper::DialogSizeChanged() +void FileDialogHelper::DialogSizeChanged() { mpImpl->handleDialogSizeChanged(); } -void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) +void FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) { m_nError = ( RET_OK == _rEvent.DialogResult ) ? ERRCODE_NONE : ERRCODE_ABORT; m_aDialogClosedLink.Call( this ); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 06343859c834..63cae375728b 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -263,35 +263,35 @@ protected: OUString m_DefaultTarget; /// check if we are initialized properly - void SAL_CALL checkInit() const; + void checkInit() const; /// initialize state from given DOM tree - void SAL_CALL init(const css::uno::Reference<css::xml::dom::XDocument>& i_xDom); + void init(const css::uno::Reference<css::xml::dom::XDocument>& i_xDom); /// update element in DOM tree - void SAL_CALL updateElement(const char *i_name, + void updateElement(const char *i_name, std::vector<std::pair<const char *, OUString> >* i_pAttrs = nullptr); /// update user-defined meta data and attributes in DOM tree - void SAL_CALL updateUserDefinedAndAttributes(); + void updateUserDefinedAndAttributes(); /// create empty DOM tree (XDocument) - css::uno::Reference<css::xml::dom::XDocument> SAL_CALL createDOM() const; + css::uno::Reference<css::xml::dom::XDocument> createDOM() const; /// extract base URL (necessary for converting relative links) - css::uno::Reference<css::beans::XPropertySet> SAL_CALL getURLProperties( + css::uno::Reference<css::beans::XPropertySet> getURLProperties( const css::uno::Sequence<css::beans::PropertyValue> & i_rMedium) const; /// get text of standard meta data element - OUString SAL_CALL getMetaText(const char* i_name) const; + OUString getMetaText(const char* i_name) const; /// set text of standard meta data element iff not equal to existing text - bool SAL_CALL setMetaText(const char* i_name, + bool setMetaText(const char* i_name, const OUString & i_rValue); /// set text of standard meta data element iff not equal to existing text - void SAL_CALL setMetaTextAndNotify(const char* i_name, + void setMetaTextAndNotify(const char* i_name, const OUString & i_rValue); /// get text of standard meta data element's attribute - OUString SAL_CALL getMetaAttr(const char* i_name, + OUString getMetaAttr(const char* i_name, const char* i_attr) const; /// get text of a list of standard meta data elements (multiple occ.) - css::uno::Sequence< OUString > SAL_CALL getMetaList( + css::uno::Sequence< OUString > getMetaList( const char* i_name) const; /// set text of a list of standard meta data elements (multiple occ.) - bool SAL_CALL setMetaList(const char* i_name, + bool setMetaList(const char* i_name, const css::uno::Sequence< OUString > & i_rValue, AttrVector const*); void createUserDefined(); @@ -558,7 +558,7 @@ OUString SAL_CALL durationToText(sal_Int32 i_value) throw () } // extract base URL (necessary for converting relative links) -css::uno::Reference< css::beans::XPropertySet > SAL_CALL +css::uno::Reference< css::beans::XPropertySet > SfxDocumentMetaData::getURLProperties( const css::uno::Sequence< css::beans::PropertyValue > & i_rMedium) const { @@ -616,7 +616,7 @@ getNodeText(const css::uno::Reference<css::xml::dom::XNode>& i_xNode) return OUString(); } -OUString SAL_CALL +OUString SfxDocumentMetaData::getMetaText(const char* i_name) const // throw (css::uno::RuntimeException) { @@ -628,7 +628,7 @@ SfxDocumentMetaData::getMetaText(const char* i_name) const return (xNode.is()) ? getNodeText(xNode) : OUString(); } -bool SAL_CALL +bool SfxDocumentMetaData::setMetaText(const char* i_name, const OUString & i_rValue) // throw (css::uno::RuntimeException) @@ -683,7 +683,7 @@ SfxDocumentMetaData::setMetaText(const char* i_name, } } -void SAL_CALL +void SfxDocumentMetaData::setMetaTextAndNotify(const char* i_name, const OUString & i_rValue) // throw (css::uno::RuntimeException) @@ -695,7 +695,7 @@ SfxDocumentMetaData::setMetaTextAndNotify(const char* i_name, } } -OUString SAL_CALL +OUString SfxDocumentMetaData::getMetaAttr(const char* i_name, const char* i_attr) const // throw (css::uno::RuntimeException) { @@ -712,7 +712,7 @@ SfxDocumentMetaData::getMetaAttr(const char* i_name, const char* i_attr) const } } -css::uno::Sequence< OUString> SAL_CALL +css::uno::Sequence< OUString> SfxDocumentMetaData::getMetaList(const char* i_name) const // throw (css::uno::RuntimeException) { @@ -728,7 +728,7 @@ SfxDocumentMetaData::getMetaList(const char* i_name) const return ret; } -bool SAL_CALL +bool SfxDocumentMetaData::setMetaList(const char* i_name, const css::uno::Sequence<OUString> & i_rValue, AttrVector const* i_pAttrs) @@ -918,7 +918,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet) } // remove the given element from the DOM, and iff i_pAttrs != 0 insert new one -void SAL_CALL +void SfxDocumentMetaData::updateElement(const char *i_name, std::vector<std::pair<const char *, OUString> >* i_pAttrs) { @@ -956,7 +956,7 @@ SfxDocumentMetaData::updateElement(const char *i_name, } // update user-defined meta data in DOM tree -void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes() +void SfxDocumentMetaData::updateUserDefinedAndAttributes() { createUserDefined(); const css::uno::Reference<css::beans::XPropertySet> xPSet(m_xUserDefined, @@ -1011,7 +1011,7 @@ void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes() } // create empty DOM tree (XDocument) -css::uno::Reference<css::xml::dom::XDocument> SAL_CALL +css::uno::Reference<css::xml::dom::XDocument> SfxDocumentMetaData::createDOM() const // throw (css::uno::RuntimeException) { css::uno::Reference<css::xml::dom::XDocumentBuilder> xBuilder( css::xml::dom::DocumentBuilder::create(m_xContext) ); @@ -1023,7 +1023,7 @@ SfxDocumentMetaData::createDOM() const // throw (css::uno::RuntimeException) return xDoc; } -void SAL_CALL +void SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException) { if (!m_isInitialized) { @@ -1035,7 +1035,7 @@ SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException) } // initialize state from DOM tree -void SAL_CALL SfxDocumentMetaData::init( +void SfxDocumentMetaData::init( const css::uno::Reference<css::xml::dom::XDocument>& i_xDoc) { if (!i_xDoc.is()) diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 925840e335a8..b82355cb88ac 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -117,7 +117,7 @@ awt::Size SAL_CALL SvtRulerAccessible::getSize() return AWTSize( GetBoundingBox().GetSize() ); } -bool SAL_CALL SvtRulerAccessible::isVisible() +bool SvtRulerAccessible::isVisible() { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index ae91f114af99..2c6843f10e23 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -174,7 +174,7 @@ void SAL_CALL PopupMenuControllerBase::updatePopupMenu() updateCommand( m_aCommandURL ); } -void SAL_CALL PopupMenuControllerBase::updateCommand( const OUString& rCommandURL ) +void PopupMenuControllerBase::updateCommand( const OUString& rCommandURL ) { osl::ClearableMutexGuard aLock( m_aMutex ); Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY ); diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 32b085e47bfa..e078468d0e36 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -875,7 +875,7 @@ void SAL_CALL AccessibleControlShape::elementReplaced( const css::container::Con // not interested in } -AccessibleControlShape* SAL_CALL AccessibleControlShape::GetLabeledByControlShape( ) +AccessibleControlShape* AccessibleControlShape::GetLabeledByControlShape( ) { if(m_xControlModel.is()) { diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 84758eb4f64b..faadef3fc063 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -96,15 +96,15 @@ namespace accessibility virtual ~AccessibleTextHelper_Impl() override; // XAccessibleContext child handling methods - sal_Int32 SAL_CALL getAccessibleChildCount(); - uno::Reference< XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ); + sal_Int32 getAccessibleChildCount(); + uno::Reference< XAccessible > getAccessibleChild( sal_Int32 i ); // XAccessibleEventBroadcaster child related methods - void SAL_CALL addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ); - void SAL_CALL removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ); + void addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ); + void removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ); // XAccessibleComponent child related methods - uno::Reference< XAccessible > SAL_CALL getAccessibleAtPoint( const awt::Point& aPoint ); + uno::Reference< XAccessible > getAccessibleAtPoint( const awt::Point& aPoint ); SvxEditSourceAdapter& GetEditSource() const; @@ -1503,12 +1503,12 @@ namespace accessibility } // XAccessibleContext - sal_Int32 SAL_CALL AccessibleTextHelper_Impl::getAccessibleChildCount() + sal_Int32 AccessibleTextHelper_Impl::getAccessibleChildCount() { return mnLastVisibleChild - mnFirstVisibleChild + 1; } - uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i ) + uno::Reference< XAccessible > AccessibleTextHelper_Impl::getAccessibleChild( sal_Int32 i ) { i -= GetStartIndex(); @@ -1526,13 +1526,13 @@ namespace accessibility return nullptr; } - void SAL_CALL AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) + void AccessibleTextHelper_Impl::addAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { if( getNotifierClientId() != -1 ) ::comphelper::AccessibleEventNotifier::addEventListener( getNotifierClientId(), xListener ); } - void SAL_CALL AccessibleTextHelper_Impl::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) + void AccessibleTextHelper_Impl::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { if( getNotifierClientId() != -1 ) { @@ -1550,7 +1550,7 @@ namespace accessibility } } - uno::Reference< XAccessible > SAL_CALL AccessibleTextHelper_Impl::getAccessibleAtPoint( const awt::Point& _aPoint ) + uno::Reference< XAccessible > AccessibleTextHelper_Impl::getAccessibleAtPoint( const awt::Point& _aPoint ) { // make given position relative if( !mxFrontEnd.is() ) diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 6cbd9ad03645..a5473ada9e25 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -113,7 +113,7 @@ SvxGraphCtrlAccessibleContext::~SvxGraphCtrlAccessibleContext() /** returns the XAccessible interface for a given SdrObject. Multiple calls for the same SdrObject return the same XAccessible. */ -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible( const SdrObject* pObj ) +Reference< XAccessible > SvxGraphCtrlAccessibleContext::getAccessible( const SdrObject* pObj ) { Reference<XAccessible> xAccessibleShape; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index fcb0a790e272..dcb869c75a3d 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -59,7 +59,7 @@ SvxShowCharSetVirtualAcc::~SvxShowCharSetVirtualAcc() IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetVirtualAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetVirtualAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 ) -void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent( +void SvxShowCharSetVirtualAcc::fireEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 542abb8278d3..4fd64288e536 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -183,7 +183,7 @@ awt::Size SAL_CALL SvxRectCtlAccessibleContext::getSize() return AWTSize( GetBoundingBox().GetSize() ); } -bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() +bool SvxRectCtlAccessibleContext::isVisible() { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 8fc9171bfee5..53a993fb2f7d 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -95,7 +95,7 @@ namespace svxform virtual void SAL_CALL disposing( const EventObject& Source ) override; // lifetime control - void SAL_CALL dispose(); + void dispose(); protected: virtual ~FormScriptListener() override; @@ -762,7 +762,7 @@ namespace svxform } - void SAL_CALL FormScriptListener::dispose() + void FormScriptListener::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); m_pScriptExecutor = nullptr; diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 8e18fb30f47a..db8a38933ddf 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -183,7 +183,7 @@ private: void CommitChange (sal_Int16 aEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue); - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessible( const SdrObject* pObj ); + css::uno::Reference< css::accessibility::XAccessible > getAccessible( const SdrObject* pObj ); ::accessibility::AccessibleShapeTreeInfo maTreeInfo; diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 4375f9351090..785ff05acc8f 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -76,7 +76,7 @@ namespace svx // call the fireEvent method from the table when it exists. - void SAL_CALL fireEvent( + void fireEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue @@ -173,7 +173,7 @@ namespace svx virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; - void SAL_CALL fireEvent( + void fireEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue @@ -256,7 +256,7 @@ namespace svx virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; - void SAL_CALL fireEvent( + void fireEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 01e5ccb6849b..35e11bef8684 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -102,7 +102,7 @@ public: getSize() override; /// @throws css::uno::RuntimeException - bool SAL_CALL + bool isVisible(); virtual void SAL_CALL diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index bcc7473b6330..510426088b3f 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -132,7 +132,7 @@ class SdrGraphicUpdater : public ::osl::Thread public: SdrGraphicUpdater( const OUString& rFileName, const OUString& rFilterName, SdrGraphicLink& ); - void SAL_CALL Terminate(); + void Terminate(); bool GraphicLinkChanged( const OUString& rFileName ){ return maFileName != rFileName; }; diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 7e7a5e3f49d1..dee7a834d726 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -78,7 +78,7 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& Service return cppu::supportsService(this, ServiceName); } -void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) +void SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { maItemSetVector.push_back( o3tl::make_unique< SfxItemSet >( *mpModelPool, std::initializer_list<SfxItemSet::Pair>{{mnWhich, mnWhich}} ) ); diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 53d7355cf408..29ded8f82530 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -48,7 +48,7 @@ private: ItemPoolVector maItemSetVector; - void SAL_CALL ImplInsertByName( const OUString& aName, const css::uno::Any& aElement ); + void ImplInsertByName( const OUString& aName, const css::uno::Any& aElement ); public: SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw(); diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 1b02a964b702..57725e32318d 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -70,7 +70,7 @@ public: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override; - void SAL_CALL ImplInsertByName( const OUString& aName, const uno::Any& aElement ); + void ImplInsertByName( const OUString& aName, const uno::Any& aElement ); // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) override; @@ -139,7 +139,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( return aSNS; } -void SAL_CALL SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) +void SvxUnoMarkerTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) { maItemSetVector.push_back( o3tl::make_unique<SfxItemSet>( *mpModelPool, svl::Items<XATTR_LINESTART, XATTR_LINEEND>{} )); diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index f5eb6a14c375..c2aa90ca7cce 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -726,7 +726,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes() } -uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() +uno::Sequence< uno::Type > SvxShape::_getTypes() { switch( mpImpl->mnObjId ) { @@ -1367,7 +1367,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL } } -Reference< beans::XPropertySetInfo > SAL_CALL +Reference< beans::XPropertySetInfo > SvxShape::_getPropertySetInfo() { return mpPropSet->getPropertySetInfo(); @@ -1400,7 +1400,7 @@ void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Re } -bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) +bool SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) { SfxItemSet aSet( mpModel->GetItemPool(), {{(sal_uInt16)nWID, (sal_uInt16)nWID}} ); @@ -1591,7 +1591,7 @@ void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const u } } -void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) +void SvxShape::_setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal ) { ::SolarMutexGuard aGuard; @@ -1982,7 +1982,7 @@ beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& Proper } } -beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& PropertyName ) +beans::PropertyState SvxShape::_getPropertyState( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; @@ -2956,7 +2956,7 @@ void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName ) } } -void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName ) +void SvxShape::_setPropertyToDefault( const OUString& PropertyName ) { ::SolarMutexGuard aGuard; @@ -2986,7 +2986,7 @@ uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName ) } } -uno::Any SAL_CALL SvxShape::_getPropertyDefault( const OUString& aPropertyName ) +uno::Any SvxShape::_getPropertyDefault( const OUString& aPropertyName ) { ::SolarMutexGuard aGuard; @@ -3122,7 +3122,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames() } } -uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() +uno::Sequence< OUString > SvxShape::_getSupportedServiceNames() { ::SolarMutexGuard aGuard; diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index e16e823d2448..1a36a3ece2a1 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -120,8 +120,8 @@ public: SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const vcl::Window& rWindow ); virtual ~SvxTextEditSourceImpl() override; - void SAL_CALL acquire(); - void SAL_CALL release(); + void acquire(); + void release(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; @@ -251,13 +251,13 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) } -void SAL_CALL SvxTextEditSourceImpl::acquire() +void SvxTextEditSourceImpl::acquire() { osl_atomic_increment( &maRefCount ); } -void SAL_CALL SvxTextEditSourceImpl::release() +void SvxTextEditSourceImpl::release() { if( ! osl_atomic_decrement( &maRefCount ) ) delete this; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index ef7647b171f2..4ad0b0caaf8c 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -138,10 +138,10 @@ class SwChartDataProvider : /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false ); + css::uno::Reference< css::chart2::data::XDataSource > Impl_createDataSource( const css::uno::Sequence< css::beans::PropertyValue >& aArguments, bool bTestOnly = false ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false ); + css::uno::Reference< css::chart2::data::XDataSequence > Impl_createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation, bool bTestOnly = false ); static OUString GetBrokenCellRangeForExport( const OUString &rCellRangeRepresentation ); diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 2d164505574b..2bd932783632 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -198,7 +198,7 @@ private: /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames ); + css::uno::Sequence< css::uno::Any > GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames ); public: diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index d34e132fcd89..23214c6decbc 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -111,7 +111,7 @@ public: virtual void SAL_CALL setFormula( const OUString& aFormula ) override; virtual double SAL_CALL getValue( ) override; /// @throws css::uno::RuntimeException - double SAL_CALL getValue( ) const + double getValue( ) const { return const_cast<SwXCell*>(this)->getValue(); }; virtual void SAL_CALL setValue( double nValue ) override; virtual css::table::CellContentType SAL_CALL getType( ) override; diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 46e0be9ce220..c0ee49f316a3 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -629,7 +629,7 @@ uno::Reference< XAccessible> SAL_CALL return xChild; } -uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParentImpl() +uno::Reference< XAccessible> SwAccessibleContext::getAccessibleParentImpl() { SolarMutexGuard aGuard; @@ -839,7 +839,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint true: Use relative mode. false: Use absolute mode. */ -awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative) +awt::Rectangle SwAccessibleContext::getBoundsImpl(bool bRelative) { SolarMutexGuard aGuard; diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 35c7ad7f1fce..efa0fc7e3c1b 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -186,7 +186,7 @@ protected: bool IsEditableState(); /// @throws css::uno::RuntimeException - css::awt::Rectangle SAL_CALL + css::awt::Rectangle getBoundsImpl(bool bRelative); // #i85634# @@ -201,7 +201,7 @@ protected: virtual ~SwAccessibleContext() override; // Return a reference to the parent. - css::uno::Reference< css::accessibility::XAccessible> SAL_CALL + css::uno::Reference< css::accessibility::XAccessible> getAccessibleParentImpl(); public: diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 2857bbd50913..525e29d76e98 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -72,7 +72,7 @@ protected: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void SAL_CALL AttachImpl( + void AttachImpl( const css::uno::Reference< css::text::XTextRange > & xTextRange, const sal_uInt16 nWhich); diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index b8603a30a155..25239840851f 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -127,20 +127,20 @@ protected: /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void SAL_CALL SetPropertyValues_Impl( + void SetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ); /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( + css::uno::Sequence< css::uno::Any > GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames ); void GetPropertyValue( css::uno::Any &rVal, const SfxItemPropertySimpleEntry& rEntry, SwUnoCursor *pUnoCursor, std::unique_ptr<SfxItemSet> &pSet ); /// @throws css::uno::RuntimeException - css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> SAL_CALL GetPropertyValuesTolerant_Impl( + css::uno::Sequence<css::beans::GetDirectPropertyTolerantResult> GetPropertyValuesTolerant_Impl( const css::uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly ); virtual ~SwXTextPortion() override; diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index a1e8ab795fc7..8907e236f079 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -374,7 +374,7 @@ void SwXTextPortion::GetPropertyValue( } } -uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl( +uno::Sequence< uno::Any > SwXTextPortion::GetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames ) { sal_Int32 nLength = rPropertyNames.getLength(); @@ -407,7 +407,7 @@ uno::Any SwXTextPortion::getPropertyValue( return GetPropertyValues_Impl(aPropertyNames).getConstArray()[0]; } -void SAL_CALL SwXTextPortion::SetPropertyValues_Impl( +void SwXTextPortion::SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& rValues ) { @@ -571,7 +571,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: return GetPropertyValuesTolerant_Impl( rPropertyNames, true ); } -uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion::GetPropertyValuesTolerant_Impl( +uno::Sequence< beans::GetDirectPropertyTolerantResult > SwXTextPortion::GetPropertyValuesTolerant_Impl( const uno::Sequence< OUString >& rPropertyNames, bool bDirectValuesOnly ) { diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 2510c4e7bfe5..3722a5296ea7 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -949,7 +949,7 @@ SwXMeta::dispose() } } -void SAL_CALL +void SwXMeta::AttachImpl(const uno::Reference< text::XTextRange > & i_xTextRange, const sal_uInt16 i_nWhich) { diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 0a587b80f129..ec5197cbbfcd 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -146,13 +146,13 @@ public: /// @throws lang::IllegalArgumentException /// @throws lang::WrappedTargetException, /// @throws uno::RuntimeException - void SAL_CALL SetPropertyValues_Impl( + void SetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames, const uno::Sequence< uno::Any >& aValues); /// @throws beans::UnknownPropertyException /// @throws lang::WrappedTargetException, /// @throws uno::RuntimeException - uno::Sequence< uno::Any > SAL_CALL + uno::Sequence< uno::Any > GetPropertyValues_Impl( const uno::Sequence< OUString >& rPropertyNames); protected: diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index bdedd08e1b94..50f56afd8b31 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -132,21 +132,21 @@ CachedContentResultSet::CCRS_Cache::~CCRS_Cache() { } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::clear() { m_pResult.reset(); clearMappedReminder(); } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::loadData( const FetchResult& rResult ) { clear(); m_pResult.reset( new FetchResult( rResult ) ); } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::hasRow( sal_Int32 row ) { if( !m_pResult ) @@ -161,7 +161,7 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache return nStart <= row && row <= nEnd; } -sal_Int32 SAL_CALL CachedContentResultSet::CCRS_Cache +sal_Int32 CachedContentResultSet::CCRS_Cache ::getMaxRow() { if( !m_pResult ) @@ -173,7 +173,7 @@ sal_Int32 SAL_CALL CachedContentResultSet::CCRS_Cache return nEnd; } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::hasKnownLast() { if( !m_pResult ) @@ -184,7 +184,7 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache && m_pResult->Rows.getLength(); } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::hasCausedException( sal_Int32 nRow ) { if( !m_pResult ) @@ -199,7 +199,7 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache return nRow == nEnd+1; } -Any& SAL_CALL CachedContentResultSet::CCRS_Cache +Any& CachedContentResultSet::CCRS_Cache ::getRowAny( sal_Int32 nRow ) { if( !nRow ) @@ -216,7 +216,7 @@ Any& SAL_CALL CachedContentResultSet::CCRS_Cache return (m_pResult->Rows)[nDiff]; } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::remindMapped( sal_Int32 nRow ) { //remind that this row was mapped @@ -230,7 +230,7 @@ void SAL_CALL CachedContentResultSet::CCRS_Cache (*pMappedReminder)[nDiff] = true; } -bool SAL_CALL CachedContentResultSet::CCRS_Cache +bool CachedContentResultSet::CCRS_Cache ::isRowMapped( sal_Int32 nRow ) { if( !m_pMappedReminder || !m_pResult ) @@ -243,14 +243,14 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache return false; } -void SAL_CALL CachedContentResultSet::CCRS_Cache +void CachedContentResultSet::CCRS_Cache ::clearMappedReminder() { delete m_pMappedReminder; m_pMappedReminder = nullptr; } -Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache +Sequence< sal_Bool >* CachedContentResultSet::CCRS_Cache ::getMappedReminder() { if( !m_pMappedReminder ) @@ -263,7 +263,7 @@ Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache return m_pMappedReminder; } -const Any& SAL_CALL CachedContentResultSet::CCRS_Cache +const Any& CachedContentResultSet::CCRS_Cache ::getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ) { if( !nColumnIndex ) @@ -289,7 +289,7 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache return (*rRow)[nColumnIndex-1]; } -OUString SAL_CALL CachedContentResultSet::CCRS_Cache +OUString CachedContentResultSet::CCRS_Cache ::getContentIdentifierString( sal_Int32 nRow ) { try @@ -310,7 +310,7 @@ OUString SAL_CALL CachedContentResultSet::CCRS_Cache } } -Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache +Reference< XContentIdentifier > CachedContentResultSet::CCRS_Cache ::getContentIdentifier( sal_Int32 nRow ) { try @@ -331,7 +331,7 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache } } -Reference< XContent > SAL_CALL CachedContentResultSet::CCRS_Cache +Reference< XContent > CachedContentResultSet::CCRS_Cache ::getContent( sal_Int32 nRow ) { try @@ -371,14 +371,14 @@ class CCRS_PropertySetInfo : long m_nFetchDirectionPropertyHandle; private: - sal_Int32 SAL_CALL + sal_Int32 impl_getRemainedHandle() const; - bool SAL_CALL + bool impl_queryProperty( const OUString& rName , css::beans::Property& rProp ) const; - sal_Int32 SAL_CALL + sal_Int32 impl_getPos( const OUString& rName ) const; static bool SAL_CALL @@ -553,7 +553,7 @@ sal_Bool SAL_CALL CCRS_PropertySetInfo // impl_ methods. -sal_Int32 SAL_CALL CCRS_PropertySetInfo +sal_Int32 CCRS_PropertySetInfo ::impl_getPos( const OUString& rName ) const { for( sal_Int32 nN = m_pProperties->getLength(); nN--; ) @@ -565,7 +565,7 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo return -1; } -bool SAL_CALL CCRS_PropertySetInfo +bool CCRS_PropertySetInfo ::impl_queryProperty( const OUString& rName, Property& rProp ) const { for( sal_Int32 nN = m_pProperties->getLength(); nN--; ) @@ -594,7 +594,7 @@ bool SAL_CALL CCRS_PropertySetInfo || rPropertyName == g_sPropertyNameForFetchDirection ); } -sal_Int32 SAL_CALL CCRS_PropertySetInfo +sal_Int32 CCRS_PropertySetInfo ::impl_getRemainedHandle( ) const { sal_Int32 nHandle = 1; @@ -676,7 +676,7 @@ CachedContentResultSet::~CachedContentResultSet() // impl_ methods. -bool SAL_CALL CachedContentResultSet +bool CachedContentResultSet ::applyPositionToOrigin( sal_Int32 nRow ) { impl_EnsureNotDisposed(); @@ -802,14 +802,14 @@ if( nMax > nCurCount ) \ if( bIsFinalCount && !bCurIsFinalCount ) \ impl_changeIsRowCountFinal( bCurIsFinalCount, bIsFinalCount ); -void SAL_CALL CachedContentResultSet +void CachedContentResultSet ::impl_fetchData( sal_Int32 nRow , sal_Int32 nFetchSize, sal_Int32 nFetchDirection ) { FETCH_XXX( m_aCache, m_xFetchProvider, fetch ); } -void SAL_CALL CachedContentResultSet +void CachedContentResultSet ::impl_changeRowCount( sal_Int32 nOld, sal_Int32 nNew ) { OSL_ENSURE( nNew > nOld, "RowCount only can grow" ); @@ -832,7 +832,7 @@ void SAL_CALL CachedContentResultSet impl_notifyPropertyChangeListeners( aEvt ); } -void SAL_CALL CachedContentResultSet +void CachedContentResultSet ::impl_changeIsRowCountFinal( bool bOld, bool bNew ) { OSL_ENSURE( !bOld && bNew, "This change is not allowed for IsRowCountFinal" ); @@ -855,14 +855,14 @@ void SAL_CALL CachedContentResultSet impl_notifyPropertyChangeListeners( aEvt ); } -bool SAL_CALL CachedContentResultSet +bool CachedContentResultSet ::impl_isKnownValidPosition( sal_Int32 nRow ) { return m_nKnownCount && nRow && nRow <= m_nKnownCount; } -bool SAL_CALL CachedContentResultSet +bool CachedContentResultSet ::impl_isKnownInvalidPosition( sal_Int32 nRow ) { if( !nRow ) diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 973b18d0aa24..0299f67c51bb 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -61,52 +61,52 @@ class CachedContentResultSet private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Any& SAL_CALL + css::uno::Any& getRowAny( sal_Int32 nRow ); - void SAL_CALL clear(); + void clear(); - void SAL_CALL remindMapped( sal_Int32 nRow ); - bool SAL_CALL isRowMapped( sal_Int32 nRow ); - void SAL_CALL clearMappedReminder(); - css::uno::Sequence< sal_Bool >* SAL_CALL getMappedReminder(); + void remindMapped( sal_Int32 nRow ); + bool isRowMapped( sal_Int32 nRow ); + void clearMappedReminder(); + css::uno::Sequence< sal_Bool >* getMappedReminder(); public: CCRS_Cache( const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping ); ~CCRS_Cache(); - void SAL_CALL loadData( + void loadData( const css::ucb::FetchResult& rResult ); - bool SAL_CALL + bool hasRow( sal_Int32 nRow ); - bool SAL_CALL + bool hasCausedException( sal_Int32 nRow ); - sal_Int32 SAL_CALL + sal_Int32 getMaxRow(); - bool SAL_CALL + bool hasKnownLast(); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - const css::uno::Any& SAL_CALL + const css::uno::Any& getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ); /// @throws css::uno::RuntimeException - OUString SAL_CALL + OUString getContentIdentifierString( sal_Int32 nRow ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL + css::uno::Reference< css::ucb::XContentIdentifier > getContentIdentifier( sal_Int32 nRow ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::ucb::XContent > SAL_CALL + css::uno::Reference< css::ucb::XContent > getContent( sal_Int32 nRow ); }; @@ -159,24 +159,24 @@ private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool SAL_CALL + bool applyPositionToOrigin( sal_Int32 nRow ); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_fetchData( sal_Int32 nRow, sal_Int32 nCount , sal_Int32 nFetchDirection ); - bool SAL_CALL + bool impl_isKnownValidPosition( sal_Int32 nRow ); - bool SAL_CALL + bool impl_isKnownInvalidPosition( sal_Int32 nRow ); - void SAL_CALL + void impl_changeRowCount( sal_Int32 nOld, sal_Int32 nNew ); - void SAL_CALL + void impl_changeIsRowCountFinal( bool bOld, bool bNew ); public: diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 4e129f536132..e1cc01584d08 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -299,7 +299,7 @@ FetchResult SAL_CALL CachedContentResultSetStub FETCH_XXX( impl_getCurrentRowContent, m_xRowOrigin ); } -sal_Int32 SAL_CALL CachedContentResultSetStub +sal_Int32 CachedContentResultSetStub ::impl_getColumnCount() { sal_Int32 nCount; @@ -329,7 +329,7 @@ sal_Int32 SAL_CALL CachedContentResultSetStub return m_nColumnCount; } -void SAL_CALL CachedContentResultSetStub +void CachedContentResultSetStub ::impl_getCurrentRowContent( Any& rRowContent , const Reference< XRow >& xRow ) { @@ -344,7 +344,7 @@ void SAL_CALL CachedContentResultSetStub rRowContent <<= aContent; } -void SAL_CALL CachedContentResultSetStub +void CachedContentResultSetStub ::impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ) { //this is done only for the case, that there is another CachedContentResultSet in the chain of underlying ResultSets diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 11c7996d5006..45d904f65df0 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -52,12 +52,12 @@ private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_getCurrentRowContent( css::uno::Any& rRowContent, const css::uno::Reference< css::sdbc::XRow >& xRow ); - sal_Int32 SAL_CALL + sal_Int32 impl_getColumnCount(); /// @throws css::uno::RuntimeException @@ -79,7 +79,7 @@ private: , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ); public: diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 6b8335fbf064..1c84d56b46fa 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -63,7 +63,7 @@ ContentResultSetWrapper::ContentResultSetWrapper( }; -void SAL_CALL ContentResultSetWrapper::impl_init_xRowOrigin() +void ContentResultSetWrapper::impl_init_xRowOrigin() { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -81,7 +81,7 @@ void SAL_CALL ContentResultSetWrapper::impl_init_xRowOrigin() } } -void SAL_CALL ContentResultSetWrapper::impl_init_xContentAccessOrigin() +void ContentResultSetWrapper::impl_init_xContentAccessOrigin() { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -100,7 +100,7 @@ void SAL_CALL ContentResultSetWrapper::impl_init_xContentAccessOrigin() } -void SAL_CALL ContentResultSetWrapper::impl_init_xPropertySetOrigin() +void ContentResultSetWrapper::impl_init_xPropertySetOrigin() { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -118,7 +118,7 @@ void SAL_CALL ContentResultSetWrapper::impl_init_xPropertySetOrigin() } } -void SAL_CALL ContentResultSetWrapper::impl_init() +void ContentResultSetWrapper::impl_init() { //call this at the end of constructor of derived class @@ -138,7 +138,7 @@ ContentResultSetWrapper::~ContentResultSetWrapper() delete m_pVetoableChangeListeners; }; -void SAL_CALL ContentResultSetWrapper::impl_deinit() +void ContentResultSetWrapper::impl_deinit() { //call this at start of destructor of derived class @@ -167,14 +167,14 @@ void SAL_CALL ContentResultSetWrapper::impl_initPropertySetInfo() } } -void SAL_CALL ContentResultSetWrapper::impl_EnsureNotDisposed() +void ContentResultSetWrapper::impl_EnsureNotDisposed() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( m_bDisposed ) throw DisposedException(); } -void SAL_CALL ContentResultSetWrapper::impl_getPropertyChangeListenerContainer() +void ContentResultSetWrapper::impl_getPropertyChangeListenerContainer() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( !m_pPropertyChangeListeners ) @@ -182,7 +182,7 @@ void SAL_CALL ContentResultSetWrapper::impl_getPropertyChangeListenerContainer() new PropertyChangeListenerContainer_Impl( m_aContainerMutex ); } -void SAL_CALL ContentResultSetWrapper::impl_getVetoableChangeListenerContainer() +void ContentResultSetWrapper::impl_getVetoableChangeListenerContainer() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( !m_pVetoableChangeListeners ) @@ -190,7 +190,7 @@ void SAL_CALL ContentResultSetWrapper::impl_getVetoableChangeListenerContainer() new PropertyChangeListenerContainer_Impl( m_aContainerMutex ); } -void SAL_CALL ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const PropertyChangeEvent& rEvt ) +void ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const PropertyChangeEvent& rEvt ) { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -228,7 +228,7 @@ void SAL_CALL ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const } } -void SAL_CALL ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const PropertyChangeEvent& rEvt ) +void ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const PropertyChangeEvent& rEvt ) { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -266,7 +266,7 @@ void SAL_CALL ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const } } -bool SAL_CALL ContentResultSetWrapper::impl_isForwardOnly() +bool ContentResultSetWrapper::impl_isForwardOnly() { //m_nForwardOnly == 2 -> don't know //m_nForwardOnly == 1 -> YES @@ -1284,7 +1284,7 @@ void SAL_CALL ContentResultSetWrapperListener::vetoableChange( const PropertyCha m_pOwner->impl_vetoableChange( rEvt ); } -void SAL_CALL ContentResultSetWrapperListener::impl_OwnerDies() +void ContentResultSetWrapperListener::impl_OwnerDies() { m_pOwner = nullptr; } diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index 7823f9f93041..475c3d2d9b65 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -97,10 +97,10 @@ private: //methods: private: - void SAL_CALL + void impl_getPropertyChangeListenerContainer(); - void SAL_CALL + void impl_getVetoableChangeListenerContainer(); protected: @@ -110,14 +110,14 @@ protected: virtual ~ContentResultSetWrapper() override; - void SAL_CALL impl_init(); - void SAL_CALL impl_deinit(); + void impl_init(); + void impl_deinit(); //-- - void SAL_CALL impl_init_xRowOrigin(); - void SAL_CALL impl_init_xContentAccessOrigin(); - void SAL_CALL impl_init_xPropertySetOrigin(); + void impl_init_xRowOrigin(); + void impl_init_xContentAccessOrigin(); + void impl_init_xPropertySetOrigin(); //-- @@ -125,20 +125,20 @@ protected: /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_EnsureNotDisposed(); - void SAL_CALL + void impl_notifyPropertyChangeListeners( const css::beans::PropertyChangeEvent& rEvt ); /// @throws css::beans::PropertyVetoException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_notifyVetoableChangeListeners( const css::beans::PropertyChangeEvent& rEvt ); - bool SAL_CALL impl_isForwardOnly(); + bool impl_isForwardOnly(); public: @@ -376,7 +376,7 @@ public: // own methods: - void SAL_CALL impl_OwnerDies(); + void impl_OwnerDies(); }; #endif diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 3079a9cee5bd..a0e71b7be81c 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -62,7 +62,7 @@ DynamicResultSetWrapper::DynamicResultSetWrapper( //call impl_init() at the end of constructor of derived class }; -void SAL_CALL DynamicResultSetWrapper::impl_init() +void DynamicResultSetWrapper::impl_init() { //call this at the end of constructor of derived class @@ -82,14 +82,14 @@ DynamicResultSetWrapper::~DynamicResultSetWrapper() //call impl_deinit() at start of destructor of derived class }; -void SAL_CALL DynamicResultSetWrapper::impl_deinit() +void DynamicResultSetWrapper::impl_deinit() { //call this at start of destructor of derived class m_xMyListenerImpl->impl_OwnerDies(); } -void SAL_CALL DynamicResultSetWrapper::impl_EnsureNotDisposed() +void DynamicResultSetWrapper::impl_EnsureNotDisposed() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( m_bDisposed ) @@ -210,7 +210,7 @@ void SAL_CALL DynamicResultSetWrapper::impl_disposing( const EventObject& ) } //virtual -void SAL_CALL DynamicResultSetWrapper::impl_notify( const ListEvent& Changes ) +void DynamicResultSetWrapper::impl_notify( const ListEvent& Changes ) { impl_EnsureNotDisposed(); //@todo @@ -485,7 +485,7 @@ void SAL_CALL DynamicResultSetWrapperListener::notify( const ListEvent& Changes // own methods: -void SAL_CALL DynamicResultSetWrapperListener::impl_OwnerDies() +void DynamicResultSetWrapperListener::impl_OwnerDies() { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index b588b9db0aa6..34a0e60870fa 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -81,11 +81,11 @@ protected: osl::Condition m_aListenerSet; protected: - void SAL_CALL impl_init(); - void SAL_CALL impl_deinit(); + void impl_init(); + void impl_deinit(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_EnsureNotDisposed(); virtual void SAL_CALL @@ -146,7 +146,7 @@ public: impl_disposing( const css::lang::EventObject& Source ); /// @throws css::uno::RuntimeException - void SAL_CALL + void impl_notify( const css::ucb::ListEvent& Changes ); }; @@ -183,7 +183,7 @@ public: // own methods: - void SAL_CALL impl_OwnerDies(); + void impl_OwnerDies(); }; diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 5ec56d58a498..028f8a56992b 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -540,7 +540,7 @@ SortedDynamicResultSetListener::notify( const ListEvent& Changes ) // own methods: -void SAL_CALL +void SortedDynamicResultSetListener::impl_OwnerDies() { osl::Guard< osl::Mutex > aGuard( maMutex ); diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index 46d3a9c6b2c3..9e100df1f143 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -136,7 +136,7 @@ public: // own methods: - void SAL_CALL impl_OwnerDies(); + void impl_OwnerDies(); }; 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; diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 41a22de0b61e..886b7dd35e05 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -332,7 +332,7 @@ HierarchyDataSource::getAvailableServiceNames() // Non-interface methods -uno::Reference< uno::XInterface > SAL_CALL +uno::Reference< uno::XInterface > HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments, diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index 244063e5ee0d..4a8a898fdac0 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -88,7 +88,7 @@ public: private: /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier, + css::uno::Reference< css::uno::XInterface > createInstanceWithArguments( const OUString & ServiceSpecifier, const css::uno::Sequence< css::uno::Any > & Arguments, bool bCheckArgs ); diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index b95f96df5a5a..7dce22ba52ab 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -784,7 +784,7 @@ void SAL_CALL InteractionAuthFallback::setCode( const OUString& code ) m_aCode = code; } -const OUString& SAL_CALL InteractionAuthFallback::getCode() const +const OUString& InteractionAuthFallback::getCode() const { return m_aCode; } diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 12b99a2db9cc..6f26ea335dcf 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -101,19 +101,19 @@ public: /// @throws css::container::NoSuchElementException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ); + void replaceByName( const OUString& aName, const css::uno::Any& aElement ); /// @throws css::container::NoSuchElementException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL getByName( const OUString& aName ); + css::uno::Any getByName( const OUString& aName ); /// @throws css::uno::RuntimeException - css::uno::Sequence< OUString > SAL_CALL getElementNames( ); + css::uno::Sequence< OUString > getElementNames( ); /// @throws css::uno::RuntimeException - bool SAL_CALL hasByName( const OUString& aName ); + bool hasByName( const OUString& aName ); /// @throws css::uno::RuntimeException static css::uno::Type SAL_CALL getElementType( ); /// @throws css::uno::RuntimeException - bool SAL_CALL hasElements() const; + bool hasElements() const; OUString const & GetEventName( GlobalEventId nID ) const; }; @@ -238,7 +238,7 @@ void GlobalEventConfig_Impl::initBindingInfo() } } -void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, const Any& aElement ) +void GlobalEventConfig_Impl::replaceByName( const OUString& aName, const Any& aElement ) { Sequence< beans::PropertyValue > props; //DF should we prepopulate the hash with a list of valid event Names? @@ -258,7 +258,7 @@ void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, cons SetModified(); } -Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName ) +Any GlobalEventConfig_Impl::getByName( const OUString& aName ) { Any aRet; Sequence< beans::PropertyValue > props(2); @@ -284,12 +284,12 @@ Any SAL_CALL GlobalEventConfig_Impl::getByName( const OUString& aName ) return aRet; } -Sequence< OUString > SAL_CALL GlobalEventConfig_Impl::getElementNames( ) +Sequence< OUString > GlobalEventConfig_Impl::getElementNames( ) { return uno::Sequence< OUString >(m_supportedEvents.data(), SupportedEventsVector::size()); } -bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) +bool GlobalEventConfig_Impl::hasByName( const OUString& aName ) { if ( m_eventBindingHash.find( aName ) != m_eventBindingHash.end() ) return true; @@ -306,7 +306,7 @@ Type SAL_CALL GlobalEventConfig_Impl::getElementType( ) return cppu::UnoType<Sequence<beans::PropertyValue>>::get(); } -bool SAL_CALL GlobalEventConfig_Impl::hasElements() const +bool GlobalEventConfig_Impl::hasElements() const { return m_eventBindingHash.empty(); } diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index db0b59f01090..dd0fd4df5a9e 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -416,7 +416,7 @@ namespace DOM m_xEntityResolver = xER; } - Reference< XEntityResolver > SAL_CALL CDocumentBuilder::getEntityResolver() + Reference< XEntityResolver > CDocumentBuilder::getEntityResolver() { ::osl::MutexGuard const g(m_Mutex); diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 9f6253bdff8a..4ef3e1840de1 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -115,7 +115,7 @@ namespace DOM virtual void SAL_CALL setEntityResolver(const css::uno::Reference< css::xml::sax::XEntityResolver >& er) override; /// @throws css::uno::RuntimeException - css::uno::Reference< css::xml::sax::XEntityResolver > SAL_CALL getEntityResolver(); + css::uno::Reference< css::xml::sax::XEntityResolver > getEntityResolver(); /** diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index 7392d44e9a89..c00f528b45c6 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -61,7 +61,7 @@ private: CURI& operator=(CURI const&) = delete; /// handle css.rdf.URIs - void SAL_CALL initFromConstant(const sal_Int16 i_Constant); + void initFromConstant(const sal_Int16 i_Constant); OUString m_Namespace; OUString m_LocalName; @@ -96,7 +96,7 @@ const char s_nsPkg [] = const char s_nsODF [] = "http://docs.oasis-open.org/ns/office/1.2/meta/odf#"; -void SAL_CALL CURI::initFromConstant(const sal_Int16 i_Constant) +void CURI::initFromConstant(const sal_Int16 i_Constant) { const char *ns(nullptr); const char *ln(nullptr); diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.cxx b/vbahelper/source/msforms/vbalistcontrolhelper.cxx index 462e39aae95e..308c0934ece5 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.cxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.cxx @@ -80,7 +80,7 @@ uno::Any ListPropListener::getValueEvent() return aRet; } -void SAL_CALL +void ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) { if ( pvargItem.hasValue() ) @@ -135,7 +135,7 @@ ListControlHelper::AddItem( const uno::Any& pvargItem, const uno::Any& pvargInde } } -void SAL_CALL +void ListControlHelper::removeItem( const uno::Any& index ) { sal_Int32 nIndex = 0; @@ -164,7 +164,7 @@ ListControlHelper::removeItem( const uno::Any& index ) } } -void SAL_CALL +void ListControlHelper::Clear( ) { // urk, setValue doesn't seem to work !! @@ -172,14 +172,14 @@ ListControlHelper::Clear( ) m_xProps->setPropertyValue( "StringItemList", uno::makeAny( uno::Sequence< OUString >() ) ); } -void SAL_CALL +void ListControlHelper::setRowSource( const OUString& _rowsource ) { if ( _rowsource.isEmpty() ) Clear(); } -sal_Int32 SAL_CALL +sal_Int32 ListControlHelper::getListCount() { uno::Sequence< OUString > sList; @@ -187,7 +187,7 @@ ListControlHelper::getListCount() return sList.getLength(); } -uno::Any SAL_CALL +uno::Any ListControlHelper::List( const ::uno::Any& pvargIndex, const uno::Any& pvarColumn ) { return uno::makeAny( uno::Reference< XPropValue > ( new ScVbaPropValue( new ListPropListener( m_xProps, pvargIndex, pvarColumn ) ) ) ); diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx b/vbahelper/source/msforms/vbalistcontrolhelper.hxx index 334f7347603f..dff3e1c33541 100644 --- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx +++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx @@ -29,17 +29,17 @@ class ListControlHelper final public: explicit ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){} /// @throws css::uno::RuntimeException - void SAL_CALL AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ); + void AddItem( const css::uno::Any& pvargItem, const css::uno::Any& pvargIndex ); /// @throws css::uno::RuntimeException - void SAL_CALL removeItem( const css::uno::Any& index ); + void removeItem( const css::uno::Any& index ); /// @throws css::uno::RuntimeException - void SAL_CALL setRowSource( const OUString& _rowsource ); + void setRowSource( const OUString& _rowsource ); /// @throws css::uno::RuntimeException - ::sal_Int32 SAL_CALL getListCount(); + ::sal_Int32 getListCount(); /// @throws css::uno::RuntimeException - css::uno::Any SAL_CALL List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ); + css::uno::Any List( const css::uno::Any& pvargIndex, const css::uno::Any& pvarColumn ); /// @throws css::uno::RuntimeException - void SAL_CALL Clear( ); + void Clear( ); }; #endif diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index cffeb7c5bbd6..e62bbe0af49e 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -71,7 +71,7 @@ namespace unotools virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerRectangle2D& rect ) override; virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, const css::geometry::IntegerPoint2D& pos ) override; /// @throws css::uno::RuntimeException - css::uno::Reference< css::rendering::XBitmapPalette > SAL_CALL getPalette( ); + css::uno::Reference< css::rendering::XBitmapPalette > getPalette( ); virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) override; // XBitmapPalette diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index 7570f9c22672..475db74c94a3 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -309,7 +309,7 @@ private: } /// @throws uno::RuntimeException - uno::Reference< rendering::XBitmapPalette > SAL_CALL getPalette( ) + uno::Reference< rendering::XBitmapPalette > getPalette( ) { uno::Reference< XBitmapPalette > aRet; if( mnBitsPerPixel == 8 ) diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx index 1ca2aa7e569b..e7151f317894 100644 --- a/vcl/source/helper/canvasbitmap.cxx +++ b/vcl/source/helper/canvasbitmap.cxx @@ -610,7 +610,7 @@ uno::Sequence< sal_Int8 > SAL_CALL VclCanvasBitmap::getPixel( rendering::Integer return aRet; } -uno::Reference< rendering::XBitmapPalette > SAL_CALL VclCanvasBitmap::getPalette() +uno::Reference< rendering::XBitmapPalette > VclCanvasBitmap::getPalette() { SolarMutexGuard aGuard; diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx index a45f79c35bcb..daa066ad6577 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx @@ -238,7 +238,7 @@ SalGtkPicker::~SalGtkPicker() } } -void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory ) +void SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory ) { OSL_ASSERT( m_pDialog != nullptr ); @@ -256,7 +256,7 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory aTxt.getStr() ); } -OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() +OUString SalGtkPicker::implgetDisplayDirectory() { OSL_ASSERT( m_pDialog != nullptr ); @@ -268,7 +268,7 @@ OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() return aCurrentFolderName; } -void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) +void SalGtkPicker::implsetTitle( const OUString& aTitle ) { OSL_ASSERT( m_pDialog != nullptr ); diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx index 6af2459562eb..b31d21aa656c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx @@ -50,14 +50,14 @@ class SalGtkPicker GtkWidget *m_pDialog; protected: /// @throws css::uno::RuntimeException - void SAL_CALL implsetTitle( const OUString& aTitle ); + void implsetTitle( const OUString& aTitle ); /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException - void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory ); + void implsetDisplayDirectory( const OUString& rDirectory ); /// @throws css::uno::RuntimeException - OUString SAL_CALL implgetDisplayDirectory( ); + OUString implgetDisplayDirectory( ); OUString uritounicode(const gchar *pIn); OString unicodetouri(const OUString &rURL); diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 4eda39e02e26..cf75d61c67ec 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -85,7 +85,7 @@ static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, libr return true; } -bool SAL_CALL WordPerfectImportFilter::importImpl(const Sequence< css::beans::PropertyValue > &aDescriptor) +bool WordPerfectImportFilter::importImpl(const Sequence< css::beans::PropertyValue > &aDescriptor) { sal_Int32 nLength = aDescriptor.getLength(); const PropertyValue *pValue = aDescriptor.getConstArray(); diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index 06eef4e826e3..731fe5230228 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -38,7 +38,7 @@ class WordPerfectImportFilter : public cppu::WeakImplHelper css::uno::Reference< css::lang::XComponent > mxDoc; /// @throws css::uno::RuntimeException - bool SAL_CALL importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor); + bool importImpl(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor); public: explicit WordPerfectImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext) diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index cd0b22b49e09..bef027c06399 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -55,7 +55,7 @@ namespace treeview { OUString locale,system; OUString appendix; - void SAL_CALL replaceName( OUString& oustring ) const; + void replaceName( OUString& oustring ) const; }; class TVDom; diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx index 8b90a26518a2..9c37cd9d5b4f 100644 --- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx +++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx @@ -46,7 +46,7 @@ namespace chelp { * Returns an error code as given by filerror.hxx */ - bool SAL_CALL CtorSuccess() { return m_bIsOpen;} + bool CtorSuccess() { return m_bIsOpen;} virtual css::uno::Any SAL_CALL queryInterface( diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index 5339a93117d7..d8b95c84bfad 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -178,7 +178,7 @@ ConfigData::ConfigData() memset(m_vAdd, 0, sizeof(m_vAdd)); } -void SAL_CALL ConfigData::replaceName( OUString& oustring ) const +void ConfigData::replaceName( OUString& oustring ) const { sal_Int32 idx = -1,k = 0,off; bool cap = false; diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 30cba7f0a00c..741cc56c9f43 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1890,7 +1890,7 @@ void SAL_CALL OOo2OasisTransformer::startDocument() XMLTransformerBase::startDocument(); } -void SAL_CALL OOo2OasisTransformer::Initialize( +void OOo2OasisTransformer::Initialize( const Sequence< Any >& rArguments ) { OSL_ENSURE( !GetDocHandler().is(), "duplication initialization" ); diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx index 96dcb42d8f87..f6fe742f4709 100644 --- a/xmloff/source/transform/OOo2Oasis.hxx +++ b/xmloff/source/transform/OOo2Oasis.hxx @@ -90,7 +90,7 @@ public: /// @throws css::uno::Exception /// @throws css::uno::RuntimeException - void SAL_CALL Initialize( const css::uno::Sequence< css::uno::Any >& aArguments ); + void Initialize( const css::uno::Sequence< css::uno::Any >& aArguments ); // css::xml::sax::XDocumentHandler virtual void SAL_CALL startDocument() override; diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx index 0319c29d43b7..e7e8658de548 100644 --- a/xmlsecurity/source/component/certificatecontainer.hxx +++ b/xmlsecurity/source/component/certificatecontainer.hxx @@ -41,9 +41,9 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI static bool SAL_CALL searchMap( const OUString & url, const OUString & certificate_name, Map &_certMap ); /// @throws css::uno::RuntimeException - bool SAL_CALL isTemporaryCertificate( const OUString & url, const OUString & certificate_name ); + bool isTemporaryCertificate( const OUString & url, const OUString & certificate_name ); /// @throws css::uno::RuntimeException - bool SAL_CALL isCertificateTrust( const OUString & url, const OUString & certificate_name ); + bool isCertificateTrust( const OUString & url, const OUString & certificate_name ); public: |