[Libreoffice-commits] core.git: dtrans/source dtrans/test
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 08:20:30 PST 2014
dtrans/source/cnttype/mcnttfactory.cxx | 12 --
dtrans/source/cnttype/mcnttfactory.hxx | 6 -
dtrans/source/cnttype/mcnttype.cxx | 81 ---------------
dtrans/source/cnttype/mcnttype.hxx | 3
dtrans/source/cnttype/mctfentry.cxx | 9 -
dtrans/source/cnttype/wbench/testcnttype.cxx | 21 ----
dtrans/source/generic/clipboardmanager.cxx | 28 -----
dtrans/source/generic/clipboardmanager.hxx | 9 -
dtrans/source/generic/dtrans.cxx | 3
dtrans/source/generic/generic_clipboard.cxx | 25 ----
dtrans/source/generic/generic_clipboard.hxx | 6 -
dtrans/source/inc/DtObjFactory.hxx | 1
dtrans/source/test/test_dtrans.cxx | 59 -----------
dtrans/source/win32/clipb/APNDataObject.hxx | 5
dtrans/source/win32/clipb/MtaOleClipb.cxx | 77 --------------
dtrans/source/win32/clipb/MtaOleClipb.hxx | 4
dtrans/source/win32/clipb/WinClipbImpl.cxx | 47 --------
dtrans/source/win32/clipb/WinClipbImpl.hxx | 11 --
dtrans/source/win32/clipb/WinClipboard.cxx | 32 ------
dtrans/source/win32/clipb/WinClipboard.hxx | 16 ---
dtrans/source/win32/clipb/wcbentry.cxx | 9 -
dtrans/source/win32/dnd/dndentry.cxx | 1
dtrans/source/win32/dnd/globals.cxx | 1
dtrans/source/win32/dnd/globals.hxx | 4
dtrans/source/win32/dnd/idroptarget.cxx | 1
dtrans/source/win32/dnd/idroptarget.hxx | 1
dtrans/source/win32/dnd/source.hxx | 5
dtrans/source/win32/dnd/sourcecontext.cxx | 2
dtrans/source/win32/dnd/sourcecontext.hxx | 6 -
dtrans/source/win32/dnd/target.cxx | 3
dtrans/source/win32/dnd/target.hxx | 11 --
dtrans/source/win32/dnd/targetdragcontext.hxx | 1
dtrans/source/win32/dnd/targetdropcontext.hxx | 1
dtrans/source/win32/dtobj/APNDataObject.cxx | 30 -----
dtrans/source/win32/dtobj/APNDataObject.hxx | 5
dtrans/source/win32/dtobj/DOTransferable.cxx | 65 ------------
dtrans/source/win32/dtobj/DOTransferable.hxx | 10 -
dtrans/source/win32/dtobj/DTransHelper.cxx | 21 ----
dtrans/source/win32/dtobj/DTransHelper.hxx | 20 ---
dtrans/source/win32/dtobj/DataFmtTransl.cxx | 53 ----------
dtrans/source/win32/dtobj/DataFmtTransl.hxx | 3
dtrans/source/win32/dtobj/DtObjFactory.cxx | 4
dtrans/source/win32/dtobj/Fetc.cxx | 80 ---------------
dtrans/source/win32/dtobj/Fetc.hxx | 2
dtrans/source/win32/dtobj/FetcList.cxx | 110 ---------------------
dtrans/source/win32/dtobj/FetcList.hxx | 1
dtrans/source/win32/dtobj/FmtFilter.cxx | 15 --
dtrans/source/win32/dtobj/FmtFilter.hxx | 1
dtrans/source/win32/dtobj/MimeAttrib.hxx | 2
dtrans/source/win32/dtobj/TxtCnvtHlp.cxx | 8 -
dtrans/source/win32/dtobj/TxtCnvtHlp.hxx | 1
dtrans/source/win32/dtobj/XNotifyingDataObject.cxx | 1
dtrans/source/win32/dtobj/XNotifyingDataObject.hxx | 3
dtrans/source/win32/dtobj/XTDataObject.cxx | 105 --------------------
dtrans/source/win32/dtobj/XTDataObject.hxx | 7 -
dtrans/source/win32/ftransl/ftransl.cxx | 56 ----------
dtrans/source/win32/ftransl/ftransl.hxx | 8 -
dtrans/source/win32/ftransl/ftranslentry.cxx | 9 -
dtrans/source/win32/misc/ImplHelper.cxx | 34 ------
dtrans/source/win32/misc/ImplHelper.hxx | 13 --
dtrans/source/win32/misc/WinClip.hxx | 1
dtrans/source/win32/workbench/XTDo.cxx | 48 ---------
dtrans/source/win32/workbench/XTDo.hxx | 7 -
dtrans/source/win32/workbench/test_wincb.cxx | 38 -------
dtrans/source/win32/workbench/testmarshal.cxx | 11 --
dtrans/test/win32/dnd/atlwindow.cxx | 12 --
dtrans/test/win32/dnd/atlwindow.hxx | 2
dtrans/test/win32/dnd/dndTest.cxx | 6 -
dtrans/test/win32/dnd/targetlistener.cxx | 1
dtrans/test/win32/dnd/targetlistener.hxx | 1
dtrans/test/win32/dnd/transferable.cxx | 11 --
dtrans/test/win32/dnd/transferable.hxx | 14 --
72 files changed, 2 insertions(+), 1318 deletions(-)
New commits:
commit 75bbbf964b7976cc02d5ba054760bf93cb2e76c9
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 18:22:33 2014 +0100
Remove visual noise from dtrans
Change-Id: Ic460e514ac078a69cd86381b9b5cf779eb97971b
Reviewed-on: https://gerrit.libreoffice.org/8254
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 7bb69a3..e1bfc96 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -24,10 +24,8 @@
#define MIMECONTENTTYPEFACTORY_IMPL_NAME "com.sun.star.datatransfer.MimeCntTypeFactory"
-
// namespace directives
-
using namespace ::rtl;
using namespace ::osl;
using namespace ::cppu;
@@ -35,10 +33,8 @@ 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( )
@@ -49,18 +45,14 @@ namespace
}
}
-
// ctor
-
CMimeContentTypeFactory::CMimeContentTypeFactory()
{
}
-
// createMimeContentType
-
Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( const OUString& aContentType )
throw( IllegalArgumentException, RuntimeException )
{
@@ -68,10 +60,8 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co
return Reference< XMimeContentType >( new CMimeContentType( aContentType ) );
}
-
// XServiceInfo
-
OUString SAL_CALL CMimeContentTypeFactory::getImplementationName( )
throw( RuntimeException )
{
@@ -85,10 +75,8 @@ sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& Serv
return cppu::supportsService(this, ServiceName);
}
-
// XServiceInfo
-
Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( )
throw( RuntimeException )
{
diff --git a/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index f849b13..2d2908e 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _MCNTTFACTORY_HXX_
#define _MCNTTFACTORY_HXX_
@@ -35,16 +34,12 @@ class CMimeContentTypeFactory : public
public:
CMimeContentTypeFactory();
- //------------------------------------------------
// XMimeContentTypeFactory
- //------------------------------------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentType > SAL_CALL createMimeContentType( const OUString& aContentType )
throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
- //------------------------------------------------
// XServiceInfo
- //------------------------------------------------
virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
@@ -59,7 +54,6 @@ private:
::osl::Mutex m_aMutex;
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 7381e36..c05d574 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -19,66 +19,43 @@
#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 );
}
-
-//
-
-
OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException)
{
return m_MediaType;
}
-
-//
-
-
OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException)
{
return m_MediaSubtype;
}
-
-//
-
-
OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException)
{
return m_MediaType + "/" + m_MediaSubtype;
}
-
-//
-
-
Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeException)
{
MutexGuard aGuard( m_aMutex );
@@ -97,20 +74,12 @@ Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeEx
return seqParams;
}
-
-//
-
-
sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(RuntimeException)
{
MutexGuard aGuard( m_aMutex );
return ( m_ParameterMap.end( ) != m_ParameterMap.find( aName ) );
}
-
-//
-
-
OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) throw(NoSuchElementException, RuntimeException)
{
MutexGuard aGuard( m_aMutex );
@@ -121,10 +90,6 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) t
return m_ParameterMap.find( aName )->second;
}
-
-//
-
-
void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalArgumentException )
{
if ( aCntType.isEmpty( ) )
@@ -136,10 +101,6 @@ void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalA
type();
}
-
-//
-
-
void SAL_CALL CMimeContentType::getSym( void )
{
if ( m_nPos < m_ContentType.getLength( ) )
@@ -152,10 +113,6 @@ void SAL_CALL CMimeContentType::getSym( void )
m_nxtSym = OUString( );
}
-
-//
-
-
void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
{
if ( pSymTlb.indexOf( m_nxtSym ) < 0 )
@@ -164,20 +121,12 @@ void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
getSym();
}
-
-//
-
-
void SAL_CALL CMimeContentType::skipSpaces( void )
{
while (m_nxtSym == SPACE)
getSym( );
}
-
-//
-
-
void SAL_CALL CMimeContentType::type( void )
{
skipSpaces( );
@@ -207,10 +156,6 @@ void SAL_CALL CMimeContentType::type( void )
subtype( );
}
-
-//
-
-
void SAL_CALL CMimeContentType::subtype( void )
{
skipSpaces( );
@@ -237,10 +182,6 @@ void SAL_CALL CMimeContentType::subtype( void )
trailer();
}
-
-//
-
-
void SAL_CALL CMimeContentType::trailer( void )
{
OUString sToken(TOKEN);
@@ -282,10 +223,6 @@ void SAL_CALL CMimeContentType::trailer( void )
}
}
-
-//
-
-
OUString SAL_CALL CMimeContentType::pName( )
{
OUString pname;
@@ -305,10 +242,6 @@ OUString SAL_CALL CMimeContentType::pName( )
return pname;
}
-
-//
-
-
OUString SAL_CALL CMimeContentType::pValue( )
{
OUString pvalue;
@@ -339,12 +272,10 @@ OUString SAL_CALL CMimeContentType::pValue( )
return pvalue;
}
-
// the following combinations within a quoted value are not allowed:
// '";' (quote sign followed by semicolon) and '" ' (quote sign followed
// by space)
-
OUString SAL_CALL CMimeContentType::quotedPValue( )
{
OUString pvalue;
@@ -375,10 +306,6 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
return pvalue;
}
-
-//
-
-
OUString SAL_CALL CMimeContentType::nonquotedPValue( )
{
OUString pvalue;
@@ -398,10 +325,6 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
return pvalue;
}
-
-//
-
-
void SAL_CALL CMimeContentType::comment( void )
{
while ( !m_nxtSym.isEmpty( ) )
@@ -415,10 +338,6 @@ void SAL_CALL CMimeContentType::comment( void )
}
}
-
-//
-
-
sal_Bool SAL_CALL CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange )
{
return ( aRange.indexOf( aChr ) > -1 );
diff --git a/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 28cfa2e..5f1d043 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _MCNTTYPE_HXX_
#define _MCNTTYPE_HXX_
@@ -35,9 +34,7 @@ class CMimeContentType : public
public:
CMimeContentType( const OUString& aCntType );
- //-------------------------------------------
// XMimeContentType
- //-------------------------------------------
virtual OUString SAL_CALL getMediaType( ) throw(::com::sun::star::uno::RuntimeException);
virtual OUString SAL_CALL getMediaSubtype( ) throw(::com::sun::star::uno::RuntimeException);
diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index 87ff14b..7ed64cb 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.cxx
@@ -23,20 +23,16 @@
#include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
#include "mcnttfactory.hxx"
-
// some defines
-
// the service names
#define MIMECONTENTTYPEFACTORY_SERVICE_NAME "com.sun.star.datatransfer.MimeContentTypeFactory"
// the implementation names
#define MIMECONTENTTYPEFACTORY_IMPL_NAME "com.sun.star.datatransfer.MimeCntTypeFactory"
-
// namespace directives
-
using namespace ::rtl ;
using namespace ::cppu ;
using namespace ::com::sun::star::uno ;
@@ -44,19 +40,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 >& )
{
return Reference< XInterface >( static_cast< XMimeContentTypeFactory* >( new CMimeContentTypeFactory() ) );
@@ -69,7 +61,6 @@ extern "C"
// component_getFactory
// returns a factory to create XFilePicker-Services
-
SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index 1c55c2b..e1535fb 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -32,17 +32,13 @@
#include <vector>
-
// my defines
-
#define TEST_CLIPBOARD
#define RDB_SYSPATH "d:\\projects\\src621\\dtrans\\wntmsci7\\bin\\applicat.rdb"
-
// namesapces
-
using namespace ::rtl;
using namespace ::std;
using namespace ::cppu;
@@ -51,10 +47,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
-
-//
-
-
void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
{
// Cast factory to XComponent
@@ -68,10 +60,6 @@ void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
SrvMgr.clear();
}
-
-//
-
-
sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData )
{
FILE* fstream;
@@ -95,10 +83,6 @@ sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData
return sal_True;
}
-
-//
-
-
sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& vecData, Reference< XMimeContentTypeFactory > cnttypeFactory )
{
FILE* fstream;
@@ -152,16 +136,13 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& v
return sal_True;
}
-
// main
-
int SAL_CALL main( int nArgc, char* argv[] )
{
if ( nArgc != 3 )
printf( "Start with: testcnttype input-file output-file\n" );
-
// get the global service-manager
OUString rdbName = OUString( RDB_SYSPATH );
@@ -198,10 +179,8 @@ int SAL_CALL main( int nArgc, char* argv[] )
ShutdownServiceMgr( g_xFactory );
}
-
// shutdown the service manager
-
ShutdownServiceMgr( g_xFactory );
return 0;
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 01955d6..b67e6ac 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -32,22 +32,16 @@ using namespace std;
using ::dtrans::ClipboardManager;
-
-
ClipboardManager::ClipboardManager():
WeakComponentImplHelper3< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex),
m_aDefaultName(OUString("default"))
{
}
-
-
ClipboardManager::~ClipboardManager()
{
}
-
-
OUString SAL_CALL ClipboardManager::getImplementationName( )
throw(RuntimeException)
{
@@ -60,16 +54,12 @@ sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName
return cppu::supportsService(this, ServiceName);
}
-
-
Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames( )
throw(RuntimeException)
{
return ClipboardManager_getSupportedServiceNames();
}
-
-
Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& aName )
throw(NoSuchElementException, RuntimeException)
{
@@ -89,8 +79,6 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString&
throw NoSuchElementException(aName, static_cast < XClipboardManager * > (this));
}
-
-
void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard )
throw(IllegalArgumentException, ElementExistException, RuntimeException)
{
@@ -129,8 +117,6 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl
}
}
-
-
void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
throw(RuntimeException)
{
@@ -139,8 +125,6 @@ void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
m_aClipboardMap.erase(aName.getLength() ? aName : m_aDefaultName );
}
-
-
Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
throw(RuntimeException)
{
@@ -163,8 +147,6 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
return aRet;
}
-
-
void SAL_CALL ClipboardManager::dispose()
throw(RuntimeException)
{
@@ -211,8 +193,6 @@ void SAL_CALL ClipboardManager::dispose()
}
}
-
-
void SAL_CALL ClipboardManager::disposing( const EventObject& event )
throw(RuntimeException)
{
@@ -222,16 +202,12 @@ void SAL_CALL ClipboardManager::disposing( const EventObject& event )
removeClipboard(xClipboard->getName());
}
-
-
Reference< XInterface > SAL_CALL ClipboardManager_createInstance(
const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
{
return Reference < XInterface >( ( OWeakObject * ) new ClipboardManager());
}
-
-
Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames()
{
Sequence < OUString > SupportedServicesNames( 1 );
@@ -240,8 +216,4 @@ Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames()
return SupportedServicesNames;
}
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index 8429996..090f759 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.hxx
@@ -27,16 +27,10 @@
#include <map>
-// ------------------------------------------------------------------------
-
#define CLIPBOARDMANAGER_IMPLEMENTATION_NAME "com.sun.star.comp.datatransfer.ClipboardManager"
-// ------------------------------------------------------------------------
-
typedef ::std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > > ClipboardMap;
-// ------------------------------------------------------------------------
-
namespace dtrans
{
@@ -103,13 +97,10 @@ namespace dtrans
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL listClipboardNames( )
throw(::com::sun::star::uno::RuntimeException);
-
};
}
-// ------------------------------------------------------------------------
-
::com::sun::star::uno::Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClipboardManager_createInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index 61ec37a..fd7c0a3 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.cxx
@@ -26,12 +26,9 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::uno;
using namespace cppu;
-
extern "C"
{
-//==================================================================================================
-
SAL_DLLPUBLIC_EXPORT void * SAL_CALL dtrans_component_getFactory(
const sal_Char * pImplName,
void * pServiceManager,
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index 1f22408..98953bf6 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -37,14 +37,10 @@ GenericClipboard::GenericClipboard() :
{
}
-
-
GenericClipboard::~GenericClipboard()
{
}
-
-
void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
throw(Exception, RuntimeException)
{
@@ -59,8 +55,6 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
}
}
-
-
OUString SAL_CALL GenericClipboard::getImplementationName( )
throw(RuntimeException)
{
@@ -73,16 +67,12 @@ sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName
return cppu::supportsService(this, ServiceName);
}
-
-
Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames( )
throw(RuntimeException)
{
return GenericClipboard_getSupportedServiceNames();
}
-
-
Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
throw(RuntimeException)
{
@@ -90,8 +80,6 @@ Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
return m_aContents;
}
-
-
void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xTrans,
const Reference< XClipboardOwner >& xClipboardOwner )
throw(RuntimeException)
@@ -128,25 +116,18 @@ void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xT
}
}
-
-
OUString SAL_CALL GenericClipboard::getName()
throw(RuntimeException)
{
return m_aName;
}
-
-
sal_Int8 SAL_CALL GenericClipboard::getRenderingCapabilities()
throw(RuntimeException)
{
return RenderingCapabilities::Delayed;
}
-
-
-
void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
throw(RuntimeException)
{
@@ -157,8 +138,6 @@ void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboar
rBHelper.aLC.addInterface( getCppuType( (const ::com::sun::star::uno::Reference< XClipboardListener > *) 0), listener );
}
-
-
void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
throw(RuntimeException)
{
@@ -168,8 +147,6 @@ void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipb
rBHelper.aLC.removeInterface( getCppuType( (const Reference< XClipboardListener > *) 0 ), listener ); \
}
-
-
Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
{
Sequence< OUString > aRet(1);
@@ -177,8 +154,6 @@ Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
return aRet;
}
-
-
Reference< XInterface > SAL_CALL GenericClipboard_createInstance(
const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
{
diff --git a/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index c307e27..a6853ce 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.hxx
@@ -28,12 +28,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-// ------------------------------------------------------------------------
-
#define GENERIC_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.comp.datatransfer.clipboard.GenericClipboard"
-// ------------------------------------------------------------------------
-
namespace dtrans
{
@@ -114,8 +110,6 @@ namespace dtrans
}
-// ------------------------------------------------------------------------
-
::com::sun::star::uno::Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames();
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GenericClipboard_createInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
diff --git a/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx
index 3427236..0031dc5 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/dtrans/source/inc/DtObjFactory.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _DTOBJFACTORY_HXX_
#define _DTOBJFACTORY_HXX_
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 11ac217..a8503a6 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -34,10 +34,8 @@
#include <stdio.h>
#include <string.h>
-
// my defines
-
#ifdef UNX
#define PATH_SEPARATOR '/'
#else
@@ -49,10 +47,8 @@
#define PERFORM( a, b ) fprintf( stderr, "Performing " a); b; fprintf( stderr, "done\n" )
#define TRACE( a ) fprintf( stderr, a )
-
// namespaces
-
using namespace ::rtl;
using namespace ::std;
using namespace ::cppu;
@@ -63,16 +59,12 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
-
// globals
-
const char * app = NULL;
-
// ClipboardOwner
-
class ClipboardOwner : public WeakImplHelper1< XClipboardOwner >
{
Reference< XClipboard > m_xClipboard;
@@ -83,10 +75,8 @@ class ClipboardOwner : public WeakImplHelper1< XClipboardOwner >
public:
ClipboardOwner();
-
// XClipboardOwner
-
virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
sal_uInt32 receivedLostOwnerships() { return m_nReceivedLostOwnerships; };
@@ -94,19 +84,15 @@ public:
Reference< XTransferable > lostOwnershipTransferableValue() { return m_xTransferable; };
};
-
// ctor
-
ClipboardOwner::ClipboardOwner():
m_nReceivedLostOwnerships( 0 )
{
}
-
// lostOwnership
-
void SAL_CALL ClipboardOwner::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
throw(RuntimeException)
{
@@ -115,10 +101,8 @@ void SAL_CALL ClipboardOwner::lostOwnership( const Reference< XClipboard >& xCli
m_xTransferable = xTrans;
}
-
// ClipboardListener
-
class ClipboardListener : public WeakImplHelper1< XClipboardListener >
{
Reference< XClipboard > m_xClipboard;
@@ -129,16 +113,12 @@ class ClipboardListener : public WeakImplHelper1< XClipboardListener >
public:
ClipboardListener();
-
// XClipboardOwner
-
virtual void SAL_CALL changedContents( const ClipboardEvent& event ) throw(RuntimeException);
-
// XEventListener
-
virtual void SAL_CALL disposing( const EventObject& event ) throw(RuntimeException);
sal_uInt32 receivedChangedContentsEvents() { return m_nReceivedChangedContentsEvents; };
@@ -146,19 +126,15 @@ public:
Reference< XTransferable > changedContentsEventTransferableValue() { return m_xTransferable; };
};
-
// ctor
-
ClipboardListener::ClipboardListener():
m_nReceivedChangedContentsEvents( 0 )
{
}
-
// changedContents
-
void SAL_CALL ClipboardListener::changedContents( const ClipboardEvent& event )
throw(RuntimeException)
{
@@ -167,36 +143,28 @@ void SAL_CALL ClipboardListener::changedContents( const ClipboardEvent& event )
m_xTransferable = event.Contents;
}
-
// disposing
-
void SAL_CALL ClipboardListener::disposing( const EventObject& event )
throw(RuntimeException)
{
}
-
// StringTransferable
-
class StringTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
{
public:
StringTransferable( );
-
// XTransferable
-
virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors( ) throw(RuntimeException);
virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
-
// XClipboardOwner
-
virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
sal_Bool receivedLostOwnership() { return m_receivedLostOwnership; };
@@ -208,10 +176,8 @@ private:
sal_Bool m_receivedLostOwnership;
};
-
// ctor
-
StringTransferable::StringTransferable( ) :
m_seqDFlv( 1 ),
m_receivedLostOwnership( sal_False ),
@@ -233,10 +199,8 @@ StringTransferable::StringTransferable( ) :
m_seqDFlv[0] = df;
}
-
// getTransferData
-
Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor )
throw(UnsupportedFlavorException, IOException, RuntimeException)
{
@@ -250,20 +214,16 @@ Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor )
return anyData;
}
-
// getTransferDataFlavors
-
Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors( )
throw(RuntimeException)
{
return m_seqDFlv;
}
-
// isDataFlavorSupported
-
sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
throw(RuntimeException)
{
@@ -282,28 +242,22 @@ sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& a
return bRet;
}
-
// lostOwnership
-
void SAL_CALL StringTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
throw(RuntimeException)
{
m_receivedLostOwnership = sal_True;
}
-
// main
-
int SAL_CALL main( int argc, const char* argv[] )
{
OUString aRegistry;
-
// check command line parameters
-
if ( NULL == ( app = strrchr( argv[0], PATH_SEPARATOR ) ) )
app = argv[0];
else
@@ -323,7 +277,6 @@ int SAL_CALL main( int argc, const char* argv[] )
if( aRegistry.isEmpty( ) )
fprintf( stderr, "Usage: %s -r full-path-to-applicat.rdb\n", app );
-
// create service manager
Reference< XMultiServiceFactory > xServiceManager;
@@ -333,10 +286,8 @@ int SAL_CALL main( int argc, const char* argv[] )
xServiceManager = createRegistryServiceFactory( aRegistry, sal_True );
ENSURE( xServiceManager.is(), "*** ERROR *** service manager could not be created." );
-
// create an instance of GenericClipboard service
-
Sequence< Any > arguments(1);
arguments[0] = makeAny( OUString("generic") );
@@ -353,10 +304,8 @@ int SAL_CALL main( int argc, const char* argv[] )
if( xClipboardNotifier.is() )
xClipboardNotifier->addClipboardListener( xClipboardListener );
-
// run various tests on clipboard implementation
-
TRACE( "\n*** testing generic clipboard service ***\n" );
Reference< XTransferable > xContents = new StringTransferable();
@@ -403,7 +352,6 @@ int SAL_CALL main( int argc, const char* argv[] )
TEST( "if received changedContents notification for correct transferable: ", pListener->changedContentsEventTransferableValue() == xContents );
}
-
PERFORM( "update on contents without data (clear): ", xClipboard->setContents( Reference< XTransferable >(), Reference< XClipboardOwner >() ) );
TEST( "that no further lostOwnership messages were received: ", pOwner->receivedLostOwnerships() == 1 );
TEST( "current clipboard contents (none): ", xClipboard->getContents().is() == sal_False );
@@ -416,19 +364,15 @@ int SAL_CALL main( int argc, const char* argv[] )
TEST( "if received changedContents notification for correct transferable: ", ! pListener->changedContentsEventTransferableValue().is() );
}
-
// create an instance of ClipboardManager service
-
Reference< XClipboardManager > xClipboardManager( xServiceManager->createInstance(
OUString("com.sun.star.datatransfer.clipboard.ClipboardManager") ), UNO_QUERY );
ENSURE( xClipboardManager.is(), "*** ERROR *** clipboard manager service could not be created." );
-
// run various tests on clipboard manager implementation
-
TRACE( "\n*** testing clipboard manager service ***\n" );
TEST( "initial number of clipboards (0): ", xClipboardManager->listClipboardNames().getLength() == 0 );
@@ -455,10 +399,8 @@ int SAL_CALL main( int argc, const char* argv[] )
ENSURE( sal_False, "*** ERROR *** exception caught." );
}
-
// shutdown the service manager
-
// query XComponent interface
Reference< XComponent > xComponent( xServiceManager, UNO_QUERY );
@@ -472,5 +414,4 @@ int SAL_CALL main( int argc, const char* argv[] )
return 0;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx
index 279cd83..740bd55 100644
--- a/dtrans/source/win32/clipb/APNDataObject.hxx
+++ b/dtrans/source/win32/clipb/APNDataObject.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _APNDATAOBJECT_HXX_
#define _APNDATAOBJECT_HXX_
@@ -34,17 +33,13 @@ public:
CAPNDataObject( IDataObjectPtr rIDataObject );
~CAPNDataObject( );
- //-----------------------------------------------------------------
//IUnknown interface methods
- //-----------------------------------------------------------------
STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject);
STDMETHODIMP_( ULONG ) AddRef( );
STDMETHODIMP_( ULONG ) Release( );
- //-----------------------------------------------------------------
// IDataObject interface methods
- //-----------------------------------------------------------------
STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 59c9a8b..82d97c4 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -52,10 +52,8 @@
#define __uuidof(I) IID_##I
#endif
-
// namespace directives
-
using osl::Condition;
using osl::Mutex;
using osl::MutexGuard;
@@ -66,10 +64,8 @@ namespace /* private */
char CLIPSRV_DLL_NAME[] = "sysdtrans.dll";
char g_szWndClsName[] = "MtaOleReqWnd###";
-
// messages constants
-
const sal_uInt32 MSG_SETCLIPBOARD = WM_USER + 0x0001;
const sal_uInt32 MSG_GETCLIPBOARD = WM_USER + 0x0002;
const sal_uInt32 MSG_REGCLIPVIEWER = WM_USER + 0x0003;
@@ -84,7 +80,6 @@ namespace /* private */
const sal_Bool AUTO_RESET = sal_False;
const sal_Bool INIT_NONSIGNALED = sal_False;
-
/* Cannot use osl conditions because they are blocking
without waking up on messages sent by another thread
this leads to deadlocks because we are blocking the
@@ -155,10 +150,8 @@ namespace /* private */
Win32Condition& operator=(const Win32Condition&);
};
-
// we use one condition for every request
-
struct MsgCtx
{
Win32Condition aCondition;
@@ -167,16 +160,12 @@ namespace /* private */
} /* namespace private */
-
// static member initialization
-
CMtaOleClipboard* CMtaOleClipboard::s_theMtaOleClipboardInst = NULL;
-
// marshal an IDataObject
-
//inline
HRESULT MarshalIDataObjectInStream( IDataObject* pIDataObject, LPSTREAM* ppStream )
{
@@ -191,10 +180,8 @@ HRESULT MarshalIDataObjectInStream( IDataObject* pIDataObject, LPSTREAM* ppStrea
);
}
-
// unmarshal an IDataObject
-
//inline
HRESULT UnmarshalIDataObjectAndReleaseStream( LPSTREAM lpStream, IDataObject** ppIDataObject )
{
@@ -208,10 +195,8 @@ HRESULT UnmarshalIDataObjectAndReleaseStream( LPSTREAM lpStream, IDataObject** p
reinterpret_cast<LPVOID*>(ppIDataObject));
}
-
// helper class to ensure that the calling thread has com initialized
-
class CAutoComInit
{
public:
@@ -255,10 +240,8 @@ private:
HRESULT m_hResult;
};
-
// ctor
-
CMtaOleClipboard::CMtaOleClipboard( ) :
m_hOleThread( NULL ),
m_uOleThreadId( 0 ),
@@ -283,10 +266,8 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
NULL, 0, CMtaOleClipboard::oleThreadProc, this, 0, &m_uOleThreadId );
OSL_ASSERT( NULL != m_hOleThread );
-
// setup the clipboard changed notifier thread
-
m_hClipboardChangedNotifierEvents[0] = CreateEventA( 0, MANUAL_RESET, INIT_NONSIGNALED, NULL );
OSL_ASSERT( NULL != m_hClipboardChangedNotifierEvents[0] );
@@ -300,10 +281,8 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
OSL_ASSERT( NULL != m_hClipboardChangedNotifierThread );
}
-
// dtor
-
CMtaOleClipboard::~CMtaOleClipboard( )
{
// block calling threads out
@@ -354,11 +333,6 @@ CMtaOleClipboard::~CMtaOleClipboard( )
"Clipboard viewer not properly unregistered" );
}
-
-
-//
-
-
HRESULT CMtaOleClipboard::flushClipboard( )
{
if ( !WaitForThreadReady( ) )
@@ -381,10 +355,6 @@ HRESULT CMtaOleClipboard::flushClipboard( )
return aMsgCtx.hr;
}
-
-//
-
-
HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
{
OSL_PRECOND( NULL != ppIDataObject, "invalid parameter" );
@@ -421,11 +391,9 @@ HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
return hr;
}
-
// this is an asynchronous method that's why we don't wait until the
// request is completed
-
HRESULT CMtaOleClipboard::setClipboard( IDataObject* pIDataObject )
{
if ( !WaitForThreadReady( ) )
@@ -460,10 +428,8 @@ HRESULT CMtaOleClipboard::setClipboard( IDataObject* pIDataObject )
return S_OK;
}
-
// register a clipboard viewer
-
bool CMtaOleClipboard::registerClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback )
{
if ( !WaitForThreadReady( ) )
@@ -487,10 +453,8 @@ bool CMtaOleClipboard::registerClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipV
return bRet;
}
-
// register a clipboard viewer
-
bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback )
{
bool bRet = true;
@@ -528,19 +492,11 @@ bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncCli
return bRet;
}
-
-//
-
-
LRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject )
{
return static_cast<LRESULT>( OleSetClipboard( pIDataObject ) );
}
-
-//
-
-
LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
{
OSL_ASSERT(NULL != ppStream);
@@ -557,19 +513,15 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
return static_cast<LRESULT>(hr);
}
-
// flush the ole-clipboard
-
LRESULT CMtaOleClipboard::onFlushClipboard( )
{
return static_cast<LRESULT>( OleFlushClipboard( ) );
}
-
// handle clipboard chain change event
-
LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext )
{
if ( hWndRemove == m_hwndNextClipViewer )
@@ -591,10 +543,8 @@ LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext )
return 0;
}
-
// handle draw clipboard event
-
LRESULT CMtaOleClipboard::onDrawClipboard( )
{
// we don't send a notification if we are
@@ -626,31 +576,24 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
return 0;
}
-
// SendMessage so we don't need to supply the HWND if we send
// something to our wrapped window
-
LRESULT CMtaOleClipboard::sendMessage( UINT msg, WPARAM wParam, LPARAM lParam )
{
return ::SendMessageA( m_hwndMtaOleReqWnd, msg, wParam, lParam );
}
-
// PostMessage so we don't need to supply the HWND if we send
// something to our wrapped window
-
bool CMtaOleClipboard::postMessage( UINT msg, WPARAM wParam, LPARAM lParam )
{
return PostMessageA( m_hwndMtaOleReqWnd, msg, wParam, lParam ) ? true : false;
}
-
-
// the window proc
-
LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
{
LRESULT lResult = 0;
@@ -734,10 +677,6 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARA
return lResult;
}
-
-//
-
-
void CMtaOleClipboard::createMtaOleReqWnd( )
{
WNDCLASSEXA wcex;
@@ -767,10 +706,6 @@ void CMtaOleClipboard::createMtaOleReqWnd( )
g_szWndClsName, NULL, 0, 0, 0, 0, 0, NULL, NULL, hInst, NULL );
}
-
-//
-
-
unsigned int CMtaOleClipboard::run( )
{
#if OSL_DEBUG_LEVEL > 0
@@ -803,10 +738,6 @@ unsigned int CMtaOleClipboard::run( )
return nRet;
}
-
-//
-
-
unsigned int WINAPI CMtaOleClipboard::oleThreadProc( LPVOID pParam )
{
CMtaOleClipboard* pInst =
@@ -816,10 +747,6 @@ unsigned int WINAPI CMtaOleClipboard::oleThreadProc( LPVOID pParam )
return pInst->run( );
}
-
-//
-
-
unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID pParam )
{
CMtaOleClipboard* pInst = reinterpret_cast< CMtaOleClipboard* >( pParam );
@@ -860,10 +787,6 @@ unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID
return ( 0 );
}
-
-//
-
-
bool CMtaOleClipboard::WaitForThreadReady( ) const
{
bool bRet = false;
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx
index af88941..e3ebfd2 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.hxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx
@@ -31,14 +31,12 @@
#pragma warning(pop)
#endif
-//--------------------------------------------------------
// the Mta-Ole clipboard class is for internal use only!
// only one instance of this class should be created, the
// user has to ensure this!
// the class is not thread-safe because it will be used
// only from within the clipboard service and the methods
// of the clipboard service are already synchronized
-//--------------------------------------------------------
class CMtaOleClipboard
{
@@ -72,10 +70,8 @@ private:
bool postMessage( UINT msg, WPARAM wParam = 0, LPARAM lParam = 0 );
LRESULT sendMessage( UINT msg, WPARAM wParam = 0, LPARAM lParam = 0 );
- //---------------------------------------------------------------
// message handler functions; remember these functions are called
// from a different thread context!
- //---------------------------------------------------------------
LRESULT onSetClipboard( IDataObject* pIDataObject );
LRESULT onGetClipboard( LPSTREAM* ppStream );
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 4413389..a529b81 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -37,10 +37,8 @@
#pragma warning(pop)
#endif
-
// namespace directives
-
using namespace osl;
using namespace std;
using namespace cppu;
@@ -50,15 +48,10 @@ using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::clipboard;
using namespace com::sun::star::datatransfer::clipboard::RenderingCapabilities;
-
// definition of static members
CWinClipbImpl* CWinClipbImpl::s_pCWinClipbImpl = NULL;
osl::Mutex CWinClipbImpl::s_aMutex;
-
-//
-
-
CWinClipbImpl::CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ) :
m_itsName( aClipboardName ),
m_pWinClipboard( theWinClipboard ),
@@ -72,10 +65,6 @@ CWinClipbImpl::CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* the
registerClipboardViewer( );
}
-
-//
-
-
CWinClipbImpl::~CWinClipbImpl( )
{
ClearableMutexGuard aGuard( s_aMutex );
@@ -85,10 +74,8 @@ CWinClipbImpl::~CWinClipbImpl( )
unregisterClipboardViewer( );
}
-
// getContent
-
Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( RuntimeException )
{
// use the shotcut or create a transferable from
@@ -125,10 +112,8 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime
return rClipContent;
}
-
// setContent
-
void SAL_CALL CWinClipbImpl::setContents(
const Reference< XTransferable >& xTransferable,
const Reference< XClipboardOwner >& xClipboardOwner )
@@ -155,28 +140,16 @@ void SAL_CALL CWinClipbImpl::setContents(
m_MtaOleClipboard.setClipboard(pIDataObj.get());
}
-
-//
-
-
OUString SAL_CALL CWinClipbImpl::getName( ) throw( RuntimeException )
{
return m_itsName;
}
-
-//
-
-
sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities( ) throw( RuntimeException )
{
return ( Delayed | Persistant );
}
-
-//
-
-
void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
{
// actually it should be ClearableMutexGuard aGuard( m_ClipContentMutex );
@@ -193,37 +166,21 @@ void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
m_MtaOleClipboard.flushClipboard( );
}
-
-//
-
-
void SAL_CALL CWinClipbImpl::registerClipboardViewer( )
{
m_MtaOleClipboard.registerClipViewer( CWinClipbImpl::onClipboardContentChanged );
}
-
-//
-
-
void SAL_CALL CWinClipbImpl::unregisterClipboardViewer( )
{
m_MtaOleClipboard.registerClipViewer( NULL );
}
-
-//
-
-
void SAL_CALL CWinClipbImpl::dispose() throw( RuntimeException )
{
OSL_ENSURE( !m_pCurrentClipContent, "Clipboard was not flushed before shutdown!" );
}
-
-//
-
-
void WINAPI CWinClipbImpl::onClipboardContentChanged( void )
{
MutexGuard aGuard( s_aMutex );
@@ -233,10 +190,6 @@ void WINAPI CWinClipbImpl::onClipboardContentChanged( void )
s_pCWinClipbImpl->m_pWinClipboard->notifyAllClipboardListener( );
}
-
-//
-
-
void SAL_CALL CWinClipbImpl::onReleaseDataObject( CXNotifyingDataObject* theCaller )
{
OSL_ASSERT( NULL != theCaller );
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index 15eea43..bb496df 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _WINCLIPBIMPL_HXX_
#define _WINCLIPBIMPL_HXX_
@@ -39,10 +38,8 @@
class CWinClipboard;
class CXNotifyingDataObject;
-//---------------------------------------------------
// impl class to avoid deadlocks between XTDataObject
// and the clipboard implementation
-//---------------------------------------------------
class CWinClipbImpl
{
@@ -62,27 +59,19 @@ protected:
OUString SAL_CALL getName( ) throw( ::com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// XClipboardEx
- //------------------------------------------------
sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( ::com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// XFlushableClipboard
- //------------------------------------------------
void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// XComponent
- //------------------------------------------------
void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// member functions
- //------------------------------------------------
void SAL_CALL registerClipboardViewer( );
void SAL_CALL unregisterClipboardViewer( );
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 66b3f58..6870052 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -25,10 +25,8 @@
#include <cppuhelper/supportsservice.hxx>
#include "WinClipbImpl.hxx"
-
// namespace directives
-
using namespace osl;
using namespace std;
using namespace cppu;
@@ -38,13 +36,10 @@ using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::clipboard;
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()
@@ -55,7 +50,6 @@ namespace
}
}
-
// ctor
/*XEventListener,*/
@@ -66,10 +60,7 @@ CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, c
m_pImpl.reset( new CWinClipbImpl( aClipboardName, this ) );
}
-//========================================================================
// XClipboard
-//========================================================================
-
// getContent
// to avoid unecessary traffic we check first if there is a clipboard
@@ -78,7 +69,6 @@ CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, c
// and so on, we simply return the orignial XTransferable instead of our
// DOTransferable
-
Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( RuntimeException )
{
MutexGuard aGuard( m_aMutex );
@@ -93,10 +83,8 @@ 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 )
@@ -111,10 +99,8 @@ 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 )
@@ -127,9 +113,7 @@ OUString SAL_CALL CWinClipboard::getName( ) throw( RuntimeException )
return OUString("");
}
-//========================================================================
// XFlushableClipboard
-//========================================================================
void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
{
@@ -143,9 +127,7 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
m_pImpl->flushClipboard( );
}
-//========================================================================
// XClipboardEx
-//========================================================================
sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities( ) throw( RuntimeException )
{
@@ -159,14 +141,10 @@ sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities( ) throw( RuntimeExce
return 0;
}
-//========================================================================
// XClipboardNotifier
-//========================================================================
-
// getName
-
void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
throw( RuntimeException )
{
@@ -183,10 +161,8 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi
rBHelper.aLC.addInterface( getCppuType( &listener ), listener );
}
-
// getName
-
void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
throw( RuntimeException )
{
@@ -203,10 +179,8 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar
rBHelper.aLC.removeInterface( getCppuType( &listener ), listener );
}
-
// getName
-
void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
{
if ( !rBHelper.bDisposed )
@@ -254,11 +228,9 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
} // end if
}
-
// overwritten base class method which will be
// called by the base class dispose method
-
void SAL_CALL CWinClipboard::disposing()
{
// do my own stuff
@@ -268,10 +240,8 @@ void SAL_CALL CWinClipboard::disposing()
m_pImpl.reset();
}
-
// XServiceInfo
-
OUString SAL_CALL CWinClipboard::getImplementationName( )
throw(RuntimeException)
{
@@ -285,10 +255,8 @@ sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName )
return cppu::supportsService(this, ServiceName);
}
-
// XServiceInfo
-
Sequence< OUString > SAL_CALL CWinClipboard::getSupportedServiceNames( )
throw(RuntimeException)
{
diff --git a/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 608f9e9..3634479 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _WINCLIPBOARD_HXX_
#define _WINCLIPBOARD_HXX_
@@ -40,7 +39,6 @@
// forward
class CWinClipbImpl;
-//------------------------------------------------------------------------
// implements the XClipboard[Ex] ... interfaces
// for the clipboard viewer mechanism we need a static callback function
// and a static member to reasocciate from this static function to the
@@ -49,7 +47,6 @@ class CWinClipbImpl;
// because we assume to be instanciated only once
// this will be asured by an OneInstanceFactory of the service and not
// by this class!
-//------------------------------------------------------------------------
// helper class, so that the mutex is constructed
// before the constructor of WeakComponentImplHelper
@@ -72,9 +69,7 @@ public:
CWinClipboard( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const OUString& aClipboardName );
- //------------------------------------------------
// XClipboard
- //------------------------------------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents( )
throw( ::com::sun::star::uno::RuntimeException );
@@ -87,21 +82,15 @@ public:
virtual OUString SAL_CALL getName( )
throw( ::com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// XFlushableClipboard
- //------------------------------------------------
virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// XClipboardEx
- //------------------------------------------------
virtual sal_Int8 SAL_CALL getRenderingCapabilities( ) throw( ::com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// XClipboardNotifier
- //------------------------------------------------
virtual void SAL_CALL addClipboardListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
@@ -111,16 +100,12 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener )
throw( ::com::sun::star::uno::RuntimeException );
- //------------------------------------------------
// overwrite base class method, which is called
// by base class dispose function
- //------------------------------------------------
virtual void SAL_CALL disposing();
- //------------------------------------------------
// XServiceInfo
- //------------------------------------------------
virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException);
@@ -141,7 +126,6 @@ private:
friend class CWinClipbImpl;
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index 8ca8563..0e91cce 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -23,20 +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 ::rtl ;
using namespace ::com::sun::star::uno ;
using namespace ::com::sun::star::registry ;
@@ -44,19 +40,15 @@ 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
{
-
// 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< XClipboard* >( new CWinClipboard( comphelper::getComponentContext(rServiceManager), OUString( "" ) ) ) );
@@ -69,7 +61,6 @@ extern "C"
// component_getFactory
// returns a factory to create XFilePicker-Services
-
SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx
index 8aadbed..da2e8de 100644
--- a/dtrans/source/win32/dnd/dndentry.cxx
+++ b/dtrans/source/win32/dnd/dndentry.cxx
@@ -43,7 +43,6 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic
return Reference<XInterface>( static_cast<XInitialization*>(pTarget), UNO_QUERY);
}
-
extern "C"
{
diff --git a/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx
index 329551f..f36297e 100644
--- a/dtrans/source/win32/dnd/globals.cxx
+++ b/dtrans/source/win32/dnd/globals.cxx
@@ -82,7 +82,6 @@ sal_Int8 dndOleKeysToAction( DWORD grfKeyState, sal_Int8 nSourceActions)
return ret;
}
-
sal_Int8 dndOleDropEffectsToActions( DWORD dwEffect)
{
sal_Int8 ret= ACTION_NONE;
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index 1828fc1..e614e50 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.hxx
@@ -30,7 +30,6 @@
#endif
#include <sal/types.h>
-
#define DNDSOURCE_SERVICE_NAME "com.sun.star.datatransfer.dnd.OleDragSource"
#define DNDSOURCE_IMPL_NAME "com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
@@ -71,14 +70,11 @@ DWORD dndActionsToDropEffects( sal_Int8 actions);
// or Alt).
DWORD dndActionsToSingleDropEffect( sal_Int8 actions);
-
-
struct MutexDummy
{
osl::Mutex m_mutex;
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx
index b0e4ad9..1510a54 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/dtrans/source/win32/dnd/idroptarget.cxx
@@ -35,7 +35,6 @@ IDropTargetImpl::~IDropTargetImpl()
{
}
-
//IDropTarget
HRESULT STDMETHODCALLTYPE IDropTargetImpl::QueryInterface( REFIID riid, void **ppvObject)
{
diff --git a/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx
index 32425a62..bbaa799 100644
--- a/dtrans/source/win32/dnd/idroptarget.hxx
+++ b/dtrans/source/win32/dnd/idroptarget.hxx
@@ -61,7 +61,6 @@ public:
/* [in] */ POINTL pt,
/* [out][in] */ DWORD __RPC_FAR *pdwEffect);
-
};
#endif
diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index aed4af9..333fc7b 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.hxx
@@ -93,7 +93,6 @@ public:
virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
throw(Exception, RuntimeException);
-
// XDragSource
virtual sal_Bool SAL_CALL isDragImageSupported( ) throw(RuntimeException);
virtual sal_Int32 SAL_CALL getDefaultCursor( sal_Int8 dragAction )
@@ -111,8 +110,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException);
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException);
-
-
virtual HRESULT STDMETHODCALLTYPE QueryInterface(
/* [in] */ REFIID riid,
/* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject);
@@ -121,7 +118,6 @@ public:
virtual ULONG STDMETHODCALLTYPE Release( );
-
// IDropSource
virtual HRESULT STDMETHODCALLTYPE QueryContinueDrag(
/* [in] */ BOOL fEscapePressed,
@@ -132,7 +128,6 @@ public:
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index a9f1c09..a6f106f 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.cxx
@@ -73,7 +73,6 @@ void SAL_CALL SourceContext::transferablesFlavorsChanged( )
{
}
-
// non -interface functions
// Fires XDragSourceListener::dragDropEnd events.
void SourceContext::fire_dragDropEnd( sal_Bool success, sal_Int8 effect)
@@ -110,7 +109,6 @@ void SourceContext::fire_dragDropEnd( sal_Bool success, sal_Int8 effect)
}
}
-
void SourceContext::fire_dropActionChanged( sal_Int8 dropAction, sal_Int8 userAction)
{
if( m_currentAction != dropAction)
diff --git a/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index 4d9e5c9..f149abb 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
#include <cppuhelper/compbase1.hxx>
-
#include "source.hxx"
using namespace ::com::sun::star::datatransfer;
@@ -32,7 +31,6 @@ using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-
// This class fires events to XDragSourceListener implementations.
// Of that interface only dragDropEnd and dropActionChanged are called.
// The functions dragEnter, dragExit and dragOver are not supported
@@ -68,16 +66,12 @@ public:
virtual void SAL_CALL transferablesFlavorsChanged( )
throw( RuntimeException);
-
-
// non - interface functions
void fire_dragDropEnd( sal_Bool success, sal_Int8 byte);
void fire_dropActionChanged( sal_Int8 dropAction, sal_Int8 userAction);
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index 036ae96..4f52e54 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -34,7 +34,6 @@ using namespace com::sun::star::datatransfer;
using namespace com::sun::star::datatransfer::dnd;
using namespace com::sun::star::datatransfer::dnd::DNDConstants;
-
#define WM_REGISTERDRAGDROP WM_USER + 1
#define WM_REVOKEDRAGDROP WM_USER + 2
extern Reference< XTransferable > g_XTransferable;
@@ -135,7 +134,6 @@ void SAL_CALL DropTarget::initialize( const Sequence< Any >& aArguments )
m_pDropTarget= new IDropTargetImpl( *static_cast<DropTarget*>( this) );
m_pDropTarget->AddRef();
-
// Obtain the id of the thread that created the window
m_threadIdWindow= GetWindowThreadProcessId( m_hWnd, NULL);
// The event is set by the thread that we will create momentarily.
@@ -274,7 +272,6 @@ sal_Bool SAL_CALL DropTarget::isActive( ) throw(RuntimeException)
return m_bActive; //m_bDropTargetRegistered;
}
-
void SAL_CALL DropTarget::setActive( sal_Bool _b ) throw(RuntimeException)
{
MutexGuard g(m_mutex);
diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 98ccb2d..37772ac 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.hxx
@@ -38,7 +38,6 @@
#include "globals.hxx"
#include "../../inc/DtObjFactory.hxx"
-
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace cppu;
@@ -106,7 +105,6 @@ private:
Reference<XDropTargetDragContext> m_currentDragContext;
Reference<XDropTargetDropContext> m_currentDropContext;
-
private:
DropTarget();
DropTarget(DropTarget&);
@@ -140,7 +138,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException);
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException);
-
// Functions called from the IDropTarget implementation ( m_pDropTarget)
virtual HRESULT DragEnter(
/* [unique][in] */ IDataObject *pDataObj,
@@ -161,7 +158,6 @@ public:
/* [in] */ POINTL pt,
/* [out][in] */ DWORD *pdwEffect);
-
// Non - interface functions --------------------------------------------------
// XDropTargetDropContext delegated from DropContext
@@ -173,7 +169,6 @@ public:
void _acceptDrag( sal_Int8 dragOperation, const Reference<XDropTargetDragContext>& context);
void _rejectDrag( const Reference<XDropTargetDragContext>& context);
-
protected:
// Gets the current action dependend on the pressed modifiers, the effects
// supported by the drop source (IDropSource) and the default actions of the
@@ -182,20 +177,14 @@ protected:
// Only filters with the default actions
inline sal_Int8 getFilteredActions( DWORD grfKeyState);
-
-
void fire_drop( const DropTargetDropEvent& dte);
void fire_dragEnter( const DropTargetDragEnterEvent& dtde );
void fire_dragExit( const DropTargetEvent& dte );
void fire_dragOver( const DropTargetDragEvent& dtde );
void fire_dropActionChanged( const DropTargetDragEvent& dtde );
-
-
-
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index 28b0b82..26029c8 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.hxx
@@ -20,7 +20,6 @@
#ifndef _TARGETDRAGCONTEXT_HXX_
#define _TARGETDRAGCONTEXT_HXX_
-
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
diff --git a/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index ce6e4c5..6f428c8 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.hxx
@@ -43,7 +43,6 @@ public:
TargetDropContext( DropTarget* pTarget);
~TargetDropContext();
-
// XDropTargetDragContext
virtual void SAL_CALL acceptDrop( sal_Int8 dropOperation )
throw( RuntimeException);
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 9428b52..4de3f3e 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -31,10 +31,8 @@
#define FREE_HGLOB_ON_RELEASE TRUE
#define KEEP_HGLOB_ON_RELEASE FALSE
-
// ctor
-
CAPNDataObject::CAPNDataObject( IDataObjectPtr rIDataObject ) :
m_rIDataObjectOrg( rIDataObject ),
m_hGlobal( NULL ),
@@ -106,10 +104,8 @@ CAPNDataObject::~CAPNDataObject( )
}
}
-
// IUnknown->QueryInterface
-
STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
{
OSL_ASSERT( NULL != ppvObject );
@@ -130,19 +126,15 @@ STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
return hr;
}
-
// IUnknown->AddRef
-
STDMETHODIMP_(ULONG) CAPNDataObject::AddRef( )
{
return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) );
}
-
// IUnknown->Release
-
STDMETHODIMP_(ULONG) CAPNDataObject::Release( )
{
// we need a helper variable because it's not allowed to access
@@ -155,10 +147,8 @@ STDMETHODIMP_(ULONG) CAPNDataObject::Release( )
return nRefCnt;
}
-
// IDataObject->GetData
-
STDMETHODIMP CAPNDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
{
HRESULT hr = m_rIDataObjectOrg->GetData( pFormatetc, pmedium );
@@ -174,10 +164,8 @@ STDMETHODIMP CAPNDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmediu
return hr;
}
-
// IDataObject->EnumFormatEtc
-
STDMETHODIMP CAPNDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc )
{
HRESULT hr = m_rIDataObjectOrg->EnumFormatEtc(dwDirection, ppenumFormatetc);
@@ -193,10 +181,8 @@ STDMETHODIMP CAPNDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC**
return hr;
}
-
// IDataObject->QueryGetData
-
STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc )
{
HRESULT hr = m_rIDataObjectOrg->QueryGetData( pFormatetc );
@@ -212,10 +198,8 @@ STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc )
return hr;
}
-
// IDataObject->GetDataHere
-
STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
{
HRESULT hr = m_rIDataObjectOrg->GetDataHere(pFormatetc, pmedium);
@@ -231,10 +215,8 @@ STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pm
return hr;
}
-
// IDataObject->GetCanonicalFormatEtc
-
STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut)
{
HRESULT hr = m_rIDataObjectOrg->GetCanonicalFormatEtc( pFormatectIn, pFormatetcOut );
@@ -250,10 +232,8 @@ STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPF
return hr;
}
-
// IDataObject->SetData
-
STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease )
{
HRESULT hr = m_rIDataObjectOrg->SetData( pFormatetc, pmedium, fRelease );
@@ -269,10 +249,8 @@ STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmediu
return hr;
}
-
// IDataObject->DAdvise
-
STDMETHODIMP CAPNDataObject::DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD * pdwConnection )
{
HRESULT hr = m_rIDataObjectOrg->DAdvise(pFormatetc, advf, pAdvSink, pdwConnection);
@@ -288,10 +266,8 @@ STDMETHODIMP CAPNDataObject::DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVI
return hr;
}
-
// IDataObject->DUnadvise
-
STDMETHODIMP CAPNDataObject::DUnadvise( DWORD dwConnection )
{
HRESULT hr = m_rIDataObjectOrg->DUnadvise( dwConnection );
@@ -307,10 +283,8 @@ STDMETHODIMP CAPNDataObject::DUnadvise( DWORD dwConnection )
return hr;
}
-
// IDataObject->EnumDAdvise
-
STDMETHODIMP CAPNDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
{
HRESULT hr = m_rIDataObjectOrg->EnumDAdvise(ppenumAdvise);
@@ -326,19 +300,15 @@ STDMETHODIMP CAPNDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
return hr;
}
-
// for our convenience
-
CAPNDataObject::operator IDataObject*( )
{
return static_cast< IDataObject* >( this );
}
-
// helper function
-
HRESULT CAPNDataObject::MarshalIDataObjectIntoCurrentApartment( IDataObject** ppIDataObj )
{
OSL_ASSERT(NULL != ppIDataObj);
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index 6ef90e1..bc23d88 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _APNDATAOBJECT_HXX_
#define _APNDATAOBJECT_HXX_
@@ -36,17 +35,13 @@ public:
CAPNDataObject( IDataObjectPtr rIDataObject );
virtual ~CAPNDataObject( );
- //-----------------------------------------------------------------
//IUnknown interface methods
- //-----------------------------------------------------------------
STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject);
STDMETHODIMP_( ULONG ) AddRef( );
STDMETHODIMP_( ULONG ) Release( );
- //-----------------------------------------------------------------
// IDataObject interface methods
- //-----------------------------------------------------------------
STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium );
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 56c5dde..475ecad 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -31,10 +31,8 @@
#include <com/sun/star/datatransfer/MimeContentTypeFactory.hpp>
#include <comphelper/processfactory.hxx>
-
// namespace directives
-
using namespace std;
using namespace osl;
using namespace cppu;
@@ -44,11 +42,6 @@ using namespace com::sun::star::io;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
-
-
-//
-
-
namespace
{
const Type CPPUTYPE_SEQINT8 = getCppuType( ( Sequence< sal_Int8 >* )0 );
@@ -64,11 +57,8 @@ namespace
} // end namespace
-
-
// ctor
-
CDOTransferable::CDOTransferable(
const Reference< XComponentContext >& rxContext, IDataObjectPtr rDataObject ) :
m_rDataObject( rDataObject ),
@@ -79,10 +69,6 @@ CDOTransferable::CDOTransferable(
{
}
-
-//
-
-
Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
throw( UnsupportedFlavorException, IOException, RuntimeException )
{
@@ -90,17 +76,13 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
MutexGuard aGuard( m_aMutex );
-
// convert dataflavor to formatetc
-
CFormatEtc fetc = m_DataFormatTranslator.getFormatEtcFromDataFlavor( aFlavor );
OSL_ASSERT( CF_INVALID != fetc.getClipformat() );
-
// get the data from clipboard in a byte stream
-
ByteSequence_t clipDataStream;
try
@@ -137,29 +119,23 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
throw; // pass through exception
}
-
// return the data as any
-
return byteStreamToAny( clipDataStream, aFlavor.DataType );
}
-
// getTransferDataFlavors
-
Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors( )
throw( RuntimeException )
{
return m_FlavorList;
}
-
// isDataFlavorSupported
// returns true if we find a DataFlavor with the same MimeType and
// DataType
-
sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
throw( RuntimeException )
{
@@ -172,7 +148,6 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla
return sal_False;
}
-
// helper function
// the list of datafalvors currently on the clipboard will be initialized
// only once; if the client of this Transferable will hold a reference
@@ -183,7 +158,6 @@ 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( )
{
IEnumFORMATETCPtr pEnumFormatEtc;
@@ -231,10 +205,6 @@ void SAL_CALL CDOTransferable::initFlavorList( )
}
}
-
-//
-
-
inline
void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor )
{
@@ -248,10 +218,8 @@ void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor )
}
}
-
// helper function
-
//inline
DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFormatEtc )
{
@@ -268,11 +236,9 @@ DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFo
return m_DataFormatTranslator.getDataFlavorFromFormatEtc( aFormatEtc, lcid );
}
-
// 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 lcid = GetThreadLocale( );
@@ -297,12 +263,10 @@ LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( )
return lcid;
}
-
// i think it's not necessary to call ReleaseStgMedium
// in case of failures because nothing should have been
// allocated etc.
-
CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFormatEtc& aFormatEtc )
{
STGMEDIUM stgmedium;
@@ -377,10 +341,6 @@ CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFor
return byteStream;
}
-
-//
-
-
OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( )
{
ByteSequence_t aTextSequence;
@@ -422,10 +382,6 @@ OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( )
return OUString(pWChar);
}
-
-//
-
-
void CDOTransferable::clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence )
{
CStgTransferHelper memTransferHelper;
@@ -458,10 +414,6 @@ void CDOTransferable::clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium,
memTransferHelper.read( aByteSequence.getArray( ), nMemSize );
}
-
-//
-
-
inline
Any CDOTransferable::byteStreamToAny( ByteSequence_t& aByteStream, const Type& aRequestedDataType )
{
@@ -478,10 +430,6 @@ Any CDOTransferable::byteStreamToAny( ByteSequence_t& aByteStream, const Type& a
return aAny;
}
-
-//
-
-
inline
OUString CDOTransferable::byteStreamToOUString( ByteSequence_t& aByteStream )
{
@@ -498,10 +446,6 @@ OUString CDOTransferable::byteStreamToOUString( ByteSequence_t& aByteStream )
return OUString( reinterpret_cast< sal_Unicode* >( aByteStream.getArray( ) ), nWChars );
}
-
-//
-
-
sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
const DataFlavor& lhs, const DataFlavor& rhs )
{
@@ -531,20 +475,12 @@ sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
return bRet;
}
-
-//
-
-
sal_Bool SAL_CALL CDOTransferable::cmpFullMediaType(
const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs ) const
{
return xLhs->getFullMediaType().equalsIgnoreAsciiCase( xRhs->getFullMediaType( ) );
}
-
-//
-
-
sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs ) const
{
@@ -606,5 +542,4 @@ sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
return retVal;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index d8fcf77..5e20010 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _DOTRANSFERABLE_HXX_
#define _DOTRANSFERABLE_HXX_
@@ -41,9 +40,7 @@ class CDOTransferable : public ::cppu::WeakImplHelper2< ::com::sun::star::datatr
public:
typedef com::sun::star::uno::Sequence< sal_Int8 > ByteSequence_t;
- //------------------------------------------------------------------------
// XTransferable
- //------------------------------------------------------------------------
virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
@@ -53,22 +50,19 @@ public:
virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
throw( ::com::sun::star::uno::RuntimeException );
- //------------------------------------------------------------------------
+
// XSystemTransferable
- //------------------------------------------------------------------------
+
virtual ::com::sun::star::uno::Any SAL_CALL getData( const com::sun::star::uno::Sequence<sal_Int8>& aProcessId ) throw
(::com::sun::star::uno::RuntimeException);
-
private:
// should be created only by CDTransObjFactory
explicit CDOTransferable(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
IDataObjectPtr rDataObject );
- //------------------------------------------------------------------------
// some helper functions
- //------------------------------------------------------------------------
void SAL_CALL initFlavorList( );
diff --git a/dtrans/source/win32/dtobj/DTransHelper.cxx b/dtrans/source/win32/dtobj/DTransHelper.cxx
index 6f70943..46b1086 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.cxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.cxx
@@ -21,10 +21,8 @@
#include <osl/diagnose.h>
#include "DTransHelper.hxx"
-
// implementation
-
CStgTransferHelper::CStgTransferHelper( sal_Bool bAutoInit,
HGLOBAL hGlob,
sal_Bool bDelStgOnRelease ) :
@@ -35,21 +33,16 @@ CStgTransferHelper::CStgTransferHelper( sal_Bool bAutoInit,
init( hGlob, m_bDelStgOnRelease );
}
-
// dtor
-
-
CStgTransferHelper::~CStgTransferHelper( )
{
if ( m_lpStream )
m_lpStream->Release( );
}
-
// TransferData into the
-
void SAL_CALL CStgTransferHelper::write( const void* lpData, ULONG cb, ULONG* cbWritten )
{
HRESULT hr = E_FAIL;
@@ -71,10 +64,8 @@ void SAL_CALL CStgTransferHelper::write( const void* lpData, ULONG cb, ULONG* cb
#endif
}
-
// read
-
void SAL_CALL CStgTransferHelper::read( LPVOID pv, ULONG cb, ULONG* pcbRead )
{
HRESULT hr = E_FAIL;
@@ -86,10 +77,8 @@ void SAL_CALL CStgTransferHelper::read( LPVOID pv, ULONG cb, ULONG* pcbRead )
throw CStgTransferException( hr );
}
-
// GetHGlobal
-
HGLOBAL SAL_CALL CStgTransferHelper::getHGlobal( ) const
{
OSL_ASSERT( m_lpStream );
@@ -106,10 +95,8 @@ HGLOBAL SAL_CALL CStgTransferHelper::getHGlobal( ) const
return hGlob;
}
-
// getIStream
-
void SAL_CALL CStgTransferHelper::getIStream( LPSTREAM* ppStream )
{
OSL_ASSERT( ppStream );
@@ -118,10 +105,8 @@ void SAL_CALL CStgTransferHelper::getIStream( LPSTREAM* ppStream )
static_cast< LPUNKNOWN >( *ppStream )->AddRef( );
}
-
// Init
-
void SAL_CALL CStgTransferHelper::init( SIZE_T newSize,
sal_uInt32 uiFlags,
sal_Bool bDelStgOnRelease )
@@ -149,10 +134,8 @@ void SAL_CALL CStgTransferHelper::init( SIZE_T newSize,
#endif
}
-
// Init
-
void SAL_CALL CStgTransferHelper::init( HGLOBAL hGlob,
sal_Bool bDelStgOnRelease )
{
@@ -165,10 +148,8 @@ void SAL_CALL CStgTransferHelper::init( HGLOBAL hGlob,
throw CStgTransferException( hr );
}
-
// free the global memory and invalidate the stream pointer
-
void SAL_CALL CStgTransferHelper::cleanup( )
{
if ( m_lpStream && !m_bDelStgOnRelease )
@@ -185,10 +166,8 @@ void SAL_CALL CStgTransferHelper::cleanup( )
}
}
-
// return the size of memory we point to
-
sal_uInt32 SAL_CALL 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 8f5a8956..7c9424f 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _DTRANSHELPER_HXX_
#define _DTRANSHELPER_HXX_
@@ -35,11 +34,9 @@
#define MEM_DESTROY_ON_RELEASE TRUE
#define NO_MEM_DESTROY_ON_RELEASE FALSE
-//-------------------------------------------------------------------------
// a helper class to manage a global memory area, the clients can write
// into the global memory area and extract the handle to the global mem
// note: not thread-safe
-//-------------------------------------------------------------------------
class CStgTransferHelper
{
@@ -91,19 +88,15 @@ private:
CStgTransferHelper& operator=( const CStgTransferHelper& );
};
-//-------------------------------------------------------------------------
// something like an auto-pointer - allows access to the memory belonging
// to a HGLOBAL and automatically unlocks a global memory at destruction
// time
-//-------------------------------------------------------------------------
class CRawHGlobalPtr
{
public:
- //---------------------------------------------
// ctor
- //---------------------------------------------
CRawHGlobalPtr( HGLOBAL hGlob ) :
m_hGlob( hGlob ),
@@ -112,10 +105,7 @@ public:
{
}
-
- //---------------------------------------------
// ctor
- //---------------------------------------------
CRawHGlobalPtr( const CStgTransferHelper& theHGlobalHelper ) :
m_hGlob( theHGlobalHelper.getHGlobal( ) ),
@@ -124,9 +114,7 @@ public:
{
}
- //---------------------------------------------
// dtor
- //---------------------------------------------
~CRawHGlobalPtr( )
{
@@ -134,10 +122,8 @@ public:
GlobalUnlock( m_hGlob );
}
- //---------------------------------------------
// lock the global memory (initializes a
// pointer to this memory)
- //---------------------------------------------
BOOL Lock( )
{
@@ -150,10 +136,8 @@ public:
return m_bIsLocked;
}
- //---------------------------------------------
// unlock the global memory (invalidates the
// pointer to this memory)
- //---------------------------------------------
BOOL Unlock( )
{
@@ -164,10 +148,8 @@ public:
return ( NO_ERROR == GetLastError( ) );
}
- //---------------------------------------------
// locks the global memory and returns a
// pointer to this memory
- //---------------------------------------------
LPVOID GetMemPtr( )
{
@@ -175,9 +157,7 @@ public:
return m_pGlobMem;
}
- //---------------------------------------------
// size of mem we point to
- //---------------------------------------------
int MemSize( ) const
{
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index 90fa35d..d1109ec6 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -29,7 +29,6 @@
#include "Fetc.hxx"
#include <com/sun/star/datatransfer/DataFormatTranslator.hpp>
-
#if defined _MSC_VER
#pragma warning(push,1)
#pragma warning(disable:4917)
@@ -40,17 +39,13 @@
#pragma warning(pop)
#endif
-
-
// namespace directives
-
using namespace std;
using namespace com::sun::star::uno;
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::lang;
-
const Type CPPUTYPE_SALINT32 = getCppuType((sal_Int32*)0);
const Type CPPUTYPE_SALINT8 = getCppuType((sal_Int8*)0);
const Type CPPUTYPE_OUSTRING = getCppuType((OUString*)0);
@@ -63,19 +58,11 @@ const OUString HPNAME_OEM_ANSI_TEXT ("OEM/ANSI Text");
const OUString HTML_FORMAT_NAME_WINDOWS ("HTML Format");
const OUString HTML_FORMAT_NAME_SOFFICE ("HTML (HyperText Markup Language)");
-
-//
-
-
CDataFormatTranslator::CDataFormatTranslator( const Reference< XComponentContext >& rxContext )
{
m_XDataFormatTranslator = DataFormatTranslator::create( rxContext );
}
-
-//
-
-
CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor& aDataFlavor ) const
{
sal_Int32 cf = CF_INVALID;
@@ -116,10 +103,6 @@ CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor&
return sal::static_int_cast<CFormatEtc>(getFormatEtcForClipformat( sal::static_int_cast<CLIPFORMAT>(cf) ));
}
-
-//
-
-
DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& aFormatEtc, LCID lcid ) const
{
DataFlavor aFlavor;
@@ -173,10 +156,6 @@ DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& a
return aFlavor;
}
-
-//
-
-
CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const OUString& aClipFmtName ) const
{
// check parameter
@@ -187,10 +166,6 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const
return getFormatEtcForClipformat( cf );
}
-
-//
-
-
OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat ) const
{
OSL_PRECOND( CF_INVALID != aClipformat, "Invalid clipboard format" );
@@ -201,10 +176,6 @@ OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat )
return OUString( wBuff, nLen );
}
-
-//
-
-
CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT cf ) const
{
CFormatEtc fetc( cf, TYMED_NULL, NULL, DVASPECT_CONTENT );
@@ -238,57 +209,33 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT
return fetc;
}
-
-//
-
-
sal_Bool SAL_CALL CDataFormatTranslator::isOemOrAnsiTextFormat( CLIPFORMAT cf ) const
{
return ( (cf == CF_TEXT) || (cf == CF_OEMTEXT) );
}
-
-//
-
-
sal_Bool SAL_CALL CDataFormatTranslator::isUnicodeTextFormat( CLIPFORMAT cf ) const
{
return ( cf == CF_UNICODETEXT );
}
-
-//
-
-
sal_Bool SAL_CALL CDataFormatTranslator::isTextFormat( CLIPFORMAT cf ) const
{
return ( isOemOrAnsiTextFormat( cf ) || isUnicodeTextFormat( cf ) );
}
-
-//
-
-
sal_Bool SAL_CALL CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf ) const
{
OUString clipFormatName = getClipboardFormatName( cf );
return ( clipFormatName == HTML_FORMAT_NAME_WINDOWS );
}
-
-//
-
-
sal_Bool SAL_CALL CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf ) const
{
OUString clipFormatName = getClipboardFormatName( cf );
return ( clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE ) );
}
-
-//
-
-
OUString SAL_CALL CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const
{
OSL_ASSERT( isOemOrAnsiTextFormat( aClipformat ) );
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index 5f8b9e1..fb024d8 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _DATAFMTTRANSL_HXX_
#define _DATAFMTTRANSL_HXX_
@@ -35,9 +34,7 @@
#pragma warning(pop)
#endif
-//-----------------------------------------------
// declaration
-//-----------------------------------------------
class CFormatEtc;
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index 1749724..584c695 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx
@@ -23,18 +23,14 @@
#include "DOTransferable.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/Fetc.cxx b/dtrans/source/win32/dtobj/Fetc.cxx
index b237b86..9f60a0e 100644
--- a/dtrans/source/win32/dtobj/Fetc.cxx
+++ b/dtrans/source/win32/dtobj/Fetc.cxx
@@ -21,10 +21,6 @@
#include "Fetc.hxx"
#include "../misc/ImplHelper.hxx"
-
-//
-
-
CFormatEtc::CFormatEtc( )
{
m_FormatEtc.cfFormat = 0;
@@ -34,28 +30,18 @@ CFormatEtc::CFormatEtc( )
m_FormatEtc.tymed = TYMED_NULL;
}
-
// transfer of ownership
-
CFormatEtc::CFormatEtc( const FORMATETC& aFormatEtc )
{
CopyFormatEtc( &m_FormatEtc, &const_cast< FORMATETC& >( aFormatEtc ) );
}
-
-//
-
-
CFormatEtc::~CFormatEtc( )
{
DeleteTargetDevice( m_FormatEtc.ptd );
}
-
-//
-
-
CFormatEtc::CFormatEtc( CLIPFORMAT cf, DWORD tymed, DVTARGETDEVICE* ptd, DWORD dwAspect, LONG lindex )
{
m_FormatEtc.cfFormat = cf;
@@ -65,10 +51,6 @@ CFormatEtc::CFormatEtc( CLIPFORMAT cf, DWORD tymed, DVTARGETDEVICE* ptd, DWORD d
m_FormatEtc.tymed = tymed;
}
-
-//
-
-
CFormatEtc::CFormatEtc( const CFormatEtc& theOther )
{
m_FormatEtc.cfFormat = theOther.m_FormatEtc.cfFormat;
@@ -78,10 +60,6 @@ CFormatEtc::CFormatEtc( const CFormatEtc& theOther )
m_FormatEtc.tymed = theOther.m_FormatEtc.tymed;
}
-
-//
-
-
CFormatEtc& CFormatEtc::operator=( const CFormatEtc& theOther )
{
if ( this != &theOther )
@@ -98,28 +76,16 @@ CFormatEtc& CFormatEtc::operator=( const CFormatEtc& theOther )
return *this;
}
-
-//
-
-
CFormatEtc::operator FORMATETC*( )
{
return &m_FormatEtc;
}
-
-//
-
-
CFormatEtc::operator FORMATETC( )
{
return m_FormatEtc;
}
-
-//
-
-
void CFormatEtc::getFORMATETC( LPFORMATETC lpFormatEtc )
{
OSL_ASSERT( lpFormatEtc );
@@ -128,28 +94,16 @@ void CFormatEtc::getFORMATETC( LPFORMATETC lpFormatEtc )
CopyFormatEtc( lpFormatEtc, &m_FormatEtc );
}
-
-//
-
-
CLIPFORMAT CFormatEtc::getClipformat( ) const
{
return m_FormatEtc.cfFormat;
}
-
-//
-
-
DWORD CFormatEtc::getTymed( ) const
{
return m_FormatEtc.tymed;
}
-
-//
-
-
void CFormatEtc::getTargetDevice( DVTARGETDEVICE** lpDvTargetDevice ) const
{
OSL_ASSERT( lpDvTargetDevice );
@@ -161,83 +115,49 @@ void CFormatEtc::getTargetDevice( DVTARGETDEVICE** lpDvTargetDevice ) const
*lpDvTargetDevice = CopyTargetDevice( m_FormatEtc.ptd );
}
-
-//
-
-
DWORD CFormatEtc::getDvAspect( ) const
{
return m_FormatEtc.dwAspect;
}
-
-//
-
-
LONG CFormatEtc::getLindex( ) const
{
return m_FormatEtc.lindex;
}
-
-//
-
-
void CFormatEtc::setClipformat( CLIPFORMAT cf )
{
m_FormatEtc.cfFormat = cf;
}
-
-//
-
-
void CFormatEtc::setTymed( DWORD tymed )
{
m_FormatEtc.tymed = tymed;
}
-
// transfer of ownership!
-
void CFormatEtc::setTargetDevice( DVTARGETDEVICE* ptd )
{
DeleteTargetDevice( m_FormatEtc.ptd );
m_FormatEtc.ptd = ptd;
}
-
-//
-
-
void CFormatEtc::setDvAspect( DWORD dwAspect )
{
m_FormatEtc.dwAspect = dwAspect;
}
-
-//
-
-
void CFormatEtc::setLindex( LONG lindex )
{
m_FormatEtc.lindex = lindex;
}
-
-//
-
-
sal_Int32 operator==( const CFormatEtc& lhs, const CFormatEtc& rhs )
{
return CompareFormatEtc( &lhs.m_FormatEtc, &rhs.m_FormatEtc );
}
-
-//
-
-
sal_Int32 operator!=( const CFormatEtc& lhs, const CFormatEtc& rhs )
{
return ( ( lhs == rhs ) != 1 );
diff --git a/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index 3d02afa..7358b9a 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.hxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef _FETC_HXX_
#define _FETC_HXX_
@@ -77,7 +76,6 @@ private:
sal_Int32 operator==( const CFormatEtc& lhs, const CFormatEtc& rhs );
sal_Int32 operator!=( const CFormatEtc& lhs, const CFormatEtc& rhs );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 1ac2313..7eba9fd 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -31,46 +31,27 @@
#include "MimeAttrib.hxx"
-
// namespace directives
-
using namespace com::sun::star::uno;
using namespace com::sun::star::datatransfer;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace std;
-
-
-//
-
-
LCID CFormatRegistrar::m_TxtLocale = 0;
sal_uInt32 CFormatRegistrar::m_TxtCodePage = GetACP( );
-
-//
-
-
CFormatEtcContainer::CFormatEtcContainer( )
{
m_EnumIterator = m_FormatMap.begin( );
}
-
-//
-
-
void CFormatEtcContainer::addFormatEtc( const CFormatEtc& fetc )
{
m_FormatMap.push_back( CFormatEtc( fetc ) );
}
-
-//
-
-
void SAL_CALL CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc )
{
FormatEtcMap_t::iterator iter =
@@ -80,19 +61,11 @@ void SAL_CALL CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc )
m_FormatMap.erase( iter );
}
-
-//
-
-
void SAL_CALL CFormatEtcContainer::removeAllFormatEtc( )
{
m_FormatMap.clear( );
}
-
-//
-
-
sal_Bool CFormatEtcContainer::hasFormatEtc( const CFormatEtc& fetc ) const
{
FormatEtcMap_t::const_iterator iter =
@@ -101,28 +74,16 @@ sal_Bool CFormatEtcContainer::hasFormatEtc( const CFormatEtc& fetc ) const
return ( iter != m_FormatMap.end( ) );
}
-
-//
-
-
sal_Bool CFormatEtcContainer::hasElements( ) const
{
return !m_FormatMap.empty();
}
-
-//
-
-
void CFormatEtcContainer::beginEnumFormatEtc( )
{
m_EnumIterator = m_FormatMap.begin( );
}
-
-//
-
-
sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc,
sal_uInt32 aNum )
{
@@ -141,11 +102,6 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc,
return nFetched;
}
-
-
-//
-
-
sal_Bool SAL_CALL CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum )
{
FormatEtcMap_t::const_iterator iter_end = m_FormatMap.end( );
@@ -157,14 +113,6 @@ sal_Bool SAL_CALL CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum )
return ( m_EnumIterator != m_FormatMap.end( ) );
}
-
-//#########################################################################
-
-
-
-//
-
-
CFormatRegistrar::CFormatRegistrar( const Reference< XComponentContext >& rxContext,
const CDataFormatTranslator& aDataFormatTranslator ) :
m_DataFormatTranslator( aDataFormatTranslator ),
@@ -173,7 +121,6 @@ CFormatRegistrar::CFormatRegistrar( const Reference< XComponentContext >& rxCont
{
}
-
// this function converts all DataFlavors of the given FlavorList into
// an appropriate FORMATETC structure, for some formats like unicodetext,
// text and text/html we will offer an accompany format e.g.:
@@ -194,7 +141,6 @@ 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(
const Reference< XTransferable >& aXTransferable, CFormatEtcContainer& aFormatEtcContainer )
{
@@ -277,46 +223,26 @@ void SAL_CALL CFormatRegistrar::RegisterFormats(
}
}
-
-//
-
-
sal_Bool SAL_CALL CFormatRegistrar::hasSynthesizedLocale( ) const
{
return m_bHasSynthesizedLocale;
}
-
-//
-
-
LCID SAL_CALL CFormatRegistrar::getSynthesizedLocale( ) const
{
return m_TxtLocale;
}
-
-//
-
-
sal_uInt32 SAL_CALL CFormatRegistrar::getRegisteredTextCodePage( ) const
{
return m_TxtCodePage;
}
-
-//
-
-
DataFlavor SAL_CALL CFormatRegistrar::getRegisteredTextFlavor( ) const
{
return m_RegisteredTextFlavor;
}
-
-//
-
-
sal_Bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) const
{
return ( m_DataFormatTranslator.isOemOrAnsiTextFormat( aFormatEtc.getClipformat() ) ||
@@ -324,10 +250,6 @@ sal_Bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aF
m_DataFormatTranslator.isHTMLFormat( aFormatEtc.getClipformat() ) );
}
-
-//
-
-
inline
sal_Bool SAL_CALL CFormatRegistrar::needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) const
{
@@ -336,10 +258,6 @@ sal_Bool SAL_CALL CFormatRegistrar::needsToSynthesizeAccompanyFormats( const CFo
m_DataFormatTranslator.isTextHtmlFormat( aFormatEtc.getClipformat( ) ) );
}
-
-//
-
-
OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor& aFlavor )
{
OUString charset;
@@ -367,10 +285,6 @@ OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor&
return charset;
}
-
-//
-
-
sal_Bool SAL_CALL CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransferable >& aXTransferable ) const
{
CFormatEtc fetc( CF_UNICODETEXT );
@@ -381,20 +295,12 @@ sal_Bool SAL_CALL CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransfer
return aXTransferable->isDataFlavorSupported( aFlavor );
}
-
-//
-
-
inline
sal_Bool CFormatRegistrar::isEqualCurrentSystemCodePage( sal_uInt32 aCodePage ) const
{
return ( (aCodePage == GetOEMCP()) || (aCodePage == GetACP()) );
}
-
-//
-
-
sal_Bool SAL_CALL CFormatRegistrar::findLocaleForTextCodePage( )
{
m_TxtLocale = 0;
@@ -402,10 +308,6 @@ sal_Bool SAL_CALL CFormatRegistrar::findLocaleForTextCodePage( )
return ( IsValidLocale( m_TxtLocale, LCID_INSTALLED ) ) ? sal_True : sal_False;
}
-
-//
-
-
sal_Bool SAL_CALL CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage )
{
char buff[6];
@@ -420,30 +322,18 @@ sal_Bool SAL_CALL CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype,
return ( localeCodePage == codepage );
}
-
-//
-
-
inline
sal_Bool SAL_CALL CFormatRegistrar::isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage )
{
return isLocaleCodePage( lcid, LOCALE_IDEFAULTCODEPAGE, codepage );
}
-
-//
-
-
inline
sal_Bool SAL_CALL CFormatRegistrar::isLocaleAnsiCodePage( LCID lcid, sal_uInt32 codepage )
{
return isLocaleCodePage( lcid, LOCALE_IDEFAULTANSICODEPAGE, codepage );
}
-
-//
-
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list