[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - bean/Ant_officebean.mk bean/com bean/java bean/Library_officebean.mk bean/Makefile bean/Module_bean.mk bean/prj Module_ooo.mk Repository.mk solenv/gbuild xmerge/java
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Nov 25 17:52:40 UTC 2018
Module_ooo.mk | 1
Repository.mk | 1
bean/Ant_officebean.mk | 9 -
bean/Library_officebean.mk | 69 ++++++++++
bean/Makefile | 15 +-
bean/Module_bean.mk | 28 ++--
bean/java/officebean/build.xml | 41 +++++
bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java | 10 -
bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java | 2
bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java | 2
bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java | 6
bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java | 2
bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java | 56 ++++----
bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java | 2
bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java | 2
bean/prj/build.lst | 9 -
bean/prj/d.lst | 5
bean/prj/makefile.mk | 25 ++-
solenv/gbuild/Ant.mk | 2
xmerge/java/XMergeBridge/makefile.mk | 39 -----
xmerge/java/pexcel/makefile.mk | 31 ----
21 files changed, 205 insertions(+), 152 deletions(-)
New commits:
commit d40b6adb1ec67fd0cfedb8ce2c0dab9e4cbb0a98
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun Nov 25 13:43:47 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun Nov 25 13:43:47 2018 +0000
main/bean needs USER32.DLL to link on Windows.
Patch by: me
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index 700f02bd6bda..80435846661c 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,officebean,\
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,officebean,\
sal \
+ user32 \
))
endif
commit bfeb94717269ea56e190548e433015f6e537206c
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun Nov 25 13:39:03 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun Nov 25 13:39:03 2018 +0000
Use
$(shell cat ...)
instead of
$(shell cat < ...).
Patch by: me
diff --git a/solenv/gbuild/Ant.mk b/solenv/gbuild/Ant.mk
index 0438575fe03d..3fd2c32c4610 100644
--- a/solenv/gbuild/Ant.mk
+++ b/solenv/gbuild/Ant.mk
@@ -67,7 +67,7 @@ $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call g
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
-$$(eval $(foreach dep,$(shell cat < $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+$$(eval $(foreach dep,$(shell cat $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
endef
commit 3fe7485fb47e170dea6612a904d70d9956f1379b
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sun Nov 25 13:28:21 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sun Nov 25 13:28:21 2018 +0000
Fix building with GNU make versions below 4.2,
which lack:
$(file < ...)
but have:
$(shell cat ...)
instead.
Patch by: me
diff --git a/solenv/gbuild/Ant.mk b/solenv/gbuild/Ant.mk
index 9b4d45f67973..0438575fe03d 100644
--- a/solenv/gbuild/Ant.mk
+++ b/solenv/gbuild/Ant.mk
@@ -67,7 +67,7 @@ $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call g
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Ant_get_target,$(1))
__ant_out:=$(shell $(gb_Ant_ANTCOMMAND) -v -Ddependencies.outfile=$(WORKDIR)/Ant/$(1)/deps -f $(2) dependencies)
-$$(eval $(foreach dep,$(file < $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
+$$(eval $(foreach dep,$(shell cat < $(WORKDIR)/Ant/$(1)/deps),$$(call gb_Ant_add_dependency,$(call gb_Ant_get_target,$(1)),$(dep))))
endef
commit a4824646106d0dadc5d18225b4cce65779406575
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Nov 24 11:42:07 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Nov 24 11:42:07 2018 +0000
Port main/bean to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 94123069e542..976467d53858 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
basebmp \
basegfx \
basic \
+ bean \
binaryurp \
canvas \
codemaker \
diff --git a/Repository.mk b/Repository.mk
index 974256b30798..690144ea9bad 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -199,6 +199,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ officebean \
))
diff --git a/bean/Ant_officebean.mk b/bean/Ant_officebean.mk
new file mode 100644
index 000000000000..49ca3fa4f545
--- /dev/null
+++ b/bean/Ant_officebean.mk
@@ -0,0 +1,27 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Ant_Ant,officebean,$(SRCDIR)/bean/java/officebean/build.xml))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
new file mode 100644
index 000000000000..700f02bd6bda
--- /dev/null
+++ b/bean/Library_officebean.mk
@@ -0,0 +1,68 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,officebean))
+
+$(eval $(call gb_Library_set_include,officebean,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,officebean, \
+# udkapi \
+# offapi \
+#))
+
+#$(eval $(call gb_Library_add_defs,officebean,\
+# -DFORMULA_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_add_linked_libs,officebean,\
+ stl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,officebean,\
+ sal \
+))
+endif
+
+$(eval $(call gb_Library_add_libs,officebean,\
+ $(AWTLIB) \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_cobjects,officebean,\
+ bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow \
+ bean/native/win32/com_sun_star_beans_LocalOfficeWindow \
+))
+else
+$(eval $(call gb_Library_add_cobjects,officebean,\
+ bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \
+ bean/native/unix/com_sun_star_beans_LocalOfficeWindow \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/bean/Makefile b/bean/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/bean/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/bean/Module_bean.mk b/bean/Module_bean.mk
new file mode 100644
index 000000000000..0128476ad0bf
--- /dev/null
+++ b/bean/Module_bean.mk
@@ -0,0 +1,43 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,bean))
+
+$(eval $(call gb_Module_add_targets,bean,\
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,bean,\
+ Ant_officebean \
+ Library_officebean \
+))
+else ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Module_add_targets,bean,\
+ Ant_officebean \
+ Library_officebean \
+))
+endif
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/bean/java/officebean/build.xml b/bean/java/officebean/build.xml
new file mode 100644
index 000000000000..0a1fe999d2bd
--- /dev/null
+++ b/bean/java/officebean/build.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+
+
+
+<project name="officebean" default="main" basedir=".">
+
+ <property file="../../../ant.properties"/>
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/juh.jar"/>
+ </path>
+ </target>
+
+</project>
+
diff --git a/bean/com/sun/star/beans/ContainerFactory.java b/bean/java/officebean/src/main/java/com/sun/star/beans/ContainerFactory.java
similarity index 100%
rename from bean/com/sun/star/beans/ContainerFactory.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/ContainerFactory.java
diff --git a/bean/com/sun/star/beans/JavaWindowPeerFake.java b/bean/java/officebean/src/main/java/com/sun/star/beans/JavaWindowPeerFake.java
similarity index 100%
rename from bean/com/sun/star/beans/JavaWindowPeerFake.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/JavaWindowPeerFake.java
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
similarity index 100%
rename from bean/com/sun/star/beans/LocalOfficeConnection.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeConnection.java
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java b/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
similarity index 97%
rename from bean/com/sun/star/beans/LocalOfficeWindow.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
index 260d3fa2fc27..309eb722e57e 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/beans/LocalOfficeWindow.java
@@ -123,7 +123,7 @@ public class LocalOfficeWindow
return null;
}
- /// called when system parent is available, reparents the bean window
+ /// called when system parent is available, reparents the bean window
private void aquireSystemWindow()
{
if ( !bPeer )
@@ -134,18 +134,18 @@ public class LocalOfficeWindow
xVclWindowPeer.setProperty( "PluginParent", getNativeWindow() );
bPeer = true;
- // show document window
+ // show document window
XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( true );
}
}
- /// called when system parent is about to die, reparents the bean window
+ /// called when system parent is about to die, reparents the bean window
private void releaseSystemWindow()
{
if ( bPeer )
{
- // hide document window
+ // hide document window
XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( false );
@@ -175,7 +175,7 @@ public class LocalOfficeWindow
public void componentShown( java.awt.event.ComponentEvent e)
{
// only when we become visible, we get a system window
- aquireSystemWindow();
+ aquireSystemWindow();
}
}
diff --git a/bean/com/sun/star/beans/NativeConnection.java b/bean/java/officebean/src/main/java/com/sun/star/beans/NativeConnection.java
similarity index 100%
rename from bean/com/sun/star/beans/NativeConnection.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/NativeConnection.java
diff --git a/bean/com/sun/star/beans/NativeService.java b/bean/java/officebean/src/main/java/com/sun/star/beans/NativeService.java
similarity index 100%
rename from bean/com/sun/star/beans/NativeService.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/NativeService.java
diff --git a/bean/com/sun/star/beans/OfficeConnection.java b/bean/java/officebean/src/main/java/com/sun/star/beans/OfficeConnection.java
similarity index 100%
rename from bean/com/sun/star/beans/OfficeConnection.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/OfficeConnection.java
diff --git a/bean/com/sun/star/beans/OfficeWindow.java b/bean/java/officebean/src/main/java/com/sun/star/beans/OfficeWindow.java
similarity index 100%
rename from bean/com/sun/star/beans/OfficeWindow.java
rename to bean/java/officebean/src/main/java/com/sun/star/beans/OfficeWindow.java
diff --git a/bean/com/sun/star/beans/makefile.mk b/bean/java/officebean/src/main/java/com/sun/star/beans/makefile.mk
similarity index 100%
rename from bean/com/sun/star/beans/makefile.mk
rename to bean/java/officebean/src/main/java/com/sun/star/beans/makefile.mk
diff --git a/bean/com/sun/star/comp/beans/CallWatchThread.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/CallWatchThread.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/CallWatchThread.java
diff --git a/bean/com/sun/star/comp/beans/ContainerFactory.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/ContainerFactory.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/ContainerFactory.java
diff --git a/bean/com/sun/star/comp/beans/Controller.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/Controller.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/Controller.java
diff --git a/bean/com/sun/star/comp/beans/Frame.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/Frame.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/Frame.java
diff --git a/bean/com/sun/star/comp/beans/HasConnectionException.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/HasConnectionException.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/HasConnectionException.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/HasConnectionException.java
diff --git a/bean/com/sun/star/comp/beans/InvalidArgumentException.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/InvalidArgumentException.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/InvalidArgumentException.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/InvalidArgumentException.java
diff --git a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
similarity index 98%
rename from bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
index 73f005749575..8dbcf90b420d 100644
--- a/bean/com/sun/star/comp/beans/JavaWindowPeerFake.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/JavaWindowPeerFake.java
@@ -33,7 +33,7 @@ import com.sun.star.awt.*;
/* package */ class JavaWindowPeerFake
implements XSystemDependentWindowPeer, XWindowPeer
{
- protected int localSystemType;
+ protected int localSystemType;
protected Any wrappedHandle;
/** Create the faked window peer.
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
similarity index 99%
rename from bean/com/sun/star/comp/beans/LocalOfficeConnection.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
index 626dfd6cd217..99024cd6a1c3 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -402,7 +402,7 @@ public class LocalOfficeConnection
com.sun.star.connection.ConnectionSetupException,
com.sun.star.lang.IllegalArgumentException
{
- String conDcp = null;
+ String conDcp = null;
String protDcp = null;
String rootOid = null;
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
similarity index 97%
rename from bean/com/sun/star/comp/beans/LocalOfficeWindow.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
index f41ce11782a9..cf2ad7008620 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -127,7 +127,7 @@ public class LocalOfficeWindow
return null;
}
- /// called when system parent is available, reparents the bean window
+ /// called when system parent is available, reparents the bean window
private synchronized void aquireSystemWindow()
{
if ( !bPeer )
@@ -144,12 +144,12 @@ public class LocalOfficeWindow
}
}
- /// called when system parent is about to die, reparents the bean window
+ /// called when system parent is about to die, reparents the bean window
private synchronized void releaseSystemWindow()
{
if ( bPeer )
{
- // hide document window
+ // hide document window
XWindow aWindow = (XWindow)UnoRuntime.queryInterface(XWindow.class, mWindow);
aWindow.setVisible( false );
diff --git a/bean/com/sun/star/comp/beans/NativeConnection.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeConnection.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/NativeConnection.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeConnection.java
diff --git a/bean/com/sun/star/comp/beans/NativeService.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeService.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/NativeService.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/NativeService.java
diff --git a/bean/com/sun/star/comp/beans/NoConnectionException.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java
similarity index 95%
rename from bean/com/sun/star/comp/beans/NoConnectionException.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java
index d9cc7869e9e4..4652a723001f 100644
--- a/bean/com/sun/star/comp/beans/NoConnectionException.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoConnectionException.java
@@ -24,7 +24,7 @@
package com.sun.star.comp.beans;
/** This exception is called when a method is called which
- needs an established connection but no connection is
+ needs an established connection but no connection is
established yet or anymore.
@since OOo 2.0.0
diff --git a/bean/com/sun/star/comp/beans/NoDocumentException.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoDocumentException.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/NoDocumentException.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/NoDocumentException.java
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
similarity index 97%
rename from bean/com/sun/star/comp/beans/OOoBean.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
index d75b99203793..909a208d1b19 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OOoBean.java
@@ -112,7 +112,7 @@ public class OOoBean
public OOoBean()
{}
- // @requirement FUNC.CON.MULT/0.3
+ // @requirement FUNC.CON.MULT/0.3
/** Constructor for an OOoBean which uses a specific office connection.
The connection must be established but no document is loaded.
@@ -251,7 +251,7 @@ public class OOoBean
}
// @requirement FUNC.CON.STOP/0.4 (via XComponent.dispose())
- // @requirement FUNC.CON.NTFY/0.4 (via XComponent.addEventListener())
+ // @requirement FUNC.CON.NTFY/0.4 (via XComponent.addEventListener())
/** Returns the a connection to an OOo instance.
If no connection exists, a default connection will be created. An OfficeConnection
@@ -348,7 +348,7 @@ public class OOoBean
This implementation simply calls clear.
@param bClearStateToo
- Not only the document content but also the state of the bean,
+ Not only the document content but also the state of the bean,
like visibility of child components is cleared.
@deprecated There is currently no way to dismiss changes, except for loading
@@ -514,8 +514,8 @@ public class OOoBean
{ throw new NoConnectionException(); }
}
- // @requirement FUNC.BEAN.LOAD/0.4
- // @requirement FUNC.CON.AUTO/0.3
+ // @requirement FUNC.BEAN.LOAD/0.4
+ // @requirement FUNC.CON.AUTO/0.3
/** Loads the bean from the given URL.
If a document is already loaded and the content modified,
@@ -547,7 +547,7 @@ public class OOoBean
com.sun.star.util.CloseVetoException
{
dbgPrint( "loadFromURL()" );
- // try loading
+ // try loading
try
{
boolean bLoaded = false;
@@ -713,7 +713,7 @@ public class OOoBean
/** Loads a document from a Java stream.
- See loadFromURL() for further information.
+ See loadFromURL() for further information.
*/
public void loadFromStream(
final java.io.InputStream iInStream,
@@ -764,7 +764,7 @@ public class OOoBean
/** Loads a document from a byte array.
- See loadFromURL() for further information.
+ See loadFromURL() for further information.
*/
public void loadFromByteArray(
final byte aInBuffer[],
@@ -853,7 +853,7 @@ public class OOoBean
/** Stores a document to a stream.
- See {@link #storeToURL storeToURL} for further information.
+ See {@link #storeToURL storeToURL} for further information.
@see #storeToURL storeToURL
*/
public java.io.OutputStream storeToStream(
@@ -893,7 +893,7 @@ public class OOoBean
/** Stores a document to a byte array.
- See {@link #storeToURL storeToURL} for further information.
+ See {@link #storeToURL storeToURL} for further information.
@see #storeToURL storeToURL
*/
public byte[] storeToByteArray(
@@ -957,8 +957,8 @@ public class OOoBean
return aFrame;
}
- // @requirement FUNC.BEAN.PROG/0.5
- // @requirement API.SIM.SEAP/0.2
+ // @requirement FUNC.BEAN.PROG/0.5
+ // @requirement API.SIM.SEAP/0.2
/** returns the <type scope="com::sun::star::frame::Controller"> of the bean.
@returns
@@ -986,7 +986,7 @@ public class OOoBean
// @requirement FUNC.BEAN.STOR/0.4
// @requirement FUNC.BEAN.PRNT/0.4
// @requirement API.SIM.SEAP/0.2
- /** returns the <type scope="com::sun::star::document::OfficeDocument">
+ /** returns the <type scope="com::sun::star::document::OfficeDocument">
of the bean.
@returns
@@ -1011,7 +1011,7 @@ public class OOoBean
/** Sets visibility of all tool bars known by this OOoBean version.
- Initially all tool bars are visible. By hiding all tool bars
+ Initially all tool bars are visible. By hiding all tool bars
utilizing this method, it is possible to turn just a subset of
tool bars on afterwards, no matter whether all available tool
bars are known or not.
@@ -1067,7 +1067,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
/** Helper method to set tool bar visibilty.
- @param bnewValue
+ @param bnewValue
If false, the tool bar is disabled,
If true, the tool bar is visible.
@@ -1133,7 +1133,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
- @param bVisible
+ @param bVisible
If false, the menu bar is disabled,
If true, the menu bar is visible.
@@ -1154,9 +1154,9 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
}
- /** Returns the visibility of the menu bar.
+ /** Returns the visibility of the menu bar.
- This method works independently from a connetion or loaded document.
+ This method works independently from a connetion or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
@@ -1181,7 +1181,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
- @param bVisible
+ @param bVisible
If false, the main function bar is disabled,
If true, the main function bar is visible.
@@ -1202,9 +1202,9 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
}
- /** Returns the visibility of the main function bar.
+ /** Returns the visibility of the main function bar.
- This method works independently from a connetion or loaded document.
+ This method works independently from a connetion or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
@@ -1229,7 +1229,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
- @param bVisible
+ @param bVisible
If false, the tool function bar is disabled,
If true, the tool function bar is visible.
@@ -1250,9 +1250,9 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
}
- /** Returns the visibility of the tool function bar.
+ /** Returns the visibility of the tool function bar.
- This method works independently from a connetion or loaded document.
+ This method works independently from a connetion or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
@@ -1277,7 +1277,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
and automatically applied to the document after it is loaded.
Same is valid when the connection dies within this function call.
- @param bVisible
+ @param bVisible
If false, the status function bar is disabled,
If true, the status function bar is visible.
@@ -1298,9 +1298,9 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
}
- /** Returns the visibility of the status function bar.
+ /** Returns the visibility of the status function bar.
- This method works independently from a connetion or loaded document.
+ This method works independently from a connetion or loaded document.
If no connection is established or no document is loaded,
this method just returns a memorized status.
@@ -1438,7 +1438,7 @@ xLayoutManager.showElement("private:resource/menubar/menubar");
}
/// gets called when the user wants to terminate OOo
- public void queryTermination( /*IN*/ com.sun.star.lang.EventObject Event )
+ public void queryTermination( /*IN*/ com.sun.star.lang.EventObject Event )
throws com.sun.star.frame.TerminationVetoException
{
// disallow termination of OOo while a OOoBean exists
diff --git a/bean/com/sun/star/comp/beans/OfficeConnection.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeConnection.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/OfficeConnection.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeConnection.java
diff --git a/bean/com/sun/star/comp/beans/OfficeDocument.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
similarity index 98%
rename from bean/com/sun/star/comp/beans/OfficeDocument.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
index a2bf651580a2..91aa1ee16708 100644
--- a/bean/com/sun/star/comp/beans/OfficeDocument.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeDocument.java
@@ -27,7 +27,7 @@ import com.sun.star.uno.UnoRuntime;
//==========================================================================
/** Wrapper class for service OfficeDocument which emulates the upcoming
- mode of automatic runtime Java classes to get rid of the need for
+ mode of automatic runtime Java classes to get rid of the need for
queryInterface.
See further information on the wrapping and compatibility limitations
diff --git a/bean/com/sun/star/comp/beans/OfficeWindow.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeWindow.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/OfficeWindow.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/OfficeWindow.java
diff --git a/bean/com/sun/star/comp/beans/SystemWindowException.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/SystemWindowException.java
similarity index 100%
rename from bean/com/sun/star/comp/beans/SystemWindowException.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/SystemWindowException.java
diff --git a/bean/com/sun/star/comp/beans/Wrapper.java b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
similarity index 97%
rename from bean/com/sun/star/comp/beans/Wrapper.java
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
index 51b8bc77e66b..7071802b9136 100644
--- a/bean/com/sun/star/comp/beans/Wrapper.java
+++ b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/Wrapper.java
@@ -27,7 +27,7 @@ import com.sun.star.uno.UnoRuntime;
//==========================================================================
/** Wrapper base class for UNO services which emulates the upcoming
- mode of automatic runtime Java classes to get rid of the need for
+ mode of automatic runtime Java classes to get rid of the need for
queryInterface.
Because it's not worth the effort to create a runtime generated wrapper
diff --git a/bean/com/sun/star/comp/beans/makefile.mk b/bean/java/officebean/src/main/java/com/sun/star/comp/beans/makefile.mk
similarity index 100%
rename from bean/com/sun/star/comp/beans/makefile.mk
rename to bean/java/officebean/src/main/java/com/sun/star/comp/beans/makefile.mk
diff --git a/bean/prj/build.lst b/bean/prj/build.lst
index 91d443344555..4b52df2bcc6f 100644
--- a/bean/prj/build.lst
+++ b/bean/prj/build.lst
@@ -1,10 +1,3 @@
ob bean : javaunohelper jurt ridljar unoil offapi udkapi NULL
-ob bean\com\sun\star\comp\beans nmake - all ob_beanjava NULL
-ob bean\com\sun\star\beans nmake - all ob_legacybeanjava ob_beanjava NULL
-ob bean\native\win32 nmake - n ob_beanwin32 NULL
-ob bean\native\unix nmake - u ob_beanunix NULL
-ob bean\util nmake - all ob_util ob_beanjava ob_legacybeanjava ob_beanwin32.n ob_beanunix.u NULL
-
-# complex tests compileable but fail at runtime
-# ob bean\qa\complex\bean nmake - all ob_qa_complex ob_util NULL
+ob bean\prj nmake - all ob_prj NULL
diff --git a/bean/prj/d.lst b/bean/prj/d.lst
index b0478b3d4cd4..e69de29bb2d1 100644
--- a/bean/prj/d.lst
+++ b/bean/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\class\officebean.jar %_DEST%\bin%_EXT%\officebean.jar
-
-..\%__SRC%\bin\officebean.dll %_DEST%\bin%_EXT%\officebean.dll
-..\%__SRC%\lib\libofficebean.so %_DEST%\lib%_EXT%\libofficebean.so
-..\%__SRC%\lib\*officebean.dylib %_DEST%\lib%_EXT%\*officebean.dylib
diff --git a/bean/prj/makefile.mk b/bean/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/bean/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
commit 6fcd735038213c9c0ec83a8c386455e757e113db
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Sat Nov 24 11:32:03 2018 +0000
Commit: Damjan Jovanovic <damjan at apache.org>
CommitDate: Sat Nov 24 11:32:03 2018 +0000
Delete some unused dmake makefiles.
Patch by: me
diff --git a/xmerge/java/XMergeBridge/makefile.mk b/xmerge/java/XMergeBridge/makefile.mk
deleted file mode 100644
index c94622011282..000000000000
--- a/xmerge/java/XMergeBridge/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-TARGET=XMergeBridge
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
-
-ALLTAR : $(MISC)/XMergeBridge.component
-
-$(MISC)/XMergeBridge.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_JAVA)XMergeBridge.jar' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt XMergeBridge.component
diff --git a/xmerge/java/aportisdoc/makefile.mk b/xmerge/java/aportisdoc/makefile.mk
deleted file mode 100644
index 9f75c9342100..000000000000
--- a/xmerge/java/aportisdoc/makefile.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-TARGET=aportisdoc
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/java/htmlsoff/makefile.mk b/xmerge/java/htmlsoff/makefile.mk
deleted file mode 100644
index 28ccfe8a7836..000000000000
--- a/xmerge/java/htmlsoff/makefile.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-TARGET=htmlsoff
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/java/pexcel/makefile.mk b/xmerge/java/pexcel/makefile.mk
deleted file mode 100644
index 9e9cdd2a2fba..000000000000
--- a/xmerge/java/pexcel/makefile.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-TARGET=pexcel
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/java/pocketword/makefile.mk b/xmerge/java/pocketword/makefile.mk
deleted file mode 100644
index 57f3dbfe1939..000000000000
--- a/xmerge/java/pocketword/makefile.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-TARGET=pocketword
-PRJ=../..
-PRJNAME=xmerge
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
diff --git a/xmerge/java/xmerge/makefile.mk b/xmerge/java/xmerge/makefile.mk
deleted file mode 100644
index b391782fe88e..000000000000
--- a/xmerge/java/xmerge/makefile.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-TARGET=xmerge
-PRJ=../..
-
-.INCLUDE : ant.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: ANTBUILD
-.ENDIF
More information about the Libreoffice-commits
mailing list