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

[Kohei Yoshida]

 patches/dev300/apply                                   |    3 
 patches/dev300/calc-xls-import-slanted-border-oox.diff |   93 -----------------
 2 files changed, 96 deletions(-)

New commits:
commit 40a6b89c8cbf1cc1242f521e82a96d147ea2d49a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Oct 6 17:43:18 2010 -0400

    Removed calc-xls-import-slanted-border-oox.diff; moved to git.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8696a0d..9479edc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -491,9 +491,6 @@ calc-combo-listbox-export-fix.diff, n#540566, noelp
 # any more? -- kendy
 calc-string-number.diff, kohei
 
-# Set reference edge to bottom when importing cells with slanted text.
-calc-xls-import-slanted-border-oox.diff, n#549728, i#38709, kohei
-
 # Support PHONETIC function to display asian phonetic guide.
 # LATER: I'll take care of this later.  --kohei
 # calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
diff --git a/patches/dev300/calc-xls-import-slanted-border-oox.diff b/patches/dev300/calc-xls-import-slanted-border-oox.diff
deleted file mode 100644
index fdb7fb5..0000000
--- a/patches/dev300/calc-xls-import-slanted-border-oox.diff
+++ /dev/null
@@ -1,93 +0,0 @@
----
- oox/inc/oox/xls/stylesbuffer.hxx |    3 ++
- oox/source/xls/stylesbuffer.cxx  |   40 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 43 insertions(+), 0 deletions(-)
-
-diff --git oox/inc/oox/xls/stylesbuffer.hxx oox/inc/oox/xls/stylesbuffer.hxx
-index 5a8ebb0..d3134fb 100644
---- oox/inc/oox/xls/stylesbuffer.hxx
-+++ oox/inc/oox/xls/stylesbuffer.hxx
-@@ -574,6 +574,8 @@ public:
-     /** Writes all border attributes to the passed property map. */
-     void                writeToPropertyMap( PropertyMap& rPropMap ) const;
- 
-+    bool                hasBorder() const;
-+
- private:
-     /** Returns the border line struct specified by the passed XML token identifier. */
-     BorderLineModel*    getBorderLine( sal_Int32 nElement );
-@@ -1049,6 +1051,7 @@ public:
-     /** Writes the cell formatting attributes of the specified style XF to the passed property set. */
-     void                writeStyleXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const;
- 
-+    bool                hasBorder( sal_Int32 nBorderId ) const;
- private:
-     typedef RefVector< Font >                           FontVector;
-     typedef RefVector< Border >                         BorderVector;
-diff --git oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesbuffer.cxx
-index d8d52f2..c682ea6 100644
---- oox/source/xls/stylesbuffer.cxx
-+++ oox/source/xls/stylesbuffer.cxx
-@@ -1773,6 +1774,34 @@ void Border::writeToPropertyMap( PropertyMap& rPropMap ) const
-     }
- }
- 
-+namespace {
-+
-+bool lcl_isBorder(const ::com::sun::star::table::BorderLine& rBorder)
-+{
-+    return (rBorder.InnerLineWidth > 0) || (rBorder.OuterLineWidth > 0);
-+}
-+
-+}
-+
-+bool Border::hasBorder() const
-+{
-+    const ApiBorderData::ApiTableBorder& rTabBorder = maApiData.maBorder;
-+
-+    if (rTabBorder.IsBottomLineValid && lcl_isBorder(rTabBorder.BottomLine))
-+        return true;
-+
-+    if (rTabBorder.IsTopLineValid && lcl_isBorder(rTabBorder.TopLine))
-+        return true;
-+
-+    if (rTabBorder.IsLeftLineValid && lcl_isBorder(rTabBorder.LeftLine))
-+        return true;
-+
-+    if (rTabBorder.IsRightLineValid && lcl_isBorder(rTabBorder.RightLine))
-+        return true;
-+
-+    return false;
-+}
-+
- BorderLineModel* Border::getBorderLine( sal_Int32 nElement )
- {
-     switch( nElement )
-@@ -2468,6 +2497,11 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const
-         rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId );
-     if( maModel.mbAlignUsed || maModel.mbBorderUsed )
-         rPropMap[ PROP_RotateReference ] <<= meRotationRef;
-+
-+    ::com::sun::star::table::CellVertJustify eRotRef = ::com::sun::star::table::CellVertJustify_STANDARD;
-+    if (maModel.mbBorderUsed && rStyles.hasBorder(maModel.mnBorderId) && maAlignment.getApiData().mnRotation)
-+        eRotRef = ::com::sun::star::table::CellVertJustify_BOTTOM;
-+    rPropMap[ PROP_RotateReference ] <<= eRotRef;
- }
- 
- void Xf::writeToPropertySet( PropertySet& rPropSet ) const
-@@ -3434,6 +3468,12 @@ void StylesBuffer::writeCellXfToPropertySet( PropertySet& rPropSet, sal_Int32 nX
-         pXf->writeToPropertySet( rPropSet );
- }
- 
-+bool StylesBuffer::hasBorder( sal_Int32 nBorderId ) const
-+{
-+    Border* pBorder = maBorders.get( nBorderId ).get();
-+    return pBorder && pBorder->hasBorder();
-+}
-+
- void StylesBuffer::writeStyleXfToPropertySet( PropertySet& rPropSet, sal_Int32 nXfId ) const
- {
-     if( Xf* pXf = maStyleXfs.get( nXfId ).get() )
--- 
-1.7.0.1
-