android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
| 16 +
android/experimental/DocumentLoader/Makefile
| 1
android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
| 82 +++++++---
android/qa/desktop/Makefile
| 6
framework/source/dispatch/interceptionhelper.cxx
| 24 --
framework/source/dispatch/loaddispatcher.cxx
| 38 ----
framework/source/loadenv/targethelper.cxx
| 6
framework/source/services/modulemanager.cxx
| 57 ------
sal/android/lo-bootstrap.c
| 19 ++
vcl/source/window/wrkwin.cxx
| 10 +
10 files changed, 107 insertions(+), 152 deletions(-)
New commits:
commit 0453a1244a3966cef1497b4a0931d1e8279e2822
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed May 30 00:01:21 2012 +0300
Better comment for how to use lo-strace
Change-Id: I29afe81866229bd29fcd997624264fb337c74d95
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index d38b413..2f7cbd0 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -254,7 +254,7 @@ uninstall:
run:
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP)
-# add -e lo-strace yes # if you want that
+# add -e lo-strace "-f -o /somewhere/the/app/can/write.log" if you want
# If you reinstall an app several times, even if you uninstall it
# between, disk space seems to leak that won't get recycled until you
commit 9faf21d484c8d9b5d30ca65d1aefdbaf101f6b22
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed May 30 00:00:33 2012 +0300
No cmdline file is created so don't use lo-main-indirect-cmdline then
Change-Id: Ifac7e34b34fcf32fb2a0f117e8b8ad5ab1003fc9
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 2253ed6..d38b413 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -253,9 +253,7 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
run:
-# echo "file:///assets/demo/writer.odt" > cmdline
-# $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-indirect-cmdline
"$(APP_DATA_PATH)/cmdline"
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP)
# add -e lo-strace yes # if you want that
# If you reinstall an app several times, even if you uninstall it
commit e28ad1b5d8258df9d4014692867d6c6ee0612047
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue May 29 23:59:03 2012 +0300
More experimentation
Change-Id: I8ad45f173c4f2b37aca6506d9021e8346c17db16
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 3774680..1e9cebc 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -53,6 +53,7 @@ copy-stuff:
basegfxlo \
bootstrap.uno \
comphelpgcc3 \
+ ctllo \
datelo \
dbaxmllo \
dbtoolslo \
diff --git
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 975cd05..5a45406 100644
---
a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -41,6 +41,29 @@ public class DocumentLoader
private static String TAG = "DocumentLoader";
+ static void dump(String objectName, Object object)
+ {
+ Log.i(TAG, objectName + " is " + (object != null ? object.toString() :
"null"));
+
+ if (object == null)
+ return;
+
+ com.sun.star.lang.XTypeProvider typeProvider =
(com.sun.star.lang.XTypeProvider)
+ UnoRuntime.queryInterface(com.sun.star.lang.XTypeProvider.class,
object);
+
+ Log.i(TAG, "typeProvider is " + (typeProvider != null ?
typeProvider.toString() : "null"));
+
+ if (typeProvider == null)
+ return;
+
+ com.sun.star.uno.Type[] types = typeProvider.getTypes();
+ if (types == null)
+ return;
+
+ for (com.sun.star.uno.Type t : types)
+ Log.i(TAG, " " + t.getTypeName());
+ }
+
@Override
public void onCreate(Bundle savedInstanceState)
{
@@ -88,17 +111,15 @@ public class DocumentLoader
Bootstrap.initVCL();
- Object oDesktop = xMCF.createInstanceWithContext(
- "com.sun.star.frame.Desktop", xContext);
+ Object oDesktop = xMCF.createInstanceWithContext
+ ("com.sun.star.frame.Desktop", xContext);
Log.i(TAG, "oDesktop is" + (oDesktop!=null ? " not" : "") + "
null");
Bootstrap.initUCBHelper();
- com.sun.star.frame.XComponentLoader xCompLoader =
- (com.sun.star.frame.XComponentLoader)
- UnoRuntime.queryInterface(
- com.sun.star.frame.XComponentLoader.class, oDesktop);
+ com.sun.star.frame.XComponentLoader xCompLoader =
(com.sun.star.frame.XComponentLoader)
+
UnoRuntime.queryInterface(com.sun.star.frame.XComponentLoader.class, oDesktop);
Log.i(TAG, "xCompLoader is" + (xCompLoader!=null ? " not" : "") +
" null");
@@ -121,22 +142,39 @@ public class DocumentLoader
Object oDoc =
xCompLoader.loadComponentFromURL
(sUrl, "_blank", 0, loadProps);
- Log.i(TAG, "oDoc is " + (oDoc!=null ? oDoc.toString() :
"null"));
-
- com.sun.star.lang.XTypeProvider typeProvider =
(com.sun.star.lang.XTypeProvider)
UnoRuntime.queryInterface(com.sun.star.lang.XTypeProvider.class, oDoc);
- Log.i(TAG, "typeProvider is " + (typeProvider!=null ?
typeProvider.toString() : "null"));
-
- if (typeProvider != null) {
- com.sun.star.uno.Type[] types = typeProvider.getTypes();
- if (types != null) {
- for (com.sun.star.uno.Type t : types) {
- Log.i(TAG, " " + t.getTypeName());
- }
- }
- }
-
- com.sun.star.view.XRenderable renderBabe =
(com.sun.star.view.XRenderable)
UnoRuntime.queryInterface(com.sun.star.view.XRenderable.class, oDoc);
- Log.i(TAG, "renderBabe is " + (renderBabe!=null ?
renderBabe.toString() : "null"));
+
+ dump("oDoc", oDoc);
+
+ // Test stuff, try creating various services, see what types
+ // they offer, stuff that is hard to find out by reading
+ // nonexistent useful documentation.
+
+ Log.i(TAG, "Attempting to load private:factory/swriter");
+
+ Object swriter =
+ xCompLoader.loadComponentFromURL
+ ("private:factory/swriter", "_blank", 0, loadProps);
+
+ dump("swriter", swriter);
+
+ Object frameControl = xMCF.createInstanceWithContext
+ ("com.sun.star.frame.FrameControl", xContext);
+
+ dump("frameControl", frameControl);
+
+ com.sun.star.awt.XControl control = (com.sun.star.awt.XControl)
+ UnoRuntime.queryInterface(com.sun.star.awt.XControl.class,
frameControl);
+
+ Object toolkit = xMCF.createInstanceWithContext
+ ("com.sun.star.awt.Toolkit", xContext);
+
+ dump("toolkit", toolkit);
+
+ // I guess the XRenderable thing might be what we want to use,
+ // having the code pretend it is printing?
+
+ com.sun.star.view.XRenderable renderBabe =
(com.sun.star.view.XRenderable)
+
UnoRuntime.queryInterface(com.sun.star.view.XRenderable.class, oDoc);
com.sun.star.beans.PropertyValue renderProps[] =
new com.sun.star.beans.PropertyValue[1];
commit c9f5b8a33434266c025d546eeb4c11f49fad8570
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue May 29 23:57:58 2012 +0300
Add temporary test JNI method createWindowFoo()...
Change-Id: I8f99399faa3b0762bdea2aac09f1b849639cd191
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index a799f44..25fded8 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -97,10 +97,13 @@ public class Bootstrap extends NativeActivity
// where the lo-bootstrap library is.
public static native void setCommandArgs(String[] argv);
- // A wrapper for InitUCBHelper() in he ucbhelper library
+ // A wrapper for InitUCBHelper() in the ucbhelper library
// (contentbroker.cxx), also this called indirectly through the
lo-bootstrap library
public static native void initUCBHelper();
+ // A wrapper for createWindowFoo() in the vcl library
+ public static native int createWindowFoo();
+
// A method that starts a thread to redirect stdout and stderr writes to
// the Android logging mechanism, or stops the redirection.
public static native boolean redirect_stdio(boolean state);
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index a180e62..9adadef 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1633,6 +1633,25 @@
Java_org_libreoffice_android_Bootstrap_initUCBHelper(JNIEnv* env,
(*InitUCBHelper)();
}
+__attribute__ ((visibility("default")))
+jint
+Java_org_libreoffice_android_Bootstrap_createWindowFoo(JNIEnv* env,
+ jobject clazz)
+{
+ int (*createWindowFoo)(void);
+ (void) env;
+ (void) clazz;
+
+ lo_dlopen("libvcllo.so");
+ createWindowFoo = dlsym(RTLD_DEFAULT, "createWindowFoo");
+ if (createWindowFoo == NULL) {
+ LOGE("createWindowFoo: createWindowFoo not found");
+ return 0;
+ }
+ return (*createWindowFoo)();
+}
+
+
/* Code for reading lines from the pipe based on the (Apache-licensed) Android
* logwrapper.c
*/
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 6438145..a4f79d2 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -107,6 +107,16 @@ WorkWindow::WorkWindow( WindowType nType ) :
ImplInitWorkWindowData();
}
+#ifdef ANDROID
+
+extern "C" void *
+createWindowFoo(void)
+{
+ return (void*) new WorkWindow((Window *)NULL);
+}
+
+#endif
+
// -----------------------------------------------------------------------
WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) :
commit a9a0ed1edc6452560a6e8985f5a33f09859af977
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue May 29 16:24:58 2012 +0300
Bin a bunch of pointless comments
Change-Id: Ic428010ce8c07a1265fef6f0fcfa594501cb9267
diff --git a/framework/source/dispatch/interceptionhelper.cxx
b/framework/source/dispatch/interceptionhelper.cxx
index 61beec7..61523cf 100644
--- a/framework/source/dispatch/interceptionhelper.cxx
+++ b/framework/source/dispatch/interceptionhelper.cxx
@@ -56,18 +56,12 @@ sal_Bool InterceptionHelper::m_bPreferrFirstInterceptor =
sal_True;
//_______________________________________________
// declarations
-/*-----------------------------------------------------------------------------
- 31.03.2003 09:02
------------------------------------------------------------------------------*/
DEFINE_XINTERFACE_3(InterceptionHelper
,
OWeakObject
,
DIRECT_INTERFACE(css::frame::XDispatchProvider
),
DIRECT_INTERFACE(css::frame::XDispatchProviderInterception),
DIRECT_INTERFACE(css::lang::XEventListener
))
-/*-----------------------------------------------------------------------------
- 31.03.2003 09:02
------------------------------------------------------------------------------*/
InterceptionHelper::InterceptionHelper(const css::uno::Reference<
css::frame::XFrame >& xOwner,
const css::uno::Reference<
css::frame::XDispatchProvider >& xSlave)
// Init baseclasses first
@@ -79,16 +73,10 @@ InterceptionHelper::InterceptionHelper(const
css::uno::Reference< css::frame::XF
{
}
-/*-----------------------------------------------------------------------------
- 31.03.2003 09:02
------------------------------------------------------------------------------*/
InterceptionHelper::~InterceptionHelper()
{
}
-/*-----------------------------------------------------------------------------
- 31.03.2003 09:09
------------------------------------------------------------------------------*/
css::uno::Reference< css::frame::XDispatch > SAL_CALL
InterceptionHelper::queryDispatch(const css::util::URL& aURL ,
const ::rtl::OUString& sTargetFrameName,
sal_Int32 nSearchFlags )
@@ -130,9 +118,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL
InterceptionHelper::queryD
return xReturn;
}
-/*-----------------------------------------------------------------------------
- 31.03.2003 07:58
------------------------------------------------------------------------------*/
css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
InterceptionHelper::queryDispatches( const css::uno::Sequence<
css::frame::DispatchDescriptor >& lDescriptor )
throw(css::uno::RuntimeException)
{
@@ -147,9 +132,6 @@ css::uno::Sequence< css::uno::Reference<
css::frame::XDispatch > > SAL_CALL Inte
return lDispatches;
}
-/*-----------------------------------------------------------------------------
- 31.03.2003 10:20
------------------------------------------------------------------------------*/
void SAL_CALL InterceptionHelper::registerDispatchProviderInterceptor(const
css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
throw(css::uno::RuntimeException)
{
@@ -230,9 +212,6 @@ void SAL_CALL
InterceptionHelper::registerDispatchProviderInterceptor(const css:
xOwner->contextChanged();
}
-/*-----------------------------------------------------------------------------
- 31.03.2003 10:27
------------------------------------------------------------------------------*/
void SAL_CALL InterceptionHelper::releaseDispatchProviderInterceptor(const
css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
throw(css::uno::RuntimeException)
{
@@ -280,9 +259,6 @@ void SAL_CALL
InterceptionHelper::releaseDispatchProviderInterceptor(const css::
xOwner->contextChanged();
}
-/*-----------------------------------------------------------------------------
- 31.03.2003 10:31
------------------------------------------------------------------------------*/
#define FORCE_DESTRUCTION_OF_INTERCEPTION_CHAIN
void SAL_CALL InterceptionHelper::disposing(const css::lang::EventObject&
aEvent)
throw(css::uno::RuntimeException)
diff --git a/framework/source/dispatch/loaddispatcher.cxx
b/framework/source/dispatch/loaddispatcher.cxx
index d512b19..9efdee3 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -26,33 +26,16 @@
*
************************************************************************/
-
-//_______________________________________________
-// my own includes
#include <dispatch/loaddispatcher.hxx>
#include <threadhelp/readguard.hxx>
#include <threadhelp/writeguard.hxx>
-//_______________________________________________
-// interface includes
#include <com/sun/star/frame/DispatchResultState.hpp>
-//_______________________________________________
-// includes of other projects
-
-//_______________________________________________
-// namespace
-
namespace framework{
namespace css = ::com::sun::star;
-//_______________________________________________
-// declarations
-
-/*-----------------------------------------------
- 20.08.2003 09:52
------------------------------------------------*/
LoadDispatcher::LoadDispatcher(const css::uno::Reference<
css::lang::XMultiServiceFactory >& xSMGR ,
const css::uno::Reference< css::frame::XFrame
>& xOwnerFrame ,
const ::rtl::OUString
sTargetName ,
@@ -66,17 +49,11 @@ LoadDispatcher::LoadDispatcher(const css::uno::Reference<
css::lang::XMultiServi
{
}
-/*-----------------------------------------------
- 20.08.2003 09:12
------------------------------------------------*/
LoadDispatcher::~LoadDispatcher()
{
m_xSMGR.clear();
}
-/*-----------------------------------------------
- 20.08.2003 09:58
------------------------------------------------*/
void SAL_CALL LoadDispatcher::dispatchWithNotification(const css::util::URL&
aURL ,
const
css::uno::Sequence< css::beans::PropertyValue >& lArguments,
const
css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
@@ -85,9 +62,6 @@ void SAL_CALL LoadDispatcher::dispatchWithNotification(const
css::util::URL&
impl_dispatch( aURL, lArguments, xListener );
}
-/*-----------------------------------------------
- 20.08.2003 09:16
------------------------------------------------*/
void SAL_CALL LoadDispatcher::dispatch(const css::util::URL&
aURL ,
const css::uno::Sequence<
css::beans::PropertyValue >& lArguments)
throw(css::uno::RuntimeException)
@@ -95,9 +69,6 @@ void SAL_CALL LoadDispatcher::dispatch(const css::util::URL&
impl_dispatch( aURL, lArguments, css::uno::Reference<
css::frame::XDispatchResultListener >() );
}
-/*-----------------------------------------------
- 14.04.2008
------------------------------------------------*/
css::uno::Any SAL_CALL LoadDispatcher::dispatchWithReturnValue( const
css::util::URL& rURL,
const
css::uno::Sequence< css::beans::PropertyValue >& lArguments )
throw( css::uno::RuntimeException )
@@ -105,27 +76,18 @@ css::uno::Any SAL_CALL
LoadDispatcher::dispatchWithReturnValue( const css::util:
return impl_dispatch( rURL, lArguments, css::uno::Reference<
css::frame::XDispatchResultListener >());
}
-/*-----------------------------------------------
- 20.08.2003 10:48
------------------------------------------------*/
void SAL_CALL LoadDispatcher::addStatusListener(const css::uno::Reference<
css::frame::XStatusListener >& /*xListener*/,
const css::util::URL&
/*aURL*/ )
throw(css::uno::RuntimeException)
{
}
-/*-----------------------------------------------
- 20.08.2003 10:49
------------------------------------------------*/
void SAL_CALL LoadDispatcher::removeStatusListener(const css::uno::Reference<
css::frame::XStatusListener >& /*xListener*/,
const css::util::URL&
/*aURL*/ )
throw(css::uno::RuntimeException)
{
}
-/*-----------------------------------------------
- 20.08.2003 09:58
------------------------------------------------*/
css::uno::Any LoadDispatcher::impl_dispatch( const css::util::URL& rURL,
const css::uno::Sequence<
css::beans::PropertyValue >& lArguments,
const css::uno::Reference<
css::frame::XDispatchResultListener >& xListener )
diff --git a/framework/source/loadenv/targethelper.cxx
b/framework/source/loadenv/targethelper.cxx
index 95f5151..27e354f 100644
--- a/framework/source/loadenv/targethelper.cxx
+++ b/framework/source/loadenv/targethelper.cxx
@@ -30,9 +30,6 @@
namespace framework{
-/*-----------------------------------------------
- 05.08.2003 09:08
------------------------------------------------*/
sal_Bool TargetHelper::matchSpecialTarget(const ::rtl::OUString& sCheckTarget
,
ESpecialTarget
eSpecialTarget)
{
@@ -69,9 +66,6 @@ sal_Bool TargetHelper::matchSpecialTarget(const
::rtl::OUString& sCheckTarget ,
}
}
-/*-----------------------------------------------
- 05.08.2003 09:17
------------------------------------------------*/
sal_Bool TargetHelper::isValidNameForFrame(const ::rtl::OUString& sName)
{
// some special targets are realy special ones :-)
diff --git a/framework/source/services/modulemanager.cxx
b/framework/source/services/modulemanager.cxx
index fd358bf..e412d82 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -30,14 +30,10 @@
#include "services/modulemanager.hxx"
#include "services/frame.hxx"
-//_______________________________________________
-// own includes
#include <threadhelp/readguard.hxx>
#include <threadhelp/writeguard.hxx>
#include <services.h>
-//_______________________________________________
-// interface includes
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -47,8 +43,6 @@
#include <comphelper/sequenceasvector.hxx>
#include <comphelper/enumhelper.hxx>
-//_______________________________________________
-// other includes
#include <rtl/logfile.hxx>
namespace framework
@@ -57,9 +51,6 @@ namespace framework
static const char CFGPATH_FACTORIES[] =
"/org.openoffice.Setup/Office/Factories";
static const char MODULEPROP_IDENTIFIER[] = "ooSetupFactoryModuleIdentifier";
-/*-----------------------------------------------
- 04.12.2003 09:32
------------------------------------------------*/
DEFINE_XINTERFACE_7(ModuleManager ,
OWeakObject ,
DIRECT_INTERFACE(css::lang::XTypeProvider ),
@@ -70,9 +61,6 @@ DEFINE_XINTERFACE_7(ModuleManager
,
DIRECT_INTERFACE(css::container::XContainerQuery),
DIRECT_INTERFACE(css::frame::XModuleManager ))
-/*-----------------------------------------------
- 04.12.2003 09:32
------------------------------------------------*/
DEFINE_XTYPEPROVIDER_7(ModuleManager ,
css::lang::XTypeProvider ,
css::lang::XServiceInfo ,
@@ -82,17 +70,11 @@ DEFINE_XTYPEPROVIDER_7(ModuleManager ,
css::container::XContainerQuery,
css::frame::XModuleManager )
-/*-----------------------------------------------
- 04.12.2003 09:35
------------------------------------------------*/
DEFINE_XSERVICEINFO_ONEINSTANCESERVICE(ModuleManager ,
::cppu::OWeakObject ,
SERVICENAME_MODULEMANAGER ,
IMPLEMENTATIONNAME_MODULEMANAGER)
-/*-----------------------------------------------
- 04.12.2003 09:35
------------------------------------------------*/
DEFINE_INIT_SERVICE(
ModuleManager,
{
@@ -104,27 +86,18 @@ DEFINE_INIT_SERVICE(
}
)
-/*-----------------------------------------------
- 04.12.2003 09:30
------------------------------------------------*/
ModuleManager::ModuleManager(const css::uno::Reference<
css::lang::XMultiServiceFactory >& xSMGR)
: ThreadHelpBase( )
, m_xSMGR (xSMGR)
{
}
-/*-----------------------------------------------
- 10.12.2003 11:59
------------------------------------------------*/
ModuleManager::~ModuleManager()
{
if (m_xCFG.is())
m_xCFG.clear();
}
-/*-----------------------------------------------
- 10.12.2003 11:02
------------------------------------------------*/
::rtl::OUString SAL_CALL ModuleManager::identify(const css::uno::Reference<
css::uno::XInterface >& xModule)
throw(css::lang::IllegalArgumentException,
css::frame::UnknownModuleException,
@@ -180,9 +153,6 @@ ModuleManager::~ModuleManager()
return sModule;
}
-/*-----------------------------------------------
- 08.03.2007 09:55
------------------------------------------------*/
void SAL_CALL ModuleManager::replaceByName(const ::rtl::OUString& sName ,
const css::uno::Any& aValue)
throw (css::lang::IllegalArgumentException ,
@@ -241,9 +211,6 @@ void SAL_CALL ModuleManager::replaceByName(const
::rtl::OUString& sName ,
::comphelper::ConfigurationHelper::flush(xCfg);
}
-/*-----------------------------------------------
- 10.12.2003 12:05
------------------------------------------------*/
css::uno::Any SAL_CALL ModuleManager::getByName(const ::rtl::OUString& sName)
throw(css::container::NoSuchElementException,
css::lang::WrappedTargetException ,
@@ -276,9 +243,6 @@ css::uno::Any SAL_CALL ModuleManager::getByName(const
::rtl::OUString& sName)
return css::uno::makeAny(lProps.getAsConstPropertyValueList());
}
-/*-----------------------------------------------
- 10.12.2003 11:58
------------------------------------------------*/
css::uno::Sequence< ::rtl::OUString > SAL_CALL ModuleManager::getElementNames()
throw(css::uno::RuntimeException)
{
@@ -286,9 +250,6 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL
ModuleManager::getElementNames()
return xCFG->getElementNames();
}
-/*-----------------------------------------------
- 10.12.2003 11:57
------------------------------------------------*/
sal_Bool SAL_CALL ModuleManager::hasByName(const ::rtl::OUString& sName)
throw(css::uno::RuntimeException)
{
@@ -296,18 +257,12 @@ sal_Bool SAL_CALL ModuleManager::hasByName(const
::rtl::OUString& sName)
return xCFG->hasByName(sName);
}
-/*-----------------------------------------------
- 10.12.2003 11:35
------------------------------------------------*/
css::uno::Type SAL_CALL ModuleManager::getElementType()
throw(css::uno::RuntimeException)
{
return ::getCppuType((const css::uno::Sequence< css::beans::PropertyValue
>*)0);
}
-/*-----------------------------------------------
- 10.12.2003 11:56
------------------------------------------------*/
sal_Bool SAL_CALL ModuleManager::hasElements()
throw(css::uno::RuntimeException)
{
@@ -315,18 +270,12 @@ sal_Bool SAL_CALL ModuleManager::hasElements()
return xCFG->hasElements();
}
-/*-----------------------------------------------
- 07.03.2007 12:55
------------------------------------------------*/
css::uno::Reference< css::container::XEnumeration > SAL_CALL
ModuleManager::createSubSetEnumerationByQuery(const ::rtl::OUString&)
throw(css::uno::RuntimeException)
{
return css::uno::Reference< css::container::XEnumeration >();
}
-/*-----------------------------------------------
- 07.03.2007 12:55
------------------------------------------------*/
css::uno::Reference< css::container::XEnumeration > SAL_CALL
ModuleManager::createSubSetEnumerationByProperties(const css::uno::Sequence<
css::beans::NamedValue >& lProperties)
throw(css::uno::RuntimeException)
{
@@ -356,9 +305,6 @@ css::uno::Reference< css::container::XEnumeration >
SAL_CALL ModuleManager::crea
return xEnum;
}
-/*-----------------------------------------------
- 14.12.2003 09:45
------------------------------------------------*/
css::uno::Reference< css::container::XNameAccess >
ModuleManager::implts_getConfig()
throw(css::uno::RuntimeException)
{
@@ -394,9 +340,6 @@ css::uno::Reference< css::container::XNameAccess >
ModuleManager::implts_getConf
// <- SAFE ----------------------------------
}
-/*-----------------------------------------------
- 30.01.2004 07:54
------------------------------------------------*/
::rtl::OUString ModuleManager::implts_identify(const css::uno::Reference<
css::uno::XInterface >& xComponent)
{
// Search for an optional (!) interface XModule first.
commit 7309b1c1dccbccc823943b21900889cde9ef1106
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Tue May 29 16:07:27 2012 +0300
Add an "extra" called lo-extra-libs for a list of libs to load early
Change-Id: I41900eca9a46acbd2f1dfac98fcfc73a62acc150
diff --git a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
index da764ab..a799f44 100644
--- a/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
+++ b/android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
@@ -220,6 +220,17 @@ public class Bootstrap extends NativeActivity
return;
}
+ // Get extra libraries to load early, so that it's easier to debug
+ // them even with a buggy ndk-gdb that doesn't grok debugging
+ // information from libraries loaded after it has been attached to the
+ // process.
+ String extraLibs = getIntent().getStringExtra("lo-extra-libs");
+ if (extraLibs != null) {
+ for (String lib : extraLibs.split(":")) {
+ dlopen(lib);
+ }
+ }
+
// Start a strace on ourself if requested.
// Note that the started strace will have its stdout and
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
