User: rt Date: 2008-06-16 13:36:44+0000 Modified: dba/reportdesign/source/filter/xml/xmlHelper.cxx
Log: INTEGRATION: CWS rptchart02 (1.6.4); FILE MERGED 2008/06/11 12:35:13 oj 1.6.4.4: RESYNC: (1.7-1.8); FILE MERGED 2008/05/16 12:53:21 oj 1.6.4.3: #i89365# copy props before set args at chart 2008/04/16 06:29:05 oj 1.6.4.2: RESYNC: (1.6-1.7); FILE MERGED 2008/04/03 06:35:19 oj 1.6.4.1: #i86343# remove unused code File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlHelper.cxx?r1=1.8&r2=1.9 Delta lines: +20 -82 --------------------- --- xmlHelper.cxx 2008-06-04 09:45:12+0000 1.8 +++ xmlHelper.cxx 2008-06-16 13:36:41+0000 1.9 @@ -258,32 +258,6 @@ return s_aXML_EnumMap; } // ----------------------------------------------------------------------------- -const SvXMLEnumMapEntry* OXMLHelper::GetImagePositionOptions() -{ - static SvXMLEnumMapEntry s_aXML_EnumMap[] = - { - { XML_START, 0 }, - { XML_END, 1 }, - { XML_TOP, 2 }, - { XML_BOTTOM, 3 }, - { XML_CENTER, (sal_uInt16)-1 }, - { XML_TOKEN_INVALID, 0 } - }; - return s_aXML_EnumMap; -} -// ----------------------------------------------------------------------------- -const SvXMLEnumMapEntry* OXMLHelper::GetImageAlignOptions() -{ - static SvXMLEnumMapEntry s_aXML_EnumMap[] = - { - { XML_START, 0 }, - { XML_CENTER, 1 }, - { XML_END, 2 }, - { XML_TOKEN_INVALID, 0 } - }; - return s_aXML_EnumMap; -} -// ----------------------------------------------------------------------------- const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions() { static SvXMLEnumMapEntry s_aXML_EnumMap[] = @@ -296,46 +270,6 @@ return s_aXML_EnumMap; } // ----------------------------------------------------------------------------- -uno::Reference< util::XNumberFormatsSupplier > OXMLHelper::GetNumberFormatsSupplier(const uno::Reference<report::XReportDefinition>& _xReportDefinition) -{ - uno::Reference< util::XNumberFormatsSupplier > xSupplier; - uno::Reference< uno::XInterface> xParent = _xReportDefinition->getParent(); - if ( xParent.is() ) - { - uno::Reference< sdb::XOfficeDatabaseDocument > xDatabaseDocument(xParent,uno::UNO_QUERY); - if ( !xDatabaseDocument.is() ) - { - uno::Reference< container::XChild> xChild(xParent,uno::UNO_QUERY); - while( !xDatabaseDocument.is() && xChild.is() ) - { - xParent = xChild->getParent(); - xDatabaseDocument.set(xParent,uno::UNO_QUERY); - xChild.set(xParent,uno::UNO_QUERY); - } - } - if ( xDatabaseDocument.is() ) - { - uno::Reference<beans::XPropertySet> xProp(xDatabaseDocument->getDataSource(),uno::UNO_QUERY); - if ( xProp.is() ) - xSupplier.set(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatsSupplier"))),uno::UNO_QUERY); - } - } - else - { - ::comphelper::MediaDescriptor aDescriptor( _xReportDefinition->getArgs() ); - uno::Sequence<beans::PropertyValue> aComponentData; - aComponentData = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ComponentData")),aComponentData); - if ( aComponentData.getLength() ) - { - ::comphelper::SequenceAsHashMap aComponentDataMap( aComponentData ); - uno::Reference<sdbc::XConnection> xConnection; - xConnection = aComponentDataMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")),xConnection); - xSupplier = dbtools::getNumberFormats(xConnection); - } - } - return xSupplier; -} -// ----------------------------------------------------------------------------- #define PROPERTY_ID_FONTNAME 1 #define PROPERTY_ID_FONTHEIGHT 2 #define PROPERTY_ID_FONTWIDTH 3 @@ -419,6 +353,8 @@ if ( xReportControlModel.is() ) { + try + { sal_Int16 nTextAlign = xReportControlModel->getParaAdjust(); switch(nTextAlign) { @@ -437,6 +373,8 @@ } xReportControlModel->setParaAdjust(nTextAlign); } + catch(beans::UnknownPropertyException){} + } } catch(uno::Exception&) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
