diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-13 17:17:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-14 11:50:10 +0200 |
| commit | 41cc83d7d6603657be91ec942b718e0d97761f2c (patch) | |
| tree | 18deda55fa3a004efca1a2022abe56fe631719fd /svx | |
| parent | a362a94b6b0b145f42294adf531fe90c0b156e5f (diff) | |
svx: remove entirely gratuitous dependency on sqlparse.hxx
... caused by stupidly referring to a class member by its subclass.
Change-Id: Icdf7d7953a69d10b62ee78740e42bfe722bdc65b
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svxcore.mk | 1 | ||||
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 3 | ||||
| -rw-r--r-- | svx/source/inc/formcontroller.hxx | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 802c056fa3c3..e2bbbc84009f 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 313fcd84e7f2..0fbe0dc9c5d4 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 e12180e301c4..cc9af3abe8f0 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> |