[ooo-build-commit] 2 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Jan 19 01:09:37 PST 2010
patches/dev300/border-types.diff | 145 ++++++++++++++++++++++++++++++++++-----
1 file changed, 127 insertions(+), 18 deletions(-)
New commits:
commit 0447ecf0e3ffb4eb8577b13b713e3d6b3e8abc34
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Jan 19 10:02:05 2010 +0100
Fixed display in border selector
* patches/dev300/border-types.diff:
* The width of lines was 1px less than what it should
* The preview wasn't what was actually done for double borders of
different width i#86716.
diff --git a/patches/dev300/border-types.diff b/patches/dev300/border-types.diff
index 28ebb56..6e04a2c 100644
--- a/patches/dev300/border-types.diff
+++ b/patches/dev300/border-types.diff
@@ -984,7 +984,7 @@ 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..78dfd51 100644
+index 01cd788..951c296 100644
--- svtools/source/control/ctrlbox.cxx
+++ svtools/source/control/ctrlbox.cxx
@@ -46,8 +46,11 @@
@@ -1031,7 +1031,7 @@ index 01cd788..78dfd51 100644
+ aVector.normalize( );
+ const basegfx::B2DVector aPerpendicular(basegfx::getPerpendicular(aVector));
+
-+ const basegfx::B2DVector aWidthOffset( ( nWidth / 2 ) * aPerpendicular);
++ const basegfx::B2DVector aWidthOffset( nWidth / 2 * aPerpendicular);
+ basegfx::B2DPolygon aDashPolygon;
+ aDashPolygon.append( aStart + aWidthOffset );
+ aDashPolygon.append( aEnd + aWidthOffset );
@@ -1490,7 +1490,7 @@ 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..c704626 100644
+index 2fe4d81..e504aa4 100644
--- svx/source/dialog/framelink.cxx
+++ svx/source/dialog/framelink.cxx
@@ -35,6 +35,7 @@
@@ -1626,7 +1626,7 @@ index 2fe4d81..c704626 100644
+
+ sal_uInt32 nWidth = lclToMapUnit( abs( nTOffs ) ) + lclToMapUnit( abs( nBOffs ) );
+ if ( ( nTOffs >= 0 && nBOffs >= 0 ) || ( nTOffs <= 0 && nBOffs <= 0 ) )
-+ nWidth = abs( lclToMapUnit( nTOffs - nBOffs ) );
++ nWidth = abs( lclToMapUnit( nTOffs ) - lclToMapUnit( nBOffs ) ) + 1;
+ Point rLMid = ( aTPoints.maBeg + aBPoints.maBeg ) / 2;
+ Point rRMid = ( aTPoints.maEnd + aBPoints.maEnd ) / 2;
+
@@ -1666,7 +1666,7 @@ index 2fe4d81..c704626 100644
+
+ sal_uInt32 nWidth = lclToMapUnit( abs( nLOffs ) ) + lclToMapUnit( abs( nROffs ) );
+ if ( ( nLOffs >= 0 && nROffs >= 0 ) || ( nLOffs <= 0 && nROffs <= 0 ) )
-+ nWidth = abs( lclToMapUnit( nLOffs - nROffs ) );
++ nWidth = abs( lclToMapUnit( nLOffs ) - lclToMapUnit( nROffs ) ) + 1;
+ Point rTMid = ( aLPoints.maBeg + aRPoints.maBeg ) / 2;
+ Point rBMid = ( aLPoints.maEnd + aRPoints.maEnd ) / 2;
+
@@ -1799,7 +1799,7 @@ index 2fe4d81..c704626 100644
}
}
diff --git svx/source/dialog/frmsel.cxx svx/source/dialog/frmsel.cxx
-index 88bbbb8..a9d2584 100644
+index 88bbbb8..84b978a 100644
--- svx/source/dialog/frmsel.cxx
+++ svx/source/dialog/frmsel.cxx
@@ -160,7 +160,7 @@ void FrameBorder::SetCoreStyle( const SvxBorderLine* pStyle )
@@ -1811,7 +1811,7 @@ index 88bbbb8..a9d2584 100644
meState = maUIStyle.Prim() ? FRAMESTATE_SHOW : FRAMESTATE_HIDE;
}
-@@ -640,11 +640,23 @@ void FrameSelectorImpl::DrawAllFrameBorders()
+@@ -640,11 +640,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() );
@@ -1825,8 +1825,17 @@ index 88bbbb8..a9d2584 100644
+ maArray.SetColumnStyleRight( mbVer ? 1 : 0, rInvertedRight );
maArray.SetRowStyleTop( 0, maTop.GetUIStyle() );
- if( mbHor ) maArray.SetRowStyleTop( 1, maHor.GetUIStyle() );
+- if( mbHor ) maArray.SetRowStyleTop( 1, maHor.GetUIStyle() );
- maArray.SetRowStyleBottom( mbHor ? 1 : 0, maBottom.GetUIStyle() );
++ if( mbHor )
++ {
++ // Invert the style for the hor line to match the real borders
++ const frame::Style rHorStyle = maHor.GetUIStyle();
++ frame::Style rInvertedHor( rHorStyle.GetColor(),
++ rHorStyle.Secn(), rHorStyle.Dist(), rHorStyle.Prim( ),
++ rHorStyle.Dashing() );
++ maArray.SetRowStyleTop( 1, rInvertedHor );
++ }
+
+ // Invert the style for the bottom line
+ const frame::Style rBottomStyle = maBottom.GetUIStyle( );
@@ -1837,7 +1846,7 @@ index 88bbbb8..a9d2584 100644
for( size_t nCol = 0; nCol < maArray.GetColCount(); ++nCol )
for( size_t nRow = 0; nRow < maArray.GetRowCount(); ++nRow )
-@@ -865,7 +877,8 @@ void FrameSelector::HideAllBorders()
+@@ -865,7 +885,8 @@ void FrameSelector::HideAllBorders()
mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE );
}
@@ -1847,7 +1856,7 @@ index 88bbbb8..a9d2584 100644
{
VisFrameBorderCIter aIt( mxImpl->maEnabBorders );
if( !aIt.Is() )
-@@ -877,13 +890,15 @@ bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnS
+@@ -877,13 +898,15 @@ bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnS
bFound =
(rStyle.GetOutWidth() == (*aIt)->GetCoreStyle().GetOutWidth()) &&
(rStyle.GetDistance() == (*aIt)->GetCoreStyle().GetDistance()) &&
@@ -1864,7 +1873,7 @@ index 88bbbb8..a9d2584 100644
}
return bFound;
}
-@@ -944,11 +959,13 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
+@@ -944,11 +967,13 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
mxImpl->SelectBorder( **aIt, bSelect );
}
commit 9638bfadbdcf08ddf4daaf04557c76e21e3132c9
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Mon Jan 18 13:32:52 2010 +0100
Border types improvements
* Improved the UOF Text and Spreadsheet export to support the new
border types
* Fixed the dotted and dashed sizes for display
* sc HTML export adapted
* patches/dev300/border-types.diff:
diff --git a/patches/dev300/border-types.diff b/patches/dev300/border-types.diff
index 1d9fdd0..28ebb56 100644
--- a/patches/dev300/border-types.diff
+++ b/patches/dev300/border-types.diff
@@ -106,6 +106,86 @@ index a2fda82..d605d68 100644
}
return false;
+diff --git filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
+index 1507305..606542c 100644
+--- filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
++++ filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
+@@ -4262,7 +4262,7 @@
+ <xsl:element name="uof:å·¦">
+ <xsl:attribute name="uof:locID">u0057</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <xsl:attribute name="uof:宽度"><xsl:value-of select="substring-before(substring-before($border,' '),$uofUnit)"/></xsl:attribute>
+ <xsl:attribute name="uof:颜色"><xsl:value-of select="substring-after(substring-after($border,' '),' ')"/></xsl:attribute>
+@@ -4274,7 +4274,7 @@
+ <xsl:element name="uof:上">
+ <xsl:attribute name="uof:locID">u0058</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <xsl:attribute name="uof:宽度"><xsl:value-of select="substring-before(substring-before($border,' '),$uofUnit)"/></xsl:attribute>
+ <xsl:attribute name="uof:颜色"><xsl:value-of select="substring-after(substring-after($border,' '),' ')"/></xsl:attribute>
+@@ -4286,7 +4286,7 @@
+ <xsl:element name="uof:å³">
+ <xsl:attribute name="uof:locID">u0059</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <xsl:attribute name="uof:宽度"><xsl:value-of select="substring-before(substring-before($border,' '),$uofUnit)"/></xsl:attribute>
+ <xsl:attribute name="uof:颜色"><xsl:value-of select="substring-after(substring-after($border,' '),' ')"/></xsl:attribute>
+@@ -4298,7 +4298,7 @@
+ <xsl:element name="uof:下">
+ <xsl:attribute name="uof:locID">u0060</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <xsl:attribute name="uof:宽度"><xsl:value-of select="substring-before(substring-before($border,' '),$uofUnit)"/></xsl:attribute>
+ <xsl:attribute name="uof:颜色"><xsl:value-of select="substring-after(substring-after($border,' '),' ')"/></xsl:attribute>
+diff --git filter/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
+index cea93c8..08586d0 100644
+--- filter/source/xslt/export/uof/odf2uof_text.xsl
++++ filter/source/xslt/export/uof/odf2uof_text.xsl
+@@ -3248,7 +3248,7 @@
+ <xsl:element name="uof:å·¦">
+ <xsl:attribute name="uof:locID">u0057</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <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>
+@@ -3266,7 +3266,7 @@
+ <xsl:element name="uof:上">
+ <xsl:attribute name="uof:locID">u0058</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <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>
+@@ -3284,7 +3284,7 @@
+ <xsl:element name="uof:å³">
+ <xsl:attribute name="uof:locID">u0059</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <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>
+@@ -3302,7 +3302,7 @@
+ <xsl:element name="uof:下">
+ <xsl:attribute name="uof:locID">u0060</xsl:attribute>
+ <xsl:attribute name="uof:attrList">类型 宽度 è¾¹è· é¢œè‰² 阴影</xsl:attribute>
+- <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
++ <xsl:attribute name="uof:类型"><xsl:choose><xsl:when test="$border!='none'"><xsl:choose><xsl:when test="substring-before(substring-after($border,' '),' ')='solid'">single</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='double'">double</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dashed'">dash</xsl:when><xsl:when test="substring-before(substring-after($border,' '),' ')='dotted'">dotted</xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:when><xsl:otherwise>none</xsl:otherwise></xsl:choose></xsl:attribute>
+ <xsl:if test="$border!='none'">
+ <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
--- offapi/com/sun/star/table/BorderLine.idl
@@ -579,6 +659,26 @@ index 2adea30..15b2374 100644
return true;
}
+diff --git sc/source/filter/html/htmlexp.cxx sc/source/filter/html/htmlexp.cxx
+index 9698b9d..70f39ba 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,
+ // thickness
+ int nWidth = pLine->GetOutWidth();
+ int nPxWidth = ( nWidth > 0 )? std::max( int( nWidth / TWIPS_PER_PIXEL ), 1 ): 0;
+- (rOut += ByteString::CreateFromInt32( nPxWidth )) += "px solid #";
++ (rOut += ByteString::CreateFromInt32( nPxWidth )) += "px ";
++ switch ( pLine->GetStyle() )
++ {
++ case DOTTED: rOut += "dotted"; break;
++ case DASHED: rOut += "dashed"; break;
++ default: rOut += "solid";
++ }
++ rOut += " #";
+
+ // color
+ char hex[7];
diff --git sc/source/filter/inc/xlstyle.hxx sc/source/filter/inc/xlstyle.hxx
index 9613abf..064c07f 100644
--- sc/source/filter/inc/xlstyle.hxx
@@ -884,7 +984,7 @@ 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..c36ebc7 100644
+index 01cd788..78dfd51 100644
--- svtools/source/control/ctrlbox.cxx
+++ svtools/source/control/ctrlbox.cxx
@@ -46,8 +46,11 @@
@@ -956,13 +1056,13 @@ index 01cd788..c36ebc7 100644
+ case STYLE_DOTTED:
+ if ( eUnit == MAP_TWIP )
+ {
-+ aPattern.push_back( 1.0 );
-+ aPattern.push_back( 50.0 );
++ aPattern.push_back( 30.0 );
++ aPattern.push_back( 110.0 );
+ }
+ else if ( eUnit == MAP_100TH_MM )
+ {
+ aPattern.push_back( 50 );
-+ aPattern.push_back( 100 );
++ aPattern.push_back( 200 );
+ }
+ else if ( eUnit == MAP_PIXEL )
+ {
@@ -973,13 +1073,13 @@ index 01cd788..c36ebc7 100644
+ case STYLE_DASHED:
+ if ( eUnit == MAP_TWIP )
+ {
-+ aPattern.push_back( 50 );
-+ aPattern.push_back( 100 );
++ aPattern.push_back( 110 );
++ aPattern.push_back( 110 );
+ }
+ else if ( eUnit == MAP_100TH_MM )
+ {
-+ aPattern.push_back( 100 );
-+ aPattern.push_back( 150 );
++ aPattern.push_back( 200 );
++ aPattern.push_back( 200 );
+ }
+ else if ( eUnit == MAP_PIXEL )
+ {
More information about the ooo-build-commit
mailing list