[ooo-build-commit] .: 2 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed Jun 16 01:02:53 PDT 2010
patches/dev300/border-types-dotted-dashed.diff | 191 ++++++++++++++++++++++++-
patches/dev300/sw-ww8-ruby-export-fix.diff | 112 +++++++++-----
2 files changed, 265 insertions(+), 38 deletions(-)
New commits:
commit d5a2295d6a34b3b5a2b3be32ad9a2b974a078b36
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Jun 16 10:01:49 2010 +0200
Fixed n#612263
* patches/dev300/border-types-dotted-dashed.diff:
diff --git a/patches/dev300/border-types-dotted-dashed.diff b/patches/dev300/border-types-dotted-dashed.diff
index 879d2dd..967a488 100644
--- a/patches/dev300/border-types-dotted-dashed.diff
+++ b/patches/dev300/border-types-dotted-dashed.diff
@@ -1,3 +1,100 @@
+Implement the dotted and dashed border types
+
+From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
+
+
+---
+
+ cui/source/tabpages/border.cxx | 27 +++
+ .../primitive2d/borderlineprimitive2d.hxx | 7 +
+ .../source/primitive2d/borderlineprimitive2d.cxx | 35 +++-
+ editeng/inc/editeng/borderline.hxx | 14 ++
+ editeng/inc/editeng/boxitem.hxx | 4
+ editeng/inc/editeng/memberids.hrc | 2
+ editeng/source/items/frmitems.cxx | 19 ++
+ editeng/source/rtf/rtfitem.cxx | 9 +
+ filter/inc/filter/msfilter/msdffimp.hxx | 1
+ filter/source/msfilter/msdffimp.cxx | 6 +
+ .../source/xslt/export/uof/odf2uof_spreadsheet.xsl | 8 -
+ filter/source/xslt/export/uof/odf2uof_text.xsl | 8 -
+ offapi/com/sun/star/table/BorderLine.idl | 1
+ offapi/com/sun/star/table/BorderLine2.idl | 55 +++++++
+ offapi/com/sun/star/table/BorderLineStyle.idl | 63 ++++++++
+ offapi/com/sun/star/table/makefile.mk | 2
+ oox/inc/oox/helper/helper.hxx | 4
+ oox/inc/oox/xls/stylesbuffer.hxx | 12 +
+ oox/source/drawingml/table/tablecell.cxx | 6 -
+ oox/source/drawingml/table/tableproperties.cxx | 2
+ oox/source/drawingml/table/tablerow.cxx | 2
+ oox/source/xls/stylesbuffer.cxx | 87 ++++++-----
+ sc/source/filter/excel/xestyle.cxx | 20 ++
+ sc/source/filter/excel/xistyle.cxx | 33 ++--
+ sc/source/filter/html/htmlexp.cxx | 9 +
+ sc/source/filter/inc/xlstyle.hxx | 3
+ sc/source/filter/xml/xmlstyle.cxx | 9 +
+ sc/source/filter/xml/xmlstyli.cxx | 12 +
+ sc/source/ui/unoobj/cellsuno.cxx | 73 +++++----
+ sc/source/ui/view/formatsh.cxx | 1
+ sc/source/ui/view/viewfun2.cxx | 2
+ svtools/inc/borderhelper.hxx | 49 ++++++
+ svtools/inc/ctrlbox.hxx | 39 ++++-
+ svtools/inc/rtfkeywd.hxx | 2
+ svtools/source/control/ctrlbox.cxx | 147 +++++++++++++++++-
+ svtools/util/makefile.mk | 3
+ svx/inc/svx/framelink.hxx | 25 ++-
+ svx/inc/svx/frmsel.hxx | 7 +
+ svx/source/dialog/framelink.cxx | 163 ++++++--------------
+ svx/source/dialog/frmsel.cxx | 39 ++++-
+ svx/source/table/cell.cxx | 1
+ svx/source/table/viewcontactoftableobj.cxx | 12 +
+ svx/source/tbxctrls/tbcontrl.cxx | 30 +++-
+ sw/source/core/inc/frame.hxx | 3
+ sw/source/core/layout/paintfrm.cxx | 107 ++++++++++---
+ sw/source/filter/html/css1atr.cxx | 27 +++
+ sw/source/filter/html/htmltabw.cxx | 18 +-
+ sw/source/filter/html/svxcss1.cxx | 12 +
+ sw/source/filter/html/wrthtml.hxx | 1
+ sw/source/filter/rtf/rtfatr.cxx | 27 +++
+ sw/source/filter/rtf/swparrtf.cxx | 4
+ sw/source/filter/rtf/wrtrtf.cxx | 15 ++
+ sw/source/filter/ww1/w1sprm.cxx | 10 +
+ sw/source/filter/ww8/docxattributeoutput.cxx | 14 ++
+ sw/source/filter/ww8/wrtw8esh.cxx | 15 ++
+ sw/source/filter/ww8/ww8atr.cxx | 20 ++
+ sw/source/filter/ww8/ww8graf.cxx | 60 +++++--
+ sw/source/filter/ww8/ww8graf2.cxx | 4
+ sw/source/filter/ww8/ww8par.cxx | 4
+ sw/source/filter/ww8/ww8par.hxx | 4
+ sw/source/filter/ww8/ww8par6.cxx | 11 +
+ sw/source/filter/ww8/ww8scan.cxx | 2
+ sw/source/filter/ww8/ww8struc.hxx | 4
+ sw/source/filter/xml/xmlexpit.cxx | 14 +-
+ sw/source/filter/xml/xmlithlp.cxx | 25 +++
+ writerfilter/source/dmapper/BorderHandler.cxx | 6 -
+ writerfilter/source/dmapper/BorderHandler.hxx | 6 -
+ writerfilter/source/dmapper/CellColorHandler.hxx | 2
+ writerfilter/source/dmapper/ConversionHelper.cxx | 61 +++++--
+ writerfilter/source/dmapper/ConversionHelper.hxx | 7 -
+ writerfilter/source/dmapper/DomainMapper.cxx | 10 +
+ .../source/dmapper/DomainMapperTableHandler.cxx | 3
+ writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4
+ writerfilter/source/dmapper/GraphicImport.cxx | 4
+ writerfilter/source/dmapper/PageBordersHandler.hxx | 4
+ writerfilter/source/dmapper/PropertyMap.cxx | 6 -
+ writerfilter/source/dmapper/PropertyMap.hxx | 6 -
+ writerfilter/source/dmapper/TDefTableHandler.cxx | 4
+ writerfilter/source/dmapper/TDefTableHandler.hxx | 19 +-
+ xmloff/source/style/PageMasterExportPropMapper.cxx | 11 +
+ xmloff/source/style/PageMasterImportPropMapper.cxx | 14 +-
+ xmloff/source/style/bordrhdl.cxx | 54 ++++++-
+ xmloff/source/text/txtexppr.cxx | 16 +-
+ xmloff/source/text/txtimppr.cxx | 10 +
+ 84 files changed, 1210 insertions(+), 491 deletions(-)
+ create mode 100644 offapi/com/sun/star/table/BorderLine2.idl
+ create mode 100644 offapi/com/sun/star/table/BorderLineStyle.idl
+ create mode 100644 svtools/inc/borderhelper.hxx
+
+
diff --git cui/source/tabpages/border.cxx cui/source/tabpages/border.cxx
index 48aac82..e1ac8fc 100644
--- cui/source/tabpages/border.cxx
@@ -1049,6 +1146,96 @@ index 6216165..0b98a8c 100644
// Background patterns --------------------------------------------------------
+diff --git sc/source/filter/xml/xmlstyle.cxx sc/source/filter/xml/xmlstyle.cxx
+index 6481e6d..499e7c5 100644
+--- sc/source/filter/xml/xmlstyle.cxx
++++ sc/source/filter/xml/xmlstyle.cxx
+@@ -54,6 +54,7 @@
+ #include <com/sun/star/table/CellHoriJustify.hpp>
+ #include <com/sun/star/table/CellJustifyMethod.hpp>
+ #include <com/sun/star/table/TableBorder.hpp>
++#include <com/sun/star/table/BorderLine2.hpp>
+ #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
+ #include <com/sun/star/sheet/XSheetConditionalEntry.hpp>
+ #include <com/sun/star/sheet/XSheetCondition.hpp>
+@@ -320,7 +321,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
+ {
+ if( pBorder_Left && pBorder_Right && pBorder_Top && pBorder_Bottom )
+ {
+- table::BorderLine aLeft, aRight, aTop, aBottom;
++ table::BorderLine2 aLeft, aRight, aTop, aBottom;
+
+ pBorder_Left->maValue >>= aLeft;
+ pBorder_Right->maValue >>= aRight;
+@@ -331,7 +332,9 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
+ aLeft.Color == aTop.Color && aLeft.InnerLineWidth == aTop.InnerLineWidth &&
+ aLeft.OuterLineWidth == aTop.OuterLineWidth && aLeft.LineDistance == aTop.LineDistance &&
+ aLeft.Color == aBottom.Color && aLeft.InnerLineWidth == aBottom.InnerLineWidth &&
+- aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance )
++ aLeft.OuterLineWidth == aBottom.OuterLineWidth && aLeft.LineDistance == aBottom.LineDistance &&
++ aLeft.LineStyle == aRight.LineStyle && aLeft.LineStyle == aTop.LineStyle &&
++ aLeft.LineStyle == aBottom.LineStyle )
+ {
+ pBorder_Left->mnIndex = -1;
+ pBorder_Left->maValue.clear();
+@@ -358,7 +361,7 @@ void ScXMLCellExportPropertyMapper::ContextFilter(
+ {
+ if( pLeftBorderWidthState && pRightBorderWidthState && pTopBorderWidthState && pBottomBorderWidthState )
+ {
+- table::BorderLine aLeft, aRight, aTop, aBottom;
++ table::BorderLine2 aLeft, aRight, aTop, aBottom;
+
+ pLeftBorderWidthState->maValue >>= aLeft;
+ pRightBorderWidthState->maValue >>= aRight;
+diff --git sc/source/filter/xml/xmlstyli.cxx sc/source/filter/xml/xmlstyli.cxx
+index 0213ac8..49dea66 100644
+--- sc/source/filter/xml/xmlstyli.cxx
++++ sc/source/filter/xml/xmlstyli.cxx
+@@ -40,7 +40,7 @@
+ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+ #include <com/sun/star/container/XNameContainer.hpp>
+ #include <com/sun/star/sheet/XSheetConditionalEntries.hpp>
+-#include <com/sun/star/table/BorderLine.hpp>
++#include <com/sun/star/table/BorderLine2.hpp>
+ #include <comphelper/extract.hxx>
+ #include <xmloff/xmlprcon.hxx>
+ #include <xmloff/xmluconv.hxx>
+@@ -164,15 +164,16 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
+ pBorderWidths[i]->mnIndex = -1;
+ if( pBorders[i] )
+ {
+- table::BorderLine aBorderLine;
++ table::BorderLine2 aBorderLine;
+ pBorders[i]->maValue >>= aBorderLine;
+ if( pBorderWidths[i] )
+ {
+- table::BorderLine aBorderLineWidth;
++ table::BorderLine2 aBorderLineWidth;
+ pBorderWidths[i]->maValue >>= aBorderLineWidth;
+ aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
+ aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
+ aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
++ aBorderLine.LineStyle = aBorderLineWidth.LineStyle;
+ pBorders[i]->maValue <<= aBorderLine;
+ }
+ }
+@@ -181,13 +182,14 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
+ {
+ if( pDiagBorders[i] && pDiagBorderWidths[i] )
+ {
+- table::BorderLine aBorderLine;
++ table::BorderLine2 aBorderLine;
+ pDiagBorders[i]->maValue >>= aBorderLine;
+- table::BorderLine aBorderLineWidth;
++ table::BorderLine2 aBorderLineWidth;
+ pDiagBorderWidths[i]->maValue >>= aBorderLineWidth;
+ aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
+ aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
+ aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
++ aBorderLine.LineStyle = aBorderLineWidth.LineStyle;
+ pDiagBorders[i]->maValue <<= aBorderLine;
+ pDiagBorderWidths[i]->mnIndex = -1;
+ }
diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
index cfe9b9d..8930328 100644
--- sc/source/ui/unoobj/cellsuno.cxx
@@ -3025,10 +3212,10 @@ index a26fc29..488ca0b 100644
else
{
diff --git sw/source/filter/ww8/docxattributeoutput.cxx sw/source/filter/ww8/docxattributeoutput.cxx
-index a691c29..1ec35d4 100644
+index 05f07d7..9f87dc7 100644
--- sw/source/filter/ww8/docxattributeoutput.cxx
+++ sw/source/filter/ww8/docxattributeoutput.cxx
-@@ -1147,6 +1147,20 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
+@@ -1148,6 +1148,20 @@ static void impl_borderLine( FSHelperPtr pSerializer, sal_Int32 elementToken, co
pVal = ( sal_Char* )"thickThinMediumGap";
}
}
commit 470af1183003ace4095184c0bd11d36eeb15e779
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Jun 15 16:47:20 2010 +0200
WW8 export perf improvements (thanks Eike)
* patches/dev300/sw-ww8-ruby-export-fix.diff:
diff --git a/patches/dev300/sw-ww8-ruby-export-fix.diff b/patches/dev300/sw-ww8-ruby-export-fix.diff
index bb3f641..41a281d 100644
--- a/patches/dev300/sw-ww8-ruby-export-fix.diff
+++ b/patches/dev300/sw-ww8-ruby-export-fix.diff
@@ -1,35 +1,14 @@
-diff --git sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/wrtw8nds.cxx
-index f207dd8..57e4920 100644
---- sw/source/filter/ww8/wrtw8nds.cxx
-+++ sw/source/filter/ww8/wrtw8nds.cxx
-@@ -36,6 +36,7 @@
- #include <functional>
- #include <iostream>
- #include <hintids.hxx>
-+#include <comphelper/processfactory.hxx>
- #include <tools/urlobj.hxx>
- #include <editeng/boxitem.hxx>
- #include <editeng/cmapitem.hxx>
-@@ -50,8 +51,10 @@
- #include <editeng/brkitem.hxx>
- #include <editeng/frmdiritem.hxx>
- #include <editeng/tstpitem.hxx>
-+#include <editeng/unolingu.hxx>
- #include "svl/urihelper.hxx"
- #include <svl/whiter.hxx>
-+#include <unotools/localedatawrapper.hxx>
- #include <fmtpdsc.hxx>
- #include <fmtfsize.hxx>
- #include <fmtornt.hxx>
-@@ -109,6 +112,7 @@
-
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::i18n;
-+using namespace ::com::sun::star::lang;
- using namespace sw::util;
- using namespace sw::types;
- using namespace sw::mark;
-@@ -739,7 +743,17 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/,
+commit fcda032d53a1d766a5d3fd6af373b4f55ab52401
+Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
+Date: Tue Jun 15 16:30:36 2010 +0200
+
+ Fix the ruby export in ww8 filter
+
+diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
+index f207dd8..65e43a7 100644
+--- a/sw/source/filter/ww8/wrtw8nds.cxx
++++ b/sw/source/filter/ww8/wrtw8nds.cxx
+@@ -739,7 +739,14 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, xub_StrLen /*nPos*/,
aStr += String::CreateFromInt32(nHeight);
aStr += '(';
aStr += rRuby.GetText();
@@ -37,10 +16,7 @@ index f207dd8..57e4920 100644
+ aStr.APPEND_CONST_ASC( ")" );
+
+ // The parameter separator depends on the FIB.lid
-+ Locale aTempLocale;
-+ SvxLanguageToLocale( aTempLocale, m_rWW8Export.pFib->lid );
-+ LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), aTempLocale );
-+ if ( aLocaleWrapper.getNumDecimalSep().EqualsAscii( "." ) )
++ if ( m_rWW8Export.pFib->getNumDecimalSep() == '.' )
+ aStr.APPEND_CONST_ASC( "," );
+ else
+ aStr.APPEND_CONST_ASC( ";" );
@@ -48,3 +24,67 @@ index f207dd8..57e4920 100644
m_rWW8Export.OutputField( 0, ww::eEQ, aStr,
WRITEFIELD_START | WRITEFIELD_CMD_START );
}
+diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
+index 59de57e..98adeba 100644
+--- a/sw/source/filter/ww8/ww8scan.cxx
++++ b/sw/source/filter/ww8/ww8scan.cxx
+@@ -47,8 +47,11 @@
+ #include <swtypes.hxx> // DELETEZ
+
+ #endif // dump
++#include <comphelper/processfactory.hxx>
++#include <unotools/localedatawrapper.hxx>
+ #include <tools/debug.hxx>
+ #include <i18npool/lang.h>
++#include <editeng/unolingu.hxx>
+ #include <vcl/svapp.hxx> // Application #i90932#
+
+ #include <stdio.h>
+@@ -58,6 +61,8 @@
+ if (!(aCon)) \
+ return aRet;
+
++using namespace ::com::sun::star::lang;
++
+ //-begin
+ namespace SL
+ {
+@@ -5652,6 +5657,16 @@ WW8Fib::WW8Fib(BYTE nVer)
+ break;
+ };
+ // <-- #i90932#
++
++ Locale aTempLocale;
++ SvxLanguageToLocale( aTempLocale, lid );
++ LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), aTempLocale );
++ nNumDecimalSep = aLocaleWrapper.getNumDecimalSep().GetChar( 0 );
++}
++
++sal_Unicode WW8Fib::getNumDecimalSep() const
++{
++ return nNumDecimalSep;
+ }
+
+ bool WW8Fib::WriteHeader(SvStream& rStrm)
+diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
+index 9e8c9ce..f9db96c 100644
+--- a/sw/source/filter/ww8/ww8scan.hxx
++++ b/sw/source/filter/ww8/ww8scan.hxx
+@@ -987,6 +987,9 @@ public:
+ */
+ class WW8Fib
+ {
++private:
++ sal_Unicode nNumDecimalSep;
++
+ public:
+ /**
+ Program-Version asked for by us:
+@@ -1444,6 +1447,7 @@ public:
+ static rtl_TextEncoding GetFIBCharset(UINT16 chs);
+ ww::WordVersion GetFIBVersion() const;
+ WW8_CP GetBaseCp(ManTypes nType) const;
++ sal_Unicode getNumDecimalSep() const;
+ };
+
+ class WW8Style
More information about the ooo-build-commit
mailing list