diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-17 23:51:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-18 00:04:15 +0300 |
| commit | 629cc605a45e75d6896b524eada2354c1d4d33a8 (patch) | |
| tree | a9bea5727019feaf545706e5694692c4742c1085 /svx | |
| parent | 558aa44672fe3565dfe1eab82c8766f2f499ee0d (diff) | |
Intermediate commit of hacking on --disable-database-connectivity
Add HAVE_FEATURE_DBCONNECTIVITY to <config_features.h> instead of
using (or not, more likely) -DDISABLE_DBCONNECTIVITY.
The plan is still that database connectivity would be disabled always
for the non-desktop platforms, and otherwise disabling it would be a
configure option.
But, still lots to do; the TiledLibreOffice iOS test app gets tons of
undefineds when linking if I actually try to disable the database
connectivity.
Change-Id: If1e4b55faa1514cd55dec5fc5487a30d689739ac
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/txencbox.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 969186c05dfb..ae5ba01aa4b0 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -17,11 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "svx/txencbox.hxx" #include "svx/txenctab.hxx" #include <svx/dialogs.hrc> -#ifndef DISABLE_DBCONNECTIVITY +#if HAVE_FEATURE_DBCONNECTIVITY #include "svx/dbcharsethelper.hxx" #endif #include <vcl/builder.hxx> @@ -134,7 +135,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, sal_uInt32 nButIncludeInfoFlags ) { -#ifdef DISABLE_DBCONNECTIVITY +#if !HAVE_FEATURE_DBCONNECTIVITY (void)bExcludeImportSubsets; (void)nExcludeInfoFlags; (void)nButIncludeInfoFlags; |