[Libreoffice-commits] .: vcl/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jul 4 04:24:35 PDT 2012


 vcl/source/gdi/pdfwriter_impl.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 359f8cebb699954700faae18961519ccfd5ebaef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 4 12:22:34 2012 +0100

    fix build problem on windows
    
    Change-Id: I0c965ac8abd25479ea97a95036f03c63daa106ae

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 8039ec0..5eb5ad7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3748,7 +3748,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
                 aUnicodes.clear();
                 for( std::vector< EmbedCode >::iterator str_it = enc_it->m_aEncVector.begin(); str_it != enc_it->m_aEncVector.end(); ++str_it )
                 {
-                    String aStr( str_it->m_aUnicode );
+                    rtl::OUString aStr( str_it->m_aUnicode );
                     aEncWidths[nEncoded] = pRef->GetTextWidth( aStr );
                     nEncodedCodes[nEncoded] = str_it->m_aUnicode;
                     nEncoding[nEncoded] = sal::static_int_cast<sal_uInt8>(nEncoded);
@@ -8260,7 +8260,7 @@ void PDFWriterImpl::drawStrikeoutChar( const Point& rPos, long nWidth, FontStrik
     //See qadevOOo/testdocs/StrikeThrough.odt for examples if you need
     //to tweak this
 
-    rtl::OUString aStrikeoutChar( eStrikeout == STRIKEOUT_SLASH ? "/" : "X" );
+    rtl::OUString aStrikeoutChar = eStrikeout == STRIKEOUT_SLASH ? rtl::OUString("/") : rtl::OUString("X");
     String aStrikeout = aStrikeoutChar;
     while( m_pReferenceDevice->GetTextWidth( aStrikeout ) < nWidth )
         aStrikeout.Append( aStrikeout );


More information about the Libreoffice-commits mailing list