diff options
Diffstat (limited to 'dtrans/source')
-rw-r--r-- | dtrans/source/cnttype/mcnttfactory.cxx | 11 | ||||
-rw-r--r-- | dtrans/source/cnttype/mcnttype.cxx | 6 | ||||
-rw-r--r-- | dtrans/source/cnttype/mctfentry.cxx | 13 | ||||
-rw-r--r-- | dtrans/source/win32/clipb/WinClipbImpl.cxx | 6 | ||||
-rw-r--r-- | dtrans/source/win32/clipb/WinClipboard.cxx | 20 | ||||
-rw-r--r-- | dtrans/source/win32/clipb/wcbentry.cxx | 14 | ||||
-rw-r--r-- | dtrans/source/win32/dtobj/DOTransferable.cxx | 6 | ||||
-rw-r--r-- | dtrans/source/win32/dtobj/DataFmtTransl.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/win32/dtobj/DtObjFactory.cxx | 4 | ||||
-rw-r--r-- | dtrans/source/win32/dtobj/FetcList.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/win32/dtobj/XTDataObject.cxx | 11 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 9 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/ftranslentry.cxx | 17 | ||||
-rw-r--r-- | dtrans/source/win32/misc/ImplHelper.cxx | 2 | ||||
-rw-r--r-- | dtrans/source/win32/workbench/XTDo.cxx | 10 |
15 files changed, 9 insertions, 124 deletions
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx index 295d9d3aa4d0..7d289a6d3365 100644 --- a/dtrans/source/cnttype/mcnttfactory.cxx +++ b/dtrans/source/cnttype/mcnttfactory.cxx @@ -24,16 +24,12 @@ #define MIMECONTENTTYPEFACTORY_IMPL_NAME "com.sun.star.datatransfer.MimeCntTypeFactory" -// namespace directives - using namespace ::osl; using namespace ::cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer; -// helper functions - namespace { Sequence< OUString > SAL_CALL MimeContentTypeFactory_getSupportedServiceNames( ) @@ -43,14 +39,10 @@ namespace } } -// ctor - CMimeContentTypeFactory::CMimeContentTypeFactory() { } -// createMimeContentType - Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( const OUString& aContentType ) throw( IllegalArgumentException, RuntimeException, std::exception ) { @@ -66,15 +58,12 @@ OUString SAL_CALL CMimeContentTypeFactory::getImplementationName( ) return OUString( MIMECONTENTTYPEFACTORY_IMPL_NAME ); } -// XServiceInfo sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } -// XServiceInfo - Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( ) throw( RuntimeException, std::exception ) { diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index cf314eb666b0..180c0c48b1c7 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -19,23 +19,17 @@ #include "mcnttype.hxx" -// namespace directives - using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace std; using namespace osl; -// constants - const char TSPECIALS[] = "()<>@,;:\\\"/[]?="; const char TOKEN[] = "!#$%&'*+-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz{|}~."; const char SPACE[] = " "; const char SEMICOLON[] = ";"; -// ctor - CMimeContentType::CMimeContentType( const OUString& aCntType ) { init( aCntType ); diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 81d71acdabe0..ee045e43339f 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -23,21 +23,14 @@ #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp> #include "mcnttfactory.hxx" -// some defines - -// the implementation names #define MIMECONTENTTYPEFACTORY_IMPL_NAME "com.sun.star.datatransfer.MimeCntTypeFactory" -// namespace directives - -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::registry ; +using namespace ::cppu; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::registry; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; -// create a static object to initialize the shell9x library - namespace { diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index ed84c02008d1..f3daae02a5db 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@ -38,8 +38,6 @@ #pragma warning(pop) #endif -// namespace directives - using namespace osl; using namespace std; using namespace cppu; @@ -75,8 +73,6 @@ CWinClipbImpl::~CWinClipbImpl( ) unregisterClipboardViewer( ); } -// getContent - Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( RuntimeException ) { // use the shortcut or create a transferable from @@ -111,8 +107,6 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime return rClipContent; } -// setContent - void SAL_CALL CWinClipbImpl::setContents( const Reference< XTransferable >& xTransferable, const Reference< XClipboardOwner >& xClipboardOwner ) diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index 3deada710780..ef383e3fe42f 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -25,8 +25,6 @@ #include <cppuhelper/supportsservice.hxx> #include "WinClipbImpl.hxx" -// namespace directives - using namespace osl; using namespace std; using namespace cppu; @@ -38,8 +36,6 @@ using namespace com::sun::star::lang; #define WINCLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32" -// helper functions - namespace { Sequence< OUString > SAL_CALL WinClipboard_getSupportedServiceNames() @@ -49,8 +45,6 @@ namespace } } -// ctor - /*XEventListener,*/ CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, const OUString& aClipboardName ) : WeakComponentImplHelper< XSystemClipboard, XFlushableClipboard, XServiceInfo >( m_aCbListenerMutex ), @@ -61,7 +55,6 @@ CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, c // XClipboard -// getContent // to avoid unnecessary traffic we check first if there is a clipboard // content which was set via setContent, in this case we don't need // to query the content from the clipboard, create a new wrapper object @@ -82,8 +75,6 @@ Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( Runtime return Reference< XTransferable >( ); } -// setContent - void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTransferable, const Reference< XClipboardOwner >& xClipboardOwner ) throw( RuntimeException ) @@ -98,8 +89,6 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra m_pImpl->setContents( xTransferable, xClipboardOwner ); } -// getName - OUString SAL_CALL CWinClipboard::getName( ) throw( RuntimeException ) { if ( rBHelper.bDisposed ) @@ -142,8 +131,6 @@ sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities( ) throw( RuntimeExce // XClipboardNotifier -// getName - void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardListener >& listener ) throw( RuntimeException ) { @@ -160,8 +147,6 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi rBHelper.aLC.addInterface( cppu::UnoType<decltype(listener)>::get(), listener ); } -// getName - void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener ) throw( RuntimeException ) { @@ -178,8 +163,6 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar rBHelper.aLC.removeInterface( cppu::UnoType<decltype(listener)>::get(), listener ); } -// getName - void SAL_CALL CWinClipboard::notifyAllClipboardListener( ) { if ( !rBHelper.bDisposed ) @@ -247,15 +230,12 @@ OUString SAL_CALL CWinClipboard::getImplementationName( ) return OUString( WINCLIPBOARD_IMPL_NAME ); } -// XServiceInfo sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName ) throw(RuntimeException) { return cppu::supportsService(this, ServiceName); } -// XServiceInfo - Sequence< OUString > SAL_CALL CWinClipboard::getSupportedServiceNames( ) throw(RuntimeException) { diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index ff4c14912cd3..c5c00ef99cf4 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -23,24 +23,16 @@ #include <osl/diagnose.h> #include "WinClipboard.hxx" -// some defines - -// the service names #define WINCLIPBOARD_SERVICE_NAME "com.sun.star.datatransfer.clipboard.SystemClipboard" -// the implementation names #define WINCLIPBOARD_IMPL_NAME "com.sun.star.datatransfer.clipboard.ClipboardW32" -// namespace directives - -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::registry ; -using namespace ::cppu ; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::registry; +using namespace ::cppu; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer::clipboard; -// create a static object to initialize the shell9x library - namespace { diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 74de0dcb0c93..0252ac74b4bf 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -32,8 +32,6 @@ #include <com/sun/star/datatransfer/MimeContentTypeFactory.hpp> #include <comphelper/processfactory.hxx> -// namespace directives - using namespace std; using namespace osl; using namespace cppu; @@ -160,7 +158,6 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla return sal_False; } -// helper function // the list of dataflavors currently on the clipboard will be initialized // only once; if the client of this Transferable will hold a reference // to it und the underlying clipboard content changes, the client does @@ -230,9 +227,6 @@ void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor ) } } -// helper function - -//inline DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) { LCID lcid = 0; diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index 55b1fba12fb1..b0e4c5816f21 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -39,8 +39,6 @@ #pragma warning(pop) #endif -// namespace directives - using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx index 579efe21161f..ee77267304b6 100644 --- a/dtrans/source/win32/dtobj/DtObjFactory.cxx +++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx @@ -21,14 +21,10 @@ #include "XTDataObject.hxx" -// namespace directives - using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; -// implementation - IDataObjectPtr SAL_CALL CDTransObjFactory::createDataObjFromTransferable(const Reference<XComponentContext>& rxContext, const Reference< XTransferable >& refXTransferable) { diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx index fbd950035b68..c3a3c056822c 100644 --- a/dtrans/source/win32/dtobj/FetcList.cxx +++ b/dtrans/source/win32/dtobj/FetcList.cxx @@ -31,8 +31,6 @@ #include "MimeAttrib.hxx" -// namespace directives - using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index 51108a16c925..105c42339226 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -45,8 +45,6 @@ #define __uuidof(I) IID_##I #endif -// namespace directives - using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::uno; @@ -61,8 +59,6 @@ public: explicit CInvalidFormatEtcException( HRESULT hr ) : m_hr( hr ) {}; }; -// ctor - CXTDataObject::CXTDataObject( const Reference< XComponentContext >& rxContext, const Reference< XTransferable >& aXTransferable ) : m_nRefCnt( 0 ) @@ -202,7 +198,6 @@ void SAL_CALL CXTDataObject::renderLocaleAndSetupStgMedium( throw CInvalidFormatEtcException( DV_E_FORMATETC ); } -//inline void SAL_CALL CXTDataObject::renderUnicodeAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) { @@ -235,7 +230,6 @@ void SAL_CALL CXTDataObject::renderUnicodeAndSetupStgMedium( stgmedium ); } -//inline void SAL_CALL CXTDataObject::renderAnyDataAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium ) { @@ -577,7 +571,6 @@ void CXTDataObject::validateFormatEtc( LPFORMATETC lpFormatEtc ) const throw CInvalidFormatEtcException( DV_E_TYMED ); } -//inline void SAL_CALL CXTDataObject::setupStgMedium( const FORMATETC& fetc, CStgTransferHelper& stgTransHlp, STGMEDIUM& stgmedium ) @@ -642,10 +635,6 @@ inline void SAL_CALL CXTDataObject::InitializeFormatEtcContainer( ) } } -// CEnumFormatEtc - -// ctor - CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN lpUnkOuter, const CFormatEtcContainer& aFormatEtcContainer ) : m_nRefCnt( 0 ), m_lpUnkOuter( lpUnkOuter ), diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 9247f2801562..55fce69266a8 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -47,8 +47,6 @@ const OUString Windows_FormatName ("windows_formatname"); const css::uno::Type CppuType_ByteSequence = cppu::UnoType<css::uno::Sequence<sal_Int8>>::get(); const css::uno::Type CppuType_String = ::cppu::UnoType<OUString>::get(); -// namespace directives - using namespace osl; using namespace cppu; using namespace std; @@ -57,8 +55,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer; using namespace com::sun::star::container; -// helper functions - namespace { Sequence< OUString > SAL_CALL DataFormatTranslator_getSupportedServiceNames( ) @@ -101,8 +97,6 @@ FormatEntry::FormatEntry( aStandardFormatId = std_clipboard_format_id; } -// ctor - CDataFormatTranslatorUNO::CDataFormatTranslatorUNO( const Reference< XComponentContext >& rxContext ) : m_xContext( rxContext ) { @@ -198,15 +192,12 @@ OUString SAL_CALL CDataFormatTranslatorUNO::getImplementationName( ) return OUString( IMPL_NAME ); } -// XServiceInfo sal_Bool SAL_CALL CDataFormatTranslatorUNO::supportsService( const OUString& ServiceName ) throw( RuntimeException ) { return cppu::supportsService(this, ServiceName); } -// XServiceInfo - Sequence< OUString > SAL_CALL CDataFormatTranslatorUNO::getSupportedServiceNames( ) throw( RuntimeException ) { diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index 5174d2ce1e4f..99521ab6c2ec 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -25,24 +25,16 @@ #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp> #include "ftransl.hxx" -// some defines - -// the service names #define SERVICE_NAME "com.sun.star.datatransfer.DataFormatTranslator" -// the implementation names #define IMPL_NAME "com.sun.star.datatransfer.DataFormatTranslator" -// namespace directives - -using namespace ::cppu ; -using namespace ::com::sun::star::uno ; -using namespace ::com::sun::star::registry ; +using namespace ::cppu; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::registry; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::datatransfer; -// create a static object to initialize the shell9x library - namespace { @@ -59,9 +51,6 @@ namespace extern "C" { -// component_getFactory -// returns a factory to create XFilePicker-Services - SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char* pImplName, void* pSrvManager, void* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index bfc31c95d410..29299e0b1fe5 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -41,8 +41,6 @@ #define FORMATETC_PARTIAL_MATCH -1 #define FORMATETC_NO_MATCH 0 -// namespace directives - // returns a windows codepage appropriate to the // given mime charset parameter value diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/dtrans/source/win32/workbench/XTDo.cxx index 8961285763d6..2aecc0c5bf22 100644 --- a/dtrans/source/win32/workbench/XTDo.cxx +++ b/dtrans/source/win32/workbench/XTDo.cxx @@ -34,14 +34,10 @@ #include <memory> #include <tchar.h> -// namespace directives - using namespace ::std; // OTWrapperDataObject -// ctor - /* in the constructor we enumerate all formats offered by the transferable and convert the formats into formatetc structures @@ -215,17 +211,11 @@ STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * ) return E_NOTIMPL; } -// for our convenience - CXTDataObject::operator IDataObject*( ) { return static_cast< IDataObject* >( this ); } -// CEnumFormatEtc - -// ctor - CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) : m_nRefCnt( 0 ), m_pUnkDataObj( pUnkDataObj ), |