reduce static_initialization_and_destruction chain

Change-Id: I962aeac0c7feeabb7963016d5afcfeca5a48ccfe

3 files changed, 3 insertions, 19 deletions

diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 06bfb7b1dad5..ddb2fdba1703 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -994,10 +994,6 @@ bool PrintFontManager::PrintFont::readAfmMetrics( const OString& rFileName, Mult
     return true;
 }
 
-// -------------------------------------------------------------------------
-
-OString PrintFontManager::s_aEmptyOString;
-
 /*
  *  one instance only
  */
@@ -1051,10 +1047,10 @@ PrintFontManager::~PrintFontManager()
 
 // -------------------------------------------------------------------------
 
-const OString& PrintFontManager::getDirectory( int nAtom ) const
+OString PrintFontManager::getDirectory( int nAtom ) const
 {
     ::boost::unordered_map< int, OString >::const_iterator it( m_aAtomToDir.find( nAtom ) );
-    return it != m_aAtomToDir.end() ? it->second : s_aEmptyOString;
+    return it != m_aAtomToDir.end() ? it->second : OString();
 }
 
 // -------------------------------------------------------------------------
diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index 0760e3069432..2cb07aed5ec5 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.hxx
@@ -267,8 +267,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
         virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* pProvider );
     };
 
-    static rtl::OString s_aEmptyOString;
-
     fontID                                      m_nNextFontID;
     boost::unordered_map< fontID, PrintFont* >       m_aFonts;
     boost::unordered_map< int, FontFamily >        m_aFamilyTypes;
@@ -328,7 +326,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     void fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const;
     void fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const;
 
-    const rtl::OString& getDirectory( int nAtom ) const;
+    rtl::OString getDirectory( int nAtom ) const;
     int getDirectoryAtom( const rtl::OString& rDirectory, bool bCreate = false );
 
     /* try to initialize fonts from libfontconfig
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 131686f273b2..3d0a48dfc264 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -37,7 +37,6 @@
 #define FAST_ARGB_BGRA
 
 #include <stdlib.h>
-static bool bDisableFastBitops = (getenv( "SAL_DISABLE_BITMAPS_OPTS" ) != NULL);
 
 typedef unsigned char PIXBYTE;
 
@@ -502,9 +501,6 @@ inline bool ImplConvertFromBitmap( BitmapBuffer& rDst, const BitmapBuffer& rSrc
 bool ImplFastBitmapConversion( BitmapBuffer& rDst, const BitmapBuffer& rSrc,
     const SalTwoRect& rTR )
 {
-    if( bDisableFastBitops )
-        return false;
-
     // horizontal mirroring not implemented yet
     if( rTR.mnDestWidth < 0 )
         return false;
@@ -760,9 +756,6 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDstWA,
     const BitmapReadAccess& rSrcRA, const BitmapReadAccess& rMskRA,
     const SalTwoRect& rTR )
 {
-    if( bDisableFastBitops )
-        return false;
-
     // accelerated blending of paletted bitmaps not implemented yet
     if( rSrcRA.HasPalette() )
         return false;
@@ -884,9 +877,6 @@ bool ImplFastBitmapBlending( BitmapWriteAccess& rDstWA,
 
 bool ImplFastEraseBitmap( BitmapBuffer& rDst, const BitmapColor& rColor )
 {
-    if( bDisableFastBitops )
-        return false;
-
     const sal_uLong nDstFormat = rDst.mnFormat & ~BMP_FORMAT_TOP_DOWN;
 
     // erasing a bitmap is often just a byte-wise memory fill