[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/border-types-dotted-dashed.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e856d1d9dce3ef902f420acaebc1a29dbae072bf
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 4 15:53:55 2010 -0400

    Adjusted patch to apply again.

diff --git a/patches/dev300/border-types-dotted-dashed.diff b/patches/dev300/border-types-dotted-dashed.diff
index 3dc4ac3..70bb101 100644
--- a/patches/dev300/border-types-dotted-dashed.diff
+++ b/patches/dev300/border-types-dotted-dashed.diff
@@ -309,7 +309,7 @@ index 00a7cfb..b335b0a 100644
      else
          aLine.Color			 = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance	 = 0;
 @@ -1843,7 +1849,7 @@ table::BorderLine SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Bool
- sal_Bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
+ bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
  {
      sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
 -    table::BorderLine aRetLine;
@@ -318,7 +318,7 @@ index 00a7cfb..b335b0a 100644
      sal_Bool bDistMember = sal_False;
      nMemberId &= ~CONVERT_TWIPS;
 @@ -2780,7 +2786,7 @@ void SvxBoxInfoItem::ResetFlags()
- sal_Bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
+ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId  ) const
  {
      sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
 -    table::BorderLine aRetLine;
@@ -390,7 +390,7 @@ index 77cb47e..2193be2 100644
 +      eLineDashing    = mso_lineSolid;
        bDrawHell       = FALSE;
        bHidden         = FALSE;
- //	  bInGroup		  = FALSE;
+       bReplaceByFly   = FALSE;
 @@ -8107,6 +8112,7 @@ SvxMSDffImportRec::SvxMSDffImportRec(const SvxMSDffImportRec& rCopy)
         *pYRelTo = *(rCopy.pYRelTo);
      }
@@ -398,7 +398,7 @@ index 77cb47e..2193be2 100644
 +    eLineDashing     = rCopy.eLineDashing;
      bDrawHell        = rCopy.bDrawHell;
      bHidden          = rCopy.bHidden;
- //			bInGroup		 = rCopy.bInGroup;
+     bReplaceByFly    = rCopy.bReplaceByFly;
 diff --git filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
 index 1507305..78a37f9 100644
 --- filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl