diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:22:33 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 10:20:05 -0600 |
commit | 75bbbf964b7976cc02d5ba054760bf93cb2e76c9 (patch) | |
tree | a20660b861414f454d9ae8ff7b554bc1667e3bdb /dtrans/source/win32/ftransl | |
parent | 5faf5492741abfd013ae677b1ec2fc06276d8644 (diff) |
Remove visual noise from dtrans
Change-Id: Ic460e514ac078a69cd86381b9b5cf779eb97971b
Reviewed-on: https://gerrit.libreoffice.org/8254
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dtrans/source/win32/ftransl')
-rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 56 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/ftransl.hxx | 8 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/ftranslentry.cxx | 9 |
3 files changed, 0 insertions, 73 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 13efa57f694e..4348a7058085 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -48,10 +48,8 @@ const OUString Windows_FormatName ("windows_formatname"); const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0); const com::sun::star::uno::Type CppuType_String = ::getCppuType((const OUString*)0); - // namespace directives - using namespace osl; using namespace cppu; using namespace std; @@ -60,10 +58,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer; using namespace com::sun::star::container; - // helper functions - namespace MODULE_PRIVATE { Sequence< OUString > SAL_CALL DataFormatTranslator_getSupportedServiceNames( ) @@ -74,18 +70,10 @@ namespace MODULE_PRIVATE } } - -// - - FormatEntry::FormatEntry() { } - -// - - FormatEntry::FormatEntry( const char* mime_content_type, const char* human_presentable_name, @@ -105,20 +93,14 @@ FormatEntry::FormatEntry( aStandardFormatId = std_clipboard_format_id; } - // ctor - CDataFormatTranslator::CDataFormatTranslator( const Reference< XComponentContext >& rxContext ) : m_xContext( rxContext ) { initTranslationTable( ); } - -// - - Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataFlavor& aDataFlavor ) throw( RuntimeException ) { @@ -174,10 +156,6 @@ Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataF return aAny; } - -// - - DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( const Any& aSysDataType ) throw( RuntimeException ) { @@ -205,10 +183,8 @@ DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( cons return aFlavor; } - // XServiceInfo - OUString SAL_CALL CDataFormatTranslator::getImplementationName( ) throw( RuntimeException ) { @@ -222,17 +198,14 @@ sal_Bool SAL_CALL CDataFormatTranslator::supportsService( const OUString& Servic return cppu::supportsService(this, ServiceName); } - // XServiceInfo - Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( ) throw( RuntimeException ) { return DataFormatTranslator_getSupportedServiceNames( ); } - // to optimize searching we add all entries with a // standard clipboard format number first, in the // table before the entries with CF_INVALID @@ -240,7 +213,6 @@ Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( ) // format number we can stop if we find the first // CF_INVALID - void SAL_CALL CDataFormatTranslator::initTranslationTable() { //SOT_FORMATSTR_ID_DIF @@ -492,10 +464,6 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable() m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy4;windows_formatname=\"SO_DUMMYFORMAT_4\"", "SO_DUMMYFORMAT_4", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); } - -// - - void SAL_CALL CDataFormatTranslator::findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& aDataFlavor ) const { /* @@ -518,10 +486,6 @@ void SAL_CALL CDataFormatTranslator::findDataFlavorForStandardFormatId( sal_Int3 } } - -// - - void SAL_CALL CDataFormatTranslator::findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, DataFlavor& aDataFlavor ) const { vector< FormatEntry >::const_iterator citer_end = m_TranslTable.end( ); @@ -537,10 +501,6 @@ void SAL_CALL CDataFormatTranslator::findDataFlavorForNativeFormatName( const OU } } - -// - - void SAL_CALL CDataFormatTranslator::findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny ) const { if ( aCharset.equalsIgnoreAsciiCase( "utf-16" ) ) @@ -553,10 +513,6 @@ void SAL_CALL CDataFormatTranslator::findStandardFormatIdForCharset( const OUStr } } - -// - - void SAL_CALL CDataFormatTranslator::setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, Any& aAny ) const { vector< FormatEntry >::const_iterator citer_end = m_TranslTable.end( ); @@ -571,10 +527,6 @@ void SAL_CALL CDataFormatTranslator::setStandardFormatIdForNativeFormatName( con } } - -// - - void SAL_CALL CDataFormatTranslator::findStdFormatIdOrNativeFormatNameForFullMediaType( const Reference< XMimeContentTypeFactory >& aRefXMimeFactory, const OUString& aFullMediaType, @@ -601,19 +553,11 @@ void SAL_CALL CDataFormatTranslator::findStdFormatIdOrNativeFormatNameForFullMed } } - -// - - inline sal_Bool CDataFormatTranslator::isTextPlainMediaType( const OUString& fullMediaType ) const { return fullMediaType.equalsIgnoreAsciiCase("text/plain"); } - -// - - DataFlavor SAL_CALL CDataFormatTranslator::mkDataFlv(const OUString& cnttype, const OUString& hpname, Type dtype) { DataFlavor dflv; diff --git a/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx index 8340050dafff..b7913097720e 100644 --- a/dtrans/source/win32/ftransl/ftransl.hxx +++ b/dtrans/source/win32/ftransl/ftransl.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef _FTRANSL_HXX_ #define _FTRANSL_HXX_ @@ -57,9 +56,7 @@ struct FormatEntry sal_Int32 aStandardFormatId; }; -//------------------------------------------------ // CDataFormatTranslator -//------------------------------------------------ class CDataFormatTranslator : public cppu::WeakImplHelper2< com::sun::star::datatransfer::XDataFormatTranslator, \ @@ -69,9 +66,7 @@ class CDataFormatTranslator : public public: CDataFormatTranslator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); - //------------------------------------------------ // XDataFormatTranslator - //------------------------------------------------ virtual ::com::sun::star::uno::Any SAL_CALL getSystemDataTypeFromDataFlavor( const ::com::sun::star::datatransfer::DataFlavor& aDataFlavor ) throw(::com::sun::star::uno::RuntimeException); @@ -79,9 +74,7 @@ public: virtual ::com::sun::star::datatransfer::DataFlavor SAL_CALL getDataFlavorFromSystemDataType( const ::com::sun::star::uno::Any& aSysDataType ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------ // XServiceInfo - //------------------------------------------------ virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -112,7 +105,6 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index b0bc48cc722e..0e6d324f01cb 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -25,20 +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 ::rtl ; using namespace ::cppu ; using namespace ::com::sun::star::uno ; @@ -46,19 +42,15 @@ 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 { - // functions to create a new Clipboad instance; is needed by factory helper implementation // @param rServiceManager - service manager, useful if the component needs other uno services // so we should give it to every UNO-Implementation component - Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) { return Reference< XInterface >( static_cast< XDataFormatTranslator* >( new CDataFormatTranslator( comphelper::getComponentContext(rServiceManager) ) ) ); @@ -71,7 +63,6 @@ extern "C" // component_getFactory // returns a factory to create XFilePicker-Services - SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; |