openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1476238 - /openoffice/trunk/main/rsc/source/rsc/rsc.cxx
Date Fri, 26 Apr 2013 14:53:55 GMT
Author: hdu
Date: Fri Apr 26 14:53:54 2013
New Revision: 1476238

URL: http://svn.apache.org/r1476238
Log:
fix type-ambiguity of pair (needed when move semantics are involved)

Modified:
    openoffice/trunk/main/rsc/source/rsc/rsc.cxx

Modified: openoffice/trunk/main/rsc/source/rsc/rsc.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/rsc/source/rsc/rsc.cxx?rev=1476238&r1=1476237&r2=1476238&view=diff
==============================================================================
--- openoffice/trunk/main/rsc/source/rsc/rsc.cxx (original)
+++ openoffice/trunk/main/rsc/source/rsc/rsc.cxx Fri Apr 26 14:53:54 2013
@@ -1298,7 +1298,7 @@ void RscCompiler::PreprocessSrsFile( con
                                 aBaseFileName += ByteString::CreateFromInt32( 0 );
 
                             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
                                 aMissingImages.push_back( aBaseFileName );
                         }



Mime
View raw message