diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-10-05 19:09:00 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-10-05 19:09:30 +0200 |
| commit | 73bb8ed0b174ec39ee442f4db0444db5dc900d7f (patch) | |
| tree | bb26578d6e0807b69f57e5d657e3ece5950669f4 | |
| parent | 75dec86439bebd6467e292be665dc39e10ce481d (diff) | |
Fix patches to apply with the ported calc-distributed-cell-text-*.diff
| -rw-r--r-- | patches/dev300/calc-xls-import-slanted-border-oox.diff | 8 | ||||
| -rw-r--r-- | patches/vba/cws-vbasupportdev300.diff | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/patches/dev300/calc-xls-import-slanted-border-oox.diff b/patches/dev300/calc-xls-import-slanted-border-oox.diff index 6f9b5526f..fdb7fb5d3 100644 --- a/patches/dev300/calc-xls-import-slanted-border-oox.diff +++ b/patches/dev300/calc-xls-import-slanted-border-oox.diff @@ -28,14 +28,6 @@ diff --git oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesbuffer.cxx index d8d52f2..c682ea6 100644 --- oox/source/xls/stylesbuffer.cxx +++ oox/source/xls/stylesbuffer.cxx -@@ -41,6 +41,7 @@ - #include <com/sun/star/style/XStyle.hpp> - #include <com/sun/star/text/WritingMode2.hpp> - #include <com/sun/star/text/XText.hpp> -+#include <com/sun/star/table/CellVertJustify.hpp> - #include <rtl/tencinfo.h> - #include <rtl/ustrbuf.hxx> - #include "properties.hxx" @@ -1773,6 +1774,34 @@ void Border::writeToPropertyMap( PropertyMap& rPropMap ) const } } diff --git a/patches/vba/cws-vbasupportdev300.diff b/patches/vba/cws-vbasupportdev300.diff index 96973826e..2d48556e0 100644 --- a/patches/vba/cws-vbasupportdev300.diff +++ b/patches/vba/cws-vbasupportdev300.diff @@ -43309,7 +43309,7 @@ index 1451cde..33de6ea 100644 // experimental namespaces XML_NAMESPACE( FIELD, 100U ) +XML_NAMESPACE( FORMX, 101U ) // form interop extensions - + XML_NAMESPACE( CSS3TEXT, 103U ) // CSS Text Level 3 #endif // _XMLOFF_XMLNMSPE_HXX diff --git xmloff/inc/xmloff/shapeexport.hxx xmloff/inc/xmloff/shapeexport.hxx @@ -43332,7 +43332,7 @@ diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx index 3ea86c2..f174cbf 100644 --- xmloff/inc/xmloff/xmltoken.hxx +++ xmloff/inc/xmloff/xmltoken.hxx -@@ -145,9 +145,13 @@ namespace xmloff { namespace token { +@@ -145,6 +145,10 @@ namespace xmloff { namespace token { XML_NP_OFFICE_EXT, XML_N_OFFICE_EXT, @@ -43342,10 +43342,6 @@ index 3ea86c2..f174cbf 100644 + XML_NP_TABLE_EXT, XML_N_TABLE_EXT, -- -+ - XML_NP_DRAW_EXT, - XML_N_DRAW_EXT, diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx index 9b1ddcb..e8a2c22 100644 |