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

[Kohei Yoshida]

 patches/dev300/apply                                   |    3 -
 patches/dev300/calc-xlsx-import-default-cellstyle.diff |   38 -----------------
 2 files changed, 41 deletions(-)

New commits:
commit 00a61abbd622a5d319d09c91264081ac111bbd92
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Oct 5 16:19:53 2010 -0400

    Removed calc-xlsx-import-default-cellstyle.diff; moved to git.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2b422a5..bbeae44 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -497,9 +497,6 @@ 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
 
-# import xlsx's Normal cell style into Calc's 'Default' style.
-calc-xlsx-import-default-cellstyle.diff, n#558577, 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-xlsx-import-default-cellstyle.diff b/patches/dev300/calc-xlsx-import-default-cellstyle.diff
deleted file mode 100644
index 2779df7..0000000
--- a/patches/dev300/calc-xlsx-import-default-cellstyle.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- oox/source/xls/stylesbuffer.cxx |   13 +++++++++++++
- 1 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git oox/source/xls/stylesbuffer.cxx oox/source/xls/stylesbuffer.cxx
-index c682ea6..cfc42ee 100644
---- oox/source/xls/stylesbuffer.cxx
-+++ oox/source/xls/stylesbuffer.cxx
-@@ -3035,6 +3035,9 @@ void CellStyleBuffer::finalizeImport()
-     for( CellStyleVector::iterator aIt = maBuiltinStyles.begin(), aEnd = maBuiltinStyles.end(); aIt != aEnd; ++aIt )
-     {
-         const CellStyleModel& rModel = (*aIt)->getModel();
-+        if (rModel.isDefaultStyle())
-+            continue;
-+
-         OUString aStyleName = lclGetBuiltinStyleName( rModel.mnBuiltinId, rModel.maName, rModel.mnLevel );
-         OSL_ENSURE( bReserveAll || (aCellStyles.count( aStyleName ) == 0),
-             "CellStyleBuffer::finalizeImport - multiple styles with equal built-in identifier" );
-@@ -3075,6 +3078,16 @@ void CellStyleBuffer::finalizeImport()
- 
-     // set final names and create user-defined and modified built-in cell styles
-     aCellStyles.forEachMemWithKey( &CellStyle::finalizeImport );
-+
-+    if (mxDefStyle)
-+    {
-+        Reference<XNameAccess> xNA(getStyleFamily(false), UNO_QUERY_THROW);
-+        if (xNA->hasByName(CREATE_OUSTRING("Default")))
-+        {
-+            PropertySet aPropSet(xNA->getByName(CREATE_OUSTRING("Default")));
-+            getStyles().writeStyleXfToPropertySet(aPropSet, mxDefStyle->getModel().mnXfId);
-+        }
-+    }
- }
- 
- sal_Int32 CellStyleBuffer::getDefaultXfId() const
--- 
-1.7.0.1
-