diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-14 15:41:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-14 15:58:52 +0000 |
| commit | ab419e3df3f51991cc35b60144e57233bf7ac678 (patch) | |
| tree | ef481376b6d3aa34f41a2a3a9dbbd51464b9f82a /vcl/unx/generic/printer/ppdparser.cxx | |
| parent | 85543a2700bcb3100f07851b3173b3f218cadff0 (diff) | |
Resolves: coverity#1078567 help coverity out
so it know that its the same rPPDCache in use to
avoid various warnings
Change-Id: I89cb7830f375f1907b2457bd05fd2df5d36c3696
Diffstat (limited to 'vcl/unx/generic/printer/ppdparser.cxx')
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index cbfe171b173b..121fa8fa6f02 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -455,9 +455,8 @@ void PPDParser::scanPPDDir( const OUString& rDir ) } } -void PPDParser::initPPDFiles() +void PPDParser::initPPDFiles(PPDCache &rPPDCache) { - PPDCache &rPPDCache = thePPDCache::get(); if( rPPDCache.pAllPPDFiles ) return; @@ -499,7 +498,7 @@ void PPDParser::getKnownPPDDrivers( std::list< OUString >& o_rDrivers, bool bRef rPPDCache.pAllPPDFiles = NULL; } - initPPDFiles(); + initPPDFiles(rPPDCache); o_rDrivers.clear(); boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it; @@ -520,7 +519,7 @@ OUString PPDParser::getPPDFile( const OUString& rFile ) bool bRetry = true; do { - initPPDFiles(); + initPPDFiles(rPPDCache); // some PPD files contain dots beside the extension, so try name first // and cut of points after that OUString aBase( rFile ); |