diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 8 | ||||
| -rw-r--r-- | vcl/null/printerinfomanager.cxx | 19 |
2 files changed, 27 insertions, 0 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index f18c18f2ab47..4b153f0b975f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -437,9 +437,17 @@ $(eval $(call gb_Library_add_defs,vcl,\ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ )) $(eval $(call gb_Library_add_exception_objects,vcl,\ + vcl/generic/fontmanager/fontcache \ + vcl/generic/fontmanager/fontconfig \ + vcl/generic/fontmanager/fontmanager \ vcl/unx/generic/plugadapt/salplug \ + vcl/unx/generic/printer/ppdparser \ vcl/null/printerinfomanager \ )) +$(eval $(call gb_Library_use_externals,vcl,\ + fontconfig \ + freetype \ +)) endif ifeq ($(GUIBASE),cocoatouch) diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx index 964a19d1e3d5..934f2772f1e8 100644 --- a/vcl/null/printerinfomanager.cxx +++ b/vcl/null/printerinfomanager.cxx @@ -39,6 +39,14 @@ using ::rtl::OString; using ::rtl::OStringToOUString; using ::rtl::OUStringHash; +PrinterInfoManager& PrinterInfoManager::get() +{ + SalData* pSalData = GetSalData(); + if( ! pSalData->m_pPIManager ) + pSalData->m_pPIManager = new PrinterInfoManager(); + return *pSalData->m_pPIManager; +} + void PrinterInfoManager::release() { SalData* pSalData = GetSalData(); @@ -46,4 +54,15 @@ void PrinterInfoManager::release() pSalData->m_pPIManager = NULL; } +PrinterInfoManager::PrinterInfoManager( Type eType ) : + m_pQueueInfo( NULL ), + m_eType( eType ), + m_bUseIncludeFeature( false ), + m_bUseJobPatch( true ), + m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ), + m_bDisableCUPS( false ) +{ + initSystemDefaultPaper(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |