Hello,
some more work towards a working disable-database-connectivity. We now
compile fine but fail with:
solenv/gbuild/ComponentTarget.mk:56: *** gb_Deliver_deliver: file does
not exist in solver, and cannot be delivered:
/home/rm/src/libo/solver/unxlngx6.pro/xml/component/forms/util/frm.component.
Stop.
Please review
--
Riccardo Magliocchetti
>From aa409124e4f054b25df97f61521890bfef8ad27a Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocche...@gmail.com>
Date: Tue, 21 Feb 2012 22:44:21 +0100
Subject: [PATCH] Some more work for --disable-database-connectivity
---
svx/source/dialog/txencbox.cxx | 6 ++++++
sw/Library_swui.mk | 35 ++++++++++++++++++++---------------
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 9a07c5f..53a1162 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -30,7 +30,9 @@
#include "svx/txencbox.hxx"
#include "svx/txenctab.hxx"
#include <svx/dialogs.hrc>
+#ifndef DISABLE_DBCONNECTIVITY
#include "svx/dbcharsethelper.hxx"
+#endif
#include <vcl/svapp.hxx>
#include <rtl/tencinfo.h>
#include <rtl/locale.h>
@@ -124,6 +126,9 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
+#ifdef DISABLE_DBCONNECTIVITY
+ (void)bExcludeImportSubsets; (void)nExcludeInfoFlags; (void)nButIncludeInfoFlags;
+#else
rtl_TextEncodingInfo aInfo;
aInfo.StructSize = sizeof(rtl_TextEncodingInfo);
svxform::ODataAccessCharsetHelper aCSH;
@@ -171,6 +176,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
InsertTextEncoding( nEnc );
}
}
+#endif
}
//------------------------------------------------------------------------
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index fe1c2545..c759aa0 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -85,21 +85,6 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/config/optcomp \
sw/source/ui/config/optload \
sw/source/ui/config/optpage \
- sw/source/ui/dbui/addresslistdialog \
- sw/source/ui/dbui/createaddresslistdialog \
- sw/source/ui/dbui/customizeaddresslistdialog \
- sw/source/ui/dbui/dbinsdlg \
- sw/source/ui/dbui/dbtablepreviewdialog \
- sw/source/ui/dbui/mailmergewizard \
- sw/source/ui/dbui/mmaddressblockpage \
- sw/source/ui/dbui/mmdocselectpage \
- sw/source/ui/dbui/mmgreetingspage \
- sw/source/ui/dbui/mmlayoutpage \
- sw/source/ui/dbui/mmmergepage \
- sw/source/ui/dbui/mmoutputpage \
- sw/source/ui/dbui/mmoutputtypepage \
- sw/source/ui/dbui/mmpreparemergepage \
- sw/source/ui/dbui/selectdbtabledialog \
sw/source/ui/dialog/abstract \
sw/source/ui/dialog/addrdlg \
sw/source/ui/dialog/ascfldlg \
@@ -170,4 +155,24 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/utlui/swrenamexnameddlg \
))
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_Library_add_exception_objects,swui,\
+ sw/source/ui/dbui/addresslistdialog \
+ sw/source/ui/dbui/createaddresslistdialog \
+ sw/source/ui/dbui/customizeaddresslistdialog \
+ sw/source/ui/dbui/dbinsdlg \
+ sw/source/ui/dbui/dbtablepreviewdialog \
+ sw/source/ui/dbui/mailmergewizard \
+ sw/source/ui/dbui/mmaddressblockpage \
+ sw/source/ui/dbui/mmdocselectpage \
+ sw/source/ui/dbui/mmgreetingspage \
+ sw/source/ui/dbui/mmlayoutpage \
+ sw/source/ui/dbui/mmmergepage \
+ sw/source/ui/dbui/mmoutputpage \
+ sw/source/ui/dbui/mmoutputtypepage \
+ sw/source/ui/dbui/mmpreparemergepage \
+ sw/source/ui/dbui/selectdbtabledialog \
+))
+endif
+
# vim: set noet sw=4 ts=4:
--
1.7.5.4
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
