[Libreoffice-commits] .: Branch 'libreoffice-3-6' - svx/Library_svx.mk svx/source

[Libreoffice Gerrit user]

 svx/Library_svx.mk         |    1 +
 svx/source/inc/filtnav.hxx |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3e0f363d828618e86a0d6c7dac89040bfd37bed1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 22 12:49:08 2012 +0200

    fdo#53888: svx: fix dependencies:
    
    It appears that since cd0046bca0691fdca45a030903b7cde3bfee544c,
    2 tinderboxes fail on including the generated sqlbison.hxx;
    it turns out one of the inclusions of that in svx is unnecessary and the
    other is used to call a virtual function, which can apparently be done
    without linking; just link svx to dbtools anyway, that should fix the
    build.
    
    Change-Id: I7f7b1c4e9561c4dd2b820b173d05bdd5d4c6ba6d
    (cherry picked from commit 01089138cc76f5717244bd04f25a868602aeaab6)
    Reviewed-on: https://gerrit.libreoffice.org/456
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index ba8ffa1..f2bb177 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,svx,\
     comphelper \
     cppuhelper \
     cppu \
+    dbtools \
     drawinglayer \
     editeng \
     i18nisolang1 \
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index c694aaa..5795a8f 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -48,7 +48,6 @@
 #include <vcl/dockwin.hxx>
 #include "svx/fmtools.hxx"
 #include "fmexch.hxx"
-#include <connectivity/sqlparse.hxx>
 #include "sqlparserclient.hxx"
 
 class FmFormShell;