diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:25:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 09:25:43 +0000 |
| commit | 2496184ad54c2d4707d9342dd03d302a52c88eac (patch) | |
| tree | db593ff4cc9c21078ffe463bd5a4b6f73267a6d9 /psprint | |
| parent | b8545336f45941e52309d567c327b10662eb9336 (diff) | |
INTEGRATION: CWS warnings01 (1.19.10); FILE MERGED
2006/01/25 17:09:13 sb 1.19.10.2: RESYNC: (1.19-1.20); FILE MERGED
2005/10/28 10:53:41 pl 1.19.10.1: #i55991# removed warnings for solaris platform
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/helper/ppdparser.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/psprint/source/helper/ppdparser.cxx b/psprint/source/helper/ppdparser.cxx index 95d2b652ce91..54bb431a4c14 100644 --- a/psprint/source/helper/ppdparser.cxx +++ b/psprint/source/helper/ppdparser.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ppdparser.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2005-12-28 17:09:13 $ + * last change: $Author: hr $ $Date: 2006-06-19 10:25:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -712,10 +712,10 @@ void PPDParser::parse( ::std::list< ByteString >& rLines ) keyit = m_aKeys.find( aKey ); if( keyit != m_aKeys.end() ) { - PPDKey* pKey = keyit->second; - const PPDValue* pValue = pKey->getValue( aOption ); + pKey = keyit->second; + const PPDValue* pDefValue = pKey->getValue( aOption ); if( pKey->m_pDefaultValue == NULL ) - pKey->m_pDefaultValue = pValue; + pKey->m_pDefaultValue = pDefValue; } else { @@ -724,8 +724,8 @@ void PPDParser::parse( ::std::list< ByteString >& rLines ) // (example: DefaultResolution) // so invent that key here and have a default value pKey = new PPDKey( aKey ); - PPDValue* pValue = pKey->insertValue( aOption ); - pValue->m_eType = eInvocation; // or what ? + PPDValue* pNewValue = pKey->insertValue( aOption ); + pNewValue->m_eType = eInvocation; // or what ? insertKey( aKey, pKey ); } } |