[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

Luboš Luňák l.lunak at collabora.com
Fri May 16 03:00:55 PDT 2014


 sc/source/filter/excel/xestream.cxx |    2 +-
 sc/source/filter/qpro/qpro.cxx      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f12631e960a2b4123c96e96d2af7d43741d8e6a5
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Wed Mar 12 13:44:29 2014 +0100

    std::strlen requires cstring include to build
    
    Or, even simpler, don't bother with the needless namespacing.
    
    Change-Id: I4bbb115c1c2c89881a0bf88ccd54b0f5cb8b3518
    (cherry picked from commit da9bd301c6f62e829daadb2af6a6b9633d4f1cb9)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 035a827..df08d2c 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -985,7 +985,7 @@ sax_fastparser::FSHelperPtr& XclExpXmlStream::WriteAttributesInternal( sal_Int32
             rStream->write( " " )
                 ->writeId( nAttribute )
                 ->write( "=\"" )
-                ->writeEscaped( OUString(pValue, std::strlen(pValue), RTL_TEXTENCODING_UTF8) )
+                ->writeEscaped( OUString(pValue, strlen(pValue), RTL_TEXTENCODING_UTF8) )
                 ->write( "\"" );
         }
 
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index c370492..793412a 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -229,7 +229,7 @@ void ScQProReader::readString( OUString &rString, sal_uInt16 nLength )
     sal_Char* pText = new sal_Char[ nLength + 1 ];
     mpStream->Read( pText, nLength );
     pText[ nLength ] = 0;
-    rString = OUString( pText, std::strlen(pText), mpStream->GetStreamCharSet() );
+    rString = OUString( pText, strlen(pText), mpStream->GetStreamCharSet() );
     delete [] pText;
 }
 


More information about the Libreoffice-commits mailing list