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

[Kohei Yoshida]

 patches/dev300/apply                                      |    3 -
 patches/dev300/calc-xls-import-biff2-file-sheet-name.diff |   27 --------------
 2 files changed, 30 deletions(-)

New commits:
commit 91d21ce2f1536185d65f87f26f3007952bf49df5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Oct 4 16:41:04 2010 -0400

    Removed calc-xls-import-biff2-file-sheet-name.diff; moved to git.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 32ccfd7..e8b3a29 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2704,9 +2704,6 @@ calc-formula-db-function-fix.diff, n#594332, n#595713, kohei
 # Opening an xml file with xls extension
 sc-xml-with-xls-ext.diff, n#527738, muthusuba
 
-# Set file name as the sheet name when importing Excel 2.1 worksheet file.
-calc-xls-import-biff2-file-sheet-name.diff, n#612902, kohei
-
 # Re-connect DDE linkage upon loading of source files.
 dde-reconnect-on-load-sc.diff,   n#618846, n#618864, kohei
 dde-reconnect-on-load-sw.diff,   n#618846, n#618864, kohei
diff --git a/patches/dev300/calc-xls-import-biff2-file-sheet-name.diff b/patches/dev300/calc-xls-import-biff2-file-sheet-name.diff
deleted file mode 100644
index 55b175f..0000000
--- a/patches/dev300/calc-xls-import-biff2-file-sheet-name.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git sc/source/filter/excel/impop.cxx sc/source/filter/excel/impop.cxx
-index cea2a9d..16060ba 100644
---- sc/source/filter/excel/impop.cxx
-+++ sc/source/filter/excel/impop.cxx
-@@ -47,6 +47,7 @@
- #include <svl/zforlist.hxx>
- 
- #include <sfx2/objsh.hxx>
-+#include "tools/urlobj.hxx"
- #include "docuno.hxx"
- 
- #include "cell.hxx"
-@@ -1158,6 +1159,14 @@ void ImportExcel::NeueTabelle( void )
-     if( nTab > 0 && !pD->HasTable( nTab ) )
-         pD->MakeTable( nTab );
- 
-+    if (nTab == 0 && GetBiff() == EXC_BIFF2)
-+    {
-+        // For Excel 2.1 Worksheet file, we need to set the file name as the 
-+        // sheet name.
-+        INetURLObject aURL(GetDocUrl());
-+        pD->RenameTab(0, aURL.getBase(), false);
-+    }
-+
-     pExcRoot->pShrfmlaBuff->Clear();
- 
-     InitializeTable( nTab );