[ooo-build-commit] patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Mon Oct 12 03:52:09 PDT 2009
patches/dev300/docx-fixes01.diff | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
New commits:
commit 934d440d13819cebed7ba5ae63cb6add47630229
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Oct 12 12:51:33 2009 +0200
Docx import: fixed 545717
* patches/dev300/docx-fixes01.diff:
it happens that some styles in the docx are used as parent, but not
defined in the stylesheet...
diff --git a/patches/dev300/docx-fixes01.diff b/patches/dev300/docx-fixes01.diff
index 27f5153..9b032ce 100644
--- a/patches/dev300/docx-fixes01.diff
+++ b/patches/dev300/docx-fixes01.diff
@@ -1,8 +1,8 @@
diff --git sw/inc/unoobj.hxx sw/inc/unoobj.hxx
-index e74aa50..56526ad 100644
+index 1b58d7c..9449c03 100644
--- sw/inc/unoobj.hxx
+++ sw/inc/unoobj.hxx
-@@ -51,6 +51,7 @@
+@@ -53,6 +53,7 @@
#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/text/XText.hpp>
@@ -10,7 +10,7 @@ index e74aa50..56526ad 100644
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/util/XSortable.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
-@@ -201,7 +202,8 @@ class SwXText : public ::com::sun::star::lang::XTypeProvider,
+@@ -204,7 +205,8 @@ class SwXText : public ::com::sun::star::lang::XTypeProvider,
public ::com::sun::star::text::XRelativeTextContentRemove,
public ::com::sun::star::beans::XPropertySet,
public ::com::sun::star::lang::XUnoTunnel,
@@ -20,7 +20,7 @@ index e74aa50..56526ad 100644
{
SwDoc* pDoc;
BOOL bObjectValid;
-@@ -288,6 +290,8 @@ public:
+@@ -296,6 +298,8 @@ public:
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& TableProperties
) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -30,7 +30,7 @@ index e74aa50..56526ad 100644
//
virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > createCursor()throw(::com::sun::star::uno::RuntimeException);
diff --git sw/source/core/unocore/unotext.cxx sw/source/core/unocore/unotext.cxx
-index c2323a5..7c6b597 100644
+index 0373d88..25d95d7 100644
--- sw/source/core/unocore/unotext.cxx
+++ sw/source/core/unocore/unotext.cxx
@@ -68,6 +68,7 @@
@@ -41,7 +41,7 @@ index c2323a5..7c6b597 100644
using namespace ::com::sun::star;
using ::rtl::OUString;
-@@ -133,6 +134,7 @@ uno::Any SAL_CALL SwXText::queryInterface( const uno::Type& rType ) throw(uno::R
+@@ -148,6 +149,7 @@ uno::Any SAL_CALL SwXText::queryInterface( const uno::Type& rType ) throw(uno::R
const uno::Type& rXTextConvert = ::getCppuType((uno::Reference< text::XTextConvert >*)0);
const uno::Type& rXTextAppend = ::getCppuType((uno::Reference< text::XTextAppend >*)0);
const uno::Type& rXTextAppendAndConvert = ::getCppuType((uno::Reference< text::XTextAppendAndConvert >*)0);
@@ -49,7 +49,7 @@ index c2323a5..7c6b597 100644
uno::Any aRet;
if(rType == rXTextType)
-@@ -210,6 +212,11 @@ uno::Any SAL_CALL SwXText::queryInterface( const uno::Type& rType ) throw(uno::R
+@@ -225,6 +227,11 @@ uno::Any SAL_CALL SwXText::queryInterface( const uno::Type& rType ) throw(uno::R
uno::Reference< XTextContentAppend > xRet = this;
aRet.setValue(&xRet, rXTextContentAppend );
}
@@ -61,7 +61,7 @@ index c2323a5..7c6b597 100644
return aRet;
}
/* -----------------------------15.03.00 17:42--------------------------------
-@@ -255,8 +262,8 @@ void SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange,
+@@ -270,8 +277,8 @@ void SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange,
sal::static_int_cast< sal_IntPtr >( xRangeTunnel->getSomething( OTextCursorHelper::getUnoTunnelId()) ));
}
@@ -72,7 +72,7 @@ index c2323a5..7c6b597 100644
{
const SwStartNode* pOwnStartNode = GetStartNode();
if(pCursor)
-@@ -1712,6 +1719,36 @@ bool lcl_SimilarPosition( sal_Int32 nPos1, sal_Int32 nPos2 )
+@@ -1787,6 +1794,36 @@ bool lcl_SimilarPosition( sal_Int32 nPos1, sal_Int32 nPos2 )
return abs( nPos1 - nPos2 ) < COL_POS_FUZZY;
}
@@ -109,7 +109,7 @@ index c2323a5..7c6b597 100644
uno::Reference< text::XTextTable > SwXText::convertToTable(
const uno::Sequence< uno::Sequence< uno::Sequence< uno::Reference< text::XTextRange > > > >& rTableRanges,
const uno::Sequence< uno::Sequence< uno::Sequence< beans::PropertyValue > > >& rCellProperties,
-@@ -2078,30 +2115,6 @@ uno::Reference< text::XTextTable > SwXText::convertToTable(
+@@ -2153,30 +2190,6 @@ uno::Reference< text::XTextTable > SwXText::convertToTable(
{
(void)rBounds;
}
@@ -783,7 +783,7 @@ index 526f902..8f7277e 100644
/*-- 28.12.2007 08:17:34---------------------------------------------------
diff --git writerfilter/source/dmapper/StyleSheetTable.cxx writerfilter/source/dmapper/StyleSheetTable.cxx
-index 9bf05a8..2d200c4 100644
+index 9bf05a8..f010518 100644
--- writerfilter/source/dmapper/StyleSheetTable.cxx
+++ writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -29,6 +29,7 @@
@@ -794,7 +794,17 @@ index 9bf05a8..2d200c4 100644
#include <ConversionHelper.hxx>
#include <TblStylePrHandler.hxx>
#include <BorderHandler.hxx>
-@@ -1215,12 +1216,43 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
+@@ -1157,7 +1158,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
+ {
+ //TODO: Handle cases where a paragraph <> character style relation is needed
+ StyleSheetEntryPtr pParent = FindStyleSheetByISTD( pEntry->sBaseStyleIdentifier );
+- xStyle->setParentStyle(ConvertStyleName( pParent->sStyleName ));
++ if ( pParent.get( ) )
++ xStyle->setParentStyle(ConvertStyleName( pParent->sStyleName ));
+ }
+ catch( const uno::RuntimeException& )
+ {
+@@ -1215,12 +1217,43 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
{
// Set the outline levels
const StyleSheetPropertyMap* pStyleSheetProperties = dynamic_cast<const StyleSheetPropertyMap*>(pEntry ? pEntry->pProperties.get() : 0);
@@ -890,10 +900,10 @@ index ca2c919..9649376 100644
OOXMLDocumentImpl(OOXMLStream::Pointer_t pStream);
virtual ~OOXMLDocumentImpl();
diff --git writerfilter/source/ooxml/OOXMLFastContextHandler.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
-index 1304fa4..b2080d5 100644
+index 162ada2..fdaf476 100644
--- writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
-@@ -755,6 +755,7 @@ void OOXMLFastContextHandler::setLastParagraphInSection()
+@@ -752,6 +752,7 @@ void OOXMLFastContextHandler::setLastParagraphInSection()
#endif
mpParserState->setLastParagraphInSection(true);
More information about the ooo-build-commit
mailing list