[Libreoffice-commits] .: 8 commits -
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Jun 6 05:13:01 PDT 2011
0 files changed
New commits:
commit b505e44d1e636bdeefec4aa46e194d96399c50f7
Merge: 5282244... 8c1eac6...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 6 12:53:09 2011 +0200
Merge remote-tracking branch 'origin/libreoffice-3-4'
commit 8c1eac6aea86f277224f10472f1a437b0ab0995c
Author: Muthu Subramanian <sumuthu at novell.com>
Date: Fri Apr 8 16:51:46 2011 +0530
Fix xlsx 2010 export.
diff --git a/filter/source/config/fragments/filters/calc_OOXML.xcu b/filter/source/config/fragments/filters/calc_OOXML.xcu
index 69007ff..00923f7 100644
--- a/filter/source/config/fragments/filters/calc_OOXML.xcu
+++ b/filter/source/config/fragments/filters/calc_OOXML.xcu
@@ -1,7 +1,7 @@
<node oor:name="Calc Office Open XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.xls.ExcelFilter</value></prop>
<prop oor:name="UserData"><value>OOXML</value></prop>
<prop oor:name="FileFormatVersion"><value>1</value></prop>
<prop oor:name="Type"><value>Office Open XML Spreadsheet</value></prop>
commit 2215258fcd74128f19126ef978b978081cfaa0c9
Author: Radek Doulik <rodo at novell.com>
Date: Wed Apr 27 11:52:40 2011 +0200
fix config for pptx filter - thanks to Bubli
Signed-off-by: Katarina Machalkova <kmachalkova at suse.cz>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
Signed-off-by: Fridrich Strba <fstrba at novell.com>
diff --git a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
index 7a2e17f..ecb6b5a 100644
--- a/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
+++ b/filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_AutoPlay.xcu
@@ -1,7 +1,7 @@
<node oor:name="Impress MS PowerPoint 2007 XML AutoPlay" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
<prop oor:name="FileFormatVersion"/>
<prop oor:name="Type"><value>MS PowerPoint 2007 XML AutoPlay</value></prop>
diff --git a/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu b/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu
index 052c613..9c83f07 100644
--- a/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu
+++ b/filter/source/config/fragments/filters/impress_OOXML_AutoPlay.xcu
@@ -1,7 +1,7 @@
<node oor:name="Impress Office Open XML AutoPlay" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED STARTPRESENTATION</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"/>
<prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation AutoPlay</value></prop>
<prop oor:name="FileFormatVersion"/>
diff --git a/filter/source/config/fragments/filters/impress_OOXML_Template.xcu b/filter/source/config/fragments/filters/impress_OOXML_Template.xcu
index e9febe1..10f9e43 100644
--- a/filter/source/config/fragments/filters/impress_OOXML_Template.xcu
+++ b/filter/source/config/fragments/filters/impress_OOXML_Template.xcu
@@ -1,7 +1,7 @@
<node oor:name="Impress Office Open XML Template" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"><value>OOXML</value></prop>
<prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation Template</value></prop>
<!-- ISO/IEC 29500:2008 -->
commit bbb2e32cb16bde370328ae391c855cf9da32806f
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Wed Apr 27 11:11:48 2011 +0200
Make export to .pptx 2010 work again
(use correct FilterService string)
Signed-off-by: Radek Doulik <rodo at novell.com>
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
Signed-off-by: Fridrich Strba <fstrba at novell.com>
diff --git a/filter/source/config/fragments/filters/impress_OOXML.xcu b/filter/source/config/fragments/filters/impress_OOXML.xcu
index d1a5adb..17d4e18 100644
--- a/filter/source/config/fragments/filters/impress_OOXML.xcu
+++ b/filter/source/config/fragments/filters/impress_OOXML.xcu
@@ -1,7 +1,7 @@
<node oor:name="Impress Office Open XML" oor:op="replace">
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ppt.PowerPointImport</value></prop>
<prop oor:name="UserData"><value>OOXML</value></prop>
<prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation</value></prop>
<!-- ISO/IEC 29500:2008 -->
commit 76502e7ce8592a76bab9102872e27bcae195452b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu May 19 16:42:44 2011 +0100
don't de-reference null pointer - fix crash with certain PPTX files
Signed-off-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index c18fd4a..cbae082 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -246,11 +246,13 @@ void PresentationFragmentHandler::endDocument() throw (SAXException, RuntimeExce
}
// importing slide page
- pSlidePersistPtr->setMasterPersist( pMasterPersistPtr );
- pSlidePersistPtr->setTheme( pMasterPersistPtr->getTheme() );
- Reference< drawing::XMasterPageTarget > xMasterPageTarget( pSlidePersistPtr->getPage(), UNO_QUERY );
- if( xMasterPageTarget.is() )
- xMasterPageTarget->setMasterPage( pMasterPersistPtr->getPage() );
+ if (pMasterPersistPtr.get()) {
+ pSlidePersistPtr->setMasterPersist( pMasterPersistPtr );
+ pSlidePersistPtr->setTheme( pMasterPersistPtr->getTheme() );
+ Reference< drawing::XMasterPageTarget > xMasterPageTarget( pSlidePersistPtr->getPage(), UNO_QUERY );
+ if( xMasterPageTarget.is() )
+ xMasterPageTarget->setMasterPage( pMasterPersistPtr->getPage() );
+ }
rFilter.getDrawPages().push_back( pSlidePersistPtr );
rFilter.setActualSlidePersist( pSlidePersistPtr );
importSlide( xSlideFragmentHandler, pSlidePersistPtr );
commit 65e4e4360a33cc845c3d375bcb1e284cb32c8fb8
Author: Noel Power <noel.power at novell.com>
Date: Thu May 19 17:23:10 2011 +0100
fix for fod#37367 ( docx import of hyperlinks )
this fix is a companion fix for the change made below
http://cgit.freedesktop.org/libreoffice/filters/commit/?id=cdd636907675d538ca10d479afc538ce3800e729
previously OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()'s call resulted in
the OOXMLFastContextHandlerStream::lcl_character method getting called which in
turn called the OOXMLFastContextHandler::text method. This no longer happens
so we call the text method directly now
Signed-off-by: Michael Meeks <michael.meeks at novell.com>
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index cad510a..0f3a2a8 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -309,7 +309,7 @@ OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()
sReturn += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
sReturn += mFieldCode;
- mpFastContext->characters(sReturn);
+ mpFastContext->text(sReturn);
}
void OOXMLHyperlinkHandler::attribute(Id name, Value & val)
commit 59b5dcb1437cdf2d27742012b1d28a45e20a903f
Author: Noel Power <noel.power at novell.com>
Date: Thu May 19 17:28:23 2011 +0100
Revert "fix for fod#37367 ( docx import of hyperlinks )"
This reverts commit 33e58cade2d3e81a86484a10ae224a1160a004d3.
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index c6f8f78..c68e957 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <dmapperLoggers.hxx>
-#include <comphelper/anytostring.hxx>
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
#include <PropertyMapHelper.hxx>
@@ -52,33 +51,6 @@ using namespace ::std;
#define DEF_BORDER_DIST 190 //0,19cm
#define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented
-void dumpSequenceOfSequence( const char* msg, const uno::Sequence< uno::Sequence< beans::PropertyValue > >& seqOfSeq )
-{
- if ( msg )
- osl_trace("%s", msg);
- for ( int row=0; row < seqOfSeq.getLength(); ++row )
- {
- const uno::Sequence< beans::PropertyValue >& props = seqOfSeq[ row ];
- for ( int index=0; index < props.getLength(); ++index )
- {
- rtl::OUString sVal( ::comphelper::anyToString( props[ index ].Value ) );
-
- osl_trace( "seq[%d][%d] prop name %s, value %s", row,index,
- rtl::OUStringToOString( props[ index ].Name, RTL_TEXTENCODING_UTF8 ).getStr() ,
- rtl::OUStringToOString( sVal, RTL_TEXTENCODING_UTF8 ).getStr() );
- }
- }
-}
-
-void dumpSequenceOfSequenceOfSequence( const char* msg, const uno::Sequence< uno::Sequence< uno::Sequence< beans::PropertyValue > > >& seqOfSeqOfSeq )
-{
- for ( int index=0; index < seqOfSeqOfSeq.getLength(); ++index )
- {
- osl_trace("dumping seqOfseq[ %d ]", index );
- uno::Sequence< uno::Sequence< beans::PropertyValue > > seqOfSeq = seqOfSeqOfSeq[ index ];
- dumpSequenceOfSequence( msg, seqOfSeq );
- }
-}
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
static void lcl_printProperties( PropertyMapPtr pProps )
{
@@ -736,9 +708,6 @@ void DomainMapperTableHandler::endTable()
{
try
{
- osl_trace("about to convert the table");
- dumpSequenceOfSequenceOfSequence( "dumping the cell properties", aCellProperties );
- dumpSequenceOfSequence( "dumping the row properties", aRowProperties );
uno::Reference<text::XTextTable> xTable = m_xText->convertToTable(*m_pTableSeq,
aCellProperties,
aRowProperties,
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index 0f3a2a8..cad510a 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -309,7 +309,7 @@ OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()
sReturn += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
sReturn += mFieldCode;
- mpFastContext->text(sReturn);
+ mpFastContext->characters(sReturn);
}
void OOXMLHyperlinkHandler::attribute(Id name, Value & val)
commit 33e58cade2d3e81a86484a10ae224a1160a004d3
Author: Noel Power <noel.power at novell.com>
Date: Thu May 19 16:02:59 2011 +0100
fix for fod#37367 ( docx import of hyperlinks )
this fix is a companion fix for the change made below
http://cgit.freedesktop.org/libreoffice/filters/commit/?id=cdd636907675d538ca10d479afc538ce3800e729http://cgit.freedesktop.org/libreoffice/filters/commit/?id=cdd636907675d538ca10d479afc538ce3800e729
previously OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()'s call to resulted in the OOXMLFastContextHandlerStream::lcl_character method getting called which in turn called the OOXMLFastContextHandler::text method. This no longer happen so we call the text method directly now
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index c68e957..c6f8f78 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <dmapperLoggers.hxx>
+#include <comphelper/anytostring.hxx>
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
#include <PropertyMapHelper.hxx>
@@ -51,6 +52,33 @@ using namespace ::std;
#define DEF_BORDER_DIST 190 //0,19cm
#define DEFAULT_CELL_MARGIN 108 //default cell margin, not documented
+void dumpSequenceOfSequence( const char* msg, const uno::Sequence< uno::Sequence< beans::PropertyValue > >& seqOfSeq )
+{
+ if ( msg )
+ osl_trace("%s", msg);
+ for ( int row=0; row < seqOfSeq.getLength(); ++row )
+ {
+ const uno::Sequence< beans::PropertyValue >& props = seqOfSeq[ row ];
+ for ( int index=0; index < props.getLength(); ++index )
+ {
+ rtl::OUString sVal( ::comphelper::anyToString( props[ index ].Value ) );
+
+ osl_trace( "seq[%d][%d] prop name %s, value %s", row,index,
+ rtl::OUStringToOString( props[ index ].Name, RTL_TEXTENCODING_UTF8 ).getStr() ,
+ rtl::OUStringToOString( sVal, RTL_TEXTENCODING_UTF8 ).getStr() );
+ }
+ }
+}
+
+void dumpSequenceOfSequenceOfSequence( const char* msg, const uno::Sequence< uno::Sequence< uno::Sequence< beans::PropertyValue > > >& seqOfSeqOfSeq )
+{
+ for ( int index=0; index < seqOfSeqOfSeq.getLength(); ++index )
+ {
+ osl_trace("dumping seqOfseq[ %d ]", index );
+ uno::Sequence< uno::Sequence< beans::PropertyValue > > seqOfSeq = seqOfSeqOfSeq[ index ];
+ dumpSequenceOfSequence( msg, seqOfSeq );
+ }
+}
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
static void lcl_printProperties( PropertyMapPtr pProps )
{
@@ -708,6 +736,9 @@ void DomainMapperTableHandler::endTable()
{
try
{
+ osl_trace("about to convert the table");
+ dumpSequenceOfSequenceOfSequence( "dumping the cell properties", aCellProperties );
+ dumpSequenceOfSequence( "dumping the row properties", aRowProperties );
uno::Reference<text::XTextTable> xTable = m_xText->convertToTable(*m_pTableSeq,
aCellProperties,
aRowProperties,
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index cad510a..0f3a2a8 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -309,7 +309,7 @@ OOXMLHyperlinkHandler::~OOXMLHyperlinkHandler()
sReturn += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
sReturn += mFieldCode;
- mpFastContext->characters(sReturn);
+ mpFastContext->text(sReturn);
}
void OOXMLHyperlinkHandler::attribute(Id name, Value & val)
More information about the Libreoffice-commits
mailing list