Commits

Anonymous committed f7cc714

vcl122: #i117746# remove Application::Get/SetFontPath

  • Participants
  • Parent commits 541bbe2

Comments (0)

Files changed (4)

vcl/inc/svdata.hxx

     XubString*              mpAppName;          // Application name
     XubString*              mpAppFileName;      // Abs. Application FileName
     XubString*              mpDisplayName;      // Application Display Name
-    String*                 mpFontPath;         // Additional Fontpath
     Help*                   mpHelp;             // Application help
     PopupMenu*              mpActivePopupMenu;  // Actives Popup-Menu (in Execute)
     UniqueIdContainer*      mpUniqueIdCont;     // Fuer Eindeutige Id's

vcl/inc/vcl/svapp.hxx

     static void                 SetDialogScaleX( short nScale );
     static short                GetDialogScaleX();
 
-    static void                 SetFontPath( const String& rPath );
-    static const String&        GetFontPath();
-
     static UniqueItemId         CreateUniqueId();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > GetDisplayConnection();

vcl/source/app/svapp.cxx

 
 // -----------------------------------------------------------------------
 
-const String& Application::GetFontPath()
-{
-    ImplSVData* pSVData = ImplGetSVData();
-    if( !pSVData->maAppData.mpFontPath )
-    {
-        if( const char* pFontPath = ::getenv( "SAL_FONTPATH_PRIVATE" ) )
-            pSVData->maAppData.mpFontPath = new String( String::CreateFromAscii( pFontPath ) );
-    }
-
-    if( pSVData->maAppData.mpFontPath )
-        return *(pSVData->maAppData.mpFontPath);
-    return ImplGetSVEmptyStr();
-}
-
-// -----------------------------------------------------------------------
-
-void Application::SetFontPath( const String& rPath )
-{
-    ImplSVData* pSVData = ImplGetSVData();
-
-    // if it doesn't exist create a new one
-    if( !pSVData->maAppData.mpFontPath )
-        pSVData->maAppData.mpFontPath = new String( rPath );
-    else
-        *(pSVData->maAppData.mpFontPath) = rPath;
-}
-
-// -----------------------------------------------------------------------
-
 UniqueItemId Application::CreateUniqueId()
 {
     ImplSVData* pSVData = ImplGetSVData();

vcl/source/glyphs/glyphcache.cxx

 {
     if( const char* pFontPath = ::getenv( "SAL_FONTPATH_PRIVATE" ) )
         AddFontPath( String::CreateFromAscii( pFontPath ) );
-    const String& rFontPath = Application::GetFontPath();
-    if( rFontPath.Len() > 0 )
-        AddFontPath( rFontPath );
 }
 
 // -----------------------------------------------------------------------