bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx | 16 ++++++-------
cppuhelper/source/shlib.cxx | 29 ++++++++++--------------
io/source/acceptor/makefile.mk | 15 +++++++-----
io/source/connector/makefile.mk | 11 +++++----
ios/qa/sc/Makefile | 11 ++++++++-
ure/Rdb_ure.mk | 5 ++--
vcl/ios/source/app/salinst.cxx | 17 ++++++++++++--
7 files changed, 65 insertions(+), 39 deletions(-)
New commits:
commit 313a47faacd469a94dac456161e1c09ff496cfd9
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Mar 30 08:35:29 2012 +0300
iOS simulator fix and some cosmetics
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
index 8b9e130..12e9d97 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno.cxx
@@ -77,7 +77,7 @@ void cpp2uno_call(
#else
CPPU_CURRENT_NAMESPACE::isSimpleReturnType( pReturnTypeDescr )
#endif
- )
+ )
{
pUnoReturn = pReturnValue; // direct way for simple types
}
@@ -365,7 +365,6 @@ extern "C" void cpp_vtable_call(
}
//==================================================================================================
-
extern "C" {
extern int nFunIndexes, nVtableOffsets;
#ifdef __arm
@@ -446,7 +445,6 @@ unsigned char * codeSnippet(
return codeSnippets[functionIndex*nVtableOffsets*6*2 + vtableOffset*6*2 +
exec*2 + flag];
#endif
-
}
}
@@ -462,7 +460,11 @@
bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable(void * block)
sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
sal_Int32 slotCount)
{
- return 0;
+#ifdef __arm
+ ???
+#else
+ return (slotCount + 2) * sizeof (Slot);
+#endif
}
bridges::cpp_uno::shared::VtableFactory::Slot *
@@ -487,7 +489,7 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
TYPELIB_DANGER_GET(&member, type->ppMembers[i]);
OSL_ASSERT(member != 0);
switch (member->eTypeClass) {
- case typelib_TypeClass_INTERFACE_ATTRIBUTE: {
+ case typelib_TypeClass_INTERFACE_ATTRIBUTE:
#ifdef __arm
typelib_InterfaceAttributeTypeDescription *pAttrTD =
reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>(
member );
@@ -516,10 +518,9 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
#endif
);
}
- }
break;
- case typelib_TypeClass_INTERFACE_METHOD: {
+ case typelib_TypeClass_INTERFACE_METHOD:
#ifdef __arm
typelib_InterfaceMethodTypeDescription *pMethodTD =
reinterpret_cast<
@@ -534,7 +535,6 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
member)->pReturnTypeRef
#endif
);
- }
break;
default:
commit 2f6ff1df4da6da4c101392dba5d6438904927374
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Mar 29 20:51:00 2012 +0300
Link with more libs, include more configuration files
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index f652079..5d3bcf5 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -30,7 +30,7 @@ SRCS = filters-test.m
CFLAGS = $(SOLARINC)
-LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a
-Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
-Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/configmgr.uno.a
-Wl,$(OUTDIR)/lib/unoexceptionprotector.a $(SOLARLIB) -lavmedialo -lbasegfxlo
-lcanvastoolslo -lcomphelpgcc3 -lcppcanvaslo -lcppunit -ldrawinglayerlo
-leditenglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno
-li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3 -licuuc -ljpeg -ljvmfwk -llnglo
-lreg -lsal_textenc -lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo
-lsvxlo -lsvxcorelo -lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3
-lucpfile1 -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3
-lunotest -lutllo -lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework
, $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(OUTDIR)/bin/cppunit/cppunittester.a
-Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a
-Wl,$(OUTDIR)/lib/bootstrap.uno.a -Wl,$(OUTDIR)/lib/configmgr.uno.a
-Wl,$(OUTDIR)/lib/i18npool.uno.a -Wl,$(OUTDIR)/lib/unoexceptionprotector.a
$(SOLARLIB) -lavmedialo -lbasegfxlo -lcanvastoolslo -lcomphelpgcc3
-lcppcanvaslo -lcppunit -ldrawinglayerlo -leditenglo -lforlo -lforuilo -lfwelo
-lfwilo -lfwklo -lgcc3_uno -li18nisolang1gcc3 -li18npaperlo -li18nutilgcc3
-licudata -licui18n -licuuc -ljpeg -ljvmfwk -llnglo -lreg -lsal_textenc
-lsalcpprt -lsaxlo -lsclo -lsfxlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo
-lsotlo -ltest -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1
-luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo
-lvcllo -lxml2 -lxmlreader -lxolo -lz $(addprefix -framework ,
$(gb_Library__FRAMEWORKS)) -liconv -lobjc
all: $(APPDIR)/$(APP) stuff
@@ -47,7 +47,16 @@ stuff:
( \
echo '[Bootstrap]'; \
echo 'BRAND_BASE_DIR=$${ORIGIN}'; \
+ echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry
module:$${BRAND_BASE_DIR}/registry/modules res:$${BRAND_BASE_DIR}/registry' \
) >$(APPDIR)/fundamentalrc
+
+#
+# hmm, once again, a hodgepodge of stuff, I don't really know which
+# files of which are actually needed...
+ mkdir -p $(APPDIR)/registry/res
+ cp $(OUTDIR)/xml/*.xcd $(APPDIR)/registry
+ mv $(APPDIR)/registry/fcfg_langpack_en-US.xcd $(APPDIR)/registry/res
+ cp -R $(OUTDIR)/xml/registry/* $(APPDIR)/registry
#
# .rdb files
cp $(OUTDIR)/bin/udkapi.rdb $(OUTDIR)/bin/types.rdb
$(OUTDIR)/xml/ure/services.rdb $(APPDIR)
commit 1a4cbf9f5ccef6d9409caad7d1b648f9fe2a2be4
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Mar 29 20:46:58 2012 +0300
More static lib name mappings. Yeah, need to do a gperf thing some night
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index df898a6..8c12784 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -459,22 +459,13 @@ Reference< XInterface > invokeComponentFactory(
#ifdef DISABLE_DYNLOADING
extern "C"
{
- // In stoc/source/bootstrap/services.cxx.
-
- // Sure, some public header would be a better place for this. But
- // it can't be in some stoc header as that hasn't been built and
- // delivered yet when cppuhelper is built.
-
- extern void * bootstrap_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void *
pRegistryKey );
-
- // More of them, in order of discovery. This is a temporary way to handle
this..
- extern void * ucb_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void *
pRegistryKey );
- extern void * configmgr_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void *
pRegistryKey );
- extern void * ucpfile_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void *
pRegistryKey );
+ extern void * bootstrap_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
+ extern void * configmgr_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
+ extern void * fwk_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
+ extern void * i18npool_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
+ extern void * sc_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
+ extern void * ucb_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
+ extern void * ucpfile_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
}
#endif
@@ -540,6 +531,12 @@ Reference< XInterface > SAL_CALL
loadSharedLibComponentFactory(
pSym = (oslGenericFunction) configmgr_component_getFactory;
else if ( rLibName.equals( OUSTR("libucpfile1.a")) )
pSym = (oslGenericFunction) ucpfile_component_getFactory;
+ else if ( rLibName.equals( OUSTR("libsclo.a")) )
+ pSym = (oslGenericFunction) sc_component_getFactory;
+ else if ( rLibName.equals( OUSTR("libfwklo.a")) )
+ pSym = (oslGenericFunction) fwk_component_getFactory;
+ else if ( rLibName.equals( OUSTR("i18npool.uno.a")) )
+ pSym = (oslGenericFunction) i18npool_component_getFactory;
else
{
#if OSL_DEBUG_LEVEL > 1
commit e362ccbab38a617c3118bcda2b86b2295e56d7b4
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Mar 29 18:33:52 2012 +0300
Add a dummy SalI18NImeStatus subclass
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index 9e4c8c6..e3747c2 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -731,10 +731,23 @@ SalSession* IosSalInstance::CreateSalSession()
// -----------------------------------------------------------------------
+class IOsImeStatus : public SalI18NImeStatus
+{
+public:
+ IOsImeStatus() {}
+ virtual ~IOsImeStatus() {}
+
+ // asks whether there is a status window available
+ // to toggle into menubar
+ virtual bool canToggle() { return false; }
+ virtual void toggle() {}
+};
+
+// -----------------------------------------------------------------------
+
SalI18NImeStatus* IosSalInstance::CreateI18NImeStatus()
{
- // ???
- return NULL;
+ return new IOsImeStatus();
}
// -----------------------------------------------------------------------
commit 677defb67bd3bfc861ea31620fadbb4bff65a06e
Author: Tor Lillqvist <t...@iki.fi>
Date: Thu Mar 29 13:18:23 2012 +0300
Don't build and deliver .component files with empty URIs (for iOS)
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index 40d6c02..566c2b5 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -68,17 +68,20 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.ENDIF
+.ENDIF # IOS
-.INCLUDE : target.mk
+.ENDIF # L10N_framework
-ALLTAR : $(MISC)/acceptor.component
+.IF "$(OS)" != "IOS"
$(MISC)/acceptor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
acceptor.component
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt acceptor.component
+
+ALLTAR : $(MISC)/acceptor.component
+
+.ENDIF # IOS
+
+.INCLUDE : target.mk
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index a484430..2470b61 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -68,12 +68,11 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
+.ENDIF # IOS
-.ENDIF
+.ENDIF # L10N_framework
-.INCLUDE : target.mk
+.IF "$(OS)" != "IOS"
ALLTAR : $(MISC)/connector.component
@@ -82,3 +81,7 @@ $(MISC)/connector.component .ERRREMOVE :
$(SOLARENV)/bin/createcomponent.xslt \
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt connector.component
+
+.ENDIF # IOS
+
+.INCLUDE : target.mk
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index a0639c1..464c747 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -28,10 +28,11 @@
$(eval $(call gb_Rdb_Rdb,ure/services))
$(eval $(call gb_Rdb_add_components,ure/services,\
- acceptor \
+ $(if $(filter IOS,$(OS)),, \
+ acceptor \
+ connector) \
binaryurp/source/binaryurp \
bootstrap \
- connector \
introspection \
invocadapt \
invocation \
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
