diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 11:19:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 12:04:10 +0100 |
| commit | 8512e5c2b3617a2c8d77381788c3864db594ce46 (patch) | |
| tree | c7fde308b180a2bce971fc80958d8bd28aa123d0 /vcl/generic | |
| parent | restore this, problem was ever-growing PATH for incremental builds (diff) | |
| download | core-8512e5c2b3617a2c8d77381788c3864db594ce46.tar.gz core-8512e5c2b3617a2c8d77381788c3864db594ce46.zip | |
reduce static_initialization_and_destruction chain
Change-Id: I962aeac0c7feeabb7963016d5afcfeca5a48ccfe
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/fontmanager.cxx | 8 |
1 files changed, 2 insertions, 6 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(); } // ------------------------------------------------------------------------- |