[Libreoffice-commits] .: 3 commits - solenv/gbuild svx/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Sep 7 09:19:26 PDT 2011
solenv/gbuild/Pyuno.mk | 64 +++++++++++++++++++++++++++++++++++++++
solenv/gbuild/TargetLocations.mk | 3 +
solenv/gbuild/gbuild.mk | 1
svx/source/unodraw/unopool.cxx | 7 +++-
4 files changed, 74 insertions(+), 1 deletion(-)
New commits:
commit d599de13b5d1d3c5020d4b22ad94930bc14d5a29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 17:14:01 2011 +0100
use vnd.openoffice.pymodule: as the prefix
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index d7533f3..a904009 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -52,8 +52,7 @@ $(foreach file,$(2),$(call gb_Pyuno_add_file,$(1),$(file)))
endef
-# TODO: is it necessary to have variable componentprefix?
-gb_Pyuno__COMPONENTPREFIX := vnd.sun.star.expand:\dOOO_BASE_DIR/program/
+gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule:
define gb_Pyuno_set_componentfile
$(call gb_ComponentTarget_ComponentTarget,$(2),$(gb_Pyuno__COMPONENTPREFIX),$(1))
commit 2e444660c25d82dfa52f0232e2d97a5d8d1b0f60
Author: David Tardon <dtardon at redhat.com>
Date: Wed Sep 7 15:53:31 2011 +0200
add support for UNO components in Python
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
new file mode 100644
index 0000000..d7533f3
--- /dev/null
+++ b/solenv/gbuild/Pyuno.mk
@@ -0,0 +1,65 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_Pyuno__get_outdir_path = lib/pyuno/$(1)
+
+$(call gb_Pyuno_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),PYU,3)
+ mkdir -p $(dir $@) && touch $@
+
+.PHONY : $(call gb_Pyuno_get_clean_target,%)
+$(call gb_Pyuno_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),PYU,3)
+ rm -f $@
+
+define gb_Pyuno_Pyuno
+$(call gb_Package_Package,$(1)_pyuno,$(2))
+$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
+$(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(1)_pyuno)
+$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_pyuno)
+
+endef
+
+define gb_Pyuno_add_file
+$(call gb_Package_add_file,$(1)_pyuno,$(call gb_Pyuno__get_outdir_path,$(2)),$(2))
+
+endef
+
+define gb_Pyuno_add_files
+$(foreach file,$(2),$(call gb_Pyuno_add_file,$(1),$(file)))
+
+endef
+
+# TODO: is it necessary to have variable componentprefix?
+gb_Pyuno__COMPONENTPREFIX := vnd.sun.star.expand:\dOOO_BASE_DIR/program/
+
+define gb_Pyuno_set_componentfile
+$(call gb_ComponentTarget_ComponentTarget,$(2),$(gb_Pyuno__COMPONENTPREFIX),$(1))
+$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_outdir_target,$(2))
+$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2))
+
+endef
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index a740cb9..2949a3a 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -38,6 +38,7 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/inc \
$(OUTDIR)/idl \
$(OUTDIR)/bin \
+ $(OUTDIR)/lib \
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_RdbTarget_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
@@ -101,6 +102,7 @@ gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1)
gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1)
gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
@@ -157,6 +159,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
PackagePart \
Package \
PrecompiledHeader \
+ Pyuno \
RdbTarget \
ResTarget \
SdiTarget \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 329eefa..c05db66 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -297,6 +297,7 @@ include $(foreach class, \
Package \
CustomTarget \
PrecompiledHeaders \
+ Pyuno \
RdbTarget \
CppunitTest \
Jar \
commit 02df624709e9ead4bb46b66e43581990b30332c8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 7 15:41:45 2011 +0100
valgrind: secondary pool leaks here
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 74e2235..c0a46e1 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -69,7 +69,12 @@ SvxUnoDrawPool::SvxUnoDrawPool( SdrModel* pModel ) throw()
SvxUnoDrawPool::~SvxUnoDrawPool() throw()
{
- SfxItemPool::Free(mpDefaultsPool);
+ if (mpDefaultsPool)
+ {
+ SfxItemPool* pOutlPool = mpDefaultsPool->GetSecondaryPool();
+ SfxItemPool::Free(mpDefaultsPool);
+ SfxItemPool::Free(pOutlPool);
+ }
}
void SvxUnoDrawPool::init()
More information about the Libreoffice-commits
mailing list