diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 11:16:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 14:53:46 +0000 |
| commit | 538cf0c496f509f8fa7efa2bc61bfb5e8878d097 (patch) | |
| tree | e77346932d9d36ae850bf0cd20a5226c6f2a570b /vcl/unx/generic/fontmanager | |
| parent | 26912eea7521dd2b84bfac56b322cf0f8b142450 (diff) | |
move dbus config into its own config header
Change-Id: I5b0734a30dee323d41270de06f6a02fd676155c9
Reviewed-on: https://gerrit.libreoffice.org/22502
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/generic/fontmanager')
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontconfig.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/fontmanager/fontmanager.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index edd303cebad2..8def3626be10 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -37,7 +37,7 @@ using namespace psp; #include <ft2build.h> #include <fontconfig/fcfreetype.h> -#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) #include <dbus/dbus-glib.h> #endif @@ -877,7 +877,7 @@ namespace return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } -#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) guint get_xid_for_dbus() { const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow(); @@ -887,7 +887,7 @@ namespace #endif } -#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { guint xid = get_xid_for_dbus(); @@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi } } OUString sStillMissing(pRemainingCodes.get(), nRemainingLen); -#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) if (get_xid_for_dbus()) { if (sStillMissing == rMissingCodes) //replaced nothing diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index d8863a4cb114..b2525ac232a3 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager() } } -#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport)); m_aFontInstallerTimer.SetTimeout(5000); #endif |