[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/graphicfilter/ieps/ieps.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 7d834ba490208d0f27e9f10543f2e4e1700af99c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 6 11:51:47 2017 +0000

    input data can be any kind of muck at this point
    
    Change-Id: Ib0d48bdfa067f58a701508a6f5e60704d49aa5a5

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 33a4ac9..2d4da64 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -479,7 +479,8 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
         sal_uInt8 aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
         if ( strcmp( reinterpret_cast<char*>(pDest), "none" ) != 0 )
         {
-            aString += " Title:" + OUString::createFromAscii( reinterpret_cast<char*>(pDest) ) + "\n";
+            const char* pStr = reinterpret_cast<char*>(pDest);
+            aString += " Title:" + OUString(pStr, strlen(pStr), RTL_TEXTENCODING_ASCII_US) + "\n";
         }
         pDest[ nLen ] = aOldValue;
     }
@@ -491,7 +492,8 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
             pDest++;
         nLen = ImplGetLen( pDest, 32 );
         sal_uInt8 aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
-        aString += " Creator:" + OUString::createFromAscii( reinterpret_cast<char*>(pDest) ) + "\n";
+        const char* pStr = reinterpret_cast<char*>(pDest);
+        aString += " Creator:" + OUString(pStr, strlen(pStr), RTL_TEXTENCODING_ASCII_US) + "\n";
         pDest[ nLen ] = aOldValue;
     }
     pDest = ImplSearchEntry( pBuf, reinterpret_cast<sal_uInt8 const *>("%%CreationDate:"), nBytesRead - 32, 15 );
@@ -504,7 +506,8 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
         sal_uInt8 aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
         if ( strcmp( reinterpret_cast<char*>(pDest), "none" ) != 0 )
         {
-            aString += " CreationDate:" + OUString::createFromAscii( reinterpret_cast<char*>(pDest) ) + "\n";
+            const char* pStr = reinterpret_cast<char*>(pDest);
+            aString += " CreationDate:" + OUString(pStr, strlen(pStr), RTL_TEXTENCODING_ASCII_US) + "\n";
         }
         pDest[ nLen ] = aOldValue;
     }