[Libreoffice-commits] core.git: vcl/generic

Stephan Bergmann sbergman at redhat.com
Tue Jan 27 05:00:48 PST 2015


 vcl/generic/print/genpspgraphics.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d9a4fe4581d973ad06375af8ae6e1204f490821a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 27 14:00:15 2015 +0100

    Use vector::data
    
    Change-Id: Ibc8a0cedf8e99986698fca9fa467e24907184148

diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index f5c24af..a67e1c2 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -1255,8 +1255,7 @@ const void* GenPspGraphics::DoGetEmbedFontData( psp::fontID aFont, const sal_Ucs
             aUnicodes[i] = pUnicodes[i] < 0x0100 ? pUnicodes[i] + 0xf000 : pUnicodes[i];
         pUnicodes = aUnicodes;
     }
-    if (!rMgr.getMetrics(
-            aFont, pUnicodes, nLen, nLen == 0 ? nullptr : &aMetrics[0]))
+    if (!rMgr.getMetrics(aFont, pUnicodes, nLen, aMetrics.data()))
         return NULL;
 
     OString aSysPath = rMgr.getFontFileSysPath( aFont );


More information about the Libreoffice-commits mailing list