Kaydet (Commit) 2e6a5683 authored tarafından Herbert Dürr's avatar Herbert Dürr

fix type-ambiguity of pair (needed when move semantics are involved)

üst 3fd02d53
...@@ -1298,7 +1298,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, ...@@ -1298,7 +1298,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
aBaseFileName += ByteString::CreateFromInt32( 0 ); aBaseFileName += ByteString::CreateFromInt32( 0 );
if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) ) if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) )
aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) ); aEntryVector.push_back( ::std::pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );
else else
aMissingImages.push_back( aBaseFileName ); aMissingImages.push_back( aBaseFileName );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment