Tag: cws_src680_rpt23fix01 User: oj Date: 2007-07-12 14:01:46+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/filter/xml/xmlHelper.cxx
Log: #i77295# fix some font problems File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.2.2.3&r2=1.2.2.4 Delta lines: +3 -2 ------------------- --- xmlExport.cxx 2007-07-12 12:59:56+0000 1.2.2.3 +++ xmlExport.cxx 2007-07-12 14:01:42+0000 1.2.2.4 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.2.2.3 $ + * $Revision: 1.2.2.4 $ * - * last change: $Author: oj $ $Date: 2007/07/12 12:59:56 $ + * last change: $Author: oj $ $Date: 2007/07/12 14:01:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1298,6 +1298,7 @@ try { awt::FontDescriptor aFont = xFormat->getFontDescriptor(); + OSL_ENSURE(aFont.Name.getLength(),"No Font Name !"); GetFontAutoStylePool()->Add(aFont.Name,aFont.StyleName,aFont.Family,aFont.Pitch,aFont.CharSet ); } catch(beans::UnknownPropertyException&) File [changed]: xmlHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlHelper.cxx?r1=1.2.2.1&r2=1.2.2.2 Delta lines: +3 -3 ------------------- --- xmlHelper.cxx 2007-07-11 10:31:00+0000 1.2.2.1 +++ xmlHelper.cxx 2007-07-12 14:01:43+0000 1.2.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: xmlHelper.cxx,v $ * - * $Revision: 1.2.2.1 $ + * $Revision: 1.2.2.2 $ * - * last change: $Author: oj $ $Date: 2007/07/11 10:31:00 $ + * last change: $Author: oj $ $Date: 2007/07/12 14:01:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -437,7 +437,7 @@ xProp->getPropertyValue(PROPERTY_CHARWORDMODE) >>= aFont.WordLineMode; xProp->getPropertyValue(PROPERTY_FONTTYPE) >>= aFont.Type; uno::Reference<report::XReportControlFormat> xReportControlModel(_xProp,uno::UNO_QUERY); - if ( xReportControlModel.is() ) + if ( xReportControlModel.is() && aFont.Name.getLength() ) try { xReportControlModel->setFontDescriptor(aFont); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
