javaunohelper/source/preload.cxx |
22 ----------
odk/config/setsdkenv_unix.sh.in |
2
odk/examples/DevelopersGuide/Components/CppComponent/Makefile |
2
odk/examples/DevelopersGuide/Components/JavaComponent/Makefile |
2
odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile |
2
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile |
2
odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile |
2
odk/examples/DevelopersGuide/Spreadsheet/Makefile |
2
odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h |
4 -
odk/examples/cpp/counter/Makefile |
2
odk/examples/java/ConverterServlet/web.xml |
4 -
odk/examples/java/Inspector/Makefile |
2
odk/examples/java/MinimalComponent/BuildMinimalComponent.xml |
4 -
odk/examples/java/MinimalComponent/Makefile |
2
odk/examples/java/Spreadsheet/Makefile |
2
odk/examples/java/ToDo/Makefile |
2
odk/settings/stdtarget.mk |
2
ure/source/uretest/Makefile |
8 +--
ure/source/uretest/Makefile.pln |
9 +---
ure/source/uretest/cppmain.cc |
18 +-------
ure/source/uretest/cppserver.cc |
12 ++---
ure/source/uretest/cpptest.cc |
14 +++---
22 files changed, 44 insertions(+), 77 deletions(-)
New commits:
commit f3242bc0f000ce8bef969e05dc0fce1c4927f1e9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 14:22:22 2013 +0200
Missing rtl:: namespace
Change-Id: Ifc9eda5846558c449c40442016a243872eae2962
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
index dfcd295..98b26e1 100644
--- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
+++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h
@@ -142,7 +142,7 @@ class WriterDispatch : public BaseDispatch
public:
WriterDispatch( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > &rxContext,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame )
- : BaseDispatch( rxContext, xFrame, OUString(
"com.sun.star.text.TextDocument" ) )
+ : BaseDispatch( rxContext, xFrame, rtl::OUString(
"com.sun.star.text.TextDocument" ) )
{}
};
@@ -151,7 +151,7 @@ class CalcDispatch : public BaseDispatch
public:
CalcDispatch( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > &rxContext,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame )
- : BaseDispatch( rxContext, xFrame, OUString(
"com.sun.star.sheet.SpreadSheetDocument" ) )
+ : BaseDispatch( rxContext, xFrame, rtl::OUString(
"com.sun.star.sheet.SpreadSheetDocument" ) )
{}
};
commit 14a2413530cd856eb9ce280187d1f32acd358d1d
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 14:05:42 2013 +0200
Adapt SDK to -B removed from cppumaker/javamaker
Change-Id: Ida4d11e0f8dfea201e0456cc54aa7f5af093d2ad
diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
index a681e1b..7fd6965 100644
--- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile
@@ -96,7 +96,7 @@ $(SAMPLE_GEN_OUT)/%.rdb : $(GENURDFILES)
$(COMP_TYPEFLAG) : $(COMP_RDB) $(SDKTYPEFLAG)
-$(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(CPPUMAKER) -Gc -BUCR -O$(SAMPLE_INC_OUT) $(TYPESLIST) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(CPPUMAKER) -Gc -O$(SAMPLE_INC_OUT) $(TYPESLIST) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
echo flagged > $@
$(SAMPLE_SLO_OUT)/%.$(OBJ_EXT) : %.cxx $(COMP_TYPEFLAG)
diff --git a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
index 327d4f2..e532d21 100644
--- a/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/JavaComponent/Makefile
@@ -113,7 +113,7 @@ $(OUT_COMP_GEN)/%.rdb : $(GENURDFILES)
$(OUT_COMP_CLASS)/$(PACKAGE)/%.class : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GENTYPELIST) -O$(OUT_COMP_CLASS) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GENTYPELIST) -O$(OUT_COMP_CLASS) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
$(OUT_COMP_CLASS)/%.class : %.java $(GENCLASSFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
b/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
index c82f0ba..c0eeca6 100644
--- a/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
+++ b/odk/examples/DevelopersGuide/Components/SimpleLicense/Makefile
@@ -108,7 +108,7 @@ $(COMP_GEN_OUT)/%.rdb : $(GEN_URDFILES)
$(GEN_CLASSFILES) : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT)
$(COMP_RDB) -X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
# component as well as application are dependent from the generated types
# rule for component class files
diff --git
a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
index fc453a1..bfd0b05 100644
---
a/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
+++
b/odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile
@@ -66,7 +66,7 @@ $(OUT_COMP_GEN)/%.rdb : $(GENURDFILES)
$(OUT_COMP_CLASS)/%.class : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GENTYPELIST) -O$(OUT_COMP_CLASS) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GENTYPELIST) -O$(OUT_COMP_CLASS) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
.PHONY: clean
clean :
diff --git a/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
b/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
index 7afc11f..6d2ec90 100644
--- a/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
+++ b/odk/examples/DevelopersGuide/Components/dialogcomponent/Makefile
@@ -109,7 +109,7 @@ $(COMP_GEN_OUT)/%.rdb : $(GEN_URDFILES)
$(GEN_CLASSFILES) : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT)
$(COMP_RDB) -X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
# component as well as application are dependent from the generated types
# rule for component class files
diff --git a/odk/examples/DevelopersGuide/Spreadsheet/Makefile
b/odk/examples/DevelopersGuide/Spreadsheet/Makefile
index 84fdd94..5b0724c 100644
--- a/odk/examples/DevelopersGuide/Spreadsheet/Makefile
+++ b/odk/examples/DevelopersGuide/Spreadsheet/Makefile
@@ -151,7 +151,7 @@ $(COMP1_RDB) : $(COMP1_GENURDFILES)
$(COMP1_CLASS_OUT)/$(PACKAGE)/%.class : $(COMP1_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(COMP1_GENTYPELIST) -O$(COMP1_CLASS_OUT)
$(COMP1_RDB) -X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(COMP1_GENTYPELIST) -O$(COMP1_CLASS_OUT) $(COMP1_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
$(COMP1_CLASSFILES) : $(COMP1_JAVAFILES) $(COMP1_GENCLASSFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/cpp/counter/Makefile
b/odk/examples/cpp/counter/Makefile
index 930eea0..da808be 100644
--- a/odk/examples/cpp/counter/Makefile
+++ b/odk/examples/cpp/counter/Makefile
@@ -92,7 +92,7 @@ $(OUT_BIN)/%.rdb : $(GENURDFILES)
$(COMP_TYPEFLAG) : $(COMP_RDB) $(SDKTYPEFLAG)
-$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(COMP_TYPEFLAG)))
- $(CPPUMAKER) -Gc -BUCR -O$(OUT_COMP_INC) $(TYPESLIST) $(COMP_RDB) -X
$(URE_TYPES)
+ $(CPPUMAKER) -Gc -O$(OUT_COMP_INC) $(TYPESLIST) $(COMP_RDB) -X
$(URE_TYPES)
echo flagged > $@
$(OUT_COMP_OBJ)/%.$(OBJ_EXT) : %.cxx $(COMP_TYPEFLAG)
diff --git a/odk/examples/java/ConverterServlet/web.xml
b/odk/examples/java/ConverterServlet/web.xml
index 3484990..10dfde5 100644
--- a/odk/examples/java/ConverterServlet/web.xml
+++ b/odk/examples/java/ConverterServlet/web.xml
@@ -45,9 +45,9 @@
</exec>
<exec dir="." executable="${ODKPATH}/windows/bin/javamaker.exe"
timeout="600">
- <arg line="-BUCR -O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD
./${RDB_NAME}"/>
+ <arg line="-O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD
./${RDB_NAME}"/>
<!--
- <arg line="-BUCR -T${PACKAGE_NAME}${INTERFACE_NAME}
-O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD ./${INTERFACE_NAME}.urd"/>
+ <arg line="-T${PACKAGE_NAME}${INTERFACE_NAME}
-O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD ./${INTERFACE_NAME}.urd"/>
-->
</exec>
diff --git a/odk/examples/java/Inspector/Makefile
b/odk/examples/java/Inspector/Makefile
index 2b0c1b3..4a3ed71 100644
--- a/odk/examples/java/Inspector/Makefile
+++ b/odk/examples/java/Inspector/Makefile
@@ -116,7 +116,7 @@ $(COMP_GEN_OUT)/%.rdb : $(GEN_URDFILES)
# rule for creating IDL dependent class files
$(GEN_CLASSFILES) : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT)
$(COMP_RDB) -X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
# component as well as application are dependent from the generated types
# rule for component class files
diff --git a/odk/examples/java/MinimalComponent/BuildMinimalComponent.xml
b/odk/examples/java/MinimalComponent/BuildMinimalComponent.xml
index 3484990..10dfde5 100644
--- a/odk/examples/java/MinimalComponent/BuildMinimalComponent.xml
+++ b/odk/examples/java/MinimalComponent/BuildMinimalComponent.xml
@@ -45,9 +45,9 @@
</exec>
<exec dir="." executable="${ODKPATH}/windows/bin/javamaker.exe"
timeout="600">
- <arg line="-BUCR -O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD
./${RDB_NAME}"/>
+ <arg line="-O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD
./${RDB_NAME}"/>
<!--
- <arg line="-BUCR -T${PACKAGE_NAME}${INTERFACE_NAME}
-O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD ./${INTERFACE_NAME}.urd"/>
+ <arg line="-T${PACKAGE_NAME}${INTERFACE_NAME}
-O${OUTPUTPATH}/class/${INTERFACE_NAME} -nD ./${INTERFACE_NAME}.urd"/>
-->
</exec>
diff --git a/odk/examples/java/MinimalComponent/Makefile
b/odk/examples/java/MinimalComponent/Makefile
index 23530a8..876ecb9 100644
--- a/odk/examples/java/MinimalComponent/Makefile
+++ b/odk/examples/java/MinimalComponent/Makefile
@@ -113,7 +113,7 @@ $(COMP_GEN_OUT)/%.rdb : $(GEN_URDFILES)
$(GEN_CLASSFILES) : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT)
$(COMP_RDB) -X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GEN_TYPELIST) -O$(SAMPLE_CLASS_OUT) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
# component as well as application are dependent from the generated types
# rule for component class files
diff --git a/odk/examples/java/Spreadsheet/Makefile
b/odk/examples/java/Spreadsheet/Makefile
index 52d73a4..43ba6d0 100644
--- a/odk/examples/java/Spreadsheet/Makefile
+++ b/odk/examples/java/Spreadsheet/Makefile
@@ -114,7 +114,7 @@ $(OUT_COMP_GEN)/%.rdb : $(GENURDFILES)
#$(OUT_COMP_GEN)/%.java : $(COMP_RDB)
$(GENCLASSFILES) : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GENTYPELIST) -O$(OUT_COMP_CLASS) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GENTYPELIST) -O$(OUT_COMP_CLASS) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
$(OUT_COMP_CLASS)/%.class : %.java
-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/examples/java/ToDo/Makefile b/odk/examples/java/ToDo/Makefile
index d597e96..7ab59a0 100644
--- a/odk/examples/java/ToDo/Makefile
+++ b/odk/examples/java/ToDo/Makefile
@@ -102,7 +102,7 @@ $(COMP_GEN_OUT)/%.rdb : $(GEN_URDFILES)
$(GEN_CLASSFILES) : $(COMP_RDB)
-$(MKDIR) $(subst /,$(PS),$(@D))
- $(JAVAMAKER) -BUCR -nD $(GEN_TYPELIST) -O$(COMP_CLASS_OUT) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
+ $(JAVAMAKER) -nD $(GEN_TYPELIST) -O$(COMP_CLASS_OUT) $(COMP_RDB)
-X$(URE_TYPES) -X$(OFFICE_TYPES)
$(COMP_CLASSFILES) : $(COMP_JAVAFILES) $(GEN_CLASSFILES)
-$(MKDIR) $(subst /,$(PS),$(@D))
diff --git a/odk/settings/stdtarget.mk b/odk/settings/stdtarget.mk
index 7563b20..14d131f 100644
--- a/odk/settings/stdtarget.mk
+++ b/odk/settings/stdtarget.mk
@@ -31,5 +31,5 @@ $(SDKTYPEFLAG): #$(URE_TYPES) $(OFFICE_TYPES)
# This is a makefile for a standard Make, so must be TABs below
-$(MKDIR) $(subst /,$(PS),$(@D))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SDKTYPEFLAG)))
- $(CPPUMAKER) -Gc -BUCR -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
+ $(CPPUMAKER) -Gc -O$(OUT_INC) $(URE_TYPES) $(OFFICE_TYPES)
echo flagged > $@
commit f0157b8e4ae5ba2bac7e3368fb63c0495dd16a1c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 13:32:46 2013 +0200
Do not include . in PATH configured for SDK
Change-Id: I5a1cc96377957705d88a0245a4c5785d4b3bf2bf
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 01e01ba..b0dc536 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -213,7 +213,7 @@ case ${sdk_platform} in
esac
# Add directory of the SDK tools to the path.
-PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:.:${PATH}
+PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:${PATH}
# Set the classpath
CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
commit b9d93c00306a10ef270f9979ed717a8c3cfb7414
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 12:55:28 2013 +0200
Adapt uretest to -B removed from cppumaker/javamaker
Change-Id: If256eeddf4b8efded6e5e010b0155e05f5a1de79
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index 26a1a6f..1db5282 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -139,12 +139,12 @@ out.sdk/cppserver.$(OBJ_EXT): cppserver.cc
out.sdk/cpputypes.cppumaker.flag \
out.sdk/cpputypes.cppumaker.flag: | out.sdk
$(CPPUMAKER) -O./out.sdk/include/cpputypes \
- -BUCR "$(URE_TYPES)"
"-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander"
\
+ "$(URE_TYPES)"
touch $@
out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk
- $(CPPUMAKER) -O./out.sdk/include/types -BUCR $< "-X$(URE_TYPES)"
+ $(CPPUMAKER) -O./out.sdk/include/types $< "-X$(URE_TYPES)"
touch $@
@@ -261,7 +261,7 @@ out.sdk/types.mf: types.mf.template | out.sdk
out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class
- $(DELRECURSIVE) $(subst /,$(PS),out.sdk/class/types)
- $(JAVAMAKER) -O./out.sdk/class/types -BUCR $< "-X$(URE_TYPES)"
+ $(JAVAMAKER) -O./out.sdk/class/types $< "-X$(URE_TYPES)"
touch $@
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 612e490..ac11d2a 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -122,14 +122,13 @@ out.pln/cppserver.o: cppserver.cc
out.pln/cpputypes.cppumaker.flag \
out.pln/cpputypes.cppumaker.flag: | out.pln
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/cpputypes \
- -BUCR $(URE_HOME)/share/misc/types.rdb
'-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander'
\
+ $(URE_HOME)/share/misc/types.rdb
touch $@
out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
- -O./out.pln/include/types -BUCR $< \
- -X$(URE_HOME)/share/misc/types.rdb
+ -O./out.pln/include/types $< -X$(URE_HOME)/share/misc/types.rdb
touch $@
@@ -246,7 +245,7 @@ out.pln/types.mf: types.mf.template | out.pln
out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
rm -rf out.pln/class/types
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/javamaker \
- -O./out.pln/class/types -BUCR $< -X$(URE_HOME)/share/misc/types.rdb
+ -O./out.pln/class/types $< -X$(URE_HOME)/share/misc/types.rdb
touch $@
commit c482ded5fd9be85b441d952b29793a2f38a76b67
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 12:48:11 2013 +0200
Let theMacroExpander.hpp take care about the singleton instantiation details
Change-Id: I8e919291cb4c8fc223ca7143e860a2a0b44cb930
diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index 8ff1c04..26a1a6f 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -139,8 +139,8 @@ out.sdk/cppserver.$(OBJ_EXT): cppserver.cc
out.sdk/cpputypes.cppumaker.flag \
out.sdk/cpputypes.cppumaker.flag: | out.sdk
$(CPPUMAKER) -O./out.sdk/include/cpputypes \
-
"-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak"
\
-BUCR "$(URE_TYPES)"
+
"-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander"
\
touch $@
out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 9ff84ec..612e490 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -122,8 +122,8 @@ out.pln/cppserver.o: cppserver.cc
out.pln/cpputypes.cppumaker.flag \
out.pln/cpputypes.cppumaker.flag: | out.pln
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/cpputypes \
-
'-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak'
\
-BUCR $(URE_HOME)/share/misc/types.rdb
+
'-Tcom.sun.star.lang.DisposedException;com.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak;com.sun.star.util.theMacroExpander'
\
touch $@
out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index c0e368e..a302b23 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -30,6 +30,7 @@
#include "com/sun/star/uno/Sequence.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/util/theMacroExpander.hpp"
#include "cppuhelper/factory.hxx"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implementationentry.hxx"
@@ -39,7 +40,6 @@
#include "osl/thread.h"
#include "rtl/malformeduriexception.hxx"
#include "rtl/string.h"
-#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.h"
#include "rtl/ustring.hxx"
#include "sal/types.h"
@@ -146,17 +146,7 @@ private:
static_cast< ::cppu::OWeakObject * >(this));
}
}
- static char const * const singletons[] = {
- "com.sun.star.util.theMacroExpander" };
- for (::std::size_t i = 0; i < SAL_N_ELEMENTS(singletons); ++i)
- {
- ::rtl::OUStringBuffer b;
- b.append("/singletons/");
- b.append(singletons[i]);
- css::uno::Reference< css::uno::XInterface > instance(
- context_->getValueByName(b.makeStringAndClear()),
- css::uno::UNO_QUERY_THROW);
- }
+ css::util::theMacroExpander::get(context_);
test(
::test::types::CppTest::create(context_),
::rtl::OUString("test.types.CppTest"));
commit 8efcfadac5eb3439d40895c040e3163aed833360
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 12:40:29 2013 +0200
Remove createRegistryServiceFactory preload left-over
...forgotten from f3051abde54e7a0bc3e2d184e31ac011e96d3e6b "API CHANGE:
Remove
deprecated cppuhelper/servicefactory.hxx and Java equiv."
Change-Id: Iccdcb68c6051a64a09ae7918eecb8d3e2c53a085
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index 85eb092..5575af0 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -38,14 +38,11 @@ typedef jboolean (JNICALL * fptr_writeInfo)(
JNIEnv *, jclass, jstring, jobject, jobject, jobject );
typedef jobject (JNICALL * fptr_getFactory)(
JNIEnv *, jclass, jstring, jstring, jobject, jobject, jobject );
-typedef jobject (JNICALL * fptr_createRegistryServiceFactory)(
- JNIEnv *, jclass, jstring, jstring, jboolean, jobject );
typedef jobject (JNICALL * fptr_bootstrap)(
JNIEnv *_env, jclass, jstring, jobjectArray, jobject );
static fptr_writeInfo s_writeInfo;
static fptr_getFactory s_getFactory;
-static fptr_createRegistryServiceFactory s_createRegistryServiceFactory;
static fptr_bootstrap s_bootstrap;
static bool s_inited = false;
@@ -77,18 +74,12 @@ static bool inited_juhx( JNIEnv * jni_env )
s_getFactory = (fptr_getFactory)osl_getFunctionSymbol(
hModule, symbol.pData );
symbol =
-
"Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory";
- s_createRegistryServiceFactory =
- (fptr_createRegistryServiceFactory)osl_getFunctionSymbol(
- hModule, symbol.pData );
- symbol =
"Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap";
s_bootstrap =
(fptr_bootstrap)osl_getFunctionSymbol( hModule, symbol.pData );
if (0 == s_writeInfo ||
0 == s_getFactory ||
- 0 == s_createRegistryServiceFactory ||
0 == s_bootstrap)
{
jclass c = jni_env->FindClass( "java/lang/RuntimeException" );
@@ -125,19 +116,6 @@
Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
}
//==================================================================================================
SAL_DLLPUBLIC_EXPORT jobject JNICALL
-Java_com_sun_star_comp_helper_RegistryServiceFactory_createRegistryServiceFactory(
- JNIEnv * pJEnv, jclass jClass, jstring jWriteRegFile,
- jstring jReadRegFile, jboolean jbReadOnly, jobject loader )
-{
- if (inited_juhx( pJEnv ))
- {
- return (*s_createRegistryServiceFactory)(
- pJEnv, jClass, jWriteRegFile, jReadRegFile, jbReadOnly, loader );
- }
- return 0;
-}
-//==================================================================================================
-SAL_DLLPUBLIC_EXPORT jobject JNICALL
Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
JNIEnv * jni_env, jclass jClass, jstring juno_rc, jobjectArray jpairs,
jobject loader )
commit 0ea1711e983775beb13b08d05637fe88ec534f0b
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Apr 11 11:54:20 2013 +0200
Missing rtl:: namespace
Change-Id: I6088dc1c9d9afaa031231ea0c9f104a92ce41658
diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc
index b9acbef9..c0e368e 100644
--- a/ure/source/uretest/cppmain.cc
+++ b/ure/source/uretest/cppmain.cc
@@ -199,8 +199,8 @@ css::uno::Reference< css::uno::XInterface > create(
}
}
-OUString getImplementationName() {
- return OUString("test.cpp.cppmain.Component");
+rtl::OUString getImplementationName() {
+ return rtl::OUString("test.cpp.cppmain.Component");
}
css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() {
diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc
index 55e094a..cee80d3 100644
--- a/ure/source/uretest/cppserver.cc
+++ b/ure/source/uretest/cppserver.cc
@@ -48,7 +48,7 @@ public:
virtual ::test::types::Data SAL_CALL getData()
throw (css::uno::RuntimeException)
{
- return ::test::types::Data(OUString("Hello"), 42);
+ return ::test::types::Data(rtl::OUString("Hello"), 42);
}
private:
@@ -68,17 +68,17 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< ::cppu::OWeakObject * >(new Service);
} catch (::std::bad_alloc &) {
throw css::uno::RuntimeException(
- OUString("std::bad_alloc"),
+ rtl::OUString("std::bad_alloc"),
css::uno::Reference< css::uno::XInterface >());
}
}
-OUString getImplementationName() {
- return OUString("test.cpp.cppserver.Component");
+rtl::OUString getImplementationName() {
+ return rtl::OUString("test.cpp.cppserver.Component");
}
-css::uno::Sequence< OUString > getSupportedServiceNames() {
- return css::uno::Sequence< OUString >();
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+ return css::uno::Sequence< rtl::OUString >();
}
}
diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc
index 9fe83e4..5bd2006 100644
--- a/ure/source/uretest/cpptest.cc
+++ b/ure/source/uretest/cpptest.cc
@@ -47,7 +47,7 @@ public:
throw (test::types::TestException, css::uno::RuntimeException)
{
throw test::types::TestException(
- OUString("test"),
+ rtl::OUString("test"),
static_cast< cppu::OWeakObject * >(this));
}
@@ -68,18 +68,18 @@ css::uno::Reference< css::uno::XInterface > create(
return static_cast< cppu::OWeakObject * >(new Service);
} catch (std::bad_alloc &) {
throw css::uno::RuntimeException(
- OUString("std::bad_alloc"),
+ rtl::OUString("std::bad_alloc"),
css::uno::Reference< css::uno::XInterface >());
}
}
-OUString getImplementationName() {
- return OUString("test.cpp.cpptest.Component");
+rtl::OUString getImplementationName() {
+ return rtl::OUString("test.cpp.cpptest.Component");
}
-css::uno::Sequence< OUString > getSupportedServiceNames() {
- OUString s("test.types.CppTest");
- return css::uno::Sequence< OUString >(&s, 1);
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+ rtl::OUString s("test.types.CppTest");
+ return css::uno::Sequence< rtl::OUString >(&s, 1);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
