[Libreoffice-commits] core.git: 4 commits - config_host.mk.in pyuno/CustomTarget_python_bin.mk pyuno/Package_python_bin.mk svx/Library_svxcore.mk svx/source
Michael Stahl
mstahl at redhat.com
Tue May 14 02:57:46 PDT 2013
config_host.mk.in | 2 --
pyuno/CustomTarget_python_bin.mk | 23 -----------------------
pyuno/Package_python_bin.mk | 14 --------------
svx/Library_svxcore.mk | 5 -----
svx/source/form/formcontroller.cxx | 3 ++-
svx/source/inc/formcontroller.hxx | 1 -
6 files changed, 2 insertions(+), 46 deletions(-)
New commits:
commit 8b6fc11782a449c06d013ac5e2ebfc3319d596de
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue May 14 11:52:18 2013 +0200
svx: revert usage of "dbtools" headers
The root cause for build failure was fixed by
41cc83d7d6603657be91ec942b718e0d97761f2c
Change-Id: I9502f668e3f27a99aa278396bee36de131706d90
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index e2bbbc8..03fd18a 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -377,10 +377,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_headers,svxcore,\
- dbtools \
-))
-
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/fmcomp/dbaexchange \
svx/source/fmcomp/fmgridcl \
commit 41cc83d7d6603657be91ec942b718e0d97761f2c
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 13 17:17:49 2013 +0200
svx: remove entirely gratuitous dependency on sqlparse.hxx
... caused by stupidly referring to a class member by its subclass.
Change-Id: Icdf7d7953a69d10b62ee78740e42bfe722bdc65b
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 802c056..e2bbbc8 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,svxcore,\
-I$(SRCDIR)/svx/source/inc \
$$(INCLUDE) \
-I$(WORKDIR)/SdiTarget/svx/sdi \
- -I$(WORKDIR)/YaccTarget/connectivity/source/parse \
))
$(eval $(call gb_Library_set_precompiled_header,svxcore,$(SRCDIR)/svx/inc/pch/precompiled_svxcore))
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 313fcd8..0fbe0dc 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -76,6 +76,7 @@
#include <comphelper/flagguard.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
+#include <connectivity/IParseContext.hxx>
#include <toolkit/controls/unocontrol.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
@@ -3228,7 +3229,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
{
OUString aCompText = aRow[(*iter).xText];
aCompText += OUString(" ");
- OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND);
+ OString aVal = m_xParser->getContext().getIntlKeywordAscii(IParseContext::KEY_AND);
aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US);
aCompText += OUString(" ");
aCompText += ::comphelper::getString(pRefValues[j].Value);
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index e12180e..cc9af3a 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -71,7 +71,6 @@
#include <comphelper/componentcontext.hxx>
#include <comphelper/proparrhlp.hxx>
#include <comphelper/stl_types.hxx>
-#include <connectivity/sqlparse.hxx>
#include <cppuhelper/propshlp.hxx>
#include <vcl/timer.hxx>
commit a362a94b6b0b145f42294adf531fe90c0b156e5f
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon May 13 16:45:15 2013 +0200
config_host.mk: remove DMAKE variables
Change-Id: I2e768f92ea6f4302ebede403e84d7bc70b4f3107
diff --git a/config_host.mk.in b/config_host.mk.in
index 76ac1a7..02da41e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -105,7 +105,6 @@ export DISABLE_OPENSSL=@DISABLE_OPENSSL@
export DISABLE_PYTHON=@DISABLE_PYTHON@
export DISABLE_SCRIPTING=@DISABLE_SCRIPTING@
export DLLTOOL=@DLLTOOL@
-export DMAKEROOT=@SRC_ROOT@/solenv/inc/startup
export DOCDIR=@DOCDIR@
export DOXYGEN=@DOXYGEN@
export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
@@ -386,7 +385,6 @@ export EXTRA_BUILDID=@EXTRA_BUILDID@
export OBJDUMP=@OBJDUMP@
export ODFGEN_CFLAGS=$(gb_SPACE)@ODFGEN_CFLAGS@
export ODFGEN_LIBS=$(gb_SPACE)@ODFGEN_LIBS@
-export OOODMAKEMODE=YES
export OOOP_FONTS_PACK=@OOOP_FONTS_PACK@
export OOOP_GALLERY_PACK=@OOOP_GALLERY_PACK@
export OOOP_SAMPLES_PACK=@OOOP_SAMPLES_PACK@
commit 96fe61f40e7c065d5bbc2f5cb60e2b9e05e8bc79
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri May 10 21:51:12 2013 +0200
pyuno: remove obsolete makefiles
These should have been removed in b6bcbb675afedba0c47654dd78dc446dac0630d1
Change-Id: Iec28da16542f16c459bf301649260d8b13c1c67d
diff --git a/pyuno/CustomTarget_python_bin.mk b/pyuno/CustomTarget_python_bin.mk
deleted file mode 100644
index 9524b61..0000000
--- a/pyuno/CustomTarget_python_bin.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,pyuno/python_bin))
-
-# do we need it here: $(gb_Executable_EXT)?
-$(call gb_CustomTarget_get_target,pyuno/python_bin) : \
- $(call gb_CustomTarget_get_workdir,pyuno/python_bin)/python.bin
-
-$(call gb_CustomTarget_get_workdir,pyuno/python_bin)/python.bin : $(OUTDIR)/bin/python | \
- $(call gb_CustomTarget_get_workdir,pyuno/python_bin)/.dir
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),COP,1)
- cp $< $@.tmp
- strip $@.tmp
- mv $@.tmp $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Package_python_bin.mk b/pyuno/Package_python_bin.mk
deleted file mode 100644
index 0ced785..0000000
--- a/pyuno/Package_python_bin.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,python_bin,$(call gb_CustomTarget_get_workdir,pyuno/python_bin)))
-
-$(eval $(call gb_Package_add_file,python_bin,bin/python.bin,python.bin))
-
-# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list