summaryrefslogtreecommitdiff
path: root/embeddedobj/test
diff options
context:
space:
mode:
Diffstat (limited to 'embeddedobj/test')
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/BitmapPainter.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/EmbedContApp.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/EmbedContFrame.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/JavaWindowPeerFake.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/NativeView.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/PaintThread.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/WindowHelper.java0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/exports.dxp0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/nativeview.c72
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/Container1/nativelib/nativeview.h2
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/exports.dxp0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/register.cxx2
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/xexecutor.cxx8
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/MainThreadExecutor/xexecutor.hxx2
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/bitmapcreator.cxx8
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/bitmapcreator.hxx2
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/exports.dxp0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/mainthreadexecutor.cxx10
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/mainthreadexecutor.hxx2
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/makefile.mk0
-rwxr-xr-x[-rw-r--r--]embeddedobj/test/mtexecutor/mteregister.cxx2
24 files changed, 30 insertions, 80 deletions
diff --git a/embeddedobj/test/Container1/BitmapPainter.java b/embeddedobj/test/Container1/BitmapPainter.java
index 2910eab3f224..2910eab3f224 100644..100755
--- a/embeddedobj/test/Container1/BitmapPainter.java
+++ b/embeddedobj/test/Container1/BitmapPainter.java
diff --git a/embeddedobj/test/Container1/EmbedContApp.java b/embeddedobj/test/Container1/EmbedContApp.java
index 5fdc9f14cf63..5fdc9f14cf63 100644..100755
--- a/embeddedobj/test/Container1/EmbedContApp.java
+++ b/embeddedobj/test/Container1/EmbedContApp.java
diff --git a/embeddedobj/test/Container1/EmbedContFrame.java b/embeddedobj/test/Container1/EmbedContFrame.java
index 033b3164985e..033b3164985e 100644..100755
--- a/embeddedobj/test/Container1/EmbedContFrame.java
+++ b/embeddedobj/test/Container1/EmbedContFrame.java
diff --git a/embeddedobj/test/Container1/JavaWindowPeerFake.java b/embeddedobj/test/Container1/JavaWindowPeerFake.java
index 8764f0d8659c..8764f0d8659c 100644..100755
--- a/embeddedobj/test/Container1/JavaWindowPeerFake.java
+++ b/embeddedobj/test/Container1/JavaWindowPeerFake.java
diff --git a/embeddedobj/test/Container1/NativeView.java b/embeddedobj/test/Container1/NativeView.java
index e88e2a0ad886..e88e2a0ad886 100644..100755
--- a/embeddedobj/test/Container1/NativeView.java
+++ b/embeddedobj/test/Container1/NativeView.java
diff --git a/embeddedobj/test/Container1/PaintThread.java b/embeddedobj/test/Container1/PaintThread.java
index 7f4f871ffd71..7f4f871ffd71 100644..100755
--- a/embeddedobj/test/Container1/PaintThread.java
+++ b/embeddedobj/test/Container1/PaintThread.java
diff --git a/embeddedobj/test/Container1/WindowHelper.java b/embeddedobj/test/Container1/WindowHelper.java
index 289542b833ac..289542b833ac 100644..100755
--- a/embeddedobj/test/Container1/WindowHelper.java
+++ b/embeddedobj/test/Container1/WindowHelper.java
diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk
index e482384dd9d6..e482384dd9d6 100644..100755
--- a/embeddedobj/test/Container1/makefile.mk
+++ b/embeddedobj/test/Container1/makefile.mk
diff --git a/embeddedobj/test/Container1/nativelib/exports.dxp b/embeddedobj/test/Container1/nativelib/exports.dxp
index e03ee0d2bccd..e03ee0d2bccd 100644..100755
--- a/embeddedobj/test/Container1/nativelib/exports.dxp
+++ b/embeddedobj/test/Container1/nativelib/exports.dxp
diff --git a/embeddedobj/test/Container1/nativelib/makefile.mk b/embeddedobj/test/Container1/nativelib/makefile.mk
index 331a5b12f2e8..331a5b12f2e8 100644..100755
--- a/embeddedobj/test/Container1/nativelib/makefile.mk
+++ b/embeddedobj/test/Container1/nativelib/makefile.mk
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index 30d885d5fe42..66ae7d413318 100644..100755
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -79,10 +80,6 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
JAWT_Win32DrawingSurfaceInfo* dsi_win ;
jlong drawable;
-#if 0
- LONG hFuncPtr;
-#endif
-
/* Get the AWT */
awt.version = JAWT_VERSION_1_3;
result = JAWT_GetAWT(env, &awt);
@@ -115,72 +112,7 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
/* Free the drawing surface */
awt.FreeDrawingSurface(ds);
-#if 0
- /* Register own window procedure
- Do it one times only! Otherwhise
- multiple instances will be registered
- and calls on such construct produce
- a stack overflow.
- */
-
- if (GetProp( (HWND)drawable, OLD_PROC_KEY )==0)
- {
- hFuncPtr = SetWindowLong( (HWND)drawable, GWL_WNDPROC, (DWORD)NativeViewWndProc );
- SetProp( (HWND)drawable, OLD_PROC_KEY, (HANDLE)hFuncPtr );
- }
-#endif
-
return drawable;
}
-#if 0
-/*****************************************************************************
- *
- * Class : -
- * Method : NativeViewWndProc
- * Signature : -
- * Description: registered window handler to intercept window messages between
- * java and office process
- */
-static LRESULT APIENTRY NativeViewWndProc(
- HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
- HANDLE hFuncPtr;
-
- /* resize new created child window to fill out the java window complete */
- if (uMsg==WM_PARENTNOTIFY)
- {
- if (wParam == WM_CREATE)
- {
- RECT rect;
- HWND hChild = (HWND) lParam;
-
- GetClientRect(hWnd, &rect);
-
- SetWindowPos(hChild,
- NULL,
- rect.left,
- rect.top,
- rect.right - rect.left,
- rect.bottom - rect.top,
- SWP_NOZORDER);
- }
- }
- /* handle normal resize events */
- else if(uMsg==WM_SIZE)
- {
- WORD newHeight = HIWORD(lParam);
- WORD newWidth = LOWORD(lParam);
- HWND hChild = GetWindow(hWnd, GW_CHILD);
-
- if (hChild != NULL)
- SetWindowPos(hChild, NULL, 0, 0, newWidth, newHeight, SWP_NOZORDER);
- }
-
- /* forward request to original handler which is intercepted by this window procedure */
- hFuncPtr = GetProp(hWnd, OLD_PROC_KEY);
- MY_ASSERT(hFuncPtr,"lost original window proc handler");
- return CallWindowProc( hFuncPtr, hWnd, uMsg, wParam, lParam);
-}
-#endif
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.h b/embeddedobj/test/Container1/nativelib/nativeview.h
index b0ad4d42bc4d..d50c1855da71 100644..100755
--- a/embeddedobj/test/Container1/nativelib/nativeview.h
+++ b/embeddedobj/test/Container1/nativelib/nativeview.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,4 @@ JNIEXPORT jlong JNICALL Java_embeddedobj_test_NativeView_getNativeWindow
#endif
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/MainThreadExecutor/exports.dxp b/embeddedobj/test/MainThreadExecutor/exports.dxp
index 9630d7e06768..9630d7e06768 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/exports.dxp
+++ b/embeddedobj/test/MainThreadExecutor/exports.dxp
diff --git a/embeddedobj/test/MainThreadExecutor/makefile.mk b/embeddedobj/test/MainThreadExecutor/makefile.mk
index c94341e6047c..c94341e6047c 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/makefile.mk
+++ b/embeddedobj/test/MainThreadExecutor/makefile.mk
diff --git a/embeddedobj/test/MainThreadExecutor/register.cxx b/embeddedobj/test/MainThreadExecutor/register.cxx
index 47899348fddf..bdcb1940151e 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/register.cxx
+++ b/embeddedobj/test/MainThreadExecutor/register.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -99,3 +100,4 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
} // extern "C"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index 8395e893e5dc..4dfe59c61d0a 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -70,7 +71,7 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na
{
uno::Reference< task::XJob > xJob;
- if ( aArguments.getLength() > 0 && aArguments[0].Name.equalsAscii( "JobToExecute" ) )
+ if ( aArguments.getLength() > 0 && aArguments[0].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) )
aArguments[0].Value >>= xJob;
if ( !xJob.is() )
@@ -96,14 +97,14 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na
uno::Sequence< ::rtl::OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString::createFromAscii( "com.sun.star.comp.thread.MainThreadExecutor" );
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL UNOMainThreadExecutor::impl_staticGetImplementationName()
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.comp.thread.MainThreadExecutor" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
}
//-------------------------------------------------------------------------
@@ -140,3 +141,4 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UNOMainThreadExecutor::getSupportedSer
return impl_staticGetSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
index be377623e3b8..7bfbbfbefbf1 100644..100755
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
index f5ccb7c69d10..6327fc7b7d53 100644..100755
--- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -40,15 +41,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.BitmapCreator");
- aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.BitmapCreator");
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.BitmapCreator"));
+ aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.BitmapCreator"));
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.BitmapCreator");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.BitmapCreator"));
}
//-------------------------------------------------------------------------
@@ -121,3 +122,4 @@ uno::Sequence< ::rtl::OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceN
return impl_staticGetSupportedServiceNames();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.hxx b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
index 63af6f3e3175..207bc0977ec6 100644..100755
--- a/embeddedobj/test/mtexecutor/bitmapcreator.hxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/mtexecutor/exports.dxp b/embeddedobj/test/mtexecutor/exports.dxp
index 9630d7e06768..9630d7e06768 100644..100755
--- a/embeddedobj/test/mtexecutor/exports.dxp
+++ b/embeddedobj/test/mtexecutor/exports.dxp
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index 4a420a6f8b5f..a481aed10701 100644..100755
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,15 +39,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.thread.MainThreadExecutor");
- aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.thread.MainThreadExecutor");
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.thread.MainThreadExecutor"));
+ aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.thread.MainThreadExecutor");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.thread.MainThreadExecutor"));
}
//-------------------------------------------------------------------------
@@ -67,7 +68,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named
sal_Int32 nValuesSize = 0;
for ( sal_Int32 nInd = 0; nInd < aArguments.getLength(); nInd++ )
- if ( aArguments[nInd].Name.equalsAscii( "JobToExecute" ) )
+ if ( aArguments[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "JobToExecute" ) ) )
aArguments[nInd].Value >>= xJob;
else
{
@@ -137,3 +138,4 @@ void MainThreadExecutorRequest::doIt()
m_xJob->execute( m_aValues );
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
index ab28f5b9498f..a229666de62f 100644..100755
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -81,3 +82,4 @@ public:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/test/mtexecutor/makefile.mk b/embeddedobj/test/mtexecutor/makefile.mk
index fb6c6224b785..fb6c6224b785 100644..100755
--- a/embeddedobj/test/mtexecutor/makefile.mk
+++ b/embeddedobj/test/mtexecutor/makefile.mk
diff --git a/embeddedobj/test/mtexecutor/mteregister.cxx b/embeddedobj/test/mtexecutor/mteregister.cxx
index 9d92f68e9b20..ee9336e2b6f6 100644..100755
--- a/embeddedobj/test/mtexecutor/mteregister.cxx
+++ b/embeddedobj/test/mtexecutor/mteregister.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -121,3 +122,4 @@ sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryK
} // extern "C"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */