[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Jun 15 09:25:52 PDT 2010
patches/dev300/border-types-dotted-dashed.diff | 878 +++++++++++++++----------
1 file changed, 527 insertions(+), 351 deletions(-)
New commits:
commit f80ecb6a1e0cc24a21ddf0d35fa25fd42511661d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Jun 15 18:20:10 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 9c26169..2ca8731 100644
--- a/patches/dev300/border-types-dotted-dashed.diff
+++ b/patches/dev300/border-types-dotted-dashed.diff
@@ -1,8 +1,105 @@
+Implement the dotted and dashed border types
+
+From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
+
+
+---
+
+ .../primitive2d/borderlineprimitive2d.hxx | 7 +
+ .../source/primitive2d/borderlineprimitive2d.cxx | 35 +++-
+ .../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 | 56 +++++++
+ 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 | 55 ++++---
+ sc/source/filter/excel/xestyle.cxx | 22 +++
+ 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 | 5 -
+ 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/prj/d.lst | 1
+ svtools/source/control/ctrlbox.cxx | 147 +++++++++++++++++-
+ svtools/source/svrtf/rtfkeywd.hxx | 2
+ svtools/util/makefile.mk | 3
+ svx/inc/svx/borderline.hxx | 14 ++
+ svx/inc/svx/framelink.hxx | 25 ++-
+ svx/inc/svx/frmsel.hxx | 7 +
+ svx/inc/svx/msdffimp.hxx | 1
+ svx/inc/svx/svxids.hrc | 2
+ svx/source/cui/border.cxx | 27 +++
+ svx/source/dialog/framelink.cxx | 163 ++++++--------------
+ svx/source/dialog/frmsel.cxx | 39 ++++-
+ svx/source/items/frmitems.cxx | 34 +++-
+ svx/source/msfilter/msdffimp.cxx | 6 +
+ svx/source/svrtf/rtfitem.cxx | 9 +
+ svx/source/table/cell.cxx | 3
+ 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, 1200 insertions(+), 482 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 drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
-index ddab5bb..cf12676 100644
+index d3d7553..bea1ca3 100644
--- drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
+++ drawinglayer/inc/drawinglayer/primitive2d/borderlineprimitive2d.hxx
-@@ -59,6 +59,7 @@ namespace drawinglayer
+@@ -51,6 +51,7 @@ namespace drawinglayer
double mfExtendOuterStart;
double mfExtendOuterEnd;
basegfx::BColor maRGBColor;
@@ -10,7 +107,7 @@ index ddab5bb..cf12676 100644
// bitfield
unsigned mbCreateInside : 1;
-@@ -122,7 +123,8 @@ namespace drawinglayer
+@@ -114,7 +115,8 @@ namespace drawinglayer
double fExtendOuterEnd,
bool bCreateInside,
bool bCreateOutside,
@@ -20,7 +117,7 @@ index ddab5bb..cf12676 100644
// get data
const basegfx::B2DPoint& getStart() const { return maStart; }
-@@ -136,7 +138,8 @@ namespace drawinglayer
+@@ -128,7 +130,8 @@ namespace drawinglayer
double getExtendOuterEnd() const { return mfExtendOuterEnd; }
bool getCreateInside() const { return mbCreateInside; }
bool getCreateOutside() const { return mbCreateOutside; }
@@ -31,10 +128,10 @@ index ddab5bb..cf12676 100644
// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
diff --git drawinglayer/source/primitive2d/borderlineprimitive2d.cxx drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
-index a2fda82..d605d68 100644
+index ed308db..f7917c6 100644
--- drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
+++ drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
-@@ -41,6 +41,7 @@
+@@ -33,6 +33,7 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
@@ -42,7 +139,7 @@ index a2fda82..d605d68 100644
#include <numeric>
//////////////////////////////////////////////////////////////////////////////
-@@ -165,14 +166,29 @@ namespace drawinglayer
+@@ -157,14 +158,29 @@ namespace drawinglayer
// create filled polygon primitive
const basegfx::B2DVector aLineWidthOffset((getCorrectedLeftWidth() * 0.5) * aPerpendicular);
@@ -78,7 +175,7 @@ index a2fda82..d605d68 100644
}
}
}
-@@ -193,7 +209,8 @@ namespace drawinglayer
+@@ -185,7 +201,8 @@ namespace drawinglayer
double fExtendOuterEnd,
bool bCreateInside,
bool bCreateOutside,
@@ -88,7 +185,7 @@ index a2fda82..d605d68 100644
: BasePrimitive2D(),
maStart(rStart),
maEnd(rEnd),
-@@ -205,6 +222,7 @@ namespace drawinglayer
+@@ -197,6 +214,7 @@ namespace drawinglayer
mfExtendOuterStart(fExtendOuterStart),
mfExtendOuterEnd(fExtendOuterEnd),
maRGBColor(rRGBColor),
@@ -96,7 +193,7 @@ index a2fda82..d605d68 100644
mbCreateInside(bCreateInside),
mbCreateOutside(bCreateOutside)
{
-@@ -227,7 +245,8 @@ namespace drawinglayer
+@@ -219,7 +237,8 @@ namespace drawinglayer
&& getExtendOuterEnd() == rCompare.getExtendOuterEnd()
&& getCreateInside() == rCompare.getCreateInside()
&& getCreateOutside() == rCompare.getCreateOutside()
@@ -187,10 +284,10 @@ index cea93c8..08586d0 100644
<xsl:attribute name="uof:宽度"><xsl:value-of select="substring-before(substring-before($border,' '),substring($ooUnit,1,2))"/></xsl:attribute>
<xsl:attribute name="uof:颜色"><xsl:value-of select="substring-after(substring-after($border,' '),' ')"/></xsl:attribute>
diff --git offapi/com/sun/star/table/BorderLine.idl offapi/com/sun/star/table/BorderLine.idl
-index 94c93c5..3484aa8 100644
+index 81e71b4..c40a416 100644
--- offapi/com/sun/star/table/BorderLine.idl
+++ offapi/com/sun/star/table/BorderLine.idl
-@@ -74,7 +74,6 @@ published struct BorderLine
+@@ -71,7 +71,6 @@ published struct BorderLine
double line (in 1/100 mm).
*/
short LineDistance;
@@ -330,10 +427,10 @@ index 0000000..17f15ad
+
+#endif
diff --git offapi/com/sun/star/table/makefile.mk offapi/com/sun/star/table/makefile.mk
-index dbcb959..0f72fd6 100644
+index b9ceafe..53151a8 100644
--- offapi/com/sun/star/table/makefile.mk
+++ offapi/com/sun/star/table/makefile.mk
-@@ -45,6 +45,8 @@ IDLFILES=\
+@@ -41,6 +41,8 @@ IDLFILES=\
AccessibleCellView.idl \
AccessibleTableView.idl \
BorderLine.idl\
@@ -343,10 +440,10 @@ index dbcb959..0f72fd6 100644
CellAddress.idl\
CellContentType.idl\
diff --git oox/inc/oox/helper/helper.hxx oox/inc/oox/helper/helper.hxx
-index 2a8bd6f..6db2fe7 100644
+index f090fbe..dcd7f2d 100644
--- oox/inc/oox/helper/helper.hxx
+++ oox/inc/oox/helper/helper.hxx
-@@ -78,6 +78,10 @@ const sal_Int32 API_RGB_TRANSPARENT = -1; /// Transparent color fo
+@@ -75,6 +75,10 @@ const sal_Int32 API_RGB_TRANSPARENT = -1; /// Transparent color fo
const sal_Int32 API_RGB_BLACK = 0x000000; /// Black color for API calls.
const sal_Int32 API_RGB_WHITE = 0xFFFFFF; /// White color for API calls.
@@ -358,10 +455,10 @@ index 2a8bd6f..6db2fe7 100644
const sal_Int16 API_LINE_HAIR = 2;
const sal_Int16 API_LINE_THIN = 35;
diff --git oox/inc/oox/xls/stylesbuffer.hxx oox/inc/oox/xls/stylesbuffer.hxx
-index ead9f05..9be9938 100644
+index b66b45a..4a581cf 100644
--- oox/inc/oox/xls/stylesbuffer.hxx
+++ oox/inc/oox/xls/stylesbuffer.hxx
-@@ -36,7 +36,7 @@
+@@ -33,7 +33,7 @@
#include <com/sun/star/table/CellHoriJustify.hpp>
#include <com/sun/star/table/CellOrientation.hpp>
#include <com/sun/star/table/CellVertJustify.hpp>
@@ -370,7 +467,7 @@ index ead9f05..9be9938 100644
#include "oox/helper/containerhelper.hxx"
#include "oox/drawingml/color.hxx"
#include "oox/xls/numberformatsbuffer.hxx"
-@@ -503,10 +503,12 @@ struct BorderModel
+@@ -500,10 +500,12 @@ struct BorderModel
/** Contains API attributes of a complete cell border. */
struct ApiBorderData
{
@@ -386,7 +483,7 @@ index ead9f05..9be9938 100644
ApiBorderLine maTLtoBR; /// Diagonal top-left to bottom-right line format.
ApiBorderLine maBLtoTR; /// Diagonal bottom-left to top-right line format.
bool mbBorderUsed; /// True = left/right/top/bottom line format used.
-@@ -559,7 +561,7 @@ private:
+@@ -556,7 +558,7 @@ private:
/** Converts border line data to an API struct, returns true, if the line is marked as used. */
bool convertBorderLine(
@@ -396,10 +493,10 @@ index ead9f05..9be9938 100644
private:
diff --git oox/source/drawingml/table/tablecell.cxx oox/source/drawingml/table/tablecell.cxx
-index 2f8dc14..aa9c7ec 100644
+index ea0e40a..1f5cec6 100644
--- oox/source/drawingml/table/tablecell.cxx
+++ oox/source/drawingml/table/tablecell.cxx
-@@ -40,7 +40,7 @@
+@@ -37,7 +37,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/table/XTable.hpp>
#include <com/sun/star/table/XMergeableCellRange.hpp>
@@ -408,7 +505,7 @@ index 2f8dc14..aa9c7ec 100644
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-@@ -51,7 +51,7 @@ using namespace ::oox::core;
+@@ -48,7 +48,7 @@ using namespace ::oox::core;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -417,7 +514,7 @@ index 2f8dc14..aa9c7ec 100644
using ::com::sun::star::drawing::LineStyle;
namespace oox { namespace drawingml { namespace table {
-@@ -79,7 +79,7 @@ void applyLineAttributes( const ::oox::core::XmlFilterBase& rFilterBase,
+@@ -76,7 +76,7 @@ void applyLineAttributes( const ::oox::core::XmlFilterBase& rFilterBase,
Reference< XPropertySet >& rxPropSet, oox::drawingml::LineProperties& rLineProperties,
sal_Int32 nPropId )
{
@@ -427,10 +524,10 @@ index 2f8dc14..aa9c7ec 100644
{
Color aColor = rLineProperties.maLineFill.getBestSolidColor();
diff --git oox/source/drawingml/table/tableproperties.cxx oox/source/drawingml/table/tableproperties.cxx
-index 9e1d288..4ed7ba3 100644
+index 1241655..6651254 100644
--- oox/source/drawingml/table/tableproperties.cxx
+++ oox/source/drawingml/table/tableproperties.cxx
-@@ -35,7 +35,7 @@
+@@ -32,7 +32,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/table/XMergeableCellRange.hpp>
@@ -440,10 +537,10 @@ index 9e1d288..4ed7ba3 100644
#include "oox/core/xmlfilterbase.hxx"
#include "oox/helper/propertyset.hxx"
diff --git oox/source/drawingml/table/tablerow.cxx oox/source/drawingml/table/tablerow.cxx
-index f41513d..977ddc0 100644
+index 8986a6e..a8c1b25 100644
--- oox/source/drawingml/table/tablerow.cxx
+++ oox/source/drawingml/table/tablerow.cxx
-@@ -37,7 +37,7 @@
+@@ -34,7 +34,7 @@
#include "oox/helper/propertyset.hxx"
#include <com/sun/star/table/XTable.hpp>
#include <com/sun/star/table/XMergeableCellRange.hpp>
@@ -453,10 +550,10 @@ index f41513d..977ddc0 100644
using rtl::OUString;
using namespace ::oox::core;
diff --git oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesbuffer.cxx
-index ac309b5..fd16a00 100644
+index 4c28fb5..1e90ca5 100644
--- oox/source/xls/stylesbuffer.cxx
+++ oox/source/xls/stylesbuffer.cxx
-@@ -75,6 +75,7 @@ using ::com::sun::star::awt::FontDescriptor;
+@@ -71,6 +71,7 @@ using ::com::sun::star::awt::FontDescriptor;
using ::com::sun::star::awt::XDevice;
using ::com::sun::star::awt::XFont2;
using ::com::sun::star::table::BorderLine;
@@ -464,7 +561,7 @@ index ac309b5..fd16a00 100644
using ::com::sun::star::text::XText;
using ::com::sun::star::style::XStyle;
using ::oox::core::FilterBase;
-@@ -1552,7 +1553,7 @@ inline sal_Int32 lclGetBorderLineWidth( const BorderLine& rBorderLine )
+@@ -1548,7 +1549,7 @@ inline sal_Int32 lclGetBorderLineWidth( const BorderLine& rBorderLine )
return rBorderLine.OuterLineWidth + rBorderLine.LineDistance + rBorderLine.InnerLineWidth;
}
@@ -473,7 +570,7 @@ index ac309b5..fd16a00 100644
{
if( bValid1 && bValid2 )
return (lclGetBorderLineWidth( rBorderLine1 ) < lclGetBorderLineWidth( rBorderLine2 )) ? &rBorderLine2 : &rBorderLine1;
-@@ -1690,21 +1691,10 @@ void Border::finalizeImport()
+@@ -1686,21 +1687,10 @@ void Border::finalizeImport()
maApiData.mbBorderUsed = maModel.maLeft.mbUsed || maModel.maRight.mbUsed || maModel.maTop.mbUsed || maModel.maBottom.mbUsed;
maApiData.mbDiagUsed = maModel.maDiagonal.mbUsed;
@@ -499,7 +596,7 @@ index ac309b5..fd16a00 100644
if( maModel.mbDiagTLtoBR )
convertBorderLine( maApiData.maTLtoBR, maModel.maDiagonal );
-@@ -1715,7 +1705,12 @@ void Border::finalizeImport()
+@@ -1711,7 +1701,12 @@ void Border::finalizeImport()
void Border::writeToPropertyMap( PropertyMap& rPropMap ) const
{
if( maApiData.mbBorderUsed )
@@ -513,7 +610,7 @@ index ac309b5..fd16a00 100644
if( maApiData.mbDiagUsed )
{
rPropMap[ PROP_DiagonalTLBR ] <<= maApiData.maTLtoBR;
-@@ -1734,18 +1729,16 @@ bool lcl_isBorder(const ::com::sun::star::table::BorderLine& rBorder)
+@@ -1730,18 +1725,16 @@ bool lcl_isBorder(const ::com::sun::star::table::BorderLine& rBorder)
bool Border::hasBorder() const
{
@@ -536,7 +633,7 @@ index ac309b5..fd16a00 100644
return true;
return false;
-@@ -1764,15 +1757,25 @@ BorderLineModel* Border::getBorderLine( sal_Int32 nElement )
+@@ -1760,15 +1753,25 @@ BorderLineModel* Border::getBorderLine( sal_Int32 nElement )
return 0;
}
@@ -566,10 +663,10 @@ index ac309b5..fd16a00 100644
case XML_hair: lclSetBorderLineWidth( rBorderLine, API_LINE_HAIR ); break;
case XML_medium: lclSetBorderLineWidth( rBorderLine, API_LINE_MEDIUM ); break;
diff --git sc/source/filter/excel/xestyle.cxx sc/source/filter/excel/xestyle.cxx
-index 2a35a31..e9a87d1 100644
+index cf81e56..3ad250a 100644
--- sc/source/filter/excel/xestyle.cxx
+++ sc/source/filter/excel/xestyle.cxx
-@@ -1572,9 +1572,26 @@ void lclGetBorderLine(
+@@ -1569,9 +1569,26 @@ void lclGetBorderLine(
else if( nOuterWidth > DEF_LINE_WIDTH_2 )
rnXclLine = EXC_LINE_THICK;
else if( nOuterWidth > DEF_LINE_WIDTH_1 )
@@ -597,7 +694,7 @@ index 2a35a31..e9a87d1 100644
else if( nOuterWidth > 0 )
rnXclLine = EXC_LINE_HAIR;
else
-@@ -1740,6 +1757,9 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
+@@ -1737,6 +1754,9 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
case EXC_LINE_THICK: return "thick";
case EXC_LINE_DOUBLE: return "double";
case EXC_LINE_HAIR: return "hair";
@@ -608,10 +705,10 @@ index 2a35a31..e9a87d1 100644
return "*unknown*";
}
diff --git sc/source/filter/excel/xistyle.cxx sc/source/filter/excel/xistyle.cxx
-index 6e29ba0..f66c363 100644
+index 1481701..f40ee7f 100644
--- sc/source/filter/excel/xistyle.cxx
+++ sc/source/filter/excel/xistyle.cxx
-@@ -878,23 +878,23 @@ namespace {
+@@ -881,23 +881,23 @@ namespace {
/** Converts the passed line style to a SvxBorderLine, or returns false, if style is "no line". */
bool lclConvertBorderLine( SvxBorderLine& rLine, const XclImpPalette& rPalette, sal_uInt8 nXclLine, sal_uInt16 nXclColor )
{
@@ -651,7 +748,7 @@ index 6e29ba0..f66c363 100644
};
if( nXclLine == EXC_LINE_NONE )
-@@ -906,6 +906,7 @@ bool lclConvertBorderLine( SvxBorderLine& rLine, const XclImpPalette& rPalette,
+@@ -909,6 +909,7 @@ bool lclConvertBorderLine( SvxBorderLine& rLine, const XclImpPalette& rPalette,
rLine.SetOutWidth( ppnLineParam[ nXclLine ][ 0 ] );
rLine.SetInWidth( ppnLineParam[ nXclLine ][ 1 ] );
rLine.SetDistance( ppnLineParam[ nXclLine ][ 2 ] );
@@ -660,10 +757,10 @@ index 6e29ba0..f66c363 100644
}
diff --git sc/source/filter/html/htmlexp.cxx sc/source/filter/html/htmlexp.cxx
-index 9698b9d..70f39ba 100644
+index 789c415..70a7442 100644
--- sc/source/filter/html/htmlexp.cxx
+++ sc/source/filter/html/htmlexp.cxx
-@@ -558,7 +558,14 @@ void ScHTMLExport::BorderToStyle( ByteString& rOut, const char* pBorderName,
+@@ -555,7 +555,14 @@ void ScHTMLExport::BorderToStyle( ByteString& rOut, const char* pBorderName,
// thickness
int nWidth = pLine->GetOutWidth();
int nPxWidth = ( nWidth > 0 )? std::max( int( nWidth / TWIPS_PER_PIXEL ), 1 ): 0;
@@ -680,10 +777,10 @@ index 9698b9d..70f39ba 100644
// color
char hex[7];
diff --git sc/source/filter/inc/xlstyle.hxx sc/source/filter/inc/xlstyle.hxx
-index e18f48b..373d701 100644
+index e4f53ff..39b2bbd 100644
--- sc/source/filter/inc/xlstyle.hxx
+++ sc/source/filter/inc/xlstyle.hxx
-@@ -51,9 +51,12 @@ class XclRoot;
+@@ -48,9 +48,12 @@ class XclRoot;
const sal_uInt8 EXC_LINE_NONE = 0x00;
const sal_uInt8 EXC_LINE_THIN = 0x01;
const sal_uInt8 EXC_LINE_MEDIUM = 0x02;
@@ -696,11 +793,90 @@ index e18f48b..373d701 100644
// Background patterns --------------------------------------------------------
+diff --git sc/source/filter/xml/xmlstyle.cxx sc/source/filter/xml/xmlstyle.cxx
+index 90bade3..2f97963 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>
+@@ -318,7 +319,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;
+@@ -356,7 +357,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 94b1ce3..9345185 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 11ecd43..1b1c8a0 100644
+index 3d4f662..8d6dc72 100644
--- sc/source/ui/unoobj/cellsuno.cxx
+++ sc/source/ui/unoobj/cellsuno.cxx
-@@ -62,6 +62,7 @@
+@@ -59,6 +59,7 @@
#include <com/sun/star/table/CellVertJustify2.hpp>
#include <com/sun/star/table/ShadowFormat.hpp>
#include <com/sun/star/table/TableBorder.hpp>
@@ -708,7 +884,7 @@ index 11ecd43..1b1c8a0 100644
#include <com/sun/star/sheet/CellFlags.hpp>
#include <com/sun/star/sheet/FormulaResult.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-@@ -162,7 +163,7 @@ const SfxItemPropertySet* lcl_GetCellsPropertySet()
+@@ -159,7 +160,7 @@ const SfxItemPropertySet* lcl_GetCellsPropertySet()
{
{MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
@@ -717,7 +893,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
{MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
-@@ -213,13 +214,13 @@ const SfxItemPropertySet* lcl_GetCellsPropertySet()
+@@ -210,13 +211,13 @@ const SfxItemPropertySet* lcl_GetCellsPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
@@ -734,7 +910,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
-@@ -234,13 +235,13 @@ const SfxItemPropertySet* lcl_GetCellsPropertySet()
+@@ -231,13 +232,13 @@ const SfxItemPropertySet* lcl_GetCellsPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_PLMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_L_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
@@ -750,7 +926,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-@@ -263,7 +264,7 @@ const SfxItemPropertySet* lcl_GetRangePropertySet()
+@@ -260,7 +261,7 @@ const SfxItemPropertySet* lcl_GetRangePropertySet()
{
{MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
@@ -759,7 +935,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
{MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
-@@ -314,13 +315,13 @@ const SfxItemPropertySet* lcl_GetRangePropertySet()
+@@ -311,13 +312,13 @@ const SfxItemPropertySet* lcl_GetRangePropertySet()
{MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
@@ -776,7 +952,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
-@@ -336,14 +337,14 @@ const SfxItemPropertySet* lcl_GetRangePropertySet()
+@@ -333,14 +334,14 @@ const SfxItemPropertySet* lcl_GetRangePropertySet()
{MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
@@ -793,7 +969,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-@@ -366,7 +367,7 @@ const SfxItemPropertySet* lcl_GetCellPropertySet()
+@@ -363,7 +364,7 @@ const SfxItemPropertySet* lcl_GetCellPropertySet()
{
{MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
@@ -802,7 +978,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
{MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
-@@ -417,15 +418,15 @@ const SfxItemPropertySet* lcl_GetCellPropertySet()
+@@ -414,15 +415,15 @@ const SfxItemPropertySet* lcl_GetCellPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
@@ -821,7 +997,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLORI), ATTR_STACKED, &getCppuType((table::CellOrientation*)0), 0, 0 },
-@@ -441,14 +442,14 @@ const SfxItemPropertySet* lcl_GetCellPropertySet()
+@@ -438,14 +439,14 @@ const SfxItemPropertySet* lcl_GetCellPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
@@ -838,7 +1014,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-@@ -471,7 +472,7 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
+@@ -468,7 +469,7 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
{
{MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
@@ -847,7 +1023,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
{MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
-@@ -522,8 +523,8 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
+@@ -519,8 +520,8 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
@@ -858,7 +1034,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
{MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
-@@ -532,7 +533,7 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
+@@ -529,7 +530,7 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
@@ -867,7 +1043,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_OWIDTH), SC_WID_UNO_OWIDTH, &getBooleanCppuType(), 0, 0 },
-@@ -549,14 +550,14 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
+@@ -546,14 +547,14 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
@@ -884,7 +1060,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-@@ -577,7 +578,7 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
+@@ -574,7 +575,7 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
{
{MAP_CHAR_LEN(SC_UNONAME_ABSNAME), SC_WID_UNO_ABSNAME, &getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
@@ -893,7 +1069,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
{MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
-@@ -628,8 +629,8 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
+@@ -625,8 +626,8 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_CONDFMT), SC_WID_UNO_CONDFMT, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDLOC), SC_WID_UNO_CONDLOC, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CONDXML), SC_WID_UNO_CONDXML, &getCppuType((uno::Reference<sheet::XSheetConditionalEntries>*)0), 0, 0 },
@@ -904,7 +1080,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLHGT), SC_WID_UNO_CELLHGT, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
{MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 },
-@@ -639,7 +640,7 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
+@@ -636,7 +637,7 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLVIS), SC_WID_UNO_CELLVIS, &getBooleanCppuType(), 0, 0 },
@@ -913,7 +1089,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NUMRULES), SC_WID_UNO_NUMRULES,&getCppuType((const uno::Reference<container::XIndexReplace>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_OHEIGHT), SC_WID_UNO_OHEIGHT, &getBooleanCppuType(), 0, 0 },
-@@ -656,14 +657,14 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
+@@ -653,14 +654,14 @@ const SfxItemPropertySet* lcl_GetRowPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_PRMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_R_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_PTMARGIN), ATTR_MARGIN, &getCppuType((sal_Int32*)0), 0, MID_MARGIN_UP_MARGIN | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
@@ -930,7 +1106,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_USERDEF), ATTR_USERDEF, &getCppuType((uno::Reference<container::XNameContainer>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
-@@ -685,7 +686,7 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
+@@ -682,7 +683,7 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_ASIANVERT),ATTR_VERTICAL_ASIAN,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_AUTOPRINT),SC_WID_UNO_AUTOPRINT,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_BORDCOL), SC_WID_UNO_BORDCOL, &getCppuType((sal_Int32*)0), 0, 0 },
@@ -939,7 +1115,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_CELLBACK), ATTR_BACKGROUND, &getCppuType((sal_Int32*)0), 0, MID_BACK_COLOR },
{MAP_CHAR_LEN(SC_UNONAME_CELLPRO), ATTR_PROTECTION, &getCppuType((util::CellProtection*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLSTYL), SC_WID_UNO_CELLSTYL,&getCppuType((rtl::OUString*)0), 0, 0 },
-@@ -739,15 +740,15 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
+@@ -736,15 +737,15 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_COPYBACK), SC_WID_UNO_COPYBACK,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_COPYFORM), SC_WID_UNO_COPYFORM,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_COPYSTYL), SC_WID_UNO_COPYSTYL,&getBooleanCppuType(), 0, 0 },
@@ -958,7 +1134,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNO_LINKDISPBIT), SC_WID_UNO_LINKDISPBIT,&getCppuType((uno::Reference<awt::XBitmap>*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNO_LINKDISPNAME), SC_WID_UNO_LINKDISPNAME,&getCppuType((rtl::OUString*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NUMFMT), ATTR_VALUE_FORMAT, &getCppuType((sal_Int32*)0), 0, 0 },
-@@ -768,7 +769,7 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
+@@ -765,7 +766,7 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_POS), SC_WID_UNO_POS, &getCppuType((awt::Point*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_PRINTBORD),SC_WID_UNO_PRINTBORD,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_PROTECT), SC_WID_UNO_PROTECT, &getBooleanCppuType(), 0, 0 },
@@ -967,7 +1143,7 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_ROTANG), ATTR_ROTATE_VALUE, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_ROTREF), ATTR_ROTATE_MODE, &getCppuType((sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_SHADOW), ATTR_SHADOW, &getCppuType((table::ShadowFormat*)0), 0, 0 | CONVERT_TWIPS },
-@@ -777,7 +778,7 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
+@@ -774,7 +775,7 @@ const SfxItemPropertySet* lcl_GetSheetPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_SIZE), SC_WID_UNO_SIZE, &getCppuType((awt::Size*)0), 0 | beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN(SC_UNONAME_TBLBORD), SC_WID_UNO_TBLBORD, &getCppuType((table::TableBorder*)0), 0, 0 | CONVERT_TWIPS },
{MAP_CHAR_LEN(SC_UNONAME_TABLAYOUT),SC_WID_UNO_TABLAYOUT,&getCppuType((sal_Int16*)0), 0, 0 },
@@ -977,10 +1153,10 @@ index 11ecd43..1b1c8a0 100644
{MAP_CHAR_LEN(SC_UNONAME_VALIDAT), SC_WID_UNO_VALIDAT, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_VALILOC), SC_WID_UNO_VALILOC, &getCppuType((uno::Reference<beans::XPropertySet>*)0), 0, 0 },
diff --git sc/source/ui/view/formatsh.cxx sc/source/ui/view/formatsh.cxx
-index fb9f77d..ef619e4 100644
+index fa6cdc6..ebc624a 100644
--- sc/source/ui/view/formatsh.cxx
+++ sc/source/ui/view/formatsh.cxx
-@@ -1536,6 +1536,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
+@@ -1533,6 +1533,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
pDefLine->SetOutWidth( pLine->GetOutWidth() );
pDefLine->SetInWidth ( pLine->GetInWidth() );
pDefLine->SetDistance( pLine->GetDistance() );
@@ -989,10 +1165,10 @@ index fb9f77d..ef619e4 100644
}
else
diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
-index e2255e0..9c0f929 100644
+index 41942dd..b2f8e2e 100644
--- sc/source/ui/view/viewfun2.cxx
+++ sc/source/ui/view/viewfun2.cxx
-@@ -3002,6 +3002,7 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine,
+@@ -3010,6 +3010,7 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine,
rLine.SetOutWidth ( pDestLine->GetOutWidth() );
rLine.SetInWidth ( pDestLine->GetInWidth() );
rLine.SetDistance ( pDestLine->GetDistance() );
@@ -1000,7 +1176,7 @@ index e2255e0..9c0f929 100644
}
else
{
-@@ -3009,6 +3010,7 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine,
+@@ -3017,6 +3018,7 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine,
rLine.SetOutWidth ( pSrcLine->GetOutWidth() );
rLine.SetInWidth ( pSrcLine->GetInWidth() );
rLine.SetDistance ( pSrcLine->GetDistance() );
@@ -1064,10 +1240,10 @@ index 0000000..a3c5cb0
+
+#endif
diff --git svtools/inc/ctrlbox.hxx svtools/inc/ctrlbox.hxx
-index 1feb2df..a4d7dc8 100644
+index 64d38e4..3235b72 100644
--- svtools/inc/ctrlbox.hxx
+++ svtools/inc/ctrlbox.hxx
-@@ -57,6 +57,10 @@ class ImpColorList;
+@@ -54,6 +54,10 @@ class ImpColorList;
class ImpLineList;
class FontList;
@@ -1078,7 +1254,7 @@ index 1feb2df..a4d7dc8 100644
/*************************************************************************
Beschreibung
-@@ -258,7 +262,8 @@ class SVT_DLLPUBLIC LineListBox : public ListBox
+@@ -255,7 +259,8 @@ class SVT_DLLPUBLIC LineListBox : public ListBox
FieldUnit eUnit;
FieldUnit eSourceUnit;
@@ -1088,7 +1264,7 @@ index 1feb2df..a4d7dc8 100644
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit();
void UpdateLineColors( void );
-@@ -273,24 +278,30 @@ public:
+@@ -270,24 +275,30 @@ public:
using ListBox::InsertEntry;
virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND );
@@ -1123,7 +1299,7 @@ index 1feb2df..a4d7dc8 100644
inline void SetUnit( FieldUnit eNewUnit ) { eUnit = eNewUnit; }
inline FieldUnit GetUnit() const { return eUnit; }
-@@ -308,9 +319,9 @@ private:
+@@ -305,9 +316,9 @@ private:
void* GetEntryData( USHORT nPos ) const;
};
@@ -1135,7 +1311,7 @@ index 1feb2df..a4d7dc8 100644
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
ListBox::SelectEntryPos( nPos, bSelect );
}
-@@ -342,9 +353,19 @@ inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const
+@@ -339,9 +350,19 @@ inline long LineListBox::GetSelectEntryDistance( USHORT nSelIndex ) const
return 0;
}
@@ -1170,10 +1346,10 @@ index 684c3a1..2e8b5b9 100644
..\inc\ctrltool.hxx %_DEST%\inc%_EXT%\svtools\ctrltool.hxx
..\inc\collatorres.hxx %_DEST%\inc%_EXT%\svtools\collatorres.hxx
diff --git svtools/source/control/ctrlbox.cxx svtools/source/control/ctrlbox.cxx
-index 01cd788..951c296 100644
+index 9a14b6d..b8edf1e 100644
--- svtools/source/control/ctrlbox.cxx
+++ svtools/source/control/ctrlbox.cxx
-@@ -46,8 +46,11 @@
+@@ -43,8 +43,11 @@
#include <svtools/svtools.hrc>
#include <ctrlbox.hxx>
#include <ctrltool.hxx>
@@ -1185,7 +1361,7 @@ index 01cd788..951c296 100644
#define IMGTEXTSPACE 2
#define EXTRAFONTSIZE 5
-@@ -255,6 +258,7 @@ struct ImpLineListData
+@@ -252,6 +255,7 @@ struct ImpLineListData
long nLine1;
long nLine2;
long nDistance;
@@ -1193,7 +1369,7 @@ index 01cd788..951c296 100644
};
DECLARE_LIST( ImpLineList, ImpLineListData* )
-@@ -268,8 +272,107 @@ inline const Color& LineListBox::GetPaintColor( void ) const
+@@ -265,8 +269,107 @@ inline const Color& LineListBox::GetPaintColor( void ) const
// -----------------------------------------------------------------------
@@ -1302,7 +1478,7 @@ index 01cd788..951c296 100644
{
Size aSize = GetOutputSizePixel();
aSize.Width() -= 20;
-@@ -296,8 +399,8 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
+@@ -293,8 +396,8 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
// Linien malen
aSize = aVirDev.PixelToLogic( aSize );
long nPix = aVirDev.PixelToLogic( Size( 0, 1 ) ).Height();
@@ -1313,7 +1489,7 @@ index 01cd788..951c296 100644
long nDist = nDistance / 100;
n1 += nPix-1;
n1 -= n1%nPix;
-@@ -320,13 +423,18 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
+@@ -317,13 +420,18 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
aVirDev.SetFillColor( GetSettings().GetStyleSettings().GetFieldColor() );
aVirDev.DrawRect( Rectangle( Point(), aSize ) );
@@ -1336,7 +1512,7 @@ index 01cd788..951c296 100644
rBmp = aVirDev.GetBitmap( Point(), Size( aSize.Width(), n1+nDist+n2 ) );
}
// Twips nach Unit
-@@ -417,11 +525,11 @@ USHORT LineListBox::InsertEntry( const XubString& rStr, USHORT nPos )
+@@ -414,11 +522,11 @@ USHORT LineListBox::InsertEntry( const XubString& rStr, USHORT nPos )
// -----------------------------------------------------------------------
USHORT LineListBox::InsertEntry( long nLine1, long nLine2, long nDistance,
@@ -1350,7 +1526,7 @@ index 01cd788..951c296 100644
nPos = ListBox::InsertEntry( aStr, aBmp, nPos );
if ( nPos != LISTBOX_ERROR )
{
-@@ -429,6 +537,7 @@ USHORT LineListBox::InsertEntry( long nLine1, long nLine2, long nDistance,
+@@ -426,6 +534,7 @@ USHORT LineListBox::InsertEntry( long nLine1, long nLine2, long nDistance,
pData->nLine1 = nLine1;
pData->nLine2 = nLine2;
pData->nDistance = nDistance;
@@ -1358,7 +1534,7 @@ index 01cd788..951c296 100644
pLineList->Insert( pData, nPos );
}
-@@ -466,7 +575,7 @@ void LineListBox::Clear()
+@@ -463,7 +572,7 @@ void LineListBox::Clear()
// -----------------------------------------------------------------------
USHORT LineListBox::GetEntryPos( long nLine1, long nLine2,
@@ -1367,7 +1543,7 @@ index 01cd788..951c296 100644
{
ULONG n = 0;
ULONG nCount = pLineList->Count();
-@@ -477,7 +586,8 @@ USHORT LineListBox::GetEntryPos( long nLine1, long nLine2,
+@@ -474,7 +583,8 @@ USHORT LineListBox::GetEntryPos( long nLine1, long nLine2,
{
if ( (pData->nLine1 == nLine1) &&
(pData->nLine2 == nLine2) &&
@@ -1377,7 +1553,7 @@ index 01cd788..951c296 100644
return (USHORT)n;
}
-@@ -522,6 +632,18 @@ long LineListBox::GetEntryDistance( USHORT nPos ) const
+@@ -519,6 +629,18 @@ long LineListBox::GetEntryDistance( USHORT nPos ) const
// -----------------------------------------------------------------------
@@ -1396,7 +1572,7 @@ index 01cd788..951c296 100644
void LineListBox::UpdateLineColors( void )
{
if( UpdatePaintLineColor() )
-@@ -544,7 +666,8 @@ void LineListBox::UpdateLineColors( void )
+@@ -541,7 +663,8 @@ void LineListBox::UpdateLineColors( void )
{
// exchange listbox data
ListBox::RemoveEntry( USHORT( n ) );
@@ -1407,10 +1583,10 @@ index 01cd788..951c296 100644
}
}
diff --git svtools/source/svrtf/rtfkeywd.hxx svtools/source/svrtf/rtfkeywd.hxx
-index 87258b5..13e1f8c 100644
+index 5ccd914..bd9aadf 100644
--- svtools/source/svrtf/rtfkeywd.hxx
+++ svtools/source/svrtf/rtfkeywd.hxx
-@@ -72,6 +72,8 @@
+@@ -69,6 +69,8 @@
#define OOO_STRING_SVTOOLS_RTF_BRDRCF "\\brdrcf"
#define OOO_STRING_SVTOOLS_RTF_BRDRDB "\\brdrdb"
#define OOO_STRING_SVTOOLS_RTF_BRDRDOT "\\brdrdot"
@@ -1420,10 +1596,10 @@ index 87258b5..13e1f8c 100644
#define OOO_STRING_SVTOOLS_RTF_BRDRL "\\brdrl"
#define OOO_STRING_SVTOOLS_RTF_BRDRR "\\brdrr"
diff --git svtools/util/makefile.mk svtools/util/makefile.mk
-index e95c557..15ea4de 100644
+index 40b1e54..9d9c2cd 100644
--- svtools/util/makefile.mk
+++ svtools/util/makefile.mk
-@@ -152,7 +152,8 @@ SHL1STDLIBS+= \
+@@ -148,7 +148,8 @@ SHL1STDLIBS+= \
$(VOSLIB) \
$(SALLIB) \
$(ICUUCLIB) \
@@ -1434,10 +1610,10 @@ index e95c557..15ea4de 100644
.IF "$(OS)"=="MACOSX"
# static libraries go at end
diff --git svx/inc/svx/borderline.hxx svx/inc/svx/borderline.hxx
-index 2337c66..5e4be3b 100644
+index f358aad..7cf0a99 100644
--- svx/inc/svx/borderline.hxx
+++ svx/inc/svx/borderline.hxx
-@@ -93,6 +93,13 @@
+@@ -90,6 +90,13 @@
// ============================================================================
@@ -1451,7 +1627,7 @@ index 2337c66..5e4be3b 100644
class SVX_DLLPUBLIC SvxBorderLine
{
protected:
-@@ -100,9 +107,11 @@ protected:
+@@ -97,9 +104,11 @@ protected:
USHORT nOutWidth;
USHORT nInWidth;
USHORT nDistance;
@@ -1464,7 +1640,7 @@ index 2337c66..5e4be3b 100644
SvxBorderLine( const SvxBorderLine& r );
SvxBorderLine& operator=( const SvxBorderLine& r );
-@@ -112,10 +121,13 @@ public:
+@@ -109,10 +118,13 @@ public:
USHORT GetInWidth() const { return nInWidth; }
USHORT GetDistance() const { return nDistance; }
@@ -1479,10 +1655,10 @@ index 2337c66..5e4be3b 100644
BOOL operator==( const SvxBorderLine &rCmp ) const;
diff --git svx/inc/svx/framelink.hxx svx/inc/svx/framelink.hxx
-index 2bf5138..8309326 100644
+index 9d5e2cd..1389630 100644
--- svx/inc/svx/framelink.hxx
+++ svx/inc/svx/framelink.hxx
-@@ -36,9 +36,10 @@
+@@ -33,9 +33,10 @@
#include <tools/gen.hxx>
#include <tools/color.hxx>
#include "svx/svxdllapi.h"
@@ -1494,7 +1670,7 @@ index 2bf5138..8309326 100644
namespace svx {
namespace frame {
-@@ -115,20 +116,20 @@ class SVX_DLLPUBLIC Style
+@@ -112,20 +113,20 @@ class SVX_DLLPUBLIC Style
{
public:
/** Constructs an invisible frame style. */
@@ -1521,7 +1697,7 @@ index 2bf5138..8309326 100644
meRefMode( REFMODE_CENTERED ) { Set( pBorder, fScale, nMaxWidth ); }
inline RefMode GetRefMode() const { return meRefMode; }
-@@ -136,7 +137,7 @@ public:
+@@ -133,7 +134,7 @@ public:
inline sal_uInt16 Prim() const { return mnPrim; }
inline sal_uInt16 Dist() const { return mnDist; }
inline sal_uInt16 Secn() const { return mnSecn; }
@@ -1530,7 +1706,7 @@ index 2bf5138..8309326 100644
/** Returns the total width of this frame style. */
inline sal_uInt16 GetWidth() const { return mnPrim + mnDist + mnSecn; }
-@@ -149,16 +150,16 @@ public:
+@@ -146,16 +147,16 @@ public:
/** Sets the frame style to the passed line widths. */
void Set( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 nS );
/** Sets the frame style to the passed SvxBorderLine struct. */
@@ -1550,7 +1726,7 @@ index 2bf5138..8309326 100644
/** Scales the style by the specified scaling factor. Ensures that visible lines keep visible. */
Style& ScaleSelf( double fScale, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
-@@ -176,7 +177,7 @@ private:
+@@ -173,7 +174,7 @@ private:
sal_uInt16 mnPrim; /// Width of primary (single, left, or top) line.
sal_uInt16 mnDist; /// Distance between primary and secondary line.
sal_uInt16 mnSecn; /// Width of secondary (right or bottom) line.
@@ -1560,10 +1736,10 @@ index 2bf5138..8309326 100644
bool operator==( const Style& rL, const Style& rR );
diff --git svx/inc/svx/frmsel.hxx svx/inc/svx/frmsel.hxx
-index c689611..bed814d 100644
+index b342c58..7dc1e6e 100644
--- svx/inc/svx/frmsel.hxx
+++ svx/inc/svx/frmsel.hxx
-@@ -36,6 +36,7 @@
+@@ -33,6 +33,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/bitmap.hxx>
#include <svx/framebordertype.hxx>
@@ -1571,7 +1747,7 @@ index c689611..bed814d 100644
#include "svx/svxdllapi.h"
class SvxBorderLine;
-@@ -131,7 +132,8 @@ public:
+@@ -128,7 +129,8 @@ public:
/** Returns true, if all visible frame borders have equal widths.
@descr Ignores hidden and "don't care" frame borders. On success,
returns the widths in the passed parameters. */
@@ -1581,7 +1757,7 @@ index c689611..bed814d 100644
/** Returns true, if all visible frame borders have equal color.
@descr Ignores hidden and "don't care" frame borders. On success,
returns the color in the passed parameter. */
-@@ -162,7 +164,8 @@ public:
+@@ -159,7 +161,8 @@ public:
void SelectAllVisibleBorders( bool bSelect = true );
/** Sets the passed line widths to all selected frame borders (in twips). */
@@ -1592,10 +1768,10 @@ index c689611..bed814d 100644
void SetColorToSelection( const Color& rColor );
diff --git svx/inc/svx/msdffimp.hxx svx/inc/svx/msdffimp.hxx
-index 0b878ee..dd56067 100644
+index abc660d..28a1932 100644
--- svx/inc/svx/msdffimp.hxx
+++ svx/inc/svx/msdffimp.hxx
-@@ -201,6 +201,7 @@ struct SVX_DLLPUBLIC SvxMSDffImportRec
+@@ -198,6 +198,7 @@ struct SVX_DLLPUBLIC SvxMSDffImportRec
ULONG nShapeId;
MSO_SPT eShapeType;
MSO_LineStyle eLineStyle; // Umrandungs-Arten
@@ -1604,10 +1780,10 @@ index 0b878ee..dd56067 100644
BOOL bHidden :1;
BOOL bReplaceByFly :1;
diff --git svx/inc/svx/svxids.hrc svx/inc/svx/svxids.hrc
-index a04975b..e2109ce 100644
+index 0779179..19f5cdc 100644
--- svx/inc/svx/svxids.hrc
+++ svx/inc/svx/svxids.hrc
-@@ -143,6 +143,8 @@
+@@ -140,6 +140,8 @@
#define MID_ADR_FATHERSNAME 0x80
#define MID_ADR_APARTMENT 0x81
@@ -1617,10 +1793,10 @@ index a04975b..e2109ce 100644
// --------------------------------------------------------------------------
// Resource-Id's ? (obsolete??? at least the one beginning with SID???)
diff --git svx/source/cui/border.cxx svx/source/cui/border.cxx
-index 1ab5a45..0284cdd 100644
+index 100a5c6..ae2d007 100644
--- svx/source/cui/border.cxx
+++ svx/source/cui/border.cxx
-@@ -572,9 +572,10 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
+@@ -569,9 +569,10 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
{
// Do all visible lines show the same line widths?
USHORT nPrim, nDist, nSecn;
@@ -1633,7 +1809,7 @@ index 1ab5a45..0284cdd 100644
else
aLbLineStyle.SelectEntryPos( 1 );
-@@ -939,13 +940,31 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb )
+@@ -936,13 +937,31 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb )
// -----------------------------------------------------------------------
@@ -1666,7 +1842,7 @@ index 1ab5a45..0284cdd 100644
return 0;
}
-@@ -1109,6 +1128,8 @@ void SvxBorderTabPage::FillLineListBox_Impl()
+@@ -1106,6 +1125,8 @@ void SvxBorderTabPage::FillLineListBox_Impl()
aLbLineStyle.InsertEntry( LINE_WIDTH0 );
aLbLineStyle.InsertEntry( LINE_WIDTH5 );
@@ -1676,10 +1852,10 @@ index 1ab5a45..0284cdd 100644
aLbLineStyle.InsertEntry( LINE_WIDTH2 );
aLbLineStyle.InsertEntry( LINE_WIDTH3 );
diff --git svx/source/dialog/framelink.cxx svx/source/dialog/framelink.cxx
-index 2fe4d81..e504aa4 100644
+index 0e68b21..36c4053 100644
--- svx/source/dialog/framelink.cxx
+++ svx/source/dialog/framelink.cxx
-@@ -35,6 +35,7 @@
+@@ -32,6 +32,7 @@
#include <math.h>
#include <vcl/outdev.hxx>
#include <svx/borderline.hxx>
@@ -1687,7 +1863,7 @@ index 2fe4d81..e504aa4 100644
// ----------------------------------------------------------------------------
-@@ -51,6 +52,9 @@
+@@ -48,6 +49,9 @@
#if SVX_FRAME_USE_LINEINFO
#include <vcl/lineinfo.hxx>
@@ -1697,7 +1873,7 @@ index 2fe4d81..e504aa4 100644
#endif
namespace svx {
-@@ -758,7 +762,7 @@ inline Polygon lclCreatePolygon( const PointVec& rPoints )
+@@ -755,7 +759,7 @@ inline Polygon lclCreatePolygon( const PointVec& rPoints )
Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4 )
{
PointVec aPoints;
@@ -1706,7 +1882,7 @@ index 2fe4d81..e504aa4 100644
aPoints.push_back( rP1 );
aPoints.push_back( rP2 );
aPoints.push_back( rP3 );
-@@ -779,12 +783,6 @@ Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3,
+@@ -776,12 +780,6 @@ Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3,
return lclCreatePolygon( aPoints );
}
@@ -1719,7 +1895,7 @@ index 2fe4d81..e504aa4 100644
/** Sets the color of the passed frame style to the output device.
Sets the line color and fill color in the output device.
-@@ -806,73 +804,6 @@ void lclSetColorToOutDev( OutputDevice& rDev, const Style& rStyle, const Color*
+@@ -803,73 +801,6 @@ void lclSetColorToOutDev( OutputDevice& rDev, const Style& rStyle, const Color*
}
// ----------------------------------------------------------------------------
@@ -1793,7 +1969,7 @@ index 2fe4d81..e504aa4 100644
// ============================================================================
// Drawing of horizontal frame borders.
-@@ -885,16 +816,18 @@ void lclDrawHorLine(
+@@ -882,16 +813,18 @@ void lclDrawHorLine(
OutputDevice& rDev,
const Point& rLPos, const LineEndResult& rLRes,
const Point& rRPos, const LineEndResult& rRRes,
@@ -1820,7 +1996,7 @@ index 2fe4d81..e504aa4 100644
}
/** Draws a horizontal frame border into the passed output device.
-@@ -920,10 +853,10 @@ void lclDrawHorFrameBorder(
+@@ -917,10 +850,10 @@ void lclDrawHorFrameBorder(
{
lclSetColorToOutDev( rDev, rBorder, pForceColor );
lclDrawHorLine( rDev, rLPos, rResult.maBeg.maPrim, rRPos, rResult.maEnd.maPrim,
@@ -1833,7 +2009,7 @@ index 2fe4d81..e504aa4 100644
rDev.Pop(); // colors
}
}
-@@ -940,16 +873,18 @@ void lclDrawVerLine(
+@@ -937,16 +870,18 @@ void lclDrawVerLine(
OutputDevice& rDev,
const Point& rTPos, const LineEndResult& rTRes,
const Point& rBPos, const LineEndResult& rBRes,
@@ -1860,7 +2036,7 @@ index 2fe4d81..e504aa4 100644
}
/** Draws a vertical frame border into the passed output device.
-@@ -975,10 +910,10 @@ void lclDrawVerFrameBorder(
+@@ -972,10 +907,10 @@ void lclDrawVerFrameBorder(
{
lclSetColorToOutDev( rDev, rBorder, pForceColor );
lclDrawVerLine( rDev, rTPos, rResult.maBeg.maPrim, rBPos, rResult.maEnd.maPrim,
@@ -1873,7 +2049,7 @@ index 2fe4d81..e504aa4 100644
rDev.Pop(); // colors
}
}
-@@ -1111,14 +1046,19 @@ void lclPushCrossingClipRegion( OutputDevice& rDev, const Rectangle& rRect, bool
+@@ -1108,14 +1043,19 @@ void lclPushCrossingClipRegion( OutputDevice& rDev, const Rectangle& rRect, bool
*/
void lclDrawDiagLine(
OutputDevice& rDev, const Rectangle& rRect, bool bTLBR,
@@ -1898,7 +2074,7 @@ index 2fe4d81..e504aa4 100644
rDev.Pop(); // clipping region
}
-@@ -1150,9 +1090,9 @@ void lclDrawDiagFrameBorder(
+@@ -1147,9 +1087,9 @@ void lclDrawDiagFrameBorder(
lclPushCrossingClipRegion( rDev, rRect, bTLBR, rCrossStyle );
lclSetColorToOutDev( rDev, rBorder, pForceColor );
@@ -1910,7 +2086,7 @@ index 2fe4d81..e504aa4 100644
rDev.Pop(); // colors
if( bClip )
-@@ -1229,7 +1169,7 @@ void Style::Set( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 n
+@@ -1226,7 +1166,7 @@ void Style::Set( const Color& rColor, sal_uInt16 nP, sal_uInt16 nD, sal_uInt16 n
Set( nP, nD, nS );
}
@@ -1919,7 +2095,7 @@ index 2fe4d81..e504aa4 100644
{
maColor = rBorder.GetColor();
-@@ -1240,12 +1180,12 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
+@@ -1237,12 +1177,12 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
if( !nSecn ) // no or single frame border
{
Set( SCALEVALUE( nPrim ), 0, 0 );
@@ -1934,7 +2110,7 @@ index 2fe4d81..e504aa4 100644
// Enlarge the style if distance is too small due to rounding losses.
sal_uInt16 nPixWidth = SCALEVALUE( nPrim + nDist + nSecn );
if( nPixWidth > GetWidth() )
-@@ -1278,14 +1218,14 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
+@@ -1275,14 +1215,14 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
}
}
@@ -1952,7 +2128,7 @@ index 2fe4d81..e504aa4 100644
}
}
-@@ -1317,7 +1257,8 @@ Style Style::Mirror() const
+@@ -1314,7 +1254,8 @@ Style Style::Mirror() const
bool operator==( const Style& rL, const Style& rR )
{
return (rL.Prim() == rR.Prim()) && (rL.Dist() == rR.Dist()) && (rL.Secn() == rR.Secn()) &&
@@ -1962,7 +2138,7 @@ index 2fe4d81..e504aa4 100644
}
bool operator<( const Style& rL, const Style& rR )
-@@ -1334,7 +1275,7 @@ bool operator<( const Style& rL, const Style& rR )
+@@ -1331,7 +1272,7 @@ bool operator<( const Style& rL, const Style& rR )
if( (rL.Secn() && rR.Secn()) && (rL.Dist() != rR.Dist()) ) return rL.Dist() > rR.Dist();
// both lines single and 1 unit thick, only one is dotted -> rL<rR, if rL is dotted
@@ -1971,7 +2147,7 @@ index 2fe4d81..e504aa4 100644
// seem to be equal
return false;
-@@ -1501,10 +1442,10 @@ void DrawVerFrameBorderSlanted( OutputDevice& rDev,
+@@ -1498,10 +1439,10 @@ void DrawVerFrameBorderSlanted( OutputDevice& rDev,
lclSetColorToOutDev( rDev, aScaled, pForceColor );
lclDrawVerLine( rDev, rTPos, aRes, rBPos, aRes,
@@ -1985,10 +2161,10 @@ index 2fe4d81..e504aa4 100644
}
}
diff --git svx/source/dialog/frmsel.cxx svx/source/dialog/frmsel.cxx
-index 88bbbb8..84b978a 100644
+index 21923b4..26416c8 100644
--- svx/source/dialog/frmsel.cxx
+++ svx/source/dialog/frmsel.cxx
-@@ -160,7 +160,7 @@ void FrameBorder::SetCoreStyle( const SvxBorderLine* pStyle )
+@@ -157,7 +157,7 @@ void FrameBorder::SetCoreStyle( const SvxBorderLine* pStyle )
maCoreStyle = SvxBorderLine();
// from twips to points
@@ -1997,7 +2173,7 @@ index 88bbbb8..84b978a 100644
meState = maUIStyle.Prim() ? FRAMESTATE_SHOW : FRAMESTATE_HIDE;
}
-@@ -640,11 +640,31 @@ void FrameSelectorImpl::DrawAllFrameBorders()
+@@ -637,11 +637,31 @@ void FrameSelectorImpl::DrawAllFrameBorders()
// Copy all frame border styles to the helper array
maArray.SetColumnStyleLeft( 0, maLeft.GetUIStyle() );
if( mbVer ) maArray.SetColumnStyleLeft( 1, maVer.GetUIStyle() );
@@ -2032,7 +2208,7 @@ index 88bbbb8..84b978a 100644
for( size_t nCol = 0; nCol < maArray.GetColCount(); ++nCol )
for( size_t nRow = 0; nRow < maArray.GetRowCount(); ++nRow )
-@@ -865,7 +885,8 @@ void FrameSelector::HideAllBorders()
+@@ -862,7 +882,8 @@ void FrameSelector::HideAllBorders()
mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE );
}
@@ -2042,7 +2218,7 @@ index 88bbbb8..84b978a 100644
{
VisFrameBorderCIter aIt( mxImpl->maEnabBorders );
if( !aIt.Is() )
-@@ -877,13 +898,15 @@ bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnS
+@@ -874,13 +895,15 @@ bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnS
bFound =
(rStyle.GetOutWidth() == (*aIt)->GetCoreStyle().GetOutWidth()) &&
(rStyle.GetDistance() == (*aIt)->GetCoreStyle().GetDistance()) &&
@@ -2059,7 +2235,7 @@ index 88bbbb8..84b978a 100644
}
return bFound;
}
-@@ -944,11 +967,13 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
+@@ -941,11 +964,13 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
mxImpl->SelectBorder( **aIt, bSelect );
}
@@ -2075,10 +2251,10 @@ index 88bbbb8..84b978a 100644
mxImpl->SetBorderState( **aIt, FRAMESTATE_SHOW );
}
diff --git svx/source/items/frmitems.cxx svx/source/items/frmitems.cxx
-index f0e8c7b..dee0b6e 100644
+index 728f9fe..ed8d236 100644
--- svx/source/items/frmitems.cxx
+++ svx/source/items/frmitems.cxx
-@@ -84,7 +84,7 @@
+@@ -81,7 +81,7 @@
#include <svx/dialmgr.hxx>
#include "svxerr.hxx"
#include <svx/unoprnms.hxx>
@@ -2087,7 +2263,7 @@ index f0e8c7b..dee0b6e 100644
#include <com/sun/star/table/ShadowLocation.hpp>
#include <com/sun/star/table/TableBorder.hpp>
#include <com/sun/star/table/ShadowFormat.hpp>
-@@ -1583,10 +1583,12 @@ void SvxShadowItem::SetEnumValue( sal_uInt16 nVal )
+@@ -1580,10 +1580,12 @@ void SvxShadowItem::SetEnumValue( sal_uInt16 nVal )
// class SvxBorderLine --------------------------------------------------
@@ -2101,7 +2277,7 @@ index f0e8c7b..dee0b6e 100644
{
if ( pCol )
aColor = *pCol;
-@@ -1607,6 +1609,7 @@ SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r )
+@@ -1604,6 +1606,7 @@ SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r )
nOutWidth = r.nOutWidth;
nInWidth = r.nInWidth;
nDistance = r.nDistance;
@@ -2109,7 +2285,7 @@ index f0e8c7b..dee0b6e 100644
return *this;
}
-@@ -1626,7 +1629,8 @@ sal_Bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const
+@@ -1623,7 +1626,8 @@ sal_Bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const
return ( ( aColor == rCmp.GetColor() ) &&
( nInWidth == rCmp.GetInWidth() ) &&
( nOutWidth == rCmp.GetOutWidth() ) &&
@@ -2119,7 +2295,7 @@ index f0e8c7b..dee0b6e 100644
}
// -----------------------------------------------------------------------
-@@ -1843,15 +1847,16 @@ int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
+@@ -1840,15 +1844,16 @@ int SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
}
// -----------------------------------------------------------------------
@@ -2138,7 +2314,7 @@ index f0e8c7b..dee0b6e 100644
}
else
aLine.Color = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance = 0;
-@@ -1861,7 +1866,7 @@ table::BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConver
+@@ -1858,7 +1863,7 @@ table::BorderLine lcl_SvxLineToLine(const SvxBorderLine* pLine, sal_Bool bConver
sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -2147,7 +2323,7 @@ index f0e8c7b..dee0b6e 100644
sal_uInt16 nDist = 0;
sal_Bool bDistMember = sal_False;
nMemberId &= ~CONVERT_TWIPS;
-@@ -1955,6 +1960,10 @@ sal_Bool lcl_LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, Svx
+@@ -1952,6 +1957,10 @@ sal_Bool lcl_LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, Svx
rSvxLine.SetInWidth( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.InnerLineWidth) : rLine.InnerLineWidth ));
rSvxLine.SetOutWidth( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.OuterLineWidth) : rLine.OuterLineWidth ));
rSvxLine.SetDistance( sal_uInt16( bConvert ? MM100_TO_TWIP(rLine.LineDistance ) : rLine.LineDistance ));
@@ -2158,7 +2334,7 @@ index f0e8c7b..dee0b6e 100644
sal_Bool bRet = rLine.InnerLineWidth > 0 || rLine.OuterLineWidth > 0;
return bRet;
}
-@@ -1977,7 +1986,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+@@ -1974,7 +1983,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
// 4 Borders and 5 distances
sal_Int32 nDist = 0;
SvxBorderLine aLine;
@@ -2167,7 +2343,7 @@ index f0e8c7b..dee0b6e 100644
if ( aSeq[0] >>= aBorderLine )
{
sal_Bool bSet = lcl_LineToSvxLine(aBorderLine, aLine, bConvert);
-@@ -2079,7 +2088,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+@@ -2076,7 +2085,7 @@ sal_Bool SvxBoxItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if( !rVal.hasValue() )
return sal_False;
@@ -2176,7 +2352,7 @@ index f0e8c7b..dee0b6e 100644
if( rVal >>= aBorderLine )
{
// usual struct
-@@ -2798,7 +2807,7 @@ void SvxBoxInfoItem::ResetFlags()
+@@ -2795,7 +2804,7 @@ void SvxBoxInfoItem::ResetFlags()
sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -2185,7 +2361,7 @@ index f0e8c7b..dee0b6e 100644
sal_Int16 nVal=0;
sal_Bool bIntMember = sal_False;
nMemberId &= ~CONVERT_TWIPS;
-@@ -2892,7 +2901,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+@@ -2889,7 +2898,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if (( rVal >>= aSeq ) && ( aSeq.getLength() == 5 ))
{
// 2 BorderLines, flags, valid flags and distance
@@ -2194,7 +2370,7 @@ index f0e8c7b..dee0b6e 100644
SvxBorderLine aLine;
sal_Int16 nFlags( 0 );
sal_Int32 nVal( 0 );
-@@ -2940,7 +2949,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+@@ -2937,7 +2946,7 @@ sal_Bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if( !rVal.hasValue() )
return sal_False;
@@ -2203,7 +2379,7 @@ index f0e8c7b..dee0b6e 100644
if( rVal >>= aBorderLine )
{
// usual struct
-@@ -3317,7 +3326,7 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
+@@ -3314,7 +3323,7 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
sal_Int32 nVal = 0;
if ( nMemId == 0 )
{
@@ -2212,7 +2388,7 @@ index f0e8c7b..dee0b6e 100644
if ( rVal >>= aLine )
{
if ( !pLine )
-@@ -3339,6 +3348,7 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
+@@ -3336,6 +3345,7 @@ sal_Bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
case MID_OUTER_WIDTH: pLine->SetOutWidth((USHORT)nVal); break;
case MID_INNER_WIDTH: pLine->SetInWidth((USHORT)nVal); break;
case MID_DISTANCE: pLine->SetDistance((USHORT)nVal); break;
@@ -2221,10 +2397,10 @@ index f0e8c7b..dee0b6e 100644
DBG_ERROR( "Wrong MemberId" );
return sal_False;
diff --git svx/source/msfilter/msdffimp.cxx svx/source/msfilter/msdffimp.cxx
-index 3bc067e..cdda10b 100644
+index 9fadaee..077d296 100644
--- svx/source/msfilter/msdffimp.cxx
+++ svx/source/msfilter/msdffimp.cxx
-@@ -6068,6 +6068,10 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
+@@ -6066,6 +6066,10 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
: (MSO_LineStyle)USHRT_MAX;
pTextImpRec->eLineStyle = pImpRec->eLineStyle;
@@ -2235,7 +2411,7 @@ index 3bc067e..cdda10b 100644
if( pImpRec->nShapeId )
{
// Import-Record-Liste ergaenzen
-@@ -8107,6 +8111,7 @@ SvxMSDffImportRec::SvxMSDffImportRec()
+@@ -8105,6 +8109,7 @@ SvxMSDffImportRec::SvxMSDffImportRec()
eShapeType( mso_sptNil )
{
eLineStyle = mso_lineSimple; // GPF-Bug #66227#
@@ -2243,7 +2419,7 @@ index 3bc067e..cdda10b 100644
bDrawHell = FALSE;
bHidden = FALSE;
// bInGroup = FALSE;
-@@ -8154,6 +8159,7 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
+@@ -8152,6 +8157,7 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
*pYRelTo = *(rCopy.pYRelTo);
}
eLineStyle = rCopy.eLineStyle; // GPF-Bug #66227#
@@ -2252,10 +2428,10 @@ index 3bc067e..cdda10b 100644
bHidden = rCopy.bHidden;
// bInGroup = rCopy.bInGroup;
diff --git svx/source/svrtf/rtfitem.cxx svx/source/svrtf/rtfitem.cxx
-index 471b00d..d1628c4 100644
+index 479c2f0..ec3b3e5 100644
--- svx/source/svrtf/rtfitem.cxx
+++ svx/source/svrtf/rtfitem.cxx
-@@ -1632,10 +1632,15 @@ case RTF_BRDRBAR: break;
+@@ -1629,10 +1629,15 @@ case RTF_BRDRBAR: break;
}
goto SETBORDERLINE;
@@ -2274,10 +2450,10 @@ index 471b00d..d1628c4 100644
SetBorderLine( nBorderTyp, aAttr, aBrd );
break;
diff --git svx/source/table/cell.cxx svx/source/table/cell.cxx
-index e760ec0..387b6a2 100644
+index 910e83c..ac7b119 100644
--- svx/source/table/cell.cxx
+++ svx/source/table/cell.cxx
-@@ -35,6 +35,7 @@
+@@ -32,6 +32,7 @@
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/table/TableBorder.hpp>
@@ -2285,7 +2461,7 @@ index e760ec0..387b6a2 100644
#include <cppuhelper/typeprovider.hxx>
#include <svtools/style.hxx>
-@@ -77,7 +78,7 @@
+@@ -74,7 +75,7 @@ using namespace ::com::sun::star::style;
using namespace ::com::sun::star::container;
extern sal_Bool lcl_LineToSvxLine(const BorderLine& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert);
@@ -2295,10 +2471,10 @@ index e760ec0..387b6a2 100644
// -----------------------------------------------------------------------------
diff --git svx/source/table/viewcontactoftableobj.cxx svx/source/table/viewcontactoftableobj.cxx
-index 03ffdc3..94249a6 100644
+index 6dc73c6..52e7809 100644
--- svx/source/table/viewcontactoftableobj.cxx
+++ svx/source/table/viewcontactoftableobj.cxx
-@@ -326,7 +326,8 @@ namespace drawinglayer
+@@ -323,7 +323,8 @@ namespace drawinglayer
fExtendOE * fTwipsToMM,
true,
getLeftIsOutside(),
@@ -2308,7 +2484,7 @@ index 03ffdc3..94249a6 100644
}
}
-@@ -368,7 +369,8 @@ namespace drawinglayer
+@@ -365,7 +366,8 @@ namespace drawinglayer
fExtendOE * fTwipsToMM,
true,
getBottomIsOutside(),
@@ -2318,7 +2494,7 @@ index 03ffdc3..94249a6 100644
}
}
-@@ -410,7 +412,8 @@ namespace drawinglayer
+@@ -407,7 +409,8 @@ namespace drawinglayer
fExtendIE * fTwipsToMM,
getRightIsOutside(),
true,
@@ -2328,7 +2504,7 @@ index 03ffdc3..94249a6 100644
}
}
-@@ -452,7 +455,8 @@ namespace drawinglayer
+@@ -449,7 +452,8 @@ namespace drawinglayer
fExtendIE * fTwipsToMM,
getTopIsOutside(),
true,
@@ -2339,10 +2515,10 @@ index 03ffdc3..94249a6 100644
}
diff --git svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/tbcontrl.cxx
-index 0ae54c2..03cd704 100644
+index 6e70ed2..131636d 100644
--- svx/source/tbxctrls/tbcontrl.cxx
+++ svx/source/tbxctrls/tbcontrl.cxx
-@@ -42,6 +42,7 @@
+@@ -39,6 +39,7 @@
#include <vcl/bmpacc.hxx>
#include <svtools/valueset.hxx>
#include <svtools/ctrlbox.hxx>
@@ -2350,7 +2526,7 @@ index 0ae54c2..03cd704 100644
#include <svtools/style.hxx>
#include <svtools/ctrltool.hxx>
#include <svtools/stritem.hxx>
-@@ -94,6 +95,7 @@
+@@ -91,6 +92,7 @@
#include <memory>
#include <svx/tbxcolorupdate.hxx>
@@ -2358,7 +2534,7 @@ index 0ae54c2..03cd704 100644
// ------------------------------------------------------------------------
-@@ -1593,6 +1595,21 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
+@@ -1522,6 +1524,21 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aVirDev.DrawRect( aRect );
nLineWidth = (USHORT) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20;
break;
@@ -2380,7 +2556,7 @@ index 0ae54c2..03cd704 100644
default:
break;
-@@ -1613,6 +1630,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -1542,6 +1559,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
USHORT n1 = 0,
n2 = 0,
n3 = 0;
@@ -2388,7 +2564,7 @@ index 0ae54c2..03cd704 100644
BOOL bSetLine = TRUE;
switch ( aLineSet.GetSelectItemId() )
-@@ -1656,6 +1674,14 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -1585,6 +1603,14 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
case 16: n1 = DEF_DOUBLE_LINE6_OUT;
n2 = DEF_DOUBLE_LINE6_IN;
n3 = DEF_DOUBLE_LINE6_DIST; break;
@@ -2403,7 +2579,7 @@ index 0ae54c2..03cd704 100644
case 0:
default:
bSetLine = FALSE;
-@@ -1663,7 +1689,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
+@@ -1592,7 +1618,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
}
if ( bSetLine )
{
@@ -2412,7 +2588,7 @@ index 0ae54c2..03cd704 100644
aLineItem.SetLine( &aTmp );
}
else
-@@ -1757,7 +1783,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
+@@ -1676,7 +1702,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
::Color aBackCol( rStyleSettings.GetWindowColor() );
aLineSet.Clear();
@@ -2422,10 +2598,10 @@ index 0ae54c2..03cd704 100644
MakeLineBitmap( i, aBmp, aBmpSize, aStr, aLineCol, aBackCol );
aLineSet.InsertItem( i, aBmp, aStr );
diff --git sw/source/core/inc/frame.hxx sw/source/core/inc/frame.hxx
-index 420d970..489cff0 100644
+index 92ea09b..a98b001 100644
--- sw/source/core/inc/frame.hxx
+++ sw/source/core/inc/frame.hxx
-@@ -30,6 +30,7 @@
+@@ -27,6 +27,7 @@
#ifndef _FRAME_HXX
#define _FRAME_HXX
#include <svtools/svarray.hxx>
@@ -2433,7 +2609,7 @@ index 420d970..489cff0 100644
#include "swtypes.hxx" // fuer SwTwips
#include "swrect.hxx"
#include "calbck.hxx" // fuer SwClient
-@@ -528,7 +529,7 @@ public:
+@@ -525,7 +526,7 @@ public:
const BOOL bLowerMode = FALSE,
const BOOL bLowerBorder = FALSE ) const;
void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
@@ -2443,10 +2619,10 @@ index 420d970..489cff0 100644
//Retouche, nicht im Bereich des uebergebenen Rect!
void Retouche( const SwPageFrm *pPage, const SwRect &rRect ) const;
diff --git sw/source/core/layout/paintfrm.cxx sw/source/core/layout/paintfrm.cxx
-index 7740a37..77f5b0f 100644
+index 617f03a..b692caf 100644
--- sw/source/core/layout/paintfrm.cxx
+++ sw/source/core/layout/paintfrm.cxx
-@@ -122,6 +122,9 @@
+@@ -119,6 +119,9 @@
#define COL_NOTES_SIDEPANE_SCROLLAREA RGB_COLORDATA(230,230,220)
#include <vcl/svapp.hxx>
@@ -2456,7 +2632,7 @@ index 7740a37..77f5b0f 100644
using namespace ::com::sun::star;
#define GETOBJSHELL() ((SfxObjectShell*)rSh.GetDoc()->GetDocShell())
-@@ -163,15 +166,17 @@ using namespace ::com::sun::star;
+@@ -160,15 +163,17 @@ using namespace ::com::sun::star;
class SwLineRect : public SwRect
{
const Color *pColor;
@@ -2475,7 +2651,7 @@ index 7740a37..77f5b0f 100644
const SwTabFrm *GetTab() const { return pTab; }
void SetPainted() { bPainted = TRUE; }
void Lock( BOOL bLock ) { if ( bLock )
-@@ -193,7 +198,7 @@ class SwLineRects : public SwLRects
+@@ -190,7 +195,7 @@ class SwLineRects : public SwLRects
USHORT nLastCount; //unuetze Durchlaeufe im PaintLines verhindern.
public:
SwLineRects() : nLastCount( 0 ) {}
@@ -2484,7 +2660,7 @@ index 7740a37..77f5b0f 100644
const SwTabFrm *pTab, const BYTE nSCol );
void ConnectEdges( OutputDevice *pOut );
void PaintLines ( OutputDevice *pOut );
-@@ -424,10 +429,11 @@ SwSavePaintStatics::~SwSavePaintStatics()
+@@ -421,10 +426,11 @@ SwSavePaintStatics::~SwSavePaintStatics()
SV_IMPL_VARARR( SwLRects, SwLineRect );
@@ -2497,7 +2673,7 @@ index 7740a37..77f5b0f 100644
pTab( pT ),
nSubColor( nSCol ),
bPainted( FALSE ),
-@@ -472,7 +478,7 @@ BOOL SwLineRect::MakeUnion( const SwRect &rRect )
+@@ -469,7 +475,7 @@ BOOL SwLineRect::MakeUnion( const SwRect &rRect )
return FALSE;
}
@@ -2506,7 +2682,7 @@ index 7740a37..77f5b0f 100644
const SwTabFrm *pTab, const BYTE nSCol )
{
//Rueckwaerts durch, weil Linien die zusammengefasst werden koennen i.d.R.
-@@ -491,7 +497,7 @@ void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol,
+@@ -488,7 +494,7 @@ void SwLineRects::AddLineRect( const SwRect &rRect, const Color *pCol,
return;
}
}
@@ -2515,7 +2691,7 @@ index 7740a37..77f5b0f 100644
}
void SwLineRects::ConnectEdges( OutputDevice *pOut )
-@@ -598,7 +604,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
+@@ -595,7 +601,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if ( !rL1.IsInside( aIns ) )
continue;
const USHORT nTmpFree = Free();
@@ -2524,7 +2700,7 @@ index 7740a37..77f5b0f 100644
rL1.GetTab(), SUBCOL_TAB ), Count() );
if ( !nTmpFree )
{
-@@ -639,7 +645,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
+@@ -636,7 +642,7 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
if ( !rL1.IsInside( aIns ) )
continue;
const USHORT nTmpFree = Free();
@@ -2533,7 +2709,7 @@ index 7740a37..77f5b0f 100644
rL1.GetTab(), SUBCOL_TAB ), Count() );
if ( !nTmpFree )
{
-@@ -669,7 +675,7 @@ inline void SwSubsRects::Ins( const SwRect &rRect, const BYTE nSCol )
+@@ -666,7 +672,7 @@ inline void SwSubsRects::Ins( const SwRect &rRect, const BYTE nSCol )
//Linien die kuerzer als die breiteste Linienbreite sind werden
//nicht aufgenommen.
if ( rRect.Height() > DEF_LINE_WIDTH_4 || rRect.Width() > DEF_LINE_WIDTH_4 )
@@ -2542,7 +2718,7 @@ index 7740a37..77f5b0f 100644
}
void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
-@@ -725,7 +731,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
+@@ -722,7 +728,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Bottom( nTmp );
@@ -2551,7 +2727,7 @@ index 7740a37..77f5b0f 100644
aSubsLineRect.GetSubColor() ), Count());
}
nTmp = rLine.Bottom()+nPixelSzH+1;
-@@ -733,7 +739,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
+@@ -730,7 +736,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Top( nTmp );
@@ -2560,7 +2736,7 @@ index 7740a37..77f5b0f 100644
aSubsLineRect.GetSubColor() ), Count());
}
Remove( i, 1 );
-@@ -751,7 +757,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
+@@ -748,7 +754,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Right( nTmp );
@@ -2569,7 +2745,7 @@ index 7740a37..77f5b0f 100644
aSubsLineRect.GetSubColor() ), Count());
}
nTmp = rLine.Right()+nPixelSzW+1;
-@@ -759,7 +765,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
+@@ -756,7 +762,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects &rRects )
{
SwRect aNewSubsRect( aSubsLineRect );
aNewSubsRect.Left( nTmp );
@@ -2578,7 +2754,7 @@ index 7740a37..77f5b0f 100644
aSubsLineRect.GetSubColor() ), Count());
}
Remove( i, 1 );
-@@ -778,6 +784,44 @@ void SwLineRects::LockLines( BOOL bLock )
+@@ -775,6 +781,44 @@ void SwLineRects::LockLines( BOOL bLock )
operator[](i).Lock( bLock );
}
@@ -2623,7 +2799,7 @@ index 7740a37..77f5b0f 100644
void SwLineRects::PaintLines( OutputDevice *pOut )
{
//Painten der Umrandungen. Leider muessen wir zweimal durch.
-@@ -791,6 +835,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
+@@ -788,6 +832,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
// OD 2004-04-23 #116347#
pOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR );
@@ -2631,7 +2807,7 @@ index 7740a37..77f5b0f 100644
pOut->SetLineColor();
ConnectEdges( pOut );
const Color *pLast = 0;
-@@ -849,11 +894,12 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
+@@ -846,11 +891,12 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
pOut->SetDrawMode( 0 );
@@ -2646,7 +2822,7 @@ index 7740a37..77f5b0f 100644
rLRect.SetPainted();
}
else
-@@ -887,7 +933,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
+@@ -884,7 +930,7 @@ void SwLineRects::PaintLines( OutputDevice *pOut )
pOut->SetDrawMode( nOldDrawMode );
}
if( !rLRect.IsEmpty() )
@@ -2655,7 +2831,7 @@ index 7740a37..77f5b0f 100644
rLRect.SetPainted();
}
nLastCount = nMinCount;
-@@ -3997,7 +4043,8 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
+@@ -3994,7 +4040,8 @@ void SwFrm::PaintShadow( const SwRect& rRect, SwRect& rOutRect,
void SwFrm::PaintBorderLine( const SwRect& rRect,
const SwRect& rOutRect,
const SwPageFrm *pPage,
@@ -2665,7 +2841,7 @@ index 7740a37..77f5b0f 100644
{
if ( !rOutRect.IsOver( rRect ) )
return;
-@@ -4020,10 +4067,10 @@ void SwFrm::PaintBorderLine( const SwRect& rRect,
+@@ -4017,10 +4064,10 @@ void SwFrm::PaintBorderLine( const SwRect& rRect,
SwRegionRects aRegion( aOut, 4, 1 );
::lcl_SubtractFlys( this, pPage, aOut, aRegion );
for ( USHORT i = 0; i < aRegion.Count(); ++i )
@@ -2678,7 +2854,7 @@ index 7740a37..77f5b0f 100644
}
/*************************************************************************
-@@ -4314,7 +4361,8 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft,
+@@ -4311,7 +4358,8 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft,
(aPaintRect.*_rRectFn->fnAddRight)( 1 );
}
}
@@ -2688,7 +2864,7 @@ index 7740a37..77f5b0f 100644
}
if ( pLeftRightBorder->GetInWidth() )
-@@ -4354,7 +4402,8 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft,
+@@ -4351,7 +4399,8 @@ void lcl_PaintLeftRightLine( const sal_Bool _bLeft,
(aPaintRect.*_rRectFn->fnAddRight)( 1 );
}
}
@@ -2698,7 +2874,7 @@ index 7740a37..77f5b0f 100644
}
}
}
-@@ -4418,7 +4467,8 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop,
+@@ -4415,7 +4464,8 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop,
(aPaintRect.*_rRectFn->fnAddBottom)( 1 );
}
}
@@ -2708,7 +2884,7 @@ index 7740a37..77f5b0f 100644
}
if ( pTopBottomBorder->GetInWidth() )
-@@ -4457,7 +4507,8 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop,
+@@ -4454,7 +4504,8 @@ void lcl_PaintTopBottomLine( const sal_Bool _bTop,
(aPaintRect.*_rRectFn->fnAddBottom)( 1 );
}
}
@@ -2718,7 +2894,7 @@ index 7740a37..77f5b0f 100644
}
}
}
-@@ -4937,7 +4988,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
+@@ -4934,7 +4985,7 @@ void SwLayoutFrm::PaintColLines( const SwRect &rRect, const SwFmtCol &rFmtCol,
(aLineRect.*fnRect->fnSetPosX)
( (pCol->Frm().*fnGetX)() - nPenHalf );
if ( aRect.IsOver( aLineRect ) )
@@ -2727,7 +2903,7 @@ index 7740a37..77f5b0f 100644
pCol = pCol->GetNext();
}
}
-@@ -6085,7 +6136,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
+@@ -6082,7 +6133,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
SwRect aRect( aP1, aP2 );
// OD 18.11.2002 #99672# - use parameter <_pSubsLines> instead of
// global variable <pSubsLines>.
@@ -2736,7 +2912,7 @@ index 7740a37..77f5b0f 100644
}
aP1 = aP2;
aP1.*pDirPt += 1;
-@@ -6224,13 +6275,13 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
+@@ -6221,13 +6272,13 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
if ( aOriginal.Left() == aOut.Left() )
{
const SwRect aRect( aOut.Pos(), aLB );
@@ -2752,7 +2928,7 @@ index 7740a37..77f5b0f 100644
(bBreak && bVert) ? SUBCOL_BREAK : nSubColor );
}
}
-@@ -6241,13 +6292,13 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
+@@ -6238,13 +6289,13 @@ void SwLayoutFrm::PaintSubsidiaryLines( const SwPageFrm *pPage,
{
// OD 14.11.2002 #104821# - in horizontal layout set page/column break at top
const SwRect aRect( aOut.Pos(), aRT );
@@ -2769,10 +2945,10 @@ index 7740a37..77f5b0f 100644
}
}
diff --git sw/source/filter/html/css1atr.cxx sw/source/filter/html/css1atr.cxx
-index 30cb06b..e33e12b 100644
+index b058394..93f0122 100644
--- sw/source/filter/html/css1atr.cxx
+++ sw/source/filter/html/css1atr.cxx
-@@ -181,7 +181,6 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
+@@ -178,7 +178,6 @@ static Writer& OutCSS1_SvxULSpace_SvxLRSpace( Writer& rWrt,
static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt,
USHORT nMode, const String *pGrfName );
static Writer& OutCSS1_SvxBrush( Writer& rWrt, const SfxPoolItem& rHt );
@@ -2780,7 +2956,7 @@ index 30cb06b..e33e12b 100644
static Writer& OutCSS1_SwFmtFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
USHORT nMode );
static Writer& OutCSS1_SvxFmtBreak_SwFmtPDesc_SvxFmtKeep( Writer& rWrt,
-@@ -3605,8 +3604,24 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
+@@ -3602,8 +3601,24 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
}
// Linien-Stil: solid oder double
@@ -2807,7 +2983,7 @@ index 30cb06b..e33e12b 100644
// und noch die Farbe
GetCSS1Color( pLine->GetColor(), sOut );
-@@ -3614,14 +3629,14 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
+@@ -3611,14 +3626,14 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
rHTMLWrt.OutCSS1_PropertyAscii( pProperty, sOut );
}
@@ -2826,10 +3002,10 @@ index 30cb06b..e33e12b 100644
const SvxBoxItem& rBoxItem = (const SvxBoxItem&)rHt;
const SvxBorderLine *pTop = rBoxItem.GetTop();
diff --git sw/source/filter/html/htmltabw.cxx sw/source/filter/html/htmltabw.cxx
-index d0d1633..ec55d16 100644
+index 2c79ea2..419e699 100644
--- sw/source/filter/html/htmltabw.cxx
+++ sw/source/filter/html/htmltabw.cxx
-@@ -440,6 +440,11 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
+@@ -437,6 +437,11 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
OutCSS1_TableBGStyleOpt( rWrt, *pBrushItem );
}
@@ -2841,7 +3017,7 @@ index d0d1633..ec55d16 100644
sal_uInt32 nNumFmt = 0;
double nValue = 0.0;
sal_Bool bNumFmt = sal_False, bValue = sal_False;
-@@ -708,19 +713,6 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
+@@ -705,19 +710,6 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
// Anderenfalls enthaelt nBorder naemlich nur die Breite der Umrandung,
// die genutzt wird, wenn gar kein sheet::Border angegeben ist.
sal_Bool bHasAnyBorders = nFrameMask || bColsHaveBorder || bRowsHaveBorder;
@@ -2862,10 +3038,10 @@ index d0d1633..ec55d16 100644
// CELLPADDING ausgeben: Stammt aus Layout oder ist berechnet
(((sOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_cellpadding ) += '=')
diff --git sw/source/filter/html/svxcss1.cxx sw/source/filter/html/svxcss1.cxx
-index bda9ee2..39fb094 100644
+index d48053f..c5ba689 100644
--- sw/source/filter/html/svxcss1.cxx
+++ sw/source/filter/html/svxcss1.cxx
-@@ -188,13 +188,13 @@ static CSS1PropertyEnum __READONLY_DATA aBorderWidthTable[] =
+@@ -185,13 +185,13 @@ static CSS1PropertyEnum __READONLY_DATA aBorderWidthTable[] =
{ 0, 0 }
};
@@ -2882,7 +3058,7 @@ index bda9ee2..39fb094 100644
{ sCSS1_PV_solid, CSS1_BS_SINGLE },
{ sCSS1_PV_double, CSS1_BS_DOUBLE },
{ sCSS1_PV_groove, CSS1_BS_SINGLE },
-@@ -372,6 +372,12 @@ void SvxCSS1BorderInfo::SetBorderLine( USHORT nLine, SvxBoxItem &rBoxItem ) cons
+@@ -369,6 +369,12 @@ void SvxCSS1BorderInfo::SetBorderLine( USHORT nLine, SvxBoxItem &rBoxItem ) cons
// Linien-Stil doppelt oder einfach?
BOOL bDouble = eStyle == CSS1_BS_DOUBLE;
@@ -2896,10 +3072,10 @@ index bda9ee2..39fb094 100644
// benannte Breite umrechnenen, wenn keine absolute gegeben ist
if( nAbsWidth==USHRT_MAX )
diff --git sw/source/filter/html/wrthtml.hxx sw/source/filter/html/wrthtml.hxx
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list