diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-02-21 22:44:21 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-28 00:43:34 +0200 |
| commit | 0d55cc7bf4dc62a0a5029fc19d0f05e08b6dc110 (patch) | |
| tree | 85c910291e594647cb371d2b3b16a4daf7610bd8 | |
| parent | 9fb0ad21f467f6e8960e3559337f8ebdfa206ff9 (diff) | |
Some more work for --disable-database-connectivity
| -rw-r--r-- | svx/source/dialog/txencbox.cxx | 8 | ||||
| -rw-r--r-- | sw/Library_swui.mk | 35 |
2 files changed, 28 insertions, 15 deletions
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 9a07c5f9f8c4..9aa57363e934 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,11 @@ 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 +178,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( InsertTextEncoding( nEnc ); } } +#endif } //------------------------------------------------------------------------ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index fe1c2545d421..c759aa0b2093 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: |