diff options
44 files changed, 240 insertions, 240 deletions
diff --git a/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx index bf06e29bb474..483033fd7c49 100644 --- a/canvas/source/directx/dx_canvashelper.hxx +++ b/canvas/source/directx/dx_canvashelper.hxx @@ -170,7 +170,7 @@ namespace dxcanvas 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/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index c5030883900c..a3267942a050 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@ -76,7 +76,7 @@ CWinClipbImpl::~CWinClipbImpl( ) unregisterClipboardViewer( ); } -Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) +Reference< XTransferable > CWinClipbImpl::getContents( ) { // use the shortcut or create a transferable from // system clipboard @@ -110,7 +110,7 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) return rClipContent; } -void SAL_CALL CWinClipbImpl::setContents( +void CWinClipbImpl::setContents( const Reference< XTransferable >& xTransferable, const Reference< XClipboardOwner >& xClipboardOwner ) { @@ -134,17 +134,17 @@ void SAL_CALL CWinClipbImpl::setContents( m_MtaOleClipboard.setClipboard(pIDataObj.get()); } -OUString SAL_CALL CWinClipbImpl::getName( ) +OUString CWinClipbImpl::getName( ) { return m_itsName; } -sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities( ) +sal_Int8 CWinClipbImpl::getRenderingCapabilities( ) { return ( Delayed | Persistant ); } -void SAL_CALL CWinClipbImpl::flushClipboard( ) +void CWinClipbImpl::flushClipboard( ) { // actually it should be ClearableMutexGuard aGuard( m_ClipContentMutex ); // but it does not work since FlushClipboard does a callback and frees DataObject @@ -160,17 +160,17 @@ void SAL_CALL CWinClipbImpl::flushClipboard( ) m_MtaOleClipboard.flushClipboard( ); } -void SAL_CALL CWinClipbImpl::registerClipboardViewer( ) +void CWinClipbImpl::registerClipboardViewer( ) { m_MtaOleClipboard.registerClipViewer( CWinClipbImpl::onClipboardContentChanged ); } -void SAL_CALL CWinClipbImpl::unregisterClipboardViewer( ) +void CWinClipbImpl::unregisterClipboardViewer( ) { m_MtaOleClipboard.registerClipViewer( nullptr ); } -void SAL_CALL CWinClipbImpl::dispose() +void CWinClipbImpl::dispose() { OSL_ENSURE( !m_pCurrentClipContent, "Clipboard was not flushed before shutdown!" ); } @@ -184,7 +184,7 @@ void WINAPI CWinClipbImpl::onClipboardContentChanged() s_pCWinClipbImpl->m_pWinClipboard->notifyAllClipboardListener( ); } -void SAL_CALL CWinClipbImpl::onReleaseDataObject( CXNotifyingDataObject* theCaller ) +void CWinClipbImpl::onReleaseDataObject( CXNotifyingDataObject* theCaller ) { OSL_ASSERT( nullptr != theCaller ); diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx index d72b5aef8b60..e062d5557546 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.hxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx @@ -53,40 +53,40 @@ protected: CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ); /// @throws css::uno::RuntimeException - css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL getContents( ); + css::uno::Reference< css::datatransfer::XTransferable > getContents( ); /// @throws css::uno::RuntimeException - void SAL_CALL setContents( + void setContents( const css::uno::Reference< css::datatransfer::XTransferable >& xTransferable, const css::uno::Reference< css::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner ); /// @throws css::uno::RuntimeException - OUString SAL_CALL getName( ); + OUString getName( ); // XClipboardEx /// @throws css::uno::RuntimeException - static sal_Int8 SAL_CALL getRenderingCapabilities( ); + static sal_Int8 getRenderingCapabilities( ); // XFlushableClipboard /// @throws css::uno::RuntimeException - void SAL_CALL flushClipboard( ); + void flushClipboard( ); // XComponent /// @throws css::uno::RuntimeException - void SAL_CALL dispose( ); + void dispose( ); // member functions - void SAL_CALL registerClipboardViewer( ); - void SAL_CALL unregisterClipboardViewer( ); + void registerClipboardViewer( ); + void unregisterClipboardViewer( ); static void WINAPI onClipboardContentChanged(); private: - void SAL_CALL onReleaseDataObject( CXNotifyingDataObject* theCaller ); + void onReleaseDataObject( CXNotifyingDataObject* theCaller ); private: OUString m_itsName; diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index 5efc5530d46d..77f17a7506d1 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -160,7 +160,7 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar rBHelper.aLC.removeInterface( cppu::UnoType<decltype(listener)>::get(), listener ); } -void SAL_CALL CWinClipboard::notifyAllClipboardListener( ) +void CWinClipboard::notifyAllClipboardListener( ) { if ( !rBHelper.bDisposed ) { diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx index 92f7ff8ca9da..c0058593ed40 100644 --- a/dtrans/source/win32/clipb/WinClipboard.hxx +++ b/dtrans/source/win32/clipb/WinClipboard.hxx @@ -109,7 +109,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: - void SAL_CALL notifyAllClipboardListener( ); + void notifyAllClipboardListener( ); private: std::unique_ptr< CWinClipbImpl > m_pImpl; diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx index 08adfaaea0cb..8531fd8a1184 100644 --- a/dtrans/source/win32/dnd/sourcecontext.cxx +++ b/dtrans/source/win32/dnd/sourcecontext.cxx @@ -40,12 +40,12 @@ SourceContext::~SourceContext() { } -void SAL_CALL SourceContext::addDragSourceListener( +void SourceContext::addDragSourceListener( const Reference<XDragSourceListener >& ) { } -void SAL_CALL SourceContext::removeDragSourceListener( +void SourceContext::removeDragSourceListener( const Reference<XDragSourceListener >& ) { } diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx index 8e76a36b3a36..81b1682ebff9 100644 --- a/dtrans/source/win32/dnd/sourcecontext.hxx +++ b/dtrans/source/win32/dnd/sourcecontext.hxx @@ -51,9 +51,9 @@ public: SourceContext &operator= (const SourceContext&) = delete; /// @throws RuntimeException - virtual void SAL_CALL addDragSourceListener( const Reference<XDragSourceListener >& dsl ); + virtual void addDragSourceListener( const Reference<XDragSourceListener >& dsl ); /// @throws RuntimeException - virtual void SAL_CALL removeDragSourceListener( const Reference<XDragSourceListener >& dsl ); + virtual void removeDragSourceListener( const Reference<XDragSourceListener >& dsl ); virtual sal_Int32 SAL_CALL getCurrentCursor( ) override; virtual void SAL_CALL setCursor( sal_Int32 cursorId ) override; virtual void SAL_CALL setImage( sal_Int32 imageId ) override; diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 8a69a438ba6f..92fecd840a36 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -171,7 +171,7 @@ bool SAL_CALL cmpAllContentTypeParameter( } // end namespace -Reference< XTransferable > SAL_CALL CDOTransferable::create( const Reference< XComponentContext >& rxContext, +Reference< XTransferable > CDOTransferable::create( const Reference< XComponentContext >& rxContext, IDataObjectPtr pIDataObject ) { CDOTransferable* pTransf = new CDOTransferable(rxContext, pIDataObject); @@ -273,7 +273,7 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla // we save the first offered text format which we will later use for the // conversion -void SAL_CALL CDOTransferable::initFlavorList( ) +void CDOTransferable::initFlavorList( ) { sal::systools::COMReference<IEnumFORMATETC> pEnumFormatEtc; HRESULT hr = m_rDataObject->EnumFormatEtc( DATADIR_GET, &pEnumFormatEtc ); @@ -321,7 +321,7 @@ void SAL_CALL CDOTransferable::initFlavorList( ) } inline -void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor ) +void CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor ) { // we ignore all formats that couldn't be translated if ( aFlavor.MimeType.getLength( ) ) @@ -333,7 +333,7 @@ void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor ) } } -DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) +DataFlavor CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) { LCID lcid = 0; @@ -350,7 +350,7 @@ DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFo // returns the current locale on clipboard; if there is no locale on // clipboard the function returns the current thread locale -LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( ) +LCID CDOTransferable::getLocaleFromClipboard( ) { LCID lcid = GetThreadLocale( ); @@ -378,7 +378,7 @@ LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( ) // in case of failures because nothing should have been // allocated etc. -CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFormatEtc& aFormatEtc ) +CDOTransferable::ByteSequence_t CDOTransferable::getClipboardData( CFormatEtc& aFormatEtc ) { STGMEDIUM stgmedium; HRESULT hr = m_rDataObject->GetData( aFormatEtc, &stgmedium ); @@ -452,7 +452,7 @@ CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFor return byteStream; } -OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( ) +OUString CDOTransferable::synthesizeUnicodeText( ) { ByteSequence_t aTextSequence; CFormatEtc fetc; @@ -493,7 +493,7 @@ OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( ) return OUString(pWChar); } -bool SAL_CALL CDOTransferable::compareDataFlavors( +bool CDOTransferable::compareDataFlavors( const DataFlavor& lhs, const DataFlavor& rhs ) { if ( !m_rXMimeCntFactory.is( ) ) diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx index 0099f3f4b4dd..f45e18c4f85a 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.hxx +++ b/dtrans/source/win32/dtobj/DOTransferable.hxx @@ -62,17 +62,17 @@ private: // some helper functions - void SAL_CALL initFlavorList( ); + void initFlavorList( ); - void SAL_CALL addSupportedFlavor( const css::datatransfer::DataFlavor& aFlavor ); - css::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ); + void addSupportedFlavor( const css::datatransfer::DataFlavor& aFlavor ); + css::datatransfer::DataFlavor formatEtcToDataFlavor( const FORMATETC& aFormatEtc ); - ByteSequence_t SAL_CALL getClipboardData( CFormatEtc& aFormatEtc ); - OUString SAL_CALL synthesizeUnicodeText( ); + ByteSequence_t getClipboardData( CFormatEtc& aFormatEtc ); + OUString synthesizeUnicodeText( ); - LCID SAL_CALL getLocaleFromClipboard( ); + LCID getLocaleFromClipboard( ); - bool SAL_CALL compareDataFlavors( const css::datatransfer::DataFlavor& lhs, + bool compareDataFlavors( const css::datatransfer::DataFlavor& lhs, const css::datatransfer::DataFlavor& rhs ); private: diff --git a/dtrans/source/win32/dtobj/DTransHelper.cxx b/dtrans/source/win32/dtobj/DTransHelper.cxx index 552ec1368f1a..5ca12d0fe26b 100644 --- a/dtrans/source/win32/dtobj/DTransHelper.cxx +++ b/dtrans/source/win32/dtobj/DTransHelper.cxx @@ -43,7 +43,7 @@ CStgTransferHelper::~CStgTransferHelper( ) // TransferData into the -void SAL_CALL CStgTransferHelper::write( const void* lpData, ULONG cb, ULONG* cbWritten ) +void CStgTransferHelper::write( const void* lpData, ULONG cb, ULONG* cbWritten ) { HRESULT hr = E_FAIL; @@ -66,7 +66,7 @@ void SAL_CALL CStgTransferHelper::write( const void* lpData, ULONG cb, ULONG* cb // read -void SAL_CALL CStgTransferHelper::read( LPVOID pv, ULONG cb, ULONG* pcbRead ) +void CStgTransferHelper::read( LPVOID pv, ULONG cb, ULONG* pcbRead ) { HRESULT hr = E_FAIL; @@ -79,7 +79,7 @@ void SAL_CALL CStgTransferHelper::read( LPVOID pv, ULONG cb, ULONG* pcbRead ) // GetHGlobal -HGLOBAL SAL_CALL CStgTransferHelper::getHGlobal( ) const +HGLOBAL CStgTransferHelper::getHGlobal( ) const { OSL_ASSERT( m_lpStream ); @@ -97,7 +97,7 @@ HGLOBAL SAL_CALL CStgTransferHelper::getHGlobal( ) const // getIStream -void SAL_CALL CStgTransferHelper::getIStream( LPSTREAM* ppStream ) +void CStgTransferHelper::getIStream( LPSTREAM* ppStream ) { OSL_ASSERT( ppStream ); *ppStream = m_lpStream; @@ -107,7 +107,7 @@ void SAL_CALL CStgTransferHelper::getIStream( LPSTREAM* ppStream ) // Init -void SAL_CALL CStgTransferHelper::init( SIZE_T newSize, +void CStgTransferHelper::init( SIZE_T newSize, sal_uInt32 uiFlags, bool bDelStgOnRelease ) { @@ -136,7 +136,7 @@ void SAL_CALL CStgTransferHelper::init( SIZE_T newSize, // Init -void SAL_CALL CStgTransferHelper::init( HGLOBAL hGlob, +void CStgTransferHelper::init( HGLOBAL hGlob, bool bDelStgOnRelease ) { cleanup( ); @@ -150,7 +150,7 @@ void SAL_CALL CStgTransferHelper::init( HGLOBAL hGlob, // free the global memory and invalidate the stream pointer -void SAL_CALL CStgTransferHelper::cleanup( ) +void CStgTransferHelper::cleanup( ) { if ( m_lpStream && !m_bDelStgOnRelease ) { @@ -168,7 +168,7 @@ void SAL_CALL CStgTransferHelper::cleanup( ) // return the size of memory we point to -sal_uInt32 SAL_CALL CStgTransferHelper::memSize( CLIPFORMAT cf ) const +sal_uInt32 CStgTransferHelper::memSize( CLIPFORMAT cf ) const { DWORD dwSize = 0; diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx index 381756c27716..5657cbe981e6 100644 --- a/dtrans/source/win32/dtobj/DTransHelper.hxx +++ b/dtrans/source/win32/dtobj/DTransHelper.hxx @@ -58,27 +58,27 @@ public: ~CStgTransferHelper( ); - void SAL_CALL write( const void* lpData, ULONG cb, ULONG* cbWritten = nullptr ); - void SAL_CALL read( LPVOID pv, ULONG cb, ULONG* pcbRead = nullptr ); + void write( const void* lpData, ULONG cb, ULONG* cbWritten = nullptr ); + void read( LPVOID pv, ULONG cb, ULONG* pcbRead = nullptr ); - HGLOBAL SAL_CALL getHGlobal( ) const; - void SAL_CALL getIStream( LPSTREAM* ppStream ); + HGLOBAL getHGlobal( ) const; + void getIStream( LPSTREAM* ppStream ); - void SAL_CALL init( + void init( SIZE_T newSize, sal_uInt32 uiFlags = GHND, bool bDelStgOnRelease = false ); - void SAL_CALL init( + void init( HGLOBAL hGlob, bool bDelStgOnRelease = false ); // returns the size of the managed memory - sal_uInt32 SAL_CALL memSize( CLIPFORMAT cf = CF_INVALID ) const; + sal_uInt32 memSize( CLIPFORMAT cf = CF_INVALID ) const; // free the global memory and necessary // release the internal stream pointer - void SAL_CALL cleanup( ); + void cleanup( ); private: LPSTREAM m_lpStream; diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index 04367b93b999..7462e01e6aff 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -158,7 +158,7 @@ DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& a return aFlavor; } -CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const OUString& aClipFmtName ) +CFormatEtc CDataFormatTranslator::getFormatEtcForClipformatName( const OUString& aClipFmtName ) { // check parameter if ( !aClipFmtName.getLength( ) ) @@ -178,7 +178,7 @@ OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat ) return OUString( wBuff, nLen ); } -CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT cf ) +CFormatEtc CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT cf ) { CFormatEtc fetc( cf, TYMED_NULL, nullptr, DVASPECT_CONTENT ); @@ -211,34 +211,34 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT return fetc; } -bool SAL_CALL CDataFormatTranslator::isOemOrAnsiTextFormat( CLIPFORMAT cf ) +bool CDataFormatTranslator::isOemOrAnsiTextFormat( CLIPFORMAT cf ) { return ( (cf == CF_TEXT) || (cf == CF_OEMTEXT) ); } -bool SAL_CALL CDataFormatTranslator::isUnicodeTextFormat( CLIPFORMAT cf ) +bool CDataFormatTranslator::isUnicodeTextFormat( CLIPFORMAT cf ) { return ( cf == CF_UNICODETEXT ); } -bool SAL_CALL CDataFormatTranslator::isTextFormat( CLIPFORMAT cf ) +bool CDataFormatTranslator::isTextFormat( CLIPFORMAT cf ) { return ( isOemOrAnsiTextFormat( cf ) || isUnicodeTextFormat( cf ) ); } -bool SAL_CALL CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf ) +bool CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf ) { OUString clipFormatName = getClipboardFormatName( cf ); return ( clipFormatName == HTML_FORMAT_NAME_WINDOWS ); } -bool SAL_CALL CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf ) +bool CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf ) { OUString clipFormatName = getClipboardFormatName( cf ); return clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE ); } -OUString SAL_CALL CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) +OUString CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) { OSL_ASSERT( isOemOrAnsiTextFormat( aClipformat ) ); diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx index 1d0231f4714c..c4f8f4d20329 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx @@ -51,18 +51,18 @@ public: css::datatransfer::DataFlavor getDataFlavorFromFormatEtc( const FORMATETC& aFormatEtc, LCID lcid = GetThreadLocale( ) ) const; - static CFormatEtc SAL_CALL getFormatEtcForClipformat( CLIPFORMAT cf ); - static CFormatEtc SAL_CALL getFormatEtcForClipformatName( const OUString& aClipFmtName ); - static OUString SAL_CALL getClipboardFormatName( CLIPFORMAT aClipformat ); + static CFormatEtc getFormatEtcForClipformat( CLIPFORMAT cf ); + static CFormatEtc getFormatEtcForClipformatName( const OUString& aClipFmtName ); + static OUString getClipboardFormatName( CLIPFORMAT aClipformat ); - static bool SAL_CALL isHTMLFormat( CLIPFORMAT cf ); - static bool SAL_CALL isTextHtmlFormat( CLIPFORMAT cf ); - static bool SAL_CALL isOemOrAnsiTextFormat( CLIPFORMAT cf ); - static bool SAL_CALL isUnicodeTextFormat( CLIPFORMAT cf ); - static bool SAL_CALL isTextFormat( CLIPFORMAT cf ); + static bool isHTMLFormat( CLIPFORMAT cf ); + static bool isTextHtmlFormat( CLIPFORMAT cf ); + static bool isOemOrAnsiTextFormat( CLIPFORMAT cf ); + static bool isUnicodeTextFormat( CLIPFORMAT cf ); + static bool isTextFormat( CLIPFORMAT cf ); private: - static OUString SAL_CALL getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ); + static OUString getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ); private: css::uno::Reference< css::datatransfer::XDataFormatTranslator > m_XDataFormatTranslator; diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx index ee77267304b6..29f630bf406b 100644 --- a/dtrans/source/win32/dtobj/DtObjFactory.cxx +++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; -IDataObjectPtr SAL_CALL CDTransObjFactory::createDataObjFromTransferable(const Reference<XComponentContext>& rxContext, +IDataObjectPtr CDTransObjFactory::createDataObjFromTransferable(const Reference<XComponentContext>& rxContext, const Reference< XTransferable >& refXTransferable) { return (IDataObjectPtr(new CXTDataObject(rxContext, refXTransferable))); diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx index 98e6bffb14d0..36bb5bd74eee 100644 --- a/dtrans/source/win32/dtobj/FetcList.cxx +++ b/dtrans/source/win32/dtobj/FetcList.cxx @@ -51,7 +51,7 @@ void CFormatEtcContainer::addFormatEtc( const CFormatEtc& fetc ) m_FormatMap.push_back( CFormatEtc( fetc ) ); } -void SAL_CALL CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc ) +void CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc ) { FormatEtcMap_t::iterator iter = find( m_FormatMap.begin(), m_FormatMap.end(), fetc ); @@ -60,7 +60,7 @@ void SAL_CALL CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc ) m_FormatMap.erase( iter ); } -void SAL_CALL CFormatEtcContainer::removeAllFormatEtc( ) +void CFormatEtcContainer::removeAllFormatEtc( ) { m_FormatMap.clear( ); } @@ -83,7 +83,7 @@ void CFormatEtcContainer::beginEnumFormatEtc( ) m_EnumIterator = m_FormatMap.begin( ); } -sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc, +sal_uInt32 CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc, sal_uInt32 aNum ) { OSL_ASSERT( lpFetc ); @@ -101,7 +101,7 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc, return nFetched; } -bool SAL_CALL CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum ) +bool CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum ) { FormatEtcMap_t::const_iterator iter_end = m_FormatMap.end( ); for ( sal_uInt32 i = 0; @@ -140,7 +140,7 @@ CFormatRegistrar::CFormatRegistrar( const Reference< XComponentContext >& rxCont // if some tries to register different text formats with different charsets the last // registered wins and the others are ignored -void SAL_CALL CFormatRegistrar::RegisterFormats( +void CFormatRegistrar::RegisterFormats( const Reference< XTransferable >& aXTransferable, CFormatEtcContainer& aFormatEtcContainer ) { Sequence< DataFlavor > aFlavorList = aXTransferable->getTransferDataFlavors( ); @@ -221,27 +221,27 @@ void SAL_CALL CFormatRegistrar::RegisterFormats( } } -bool SAL_CALL CFormatRegistrar::hasSynthesizedLocale( ) const +bool CFormatRegistrar::hasSynthesizedLocale( ) const { return m_bHasSynthesizedLocale; } -LCID SAL_CALL CFormatRegistrar::getSynthesizedLocale( ) +LCID CFormatRegistrar::getSynthesizedLocale( ) { return m_TxtLocale; } -sal_uInt32 SAL_CALL CFormatRegistrar::getRegisteredTextCodePage( ) +sal_uInt32 CFormatRegistrar::getRegisteredTextCodePage( ) { return m_TxtCodePage; } -DataFlavor SAL_CALL CFormatRegistrar::getRegisteredTextFlavor( ) const +DataFlavor CFormatRegistrar::getRegisteredTextFlavor( ) const { return m_RegisteredTextFlavor; } -bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) +bool CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) { return ( CDataFormatTranslator::isOemOrAnsiTextFormat( aFormatEtc.getClipformat() ) || CDataFormatTranslator::isUnicodeTextFormat( aFormatEtc.getClipformat() ) || @@ -249,14 +249,14 @@ bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aForma } inline -bool SAL_CALL CFormatRegistrar::needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) +bool CFormatRegistrar::needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) { return ( CDataFormatTranslator::isOemOrAnsiTextFormat( aFormatEtc.getClipformat() ) || CDataFormatTranslator::isUnicodeTextFormat( aFormatEtc.getClipformat() ) || CDataFormatTranslator::isTextHtmlFormat( aFormatEtc.getClipformat( ) ) ); } -OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor& aFlavor ) +OUString CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor& aFlavor ) { OUString charset; @@ -283,7 +283,7 @@ OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor& return charset; } -bool SAL_CALL CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransferable >& aXTransferable ) const +bool CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransferable >& aXTransferable ) const { CFormatEtc fetc( CF_UNICODETEXT ); @@ -293,14 +293,14 @@ bool SAL_CALL CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransferable return aXTransferable->isDataFlavorSupported( aFlavor ); } -bool SAL_CALL CFormatRegistrar::findLocaleForTextCodePage( ) +bool CFormatRegistrar::findLocaleForTextCodePage( ) { m_TxtLocale = 0; EnumSystemLocalesA( CFormatRegistrar::EnumLocalesProc, LCID_INSTALLED ); return IsValidLocale( m_TxtLocale, LCID_INSTALLED ); } -bool SAL_CALL CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage ) +bool CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage ) { char buff[6]; sal_uInt32 localeCodePage; @@ -315,13 +315,13 @@ bool SAL_CALL CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_ } inline -bool SAL_CALL CFormatRegistrar::isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage ) +bool CFormatRegistrar::isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage ) { return isLocaleCodePage( lcid, LOCALE_IDEFAULTCODEPAGE, codepage ); } inline -bool SAL_CALL CFormatRegistrar::isLocaleAnsiCodePage( LCID lcid, sal_uInt32 codepage ) +bool CFormatRegistrar::isLocaleAnsiCodePage( LCID lcid, sal_uInt32 codepage ) { return isLocaleCodePage( lcid, LOCALE_IDEFAULTANSICODEPAGE, codepage ); } diff --git a/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx index 1015729ad6c2..707ad4dd094b 100644 --- a/dtrans/source/win32/dtobj/FetcList.hxx +++ b/dtrans/source/win32/dtobj/FetcList.hxx @@ -48,29 +48,29 @@ public: CFormatEtcContainer( ); // duplicates not allowed - void SAL_CALL addFormatEtc( const CFormatEtc& fetc ); + void addFormatEtc( const CFormatEtc& fetc ); // removes the specified formatetc - void SAL_CALL removeFormatEtc( const CFormatEtc& fetc ); + void removeFormatEtc( const CFormatEtc& fetc ); // removes the formatetc at pos - void SAL_CALL removeAllFormatEtc( ); + void removeAllFormatEtc( ); - bool SAL_CALL hasFormatEtc( const CFormatEtc& fetc ) const; + bool hasFormatEtc( const CFormatEtc& fetc ) const; - bool SAL_CALL hasElements( ) const; + bool hasElements( ) const; // begin enumeration - void SAL_CALL beginEnumFormatEtc( ); + void beginEnumFormatEtc( ); // copies the specified number of formatetc structures starting // at the current enum position // the return value is the number of copied elements; if the // current enum position is at the end the return value is 0 - sal_uInt32 SAL_CALL nextFormatEtc( LPFORMATETC lpFetc, sal_uInt32 aNum = 1 ); + sal_uInt32 nextFormatEtc( LPFORMATETC lpFetc, sal_uInt32 aNum = 1 ); // skips the specified number of elements in the container - bool SAL_CALL skipFormatEtc( sal_uInt32 aNum ); + bool skipFormatEtc( sal_uInt32 aNum ); protected: typedef std::vector< CFormatEtc > FormatEtcMap_t; @@ -102,28 +102,28 @@ public: CFormatRegistrar( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const CDataFormatTranslator& aDataFormatTranslator ); - void SAL_CALL RegisterFormats( const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable, + void RegisterFormats( const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable, CFormatEtcContainer& aFormatEtcContainer ); - bool SAL_CALL hasSynthesizedLocale( ) const; - static LCID SAL_CALL getSynthesizedLocale( ); - static sal_uInt32 SAL_CALL getRegisteredTextCodePage( ); - css::datatransfer::DataFlavor SAL_CALL getRegisteredTextFlavor( ) const; + bool hasSynthesizedLocale( ) const; + static LCID getSynthesizedLocale( ); + static sal_uInt32 getRegisteredTextCodePage( ); + css::datatransfer::DataFlavor getRegisteredTextFlavor( ) const; - static bool SAL_CALL isSynthesizeableFormat( const CFormatEtc& aFormatEtc ); - static bool SAL_CALL needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ); + static bool isSynthesizeableFormat( const CFormatEtc& aFormatEtc ); + static bool needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ); private: - OUString SAL_CALL getCharsetFromDataFlavor( const css::datatransfer::DataFlavor& aFlavor ); + OUString getCharsetFromDataFlavor( const css::datatransfer::DataFlavor& aFlavor ); - bool SAL_CALL hasUnicodeFlavor( + bool hasUnicodeFlavor( const css::uno::Reference< css::datatransfer::XTransferable >& aXTransferable ) const; - static bool SAL_CALL findLocaleForTextCodePage( ); + static bool findLocaleForTextCodePage( ); - static bool SAL_CALL isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage ); - static bool SAL_CALL isLocaleAnsiCodePage( LCID lcid, sal_uInt32 codepage ); - static bool SAL_CALL isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage ); + static bool isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage ); + static bool isLocaleAnsiCodePage( LCID lcid, sal_uInt32 codepage ); + static bool isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage ); static BOOL CALLBACK EnumLocalesProc( LPSTR lpLocaleStr ); diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx index 3b495b4d2dd4..9a181d197bcb 100644 --- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx +++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx @@ -132,7 +132,7 @@ CXNotifyingDataObject::operator IDataObject*( ) return static_cast< IDataObject* >( this ); } -void SAL_CALL CXNotifyingDataObject::lostOwnership( ) +void CXNotifyingDataObject::lostOwnership( ) { try { diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx index a6a8bd075e7f..0a1f4a04d2c7 100644 --- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx +++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx @@ -77,7 +77,7 @@ public: operator IDataObject*( ); private: - void SAL_CALL lostOwnership( ); + void lostOwnership( ); private: sal_Int32 m_nRefCnt; diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index 76442f27fd7c..65830690fc6d 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -297,7 +297,7 @@ STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium } //inline -void SAL_CALL CXTDataObject::renderLocaleAndSetupStgMedium( +void CXTDataObject::renderLocaleAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ) { if ( !m_FormatRegistrar.hasSynthesizedLocale( ) ) @@ -311,7 +311,7 @@ void SAL_CALL CXTDataObject::renderLocaleAndSetupStgMedium( stgmedium ); } -void SAL_CALL CXTDataObject::renderUnicodeAndSetupStgMedium( +void CXTDataObject::renderUnicodeAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ) { DataFlavor aFlavor = formatEtcToDataFlavor( fetc ); @@ -343,7 +343,7 @@ void SAL_CALL CXTDataObject::renderUnicodeAndSetupStgMedium( stgmedium ); } -void SAL_CALL CXTDataObject::renderAnyDataAndSetupStgMedium( +void CXTDataObject::renderAnyDataAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) { DataFlavor aFlavor = formatEtcToDataFlavor( fetc ); @@ -412,7 +412,7 @@ void SAL_CALL CXTDataObject::renderAnyDataAndSetupStgMedium( stgmedium ); } -HRESULT SAL_CALL CXTDataObject::renderSynthesizedFormatAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) +HRESULT CXTDataObject::renderSynthesizedFormatAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) { HRESULT hr = S_OK; @@ -450,7 +450,7 @@ HRESULT SAL_CALL CXTDataObject::renderSynthesizedFormatAndSetupStgMedium( FORMAT // the transferable must have only text, so we will synthesize unicode text -void SAL_CALL CXTDataObject::renderSynthesizedUnicodeAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ) +void CXTDataObject::renderSynthesizedUnicodeAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ) { OSL_ASSERT( CF_UNICODETEXT == fetc.cfFormat ); @@ -481,7 +481,7 @@ void SAL_CALL CXTDataObject::renderSynthesizedUnicodeAndSetupStgMedium( FORMATET // the transferable must have only unicode text so we will synthesize text -void SAL_CALL CXTDataObject::renderSynthesizedTextAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) +void CXTDataObject::renderSynthesizedTextAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) { OSL_ASSERT( CDataFormatTranslator::isOemOrAnsiTextFormat( fetc.cfFormat ) ); @@ -513,7 +513,7 @@ void SAL_CALL CXTDataObject::renderSynthesizedTextAndSetupStgMedium( FORMATETC& setupStgMedium( fetc, stgTransfHelper, stgmedium ); } -void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) +void CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) { OSL_ASSERT( CDataFormatTranslator::isHTMLFormat( fetc.cfFormat ) ); @@ -641,7 +641,7 @@ CXTDataObject::operator IDataObject*( ) } inline -DataFlavor SAL_CALL CXTDataObject::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const +DataFlavor CXTDataObject::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const { DataFlavor aFlavor; @@ -657,7 +657,7 @@ DataFlavor SAL_CALL CXTDataObject::formatEtcToDataFlavor( const FORMATETC& aForm return aFlavor; } -inline void SAL_CALL CXTDataObject::InitializeFormatEtcContainer( ) +inline void CXTDataObject::InitializeFormatEtcContainer( ) { if ( !m_bFormatEtcContainerInitialized ) { diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx index 4effb8e6a89c..cd6097879656 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.hxx +++ b/dtrans/source/win32/dtobj/XTDataObject.hxx @@ -90,18 +90,18 @@ public: operator IDataObject*( ); private: - css::datatransfer::DataFlavor SAL_CALL formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const; + css::datatransfer::DataFlavor formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const; - void SAL_CALL renderLocaleAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ); - void SAL_CALL renderUnicodeAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ); - void SAL_CALL renderAnyDataAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); + void renderLocaleAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ); + void renderUnicodeAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ); + void renderAnyDataAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); - HRESULT SAL_CALL renderSynthesizedFormatAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); - void SAL_CALL renderSynthesizedUnicodeAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ); - void SAL_CALL renderSynthesizedTextAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); - void SAL_CALL renderSynthesizedHtmlAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); + HRESULT renderSynthesizedFormatAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); + void renderSynthesizedUnicodeAndSetupStgMedium( FORMATETC const & fetc, STGMEDIUM& stgmedium ); + void renderSynthesizedTextAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); + void renderSynthesizedHtmlAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ); - inline void SAL_CALL InitializeFormatEtcContainer( ); + inline void InitializeFormatEtcContainer( ); private: LONG m_nRefCnt; diff --git a/embedserv/source/embed/intercept.cxx b/embedserv/source/embed/intercept.cxx index b383f040a803..a25fd7bab9b5 100644 --- a/embedserv/source/embed/intercept.cxx +++ b/embedserv/source/embed/intercept.cxx @@ -42,7 +42,7 @@ public: }; -void SAL_CALL +void Interceptor::addEventListener( const uno::Reference<lang::XEventListener >& Listener ) { @@ -56,7 +56,7 @@ Interceptor::addEventListener( } -void SAL_CALL +void Interceptor::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) { @@ -67,7 +67,7 @@ Interceptor::removeEventListener( } -void SAL_CALL Interceptor::dispose() +void Interceptor::dispose() { lang::EventObject aEvt; aEvt.Source = static_cast< frame::XDispatch* >( this ); diff --git a/embedserv/source/embed/servprov.cxx b/embedserv/source/embed/servprov.cxx index b39b06b3bd0c..0460565a3f20 100644 --- a/embedserv/source/embed/servprov.cxx +++ b/embedserv/source/embed/servprov.cxx @@ -50,9 +50,9 @@ class CurThreadData CurThreadData(); virtual ~CurThreadData(); - bool SAL_CALL setData(void *pData); + bool setData(void *pData); - void* SAL_CALL getData(); + void* getData(); protected: oslThreadKey m_hKey; diff --git a/embedserv/source/inc/intercept.hxx b/embedserv/source/inc/intercept.hxx index 6c8187cf8edb..ab3fb63cad8f 100644 --- a/embedserv/source/inc/intercept.hxx +++ b/embedserv/source/inc/intercept.hxx @@ -59,16 +59,16 @@ public: // XComponent /// @throws css::uno::RuntimeException - virtual void SAL_CALL + virtual void addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ); /// @throws css::uno::RuntimeException - virtual void SAL_CALL + virtual void removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ); /// @throws css::uno::RuntimeException - void SAL_CALL + void dispose(); diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx index a1afc6c581eb..07b9a9cea3ef 100644 --- a/fpicker/source/win32/filepicker/FilterContainer.cxx +++ b/fpicker/source/win32/filepicker/FilterContainer.cxx @@ -45,7 +45,7 @@ CFilterContainer::CFilterContainer( sal_Int32 initSize ) : // add a name/filter pair -bool SAL_CALL CFilterContainer::addFilter( +bool CFilterContainer::addFilter( const OUString& aName, const OUString& aFilter, bool bAllowDuplicates ) { // check if the filter is already in the container @@ -73,7 +73,7 @@ bool SAL_CALL CFilterContainer::addFilter( // Precondition: the container is not empty // there is a filter identified by the given name -bool SAL_CALL CFilterContainer::delFilter( const OUString& aName ) +bool CFilterContainer::delFilter( const OUString& aName ) { OSL_ASSERT( !m_vFilters.empty() ); @@ -89,14 +89,14 @@ bool SAL_CALL CFilterContainer::delFilter( const OUString& aName ) // return the number of filters currently in the container -sal_Int32 SAL_CALL CFilterContainer::numFilter( ) +sal_Int32 CFilterContainer::numFilter( ) { return m_vFilters.size( ); } // clear all entries -void SAL_CALL CFilterContainer::empty() +void CFilterContainer::empty() { m_vFilters.clear( ); } @@ -105,7 +105,7 @@ void SAL_CALL CFilterContainer::empty() // Precondition: the container is not empty // there is a filter identified by the name -bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& theFilter ) const +bool CFilterContainer::getFilter( const OUString& aName, OUString& theFilter ) const { OSL_PRECOND( !m_vFilters.empty() , "Empty filter container" ); @@ -125,7 +125,7 @@ bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& theF return pos > -1; } -bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const +bool CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const { bool bRet = true; @@ -142,14 +142,14 @@ bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter return bRet; } -sal_Int32 SAL_CALL CFilterContainer::getFilterPos( const OUString& aName ) const +sal_Int32 CFilterContainer::getFilterPos( const OUString& aName ) const { return getFilterTagPos( aName ); } // returns the index of the filter identified by name -sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) const +sal_Int32 CFilterContainer::getFilterTagPos( const OUString& aName ) const { if ( !m_vFilters.empty() ) { @@ -167,7 +167,7 @@ sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) co // starts enumerating the filter in the container -void SAL_CALL CFilterContainer::beginEnumFilter( ) +void CFilterContainer::beginEnumFilter( ) { m_iter = m_vFilters.begin( ); m_bIterInitialized = true; @@ -175,7 +175,7 @@ void SAL_CALL CFilterContainer::beginEnumFilter( ) // returns true if another filter has been retrieved -bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry ) +bool CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry ) { OSL_ASSERT( m_bIterInitialized ); @@ -189,12 +189,12 @@ bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry ) return bRet; } -void SAL_CALL CFilterContainer::setCurrentFilter( const OUString& aName ) +void CFilterContainer::setCurrentFilter( const OUString& aName ) { m_sCurrentFilter = aName; } -OUString SAL_CALL CFilterContainer::getCurrentFilter() const +OUString CFilterContainer::getCurrentFilter() const { return m_sCurrentFilter; } diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx index 18edcf5df25e..450072fecf88 100644 --- a/fpicker/source/win32/filepicker/FilterContainer.hxx +++ b/fpicker/source/win32/filepicker/FilterContainer.hxx @@ -43,42 +43,42 @@ public: // returns true if the filter was successfully added // returns false if duplicates are not allowed and // the filter is already in the container - bool SAL_CALL addFilter( + bool addFilter( const OUString& aName, const OUString& aFilter, bool bAllowDuplicates = false ); // delete the specified filter returns true on // success and false if the filter was not found - bool SAL_CALL delFilter( const OUString& aName ); + bool delFilter( const OUString& aName ); // the number of filter already added - sal_Int32 SAL_CALL numFilter( ); + sal_Int32 numFilter( ); // clear all entries - void SAL_CALL empty( ); + void empty( ); // retrieve a filter from the container both methods // return true on success and false if the specified // filter was not found - bool SAL_CALL getFilter( const OUString& aName, OUString& theFilter ) const; - bool SAL_CALL getFilter( sal_Int32 aIndex, OUString& theFilter ) const; + bool getFilter( const OUString& aName, OUString& theFilter ) const; + bool getFilter( sal_Int32 aIndex, OUString& theFilter ) const; // returns the position of the specified filter or -1 // if the filter was not found - sal_Int32 SAL_CALL getFilterPos( const OUString& aName ) const; + sal_Int32 getFilterPos( const OUString& aName ) const; // starts enumerating the filter in the container - void SAL_CALL beginEnumFilter( ); + void beginEnumFilter( ); // returns true if another filter has been retrieved - bool SAL_CALL getNextFilter( FILTER_ENTRY_T& nextFilterEntry ); + bool getNextFilter( FILTER_ENTRY_T& nextFilterEntry ); // cache current filter - void SAL_CALL setCurrentFilter( const OUString& aName ); + void setCurrentFilter( const OUString& aName ); // returns cached current filter - OUString SAL_CALL getCurrentFilter() const; + OUString getCurrentFilter() const; protected: typedef std::vector< FILTER_ENTRY_T > FILTER_VECTOR_T; @@ -88,7 +88,7 @@ private: CFilterContainer( const CFilterContainer& ); CFilterContainer& SAL_CALL operator=( const CFilterContainer& ); - sal_Int32 SAL_CALL getFilterTagPos( const OUString& aName ) const; + sal_Int32 getFilterTagPos( const OUString& aName ) const; private: FILTER_VECTOR_T m_vFilters; diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index 54ff672579ff..15aa1474ff5d 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -95,7 +95,7 @@ void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Referenc m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED); } -void SAL_CALL VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/) +void VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/) { } diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx index 65e67c2c3041..8f36f5438698 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx @@ -175,7 +175,7 @@ public: // XEventListener /// @throws css::uno::RuntimeException - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ); + virtual void disposing( const css::lang::EventObject& aEvent ); // XServiceInfo diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index 4817ff129170..ea7b2cd1ba86 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -201,13 +201,13 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi } -void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) +void VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) { m_lListener.addInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener); } -void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) +void VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) { m_lListener.removeInterface(cppu::UnoType<css::ui::dialogs::XFilePickerListener>::get(), xListener); } diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index 6a8a783dce7d..0a1f9647a7cc 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -113,10 +113,10 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex // XFilePickerNotifier /// @throws css::uno::RuntimeException - virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ); + virtual void addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ); /// @throws css::uno::RuntimeException - virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ); + virtual void removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ); // native interface diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index 22b484034f6c..c3b7b391f89a 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -127,7 +127,7 @@ void SAL_CALL CFolderPicker::cancel( ) // overwrite base class method, which is called // by base class dispose function -void SAL_CALL CFolderPicker::disposing() +void CFolderPicker::disposing() { } diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx index 2f25cc4a4ecf..346a6bfccd98 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.hxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx @@ -86,7 +86,7 @@ public: // by base class dispose function - virtual void SAL_CALL disposing(); + virtual void disposing(); private: css::uno::Reference< css::lang::XMultiServiceFactory > m_xServiceMgr; diff --git a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx index ffb35b7d8a37..d070e8208d26 100644 --- a/fpicker/source/win32/folderpicker/FopEvtDisp.hxx +++ b/fpicker/source/win32/folderpicker/FopEvtDisp.hxx @@ -28,7 +28,7 @@ class CFOPEventDispatcher public: // dispatches a FilePickerEvent to wherever - virtual void SAL_CALL helpRequested( css::lang::EventObject aEvent ) const = 0; + virtual void helpRequested( css::lang::EventObject aEvent ) const = 0; protected: ~CFOPEventDispatcher() {} diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 497d1ebba835..f0cf32b8d0c9 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -302,37 +302,37 @@ bool CMtaFolderPicker::browseForFolder( ) } -void SAL_CALL CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory ) +void CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory ) { m_displayDir = aDirectory; } -OUString SAL_CALL CMtaFolderPicker::getDisplayDirectory( ) +OUString CMtaFolderPicker::getDisplayDirectory( ) { return m_displayDir; } -OUString SAL_CALL CMtaFolderPicker::getDirectory( ) +OUString CMtaFolderPicker::getDirectory( ) { return m_SelectedDir; } -void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription ) +void CMtaFolderPicker::setDescription( const OUString& aDescription ) { m_Description = aDescription; } -void SAL_CALL CMtaFolderPicker::setTitle( const OUString& aTitle ) +void CMtaFolderPicker::setTitle( const OUString& aTitle ) { m_dialogTitle = aTitle; } -OUString SAL_CALL CMtaFolderPicker::getTitle( ) +OUString CMtaFolderPicker::getTitle( ) { return m_dialogTitle; } @@ -341,7 +341,7 @@ OUString SAL_CALL CMtaFolderPicker::getTitle( ) // XCancellable -void SAL_CALL CMtaFolderPicker::cancel( ) +void CMtaFolderPicker::cancel( ) { if ( IsWindow( m_hwnd ) ) { @@ -357,7 +357,7 @@ void SAL_CALL CMtaFolderPicker::cancel( ) } -bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) +bool CMtaFolderPicker::onBrowseForFolder( ) { bool bRet; LPITEMIDLIST lpiid; @@ -382,7 +382,7 @@ bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) } -void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) +void CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) { sal::systools::COMReference<IMalloc> pIMalloc; SHGetMalloc(&pIMalloc); @@ -394,7 +394,7 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) } -LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory ) +LPITEMIDLIST CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory ) { // parameter checking if ( !aDirectory.getLength( ) ) @@ -420,7 +420,7 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a } -OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList ) +OUString CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList ) { OUString path; @@ -435,7 +435,7 @@ OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemI } -void SAL_CALL CMtaFolderPicker::enableOk( bool bEnable ) +void CMtaFolderPicker::enableOk( bool bEnable ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -447,7 +447,7 @@ void SAL_CALL CMtaFolderPicker::enableOk( bool bEnable ) } -void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) +void CMtaFolderPicker::setSelection( const OUString& aDirectory ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -459,7 +459,7 @@ void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) } -void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) +void CMtaFolderPicker::setStatusText( const OUString& aStatusText ) { OSL_ASSERT( IsWindow( m_hwnd ) ); @@ -471,7 +471,7 @@ void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) } -void SAL_CALL CMtaFolderPicker::onInitialized( ) +void CMtaFolderPicker::onInitialized( ) { LPITEMIDLIST lpiidDisplayDir = getItemIdListFromPath( m_displayDir ); @@ -603,7 +603,7 @@ LRESULT CALLBACK CMtaFolderPicker::StaWndProc( HWND hWnd, UINT uMsg, WPARAM wPar } -bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( ) +bool CMtaFolderPicker::createStaRequestWindow( ) { bool bIsWnd = false; @@ -692,7 +692,7 @@ unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) } -ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) +ATOM CMtaFolderPicker::RegisterStaRequestWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); @@ -729,7 +729,7 @@ ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) } -void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( ) +void CMtaFolderPicker::UnregisterStaRequestWindowClass( ) { osl::MutexGuard aGuard( s_Mutex ); diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx index 06529bab7add..805c137bcb2b 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.hxx +++ b/fpicker/source/win32/folderpicker/MtaFop.hxx @@ -55,51 +55,51 @@ public: virtual ~CMtaFolderPicker( ); // shell functions - bool SAL_CALL browseForFolder( ); + bool browseForFolder( ); - virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ); - virtual OUString SAL_CALL getDisplayDirectory( ); - virtual OUString SAL_CALL getDirectory( ); + virtual void setDisplayDirectory( const OUString& aDirectory ); + virtual OUString getDisplayDirectory( ); + virtual OUString getDirectory( ); - virtual void SAL_CALL setDescription( const OUString& aDescription ); + virtual void setDescription( const OUString& aDescription ); - virtual void SAL_CALL setTitle( const OUString& aTitle ); - OUString SAL_CALL getTitle( ); + virtual void setTitle( const OUString& aTitle ); + OUString getTitle( ); // XCancellable - virtual void SAL_CALL cancel( ); + virtual void cancel( ); protected: - void SAL_CALL enableOk( bool bEnable ); - void SAL_CALL setSelection( const OUString& aDirectory ); - void SAL_CALL setStatusText( const OUString& aStatusText ); + void enableOk( bool bEnable ); + void setSelection( const OUString& aDirectory ); + void setStatusText( const OUString& aStatusText ); - virtual void SAL_CALL onInitialized( ); - virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) = 0; + virtual void onInitialized( ); + virtual void onSelChanged( const OUString& aNewPath ) = 0; private: static sal_uInt32 onValidateFailed(); // helper functions - static LPITEMIDLIST SAL_CALL getItemIdListFromPath( const OUString& aDirectory ); - OUString SAL_CALL getPathFromItemIdList( LPCITEMIDLIST lpItemIdList ); - static void SAL_CALL releaseItemIdList( LPITEMIDLIST lpItemIdList ); + static LPITEMIDLIST getItemIdListFromPath( const OUString& aDirectory ); + OUString getPathFromItemIdList( LPCITEMIDLIST lpItemIdList ); + static void releaseItemIdList( LPITEMIDLIST lpItemIdList ); unsigned int run( ); // create a hidden windows which serves as an request // target; so we guarantee synchronization - bool SAL_CALL createStaRequestWindow( ); + bool createStaRequestWindow( ); // message handler functions; remember these functions are called // from a different thread context! - bool SAL_CALL onBrowseForFolder( ); + bool onBrowseForFolder( ); static LRESULT CALLBACK StaWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static unsigned int WINAPI StaThreadProc( LPVOID pParam ); @@ -110,8 +110,8 @@ protected: HWND m_hwnd; private: - ATOM SAL_CALL RegisterStaRequestWindowClass( ); - void SAL_CALL UnregisterStaRequestWindowClass( ); + ATOM RegisterStaRequestWindowClass( ); + void UnregisterStaRequestWindowClass( ); private: HANDLE m_hStaThread; diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 018922d81c21..c649302ba6b1 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -46,7 +46,7 @@ CWinFolderPickerImpl::CWinFolderPickerImpl( CFolderPicker* aFolderPicker ) : // If the specified path is well formed but invalid for the underlying // OS the FolderPicker starts in the root of the file system hierarchy -void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirectory ) +void CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirectory ) { OUString sysDir; @@ -91,7 +91,7 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( ) return displayDirectoryURL; } -OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) +OUString CWinFolderPickerImpl::getDirectory( ) { OUString sysDir = CMtaFolderPicker::getDirectory( ); OUString dirURL; @@ -102,7 +102,7 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) return dirURL; } -sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) +sal_Int16 CWinFolderPickerImpl::execute( ) { return m_nLastDlgResult = CMtaFolderPicker::browseForFolder( ) ? css::ui::dialogs::ExecutableDialogResults::OK : diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx index ffed7e969342..98f52dac2f31 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx @@ -39,20 +39,20 @@ public: // XExecutableDialog /// @throws css::uno::RuntimeException - virtual sal_Int16 SAL_CALL execute( ); + virtual sal_Int16 execute( ); // XFolderPicker - virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) override; + virtual void setDisplayDirectory( const OUString& aDirectory ) override; - virtual OUString SAL_CALL getDisplayDirectory( ) override; + virtual OUString getDisplayDirectory( ) override; - virtual OUString SAL_CALL getDirectory( ) override; + virtual OUString getDirectory( ) override; protected: - virtual void SAL_CALL onSelChanged( const OUString& aNewPath ) override; + virtual void onSelChanged( const OUString& aNewPath ) override; private: CFolderPicker* m_pFolderPicker; diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index df3c33845b1e..5aa857005c69 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -404,7 +404,7 @@ public: virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) override; // css::form::XLoadListener virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) override; @@ -450,7 +450,7 @@ public: virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener >& l) override; // UnoControl - virtual void SAL_CALL SAL_CALL setDesignMode(sal_Bool bOn) override; + virtual void SAL_CALL setDesignMode(sal_Bool bOn) override; virtual sal_Bool SAL_CALL isDesignMode() override; // css::view::XSelectionChangeListener diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index dfc6973cbcb7..11305dc2c48e 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -118,8 +118,8 @@ public: virtual void SAL_CALL setRelativeVerticalPosition(::sal_Int32 _relativeverticalposition) override; // Methods - virtual css::uno::Any SAL_CALL SAL_CALL TextFrame( ) override; - virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat( ) override; + virtual css::uno::Any SAL_CALL TextFrame( ) override; + virtual css::uno::Any SAL_CALL WrapFormat( ) override; virtual void SAL_CALL Delete() override; virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) override; virtual void SAL_CALL IncrementRotation( double Increment ) override; diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx index 89cde7643125..4b8261ffa6cc 100644 --- a/include/vbahelper/vbashaperange.hxx +++ b/include/vbahelper/vbashaperange.hxx @@ -90,8 +90,8 @@ public: virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) override; virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() override; virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) override; - virtual css::uno::Any SAL_CALL SAL_CALL TextFrame( ) override; - virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat( ) override; + virtual css::uno::Any SAL_CALL TextFrame( ) override; + virtual css::uno::Any SAL_CALL WrapFormat( ) override; virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) override; //XEnumerationAccess virtual css::uno::Type SAL_CALL getElementType() override; diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 6a7744b48025..c412fffcd915 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -981,14 +981,14 @@ public: virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() override; virtual OUString SAL_CALL getSelectedItem() override; virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems() override; - virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) override; - virtual void SAL_CALL SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) override; - virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) override; + virtual void SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) override; + virtual void SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) override; + virtual void SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) override; virtual sal_Bool SAL_CALL isMutipleMode() override; - virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) override; + virtual void SAL_CALL setMultipleMode(sal_Bool bMulti) override; virtual sal_Int16 SAL_CALL getDropDownLineCount() override; - virtual void SAL_CALL SAL_CALL setDropDownLineCount(sal_Int16 nLines) override; - virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) override; + virtual void SAL_CALL setDropDownLineCount(sal_Int16 nLines) override; + virtual void SAL_CALL makeVisible(sal_Int16 nEntry) override; private: virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 20d5dd1e9efa..9048a2c4d8d0 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -449,7 +449,7 @@ public: SwXNumberingRulesCollection( SwDoc* pDoc ); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount() override; + virtual sal_Int32 SAL_CALL getCount() override; virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess @@ -476,7 +476,7 @@ public: SwXFootnotes(bool bEnd, SwDoc* pDoc); //XIndexAccess - virtual sal_Int32 SAL_CALL SAL_CALL getCount() override; + virtual sal_Int32 SAL_CALL getCount() override; virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 2bd932783632..afd2a500ff38 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -130,8 +130,8 @@ public: virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) override; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) override; @@ -161,8 +161,8 @@ public: virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) override; //XElementAccess - virtual css::uno::Type SAL_CALL SAL_CALL getElementType( ) override; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; }; diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 781abb30f833..5a31f787a55d 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -205,9 +205,9 @@ namespace sw virtual uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override; //XElementAccess - virtual uno::Type SAL_CALL SAL_CALL getElementType( ) override + virtual uno::Type SAL_CALL getElementType( ) override { return cppu::UnoType<style::XStyle>::get(); }; - virtual sal_Bool SAL_CALL SAL_CALL hasElements( ) override + virtual sal_Bool SAL_CALL hasElements( ) override { if(!m_pBasePool) throw uno::RuntimeException(); diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index b8bb8da2bd27..c9a9b3fe7c0f 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -96,7 +96,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper< /// @throws css::uno::SecurityException /// @throws css::uno::RuntimeException - virtual css::uno::Reference< css::security::XCertificate > SAL_CALL getCertificate( + virtual css::uno::Reference< css::security::XCertificate > getCertificate( const OUString& issuerName, const OUString& serialNumber ) ; |