vcl/source/glyphs/gcach_ftyp.cxx | 9 +++++++++
wizards/source/euro/DlgConvert.xdl | 14 +++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
New commits:
commit 3a4bcd943f772f1c284cdd01d5865df47886900b
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Sun Nov 11 14:49:18 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Sun Nov 11 14:49:18 2018 +0000
Small changes to Euro Converter dialog
diff --git a/wizards/source/euro/DlgConvert.xdl
b/wizards/source/euro/DlgConvert.xdl
index c76df2747e13..61f397d3b2c9 100644
--- a/wizards/source/euro/DlgConvert.xdl
+++ b/wizards/source/euro/DlgConvert.xdl
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN"
"dialog.dtd">
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -9,24 +9,24 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog";
xmlns:script="http://openoffice.org/2000/script"; dlg:id="DialogConvert"
dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2"
dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_DIALOG" dlg:closeable="true"
dlg:moveable="true">
<dlg:bulletinboard>
- <dlg:text dlg:id="lblCurrencies" dlg:tab-index="1" dlg:left="170"
dlg:top="39" dlg:width="89" dlg:height="8" dlg:value="lblCurrencies"/>
+ <dlg:text dlg:id="lblCurrencies" dlg:tab-index="1" dlg:left="170"
dlg:top="39" dlg:width="92" dlg:height="8" dlg:value="lblCurrencies"/>
<dlg:checkbox dlg:id="chkComplete" dlg:tab-index="0" dlg:left="12"
dlg:top="43" dlg:width="129" dlg:height="10" dlg:page="1"
dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_CHECKBOX1" dlg:value="chkComplete"
dlg:checked="true">
<script:event script:event-name="on-itemstatechange"
script:macro-name="vnd.sun.star.script:Euro.ConvertRun.RetrieveEnableValue?language=Basic&location=application"
script:language="Script"/>
</dlg:checkbox>
- <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="2" dlg:left="170"
dlg:top="51" dlg:width="90" dlg:height="12"
dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1" dlg:spin="true"
dlg:linecount="12">
+ <dlg:menulist dlg:id="lstCurrencies" dlg:tab-index="2" dlg:left="170"
dlg:top="51" dlg:width="93" dlg:height="12"
dlg:help-url="HID:WIZARDS_HID_DLGCONVERT_COMBOBOX1" dlg:spin="true"
dlg:linecount="12">
<script:event script:event-name="on-itemstatechange"
script:macro-name="vnd.sun.star.script:Euro.Common.SelectCurrency?language=Basic&location=application"
script:language="Script"/>
</dlg:menulist>
<dlg:radiogroup>
@@ -77,7 +77,7 @@
<dlg:text dlg:id="lblRetrieval" dlg:tab-index="24" dlg:left="9"
dlg:top="119" dlg:width="216" dlg:height="8" dlg:page="3"
dlg:value="lblRetrieval"/>
<dlg:text dlg:id="lblConfig" dlg:tab-index="25" dlg:left="6" dlg:top="39"
dlg:width="94" dlg:height="8" dlg:page="3" dlg:value="lblConfig"/>
<dlg:text dlg:id="lblCurDocument" dlg:tab-index="26" dlg:left="16"
dlg:top="141" dlg:width="208" dlg:height="8" dlg:page="3"/>
- <dlg:img dlg:id="imgPreview" dlg:tab-index="27" dlg:left="6" dlg:top="6"
dlg:width="258" dlg:height="26"
dlg:src="file:///D:/office630np/share/template/german/wizard/bitmap/euro_2.png"/>
+ <dlg:img dlg:id="imgPreview" dlg:tab-index="27" dlg:left="6" dlg:top="6"
dlg:width="258" dlg:height="26"/>
<dlg:fixedline dlg:id="hlnSelection" dlg:tab-index="28" dlg:left="7"
dlg:top="72" dlg:width="258" dlg:height="8" dlg:page="1"
dlg:value="hlnSelection"/>
<dlg:fixedline dlg:id="hlnExtent" dlg:tab-index="29" dlg:left="6"
dlg:top="39" dlg:width="156" dlg:height="8" dlg:page="2" dlg:value="hlnExtent"/>
<dlg:fixedline dlg:id="hlnProgress" dlg:tab-index="30" dlg:left="6"
dlg:top="108" dlg:width="258" dlg:height="8" dlg:page="3"
dlg:value="hlnProgress"/>
commit 9ec19c0d46d0dcb04388a986354a359531833275
Author: Matthias Seidel <msei...@apache.org>
AuthorDate: Sun Nov 11 13:32:28 2018 +0000
Commit: Matthias Seidel <msei...@apache.org>
CommitDate: Sun Nov 11 13:32:28 2018 +0000
i127929 - Fix for crash in Freetype code
Patch by: Arrigo Marchiori
Thank you for your contribution!
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 59447ba2f3ad..e6c1326becf6 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -1361,6 +1361,15 @@ void FreetypeServerFont::InitGlyphData( sal_GlyphId
aGlyphId, GlyphData& rGD ) c
FT_Glyph pGlyphFT;
rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );
+ if( rc != FT_Err_Ok )
+ {
+ // we get here e.g. when a PS font lacks the default glyph
+ rGD.SetCharWidth( 0 );
+ rGD.SetDelta( 0, 0 );
+ rGD.SetOffset( 0, 0 );
+ rGD.SetSize( Size( 0, 0 ) );
+ return;
+ }
ApplyGlyphTransform( nGlyphFlags, pGlyphFT, false );
if( mbArtBold && pFTEmbolden && (nFTVERSION < 2200) ) // #i71094#
workaround staircase bug
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
