diff options
author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:16:51 +0100 |
---|---|---|
committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:16:51 +0100 |
commit | 890251245c4589f0b710f21d41c9eea22104a40b (patch) | |
tree | e819a6acb9919eebabe5151b5f2a2cd87ec5cb4b /reportdesign | |
parent | 9b251503202b1197a16f6f66adf262e68427c3f5 (diff) | |
parent | 2241dfcdf029fcce801d65f4277131e0a5871f72 (diff) |
dba33b: merge m69
Diffstat (limited to 'reportdesign')
5 files changed, 19 insertions, 4 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 31ac92345a2f..b0012e731c81 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -293,6 +293,16 @@ ORptExport::ORptExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt1 { _GetNamespaceMap().Add( GetXMLToken(XML_NP_STYLE), GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE ); } + // RDFa: needed for content and header/footer styles + if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) + { + _GetNamespaceMap().Add( GetXMLToken(XML_NP_XHTML),GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML ); + } + // GRDDL: to convert RDFa and meta.xml to RDF + if( (getExportFlags() & (EXPORT_META|EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 ) + { + _GetNamespaceMap().Add( GetXMLToken(XML_NP_GRDDL),GetXMLToken(XML_N_GRDDL), XML_NAMESPACE_GRDDL ); + } _GetNamespaceMap().Add( GetXMLToken(XML_NP_TABLE), GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_NUMBER), GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER ); @@ -948,9 +958,9 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection) AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation); } bExportData = sal_True; - ::rtl::OUStringBuffer sValue;
- const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions();
- if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) )
+ ::rtl::OUStringBuffer sValue; + const SvXMLEnumMapEntry* aXML_ImageScaleEnumMap = OXMLHelper::GetImageScaleOptions(); + if ( SvXMLUnitConverter::convertEnum( sValue, xImage->getScaleMode(),aXML_ImageScaleEnumMap ) ) AddAttribute(XML_NAMESPACE_REPORT, XML_SCALE, sValue.makeStringAndClear() ); } else if ( xReportDefinition.is() ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 9d5c6352ef0b..817f88adf3cb 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1731,7 +1731,9 @@ void OReportController::impl_initialize( ) m_xReportDefinition->setCommand(aNames[0]); m_xReportDefinition->setCommandType(sdb::CommandType::TABLE); } - } + } // if ( !sHierarchicalDocumentName.getLength() && getConnection().is() ) + + m_aVisualAreaSize = m_xReportDefinition->getVisualAreaSize(0); } // if ( m_xReportDefinition.is() ) diff --git a/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml b/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml index 6aaa305ae7a1..76c197f06174 100644 --- a/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml +++ b/reportdesign/uiconfig/dbreport/accelerator/de-DE/default.xml @@ -4,6 +4,7 @@ <accel:item accel:code="KEY_RETURN" accel:mod2="true" xlink:href=".uno:ControlProperties"/> <accel:item accel:code="KEY_F4" xlink:href=".uno:ControlProperties"/> <accel:item accel:code="KEY_F5" xlink:href=".uno:ReportNavigator"/> + <accel:item accel:code="KEY_F8" accel:mod2="true" xlink:href=".uno:AddField"/> <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/> <accel:item accel:code="KEY_G" accel:mod1="true" xlink:href=".uno:DbSortingAndGrouping"/> <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:ExecuteReport"/> diff --git a/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml b/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml index 6aaa305ae7a1..76c197f06174 100644 --- a/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml +++ b/reportdesign/uiconfig/dbreport/accelerator/en-GB/default.xml @@ -4,6 +4,7 @@ <accel:item accel:code="KEY_RETURN" accel:mod2="true" xlink:href=".uno:ControlProperties"/> <accel:item accel:code="KEY_F4" xlink:href=".uno:ControlProperties"/> <accel:item accel:code="KEY_F5" xlink:href=".uno:ReportNavigator"/> + <accel:item accel:code="KEY_F8" accel:mod2="true" xlink:href=".uno:AddField"/> <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/> <accel:item accel:code="KEY_G" accel:mod1="true" xlink:href=".uno:DbSortingAndGrouping"/> <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:ExecuteReport"/> diff --git a/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml b/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml index 6aaa305ae7a1..76c197f06174 100644 --- a/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml +++ b/reportdesign/uiconfig/dbreport/accelerator/en-US/default.xml @@ -4,6 +4,7 @@ <accel:item accel:code="KEY_RETURN" accel:mod2="true" xlink:href=".uno:ControlProperties"/> <accel:item accel:code="KEY_F4" xlink:href=".uno:ControlProperties"/> <accel:item accel:code="KEY_F5" xlink:href=".uno:ReportNavigator"/> + <accel:item accel:code="KEY_F8" accel:mod2="true" xlink:href=".uno:AddField"/> <accel:item accel:code="KEY_ESCAPE" xlink:href=".uno:Escape"/> <accel:item accel:code="KEY_G" accel:mod1="true" xlink:href=".uno:DbSortingAndGrouping"/> <accel:item accel:code="KEY_E" accel:mod1="true" xlink:href=".uno:ExecuteReport"/> |