summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--padmin/source/padialog.cxx16
-rw-r--r--padmin/source/padialog.hrc4
-rw-r--r--padmin/source/padialog.hxx1
-rw-r--r--padmin/source/padialog.src7
-rw-r--r--vcl/generic/fontmanager/fontconfig.cxx5
-rw-r--r--vcl/generic/fontmanager/fontmanager.cxx26
-rw-r--r--vcl/generic/print/genpspgraphics.cxx5
-rw-r--r--vcl/inc/vcl/fontmanager.hxx8
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx5
9 files changed, 18 insertions, 59 deletions
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index ee3a815fa042..9b0e62e4812f 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -99,7 +99,6 @@ PADialog::PADialog( Window* pParent, sal_Bool /*bAdmin*/ ) :
m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
m_aAddPB( this, PaResId( RID_PA_BTN_ADD ) ),
- m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
m_aCancelButton( this, PaResId( RID_PA_BTN_CANCEL ) ),
m_aDefPrt( PaResId( RID_PA_STR_DEFPRT ) ),
m_aRenameStr( PaResId( RID_PA_STR_RENAME ) ),
@@ -135,20 +134,10 @@ void PADialog::Init()
m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
m_aCUPSCB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
- ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
- if( ! rFontManager.checkImportPossible() )
- m_aFontsPB.Enable( sal_False );
- if( rFontManager.hasFontconfig() )
- {
- m_aFontsPB.Enable( sal_False );
- m_aFontsPB.Show( sal_False );
- }
-
// at this point no actual changes will be written
// but the write will have checked whether any writeable config exists
if( ! m_rPIManager.writePrinterConfig() )
@@ -227,11 +216,6 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushButton*, pButton )
PrintTestPage();
else if( pButton == &m_aAddPB )
AddDevice();
- else if( pButton == &m_aFontsPB )
- {
- FontNameDlg aDialog( this );
- aDialog.Execute();
- }
else if( static_cast<Button*>(pButton) == &m_aCUPSCB )
{
m_rPIManager.setCUPSDisabled( m_aCUPSCB.IsChecked() );
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index 69e12428ddab..9ae1bfeeee26 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -33,11 +33,11 @@
#define RID_PA_BTN_STD 2
#define RID_PA_BTN_DEL 3
#define RID_PA_LB_DEV 4
-#define RID_PA_FL_PRINTERS 5
+#define RID_PA_FL_PRINTERS 5
#define RID_PA_BTN_CONF 6
#define RID_PA_BTN_RENAME 7
#define RID_PA_TESTPAGE 8
-#define RID_PA_BTN_FONTS 9
+
#define RID_PA_TXT_DRIVER 10
#define RID_PA_TXT_DRIVER_STRING 11
#define RID_PA_TXT_LOCATION 12
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 4f39f03b6727..9c6646fb21d8 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -68,7 +68,6 @@ namespace padmin {
FixedLine m_aSepButtonFL;
PushButton m_aAddPB;
- PushButton m_aFontsPB;
CancelButton m_aCancelButton;
String m_aDefPrt;
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index f9f9b165af7b..194dea7e9b3f 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -281,13 +281,6 @@ ModalDialog RID_PADIALOG
Text [ en-US ] = "Test ~Page";
};
- PushButton RID_PA_BTN_FONTS
- {
- HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS";
- Pos = MAP_APPFONT( 80, 181 );
- Size = MAP_APPFONT( 70, 12 );
- Text [ en-US ] = "Fon~ts...";
- };
PushButton RID_PA_BTN_ADD
{
HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD";
diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx
index 4d02a76a3995..0c3655ccb543 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -104,7 +104,7 @@ namespace
class FontCfgWrapper
{
- FcFontSet* m_pOutlineSet;
+ FcFontSet* m_pOutlineSet;
void addFontSet( FcSetName );
@@ -383,10 +383,9 @@ FcResult FontCfgWrapper::LocalizedElementFromPattern(FcPattern* pPattern, FcChar
/*
* PrintFontManager::initFontconfig
*/
-bool PrintFontManager::initFontconfig()
+void PrintFontManager::initFontconfig()
{
FontCfgWrapper::get();
- return true;
}
namespace
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 37f0bf79b3b7..2b99ca5fd181 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -1195,12 +1195,11 @@ PrintFontManager& PrintFontManager::get()
* the PrintFontManager
*/
-PrintFontManager::PrintFontManager() :
- m_nNextFontID( 1 ),
- m_pAtoms( new MultiAtomProvider() ),
- m_nNextDirAtom( 1 ),
- m_pFontCache( NULL ),
- m_bFontconfigSuccess( false )
+PrintFontManager::PrintFontManager()
+ : m_nNextFontID( 1 )
+ , m_pAtoms( new MultiAtomProvider() )
+ , m_nNextDirAtom( 1 )
+ , m_pFontCache( NULL )
{
for( unsigned int i = 0; i < SAL_N_ELEMENTS( aAdobeCodes ); i++ )
{
@@ -2153,7 +2152,7 @@ void PrintFontManager::initialize()
#endif
// first try fontconfig
- m_bFontconfigSuccess = initFontconfig();
+ initFontconfig();
// part one - look for downloadable fonts
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
@@ -2177,7 +2176,7 @@ void PrintFontManager::initialize()
// if registering an app-specific fontdir with fontconfig fails
// and fontconfig-based substitutions are enabled
// then trying to use these app-specific fonts doesn't make sense
- if( m_bFontconfigSuccess && !addFontconfigDir( aToken ) )
+ if( !addFontconfigDir( aToken ) )
if( bAreFCSubstitutionsEnabled )
continue;
m_aFontDirectories.push_back( aToken );
@@ -2188,15 +2187,8 @@ void PrintFontManager::initialize()
// protect against duplicate paths
boost::unordered_map< OString, int, OStringHash > visited_dirs;
- // now that all global and local font dirs are known to fontconfig
- // check that there are fonts actually managed by fontconfig
- // also don't search directories that fontconfig already did
- if( m_bFontconfigSuccess )
- m_bFontconfigSuccess = (countFontconfigFonts( visited_dirs ) > 0);
-
- // don't search through many directories fontconfig already told us about
- if( ! m_bFontconfigSuccess )
- ImplGetSVData()->mpDefInst->FillFontPathList( m_aFontDirectories );
+ // Don't search directories that fontconfig already did
+ countFontconfigFonts( visited_dirs );
// fill XLFD aliases from fonts.alias files
initFontsAlias();
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 4d869c53a0fa..67bb7595b8a1 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -903,9 +903,8 @@ void GenPspGraphics::GetDevFontList( ImplDevFontList *pList )
if (rMgr.getFontFastInfo (*it, aInfo))
AnnounceFonts( pList, aInfo );
- // register platform specific font substitutions if available
- if( rMgr.hasFontconfig() )
- SalGenericInstance::RegisterFontSubstitutors( pList );
+ // register platform specific font substitutions if available
+ SalGenericInstance::RegisterFontSubstitutors( pList );
}
void GenPspGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 723600912fad..c7abfc4ebd26 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -325,7 +325,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
boost::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
mutable FontCache* m_pFontCache;
- bool m_bFontconfigSuccess;
mutable std::vector< fontID > m_aOverrideFonts;
@@ -361,12 +360,8 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
/* try to initialize fonts from libfontconfig
called from <code>initialize()</code>
-
- @returns
- true if at least one font was added by libfontconfig
- false else (e.g. no libfontconfig found)
*/
- bool initFontconfig();
+ void initFontconfig();
int countFontconfigFonts( boost::unordered_map<rtl::OString, int, rtl::OStringHash>& o_rVisitedPaths );
/* deinitialize fontconfig
*/
@@ -649,7 +644,6 @@ public:
ImplFontOptions* getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*)) const;
bool Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes ) const;
- bool hasFontconfig() const { return m_bFontconfigSuccess; }
int FreeTypeCharIndex( void *pFace, sal_uInt32 aChar );
};
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index a7e532bbc2b3..1a496c43a1c4 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -607,10 +607,9 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
rGC.AnnounceFonts( pList );
// register platform specific font substitutions if available
- if( rMgr.hasFontconfig() )
- SalGenericInstance::RegisterFontSubstitutors( pList );
+ SalGenericInstance::RegisterFontSubstitutors( pList );
- ImplGetSVData()->maGDIData.mbNativeFontConfig = rMgr.hasFontconfig();
+ ImplGetSVData()->maGDIData.mbNativeFontConfig = true;
}
// ----------------------------------------------------------------------------
generated by cgit (git 2.34.1) at 2024-07-27 22:00:24 +0000