Skip to content

C
core
Kaydet (Commit) bc2fe224 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Adapt to true wchar_t in clang-cl 

Change-Id: Id127668e6786665b819b7c0b1c0cd424ebff96bf
üst 0475ab72
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
hwpfilter/source/hwpreader.cxx
Dosyayı görüntüle @ bc2fe224
...@@ -1720,7 +1720,7 @@ void HwpReader::makePageStyle() ...@@ -1720,7 +1720,7 @@ void HwpReader::makePageStyle()
if( hwpinfo.back_info.type == 1 ){ if( hwpinfo.back_info.type == 1 ){
#ifdef _WIN32 #ifdef _WIN32
padd("xlink:href", sXML_CDATA, padd("xlink:href", sXML_CDATA,
hconv(kstr2hstr((uchar*) urltowin(hwpinfo.back_info.filename).c_str()).c_str())); reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr((uchar*) urltowin(hwpinfo.back_info.filename).c_str()).c_str())));
#else #else
padd("xlink:href", sXML_CDATA, padd("xlink:href", sXML_CDATA,
reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr( reinterpret_cast<uchar const *>(urltounix(hwpinfo.back_info.filename).c_str())).c_str()))); reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr( reinterpret_cast<uchar const *>(urltounix(hwpinfo.back_info.filename).c_str())).c_str())));
...@@ -3831,9 +3831,9 @@ void HwpReader::makePicture(Picture * hbox) ...@@ -3831,9 +3831,9 @@ void HwpReader::makePicture(Picture * hbox)
padd("xlink:type", sXML_CDATA, "simple"); padd("xlink:type", sXML_CDATA, "simple");
#ifdef _WIN32 #ifdef _WIN32
if( hbox->follow[4] != 0 ) if( hbox->follow[4] != 0 )
padd("xlink:href", sXML_CDATA, (hconv(kstr2hstr(hbox->follow + 4).c_str()))); padd("xlink:href", sXML_CDATA, reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr(hbox->follow + 4).c_str())));
else else
padd("xlink:href", sXML_CDATA, (hconv(kstr2hstr(hbox->follow + 5).c_str()))); padd("xlink:href", sXML_CDATA, reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr(hbox->follow + 5).c_str())));
#else #else
if( hbox->follow[4] != 0 ) if( hbox->follow[4] != 0 )
padd("xlink:href", sXML_CDATA, padd("xlink:href", sXML_CDATA,
...@@ -3892,7 +3892,7 @@ void HwpReader::makePicture(Picture * hbox) ...@@ -3892,7 +3892,7 @@ void HwpReader::makePicture(Picture * hbox)
if ( hbox->pictype == PICTYPE_FILE ){ if ( hbox->pictype == PICTYPE_FILE ){
#ifdef _WIN32 #ifdef _WIN32
sprintf(buf, "file:///%s", hbox->picinfo.picun.path ); sprintf(buf, "file:///%s", hbox->picinfo.picun.path );
padd("xlink:href", sXML_CDATA, (hconv(kstr2hstr((uchar *) buf).c_str()))); padd("xlink:href", sXML_CDATA, reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr((uchar *) buf).c_str())));
#else #else
padd("xlink:href", sXML_CDATA, padd("xlink:href", sXML_CDATA,
reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr(reinterpret_cast<uchar const *>(urltounix(hbox->picinfo.picun.path).c_str())).c_str()))); reinterpret_cast<sal_Unicode const *>(hconv(kstr2hstr(reinterpret_cast<uchar const *>(urltounix(hbox->picinfo.picun.path).c_str())).c_str())));
......
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