diff options
Diffstat (limited to 'dtrans')
23 files changed, 41 insertions, 67 deletions
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx index 3edc2eca2ba1..952e4eab93a7 100644 --- a/dtrans/source/cnttype/mcnttype.cxx +++ b/dtrans/source/cnttype/mcnttype.cxx @@ -41,10 +41,11 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::container; -using namespace rtl; using namespace std; using namespace osl; +using ::rtl::OUString; + //------------------------------------------------------------------------ // constants //------------------------------------------------------------------------ diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx index dbe2ff05c79d..926e385749b8 100644 --- a/dtrans/source/generic/dtrans.cxx +++ b/dtrans/source/generic/dtrans.cxx @@ -38,7 +38,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::uno; using namespace cppu; -using namespace rtl; + +using ::rtl::OUString; extern "C" { diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx index cc8c5240d6fb..260c58f0d46f 100644 --- a/dtrans/source/os2/clipb/Os2Clipboard.cxx +++ b/dtrans/source/os2/clipb/Os2Clipboard.cxx @@ -43,9 +43,10 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uno; using namespace cppu; using namespace osl; -using namespace rtl; using namespace os2; +using ::rtl::OUString; + const Type CPPUTYPE_SEQINT8 = getCppuType( ( Sequence< sal_Int8 >* )0 ); const Type CPPUTYPE_OUSTRING = getCppuType( (OUString*)0 ); @@ -75,7 +76,6 @@ MRESULT EXPENTRY DtransObjWndProc( HWND hWnd, ULONG nMsg, MPARAM nMP1, MPARAM nM Os2Clipboard* os2Clipboard = GetWindowPtr( hWnd); if (os2Clipboard) { - //MutexGuard aGuard(os2Clipboard->m_aMutex); debug_printf("WM_DRAWCLIPBOARD os2Clipboard %08x\n", os2Clipboard); if (os2Clipboard->m_bInSetClipboardData) { @@ -228,7 +228,7 @@ void SAL_CALL Os2Clipboard::setContents( const Reference< XTransferable >& xTran } } -#if OSL_DEBUG_LEVEL>0 +#if OSL_DEBUG_LEVEL > 0 // dump list of available mimetypes Sequence< DataFlavor > aFlavors( m_aContents->getTransferDataFlavors() ); for( int i = 0; i < aFlavors.getLength(); i++ ) diff --git a/dtrans/source/os2/clipb/Os2Service.cxx b/dtrans/source/os2/clipb/Os2Service.cxx index f0b53faca876..ddbdf6ecddaa 100644 --- a/dtrans/source/os2/clipb/Os2Service.cxx +++ b/dtrans/source/os2/clipb/Os2Service.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/container/XSet.hpp> #include <osl/diagnose.h> -using namespace rtl; using namespace com::sun::star::uno; using namespace com::sun::star::registry; using namespace cppu; @@ -39,6 +38,8 @@ using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer::clipboard; using namespace os2; +using ::rtl::OUString; + namespace os2 { Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) diff --git a/dtrans/source/os2/clipb/Os2Transferable.cxx b/dtrans/source/os2/clipb/Os2Transferable.cxx index bc1840d38c0a..908a2f00ace4 100644 --- a/dtrans/source/os2/clipb/Os2Transferable.cxx +++ b/dtrans/source/os2/clipb/Os2Transferable.cxx @@ -43,9 +43,10 @@ using namespace com::sun::star::io; using namespace com::sun::star::uno; using namespace cppu; using namespace osl; -using namespace rtl; using namespace os2; +using ::rtl::OUString; + // ======================================================================= Os2Transferable::Os2Transferable( diff --git a/dtrans/source/os2/clipb/Os2Transferable.hxx b/dtrans/source/os2/clipb/Os2Transferable.hxx index fbd9e8167e7d..39126e522280 100644 --- a/dtrans/source/os2/clipb/Os2Transferable.hxx +++ b/dtrans/source/os2/clipb/Os2Transferable.hxx @@ -41,8 +41,7 @@ #define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer -#if OSL_DEBUG_LEVEL>1 -//extern "C" int debug_printf(const char *f, ...); +#if OSL_DEBUG_LEVEL > 1 #define debug_printf( ...) { 1; } #else #define debug_printf( ...) { 1; } diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx index 8b717d9a3ed0..e2755bcd8123 100644 --- a/dtrans/source/win32/clipb/WinClipbImpl.cxx +++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx @@ -56,7 +56,6 @@ // namespace directives //------------------------------------------------------------------------ -using namespace rtl; using namespace osl; using namespace std; using namespace cppu; @@ -66,6 +65,8 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::datatransfer::clipboard::RenderingCapabilities; +using ::rtl::OUString; + //------------------------------------------------------------------------ // deklarations //------------------------------------------------------------------------ diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx index 0ade8dcad446..76cf9bc2711b 100644 --- a/dtrans/source/win32/clipb/WinClipboard.cxx +++ b/dtrans/source/win32/clipb/WinClipboard.cxx @@ -43,7 +43,6 @@ // namespace directives //------------------------------------------------------------------------ -using namespace rtl; using namespace osl; using namespace std; using namespace cppu; @@ -53,6 +52,8 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::lang; +using ::rtl::OUString; + //------------------------------------------------------------------------ // defines //------------------------------------------------------------------------ diff --git a/dtrans/source/win32/dnd/makefile.mk b/dtrans/source/win32/dnd/makefile.mk index 54fd748a0889..4dda72007d15 100644 --- a/dtrans/source/win32/dnd/makefile.mk +++ b/dtrans/source/win32/dnd/makefile.mk @@ -44,13 +44,6 @@ stoponerror=tr # ------------------------------------------------------------------ -#CFLAGS+=-GR -DUNICODE -D_UNICODE - -#DBG_CONSOLE_OUT: when IDropTarget or IDropSource are called we write to a console -#DBG_CLIPBOARD_DATA: To provide DoDragDrop with an data object we call OleGetClipboard -#CFLAGS+= -DDBG_CONSOLE_OUT -DDBG_CLIPBOARD_DATA - - SLOFILES= $(SLO)$/dndentry.obj \ $(SLO)$/target.obj \ $(SLO)$/idroptarget.obj \ diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx index 7d714aed4a33..6e1f9f5b1bb5 100644 --- a/dtrans/source/win32/dnd/source.cxx +++ b/dtrans/source/win32/dnd/source.cxx @@ -50,7 +50,6 @@ #define __uuidof(I) IID_##I #endif -using namespace rtl; using namespace cppu; using namespace osl; using namespace com::sun::star::datatransfer; @@ -61,6 +60,8 @@ using namespace com::sun::star::awt::MouseButton; using namespace com::sun::star::awt; using namespace com::sun::star::lang; +using ::rtl::OUString; + extern rtl_StandardModuleCount g_moduleCount; //--> TRA diff --git a/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx index feef33a18add..4efa573e0e25 100644 --- a/dtrans/source/win32/dnd/source.hxx +++ b/dtrans/source/win32/dnd/source.hxx @@ -45,10 +45,10 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace cppu; using namespace osl; -using namespace rtl; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; +using ::rtl::OUString; class SourceContext; diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx index 1f67d3cb92e1..b501f7454bd4 100644 --- a/dtrans/source/win32/dnd/target.cxx +++ b/dtrans/source/win32/dnd/target.cxx @@ -39,13 +39,14 @@ #include "targetdropcontext.hxx" #include "targetdragcontext.hxx" #include <rtl/ustring.h> -using namespace rtl; using namespace cppu; using namespace osl; using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; +using ::rtl::OUString; + #define WM_REGISTERDRAGDROP WM_USER + 1 #define WM_REVOKEDRAGDROP WM_USER + 2 //--> TRA diff --git a/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx index e85bd89f2fb0..375dfbc018bf 100644 --- a/dtrans/source/win32/dnd/target.hxx +++ b/dtrans/source/win32/dnd/target.hxx @@ -52,10 +52,11 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace cppu; using namespace osl; -using namespace rtl; using namespace ::com::sun::star::datatransfer; using namespace ::com::sun::star::datatransfer::dnd; +using ::rtl::OUString; + // The client // has to call XComponent::dispose. The thread that calls initialize diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx index 11d963da3093..a8360095683b 100644 --- a/dtrans/source/win32/dtobj/DOTransferable.cxx +++ b/dtrans/source/win32/dtobj/DOTransferable.cxx @@ -58,7 +58,6 @@ // namespace directives //------------------------------------------------------------------------ -using namespace rtl; using namespace std; using namespace osl; using namespace cppu; @@ -68,6 +67,8 @@ using namespace com::sun::star::io; using namespace com::sun::star::lang; using namespace com::sun::star::container; +using ::rtl::OUString; + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index 48b4328113cd..c3171c91d0ee 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -61,12 +61,13 @@ // namespace directives //------------------------------------------------------------------------ -using namespace rtl; using namespace std; using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer; using namespace com::sun::star::lang; +using ::rtl::OUString; + //------------------------------------------------------------------------ // const //------------------------------------------------------------------------ diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx index 3f7be8b53f2b..b7e556445fdb 100644 --- a/dtrans/source/win32/dtobj/FetcList.cxx +++ b/dtrans/source/win32/dtobj/FetcList.cxx @@ -54,9 +54,10 @@ 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 rtl; using namespace std; +using ::rtl::OUString; + //------------------------------------------------------------------------ // //------------------------------------------------------------------------ diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index f2e1fd579f8e..514669cfe15c 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -64,7 +64,8 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::datatransfer::clipboard; using namespace com::sun::star::uno; using namespace com::sun::star::lang; -using namespace rtl; + +using ::rtl::OUString; //------------------------------------------------------------------------ // a helper class that will be thrown by the function validateFormatEtc diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index ffa0a9a43e56..ca2d29448d7d 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -69,7 +69,7 @@ const com::sun::star::uno::Type CppuType_String = ::getCppuType((const ::r // namespace directives //------------------------------------------------------------------------ -using namespace rtl; +using ::rtl::OUString; using namespace osl; using namespace cppu; using namespace std; diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk index be85525016c9..7432d2512df2 100644 --- a/dtrans/source/win32/workbench/makefile.mk +++ b/dtrans/source/win32/workbench/makefile.mk @@ -41,7 +41,6 @@ stoponerror=tr .ENDIF # --- Settings ----------------------------------------------------- -#.INCLUDE : $(PRJ)$/util$/makefile.pmk .INCLUDE : settings.mk @@ -54,8 +53,7 @@ CFLAGS+=-D_WIN32_DCOM -EHsc -Ob0 OBJFILES= $(OBJ)$/test_wincb.obj APP1TARGET= $(TARGET) APP1OBJS= $(OBJ)$/test_wincb.obj - - + APP1STDLIBS= $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ @@ -65,7 +63,6 @@ APP1STDLIBS= $(SALLIB) \ $(COMDLG32LIB) APP1LIBS= $(SLB)$/dtutils.lib - APP1NOSAL= TRUE @@ -86,11 +83,9 @@ APP1STDLIBS= $(SALLIB)\ $(OLEAUT32LIB) APP1LIBS= - APP1NOSAL= TRUE .ENDIF # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -#.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx index 82f0b9d4f45e..2295a7ddf2e5 100644 --- a/dtrans/test/win32/dnd/atlwindow.cxx +++ b/dtrans/test/win32/dnd/atlwindow.cxx @@ -48,9 +48,10 @@ using namespace com::sun::star::lang; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace cppu; -using namespace rtl; using namespace std; +using ::rtl::OUString; + LRESULT APIENTRY EditSubclassProc( HWND hwnd, UINT uMsg,WPARAM wParam, LPARAM lParam) ; diff --git a/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx index 34080fb46efe..511a66cdf8a5 100644 --- a/dtrans/test/win32/dnd/dndTest.cxx +++ b/dtrans/test/win32/dnd/dndTest.cxx @@ -62,22 +62,16 @@ using namespace com::sun::star::datatransfer; using namespace com::sun::star::uno; using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; -using namespace rtl; -// defined in atlwindow.hxx -// #define WM_SOURCE_INIT WM_APP+100 -// #define WM_SOURCE_STARTDRAG WM_APP+101 +using ::rtl::OUString; + #define WM_CREATE_MTA_WND HRESULT doTest(); DWORD WINAPI MTAFunc( void* threadData); Reference< XMultiServiceFactory > MultiServiceFactory; -//int APIENTRY WinMain(HINSTANCE hInstance, -// HINSTANCE hPrevInstance, -// LPSTR lpCmdLine, -// int nCmdShow) -//int _tmain( int argc, TCHAR *argv[ ], TCHAR *envp[ ] ) + int main( int argc, char *argv[ ], char *envp[ ] ) { HRESULT hr; @@ -93,8 +87,6 @@ int main( int argc, char *argv[ ], char *envp[ ] ) if( FAILED(hr=doTest())) { _com_error err( hr); - const TCHAR * errMsg= err.ErrorMessage(); -// MessageBox( NULL, errMsg, "Test failed", MB_ICONERROR); } @@ -160,8 +152,7 @@ DWORD WINAPI MTAFunc( void* threadData) RECT pos={0, 406, 300, 605}; AWindow win(_T("DnD, full MTA"), GetCurrentThreadId(), pos, false, true); -// ThreadData data= *( ThreadData*)pParams; -// SetEvent(data.evtThreadReady); + while( GetMessage(&msg, (HWND)NULL, 0, 0) ) { switch( msg.message) diff --git a/dtrans/test/win32/dnd/makefile.mk b/dtrans/test/win32/dnd/makefile.mk index 3744e6135806..93ac89b0d35c 100644 --- a/dtrans/test/win32/dnd/makefile.mk +++ b/dtrans/test/win32/dnd/makefile.mk @@ -32,7 +32,6 @@ TARGET=dndTest TARGETTYPE=CUI LIBTARGET=NO -#USE_DEFFILE= TRUE ENABLE_EXCEPTIONS=TRUE # --- Settings --- @@ -41,7 +40,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files --- -# CFLAGS+=-GR -DUNICODE -D_UNICODE CFLAGS+= -D_WIN32_DCOM INCPRE+= -I$(ATL_INCLUDE) @@ -73,8 +71,6 @@ APP1LIBS= \ $(SLB)$/dtobjfact.lib \ $(SLB)$/dtutils.lib -# $(SOLARLIBDIR)$/imtaolecb.lib\ - APP1DEF= $(MISC)\$(APP1TARGET).def # --- Targets --- diff --git a/dtrans/test/win32/dnd/targetlistener.cxx b/dtrans/test/win32/dnd/targetlistener.cxx index ecc70e472916..1a1339833cc1 100644 --- a/dtrans/test/win32/dnd/targetlistener.cxx +++ b/dtrans/test/win32/dnd/targetlistener.cxx @@ -29,15 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dtrans.hxx" - #include "targetlistener.hxx" #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> -//using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd::DNDConstants; using namespace com::sun::star::datatransfer; -using namespace rtl; + +using ::rtl::OUString; DropTargetListener::DropTargetListener(HWND hEdit):m_hEdit( hEdit) { @@ -52,21 +51,11 @@ void SAL_CALL DropTargetListener::disposing( const EventObject& Source ) } - - void SAL_CALL DropTargetListener::drop( const DropTargetDropEvent& e ) throw(RuntimeException) { -// e.Context->dropComplete( sal_True); -// e.Context->acceptDrop( ACTION_COPY); e.Context->rejectDrop(); - // if the Transferable contains text, then we send it to the edit window -// Sequence<DataFlavor> flavors= e.Transferable->getTransferDataFlavors(); -// DataFlavor aFlavor; -// for( int i=0; i < flavors.getLength(); i++) -// aFlavor= flavors[4]; - DataFlavor flavor( OUString(OUString(RTL_CONSTASCII_USTRINGPARAM("text/plain;charset=windows-1252"))), OUString(L"Text plain"), getCppuType( ( Sequence<sal_Int8>*)0 ) ); @@ -81,9 +70,6 @@ void SAL_CALL DropTargetListener::dragEnter( const DropTargetDragEnterEvent& dtd //If one drags something that is not moveable if( !(dtde.SourceActions & dtde.DropAction) ) dtde.Context->acceptDrag( ACTION_COPY); - -// dtde.Context->rejectDrag( ); - } void SAL_CALL DropTargetListener::dragExit( const DropTargetEvent& dte ) |