summaryrefslogtreecommitdiff
path: root/embeddedobj
diff options
context:
space:
mode:
authorPovilas Kanapickas <povilas.kanapickas@gmail.com>2010-10-18 19:37:48 +0100
committerMichael Meeks <michael.meeks@novell.com>2010-10-18 19:38:00 +0100
commitbc8fcf207ffeee1dd6fb4a361b0ad5c5def21beb (patch)
tree43f54910146344613e641bd0b54cee3069292624 /embeddedobj
parent34f1c06830ae530bea4f11aca91e2836a53fd764 (diff)
remove non-compiled code
Diffstat (limited to 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx3
-rw-r--r--embeddedobj/source/commonembedding/xfactory.cxx17
-rw-r--r--embeddedobj/test/Container1/nativelib/nativeview.c70
3 files changed, 0 insertions, 90 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 990a6258cc8f..48776dc36edb 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1795,14 +1795,11 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
::rtl::OUString::createFromAscii( "The object is not a valid linked object!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
-#if 0
else
{
// the current implementation of OOo links does not implement this method since it does not implement
// all the set of interfaces required for OOo embedded object ( XEmbedPersist is not supported ).
- throw io::IOException(); // TODO:
}
-#endif
if ( !xStorage.is() )
throw lang::IllegalArgumentException( ::rtl::OUString::createFromAscii( "No parent storage is provided!\n" ),
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx b/embeddedobj/source/commonembedding/xfactory.cxx
index e23a563bd061..dfa7464a3dbf 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -130,18 +130,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
}
xSubStorage = uno::Reference< embed::XStorage >();
-#if 0
- ::rtl::OUString aDocServiceName = m_aConfigHelper.GetDocumentServiceFromMediaType( aMediaType );
- if ( !aDocServiceName.getLength() )
- {
- // only own document can be based on storage
- // in case it is not possible to find related
- // document service name the storage entry is invalid
-
- throw io::IOException(); // unexpected mimetype of the storage
- }
-#endif
-
uno::Sequence< beans::NamedValue > aObject = m_aConfigHelper.GetObjectPropsByMediaType( aMediaType );
if ( !aObject.getLength() )
throw io::IOException(); // unexpected mimetype of the storage
@@ -150,11 +138,6 @@ uno::Reference< uno::XInterface > SAL_CALL OOoEmbeddedObjectFactory::createInsta
static_cast< ::cppu::OWeakObject* > ( new OCommonEmbeddedObject(
m_xFactory,
aObject ) ),
-#if 0
- GetClassIDFromServName( aDocServiceName ),
- GetClassNameFromServName( aDocServiceName ),
- aDocServiceName ) ),
-#endif
uno::UNO_QUERY );
}
else
diff --git a/embeddedobj/test/Container1/nativelib/nativeview.c b/embeddedobj/test/Container1/nativelib/nativeview.c
index 30d885d5fe42..57f7bba52843 100644
--- a/embeddedobj/test/Container1/nativelib/nativeview.c
+++ b/embeddedobj/test/Container1/nativelib/nativeview.c
@@ -79,10 +79,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 +111,6 @@ 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
-