mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CID#1079151 make it impossible to have an init m_eType

Browse Source 
Change-Id: I04cc7fdc07e89b0a056f0012cdd00b43d29184e7
This commit is contained in:
Caolán McNamara
2013-09-09 20:22:46 +01:00
parent 9bba2d6a5c
commit 4bd3496425
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vcl/ppdparser.hxx
View File

@@ -82,7 +82,7 @@ public:
PPDKey( const OUString& rKey ); PPDKey( const OUString& rKey );
~PPDKey(); ~PPDKey();
PPDValue* insertValue( const OUString& rOption ); PPDValue* insertValue( const OUString& rOption, PPDValueType eType );
int countValues() const int countValues() const
{ return m_aValues.size(); } { return m_aValues.size(); }
// neither getValue will return the query option // neither getValue will return the query option

9
vcl/unx/generic/printer/ppdparser.cxx
View File

@@ -1151,10 +1151,9 @@ void PPDParser::parse( ::std::list< OString >& rLines )
if( eType == eNo && bQuery ) if( eType == eNo && bQuery )
continue; continue;
PPDValue* pValue = pKey->insertValue( aOption ); PPDValue* pValue = pKey->insertValue( aOption, eType );
if( ! pValue ) if( ! pValue )
continue; continue;
pValue->m_eType = eType;
pValue->m_aValue = aValue; pValue->m_aValue = aValue;
if( !aOptionTranslation.isEmpty() ) if( !aOptionTranslation.isEmpty() )
@@ -1200,8 +1199,7 @@ void PPDParser::parse( ::std::list< OString >& rLines )
// (example: DefaultResolution) // (example: DefaultResolution)
// so invent that key here and have a default value // so invent that key here and have a default value
PPDKey* pKey = new PPDKey( aKey ); PPDKey* pKey = new PPDKey( aKey );
PPDValue* pNewValue = pKey->insertValue( aOption ); pKey->insertValue( aOption, eInvocation /*or what ?*/ );
pNewValue->m_eType = eInvocation; // or what ?
insertKey( aKey, pKey ); insertKey( aKey, pKey );
} }
} }
@@ -1598,13 +1596,14 @@ void PPDKey::eraseValue( const OUString& rOption )
// ------------------------------------------------------------------- // -------------------------------------------------------------------
PPDValue* PPDKey::insertValue( const OUString& rOption ) PPDValue* PPDKey::insertValue( const OUString& rOption, PPDValueType eType )
{ {
if( m_aValues.find( rOption ) != m_aValues.end() ) if( m_aValues.find( rOption ) != m_aValues.end() )
return NULL; return NULL;
PPDValue aValue; PPDValue aValue;
aValue.m_aOption = rOption; aValue.m_aOption = rOption;
aValue.m_eType = eType;
m_aValues[ rOption ] = aValue; m_aValues[ rOption ] = aValue;
PPDValue* pValue = &m_aValues[rOption]; PPDValue* pValue = &m_aValues[rOption];
m_aOrderedValues.push_back( pValue ); m_aOrderedValues.push_back( pValue );