[ooo-build-commit] .: 2 commits - patches/dev300
Katarina Machalkova
bubli at kemper.freedesktop.org
Tue Apr 20 07:38:30 PDT 2010
patches/dev300/apply | 13 +--
patches/dev300/border-types-dotted-dashed-xlsx-part.diff | 41 ++++++++++
patches/dev300/border-types-dotted-dashed.diff | 41 ----------
patches/dev300/calc-perf-xls-import-cellstyles-xlsx-part.diff | 35 ++++++++
patches/dev300/calc-perf-xls-import-cellstyles.diff | 35 --------
5 files changed, 81 insertions(+), 84 deletions(-)
New commits:
commit f5151576e4caab2b6c02ed46b7690ad3e794dfb7
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Tue Apr 20 16:00:39 2010 +0200
Ooops, I didn't mean to enable Devel section :(
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 202207f..fa16d48 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -15,7 +15,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, WPS, \
- OOXML, OOXMLExportDevel, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
+ OOXML, OOXMLExport321, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
@@ -37,7 +37,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
WriterNavigation, SystemGraphiteWithSTLport, \
- HPPA, AXP, Speed, SystemMySQLWithSTLport, OOXMLExport321
+ HPPA, AXP, Speed, SystemMySQLWithSTLport, OOXMLExportDevel
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
commit 67b2499fd887709f4519560598e46d22aca86dff
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date: Tue Apr 20 15:41:03 2010 +0200
More moving of xlsx-specific parts into [OOXMLExport321]
* patches/dev300/apply:
* patches/dev300/border-types-dotted-dashed-xlsx-part.diff:
* patches/dev300/border-types-dotted-dashed.diff:
* patches/dev300/calc-perf-xls-import-cellstyles-xlsx-part.diff:
* patches/dev300/calc-perf-xls-import-cellstyles.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2a8da0f..202207f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -15,7 +15,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
Icons, Branding, CalcFixes, WriterFixes, EasterEgg, \
GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, WPS, \
- OOXML, OOXMLExport321, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
+ OOXML, OOXMLExportDevel, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
CalcRowLimit, Gcc44, Gcc45, BuildFix, WriterDocComparison, \
@@ -37,7 +37,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
KDE4Experimental, MinGW, CalcExperimental, \
OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
WriterNavigation, SystemGraphiteWithSTLport, \
- HPPA, AXP, Speed, SystemMySQLWithSTLport, OOXMLExportDevel
+ HPPA, AXP, Speed, SystemMySQLWithSTLport, OOXMLExport321
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes, Win32OnlyExtensionFixes, Linux32OnlyExtensionFixes
@@ -3372,6 +3372,11 @@ oox-drawingml-fix-shapes-map-crash-xlsx-part.diff
# xlsx-specifig part of oox-smartart-import.diff
oox-smartart-import-xlsx-part.diff
+# xlsx-specific part of calc-perf-xls-import-cellstyles.diff
+calc-perf-xls-import-cellstyles-xlsx-part.diff
+# xlsx-specific part of border-types-dotted-dashed.diff
+border-types-dotted-dashed-xlsx-part.diff
+
[ OOXMLExportDevel ]
# this is shared binary/ooxml filter, WIP
# doesn't include
@@ -3382,7 +3387,6 @@ oox-smartart-import-xlsx-part.diff
xlsx-shared-xlsx-snapshot.diff
xlsx-shared-xlsx-shared-import-and-export.diff
xlsx-shared-xlsx-arabic-export-crash.diff
-xlsx-shared-calc-perf-xls-import-cellstyles.diff
#xlsx-shared-oox-chart-export-part1.diff
xlsx-shared-xlsx-export-set-xml-2007-flavour.diff
xlsx-shared-xlsx-export-simple-autofilter.diff
@@ -3823,11 +3827,7 @@ calc-perf-import-dbf-sc.diff, n#558505, kohei
# Speed up row height data import from ods documents.
calc-perf-ods-import-row-height.diff, n#582693, kohei
calc-perf-ods-import-cellstyles.diff, n#582693, kohei
-
-[ OOXMLExport321 ]
calc-perf-xls-import-cellstyles.diff, n#582693, kohei
-
-[ CalcRowLimit ]
calc-perf-xls-import-cellstyles-fix.diff, n#594266, kohei
calc-perf-xls-import-cellstyles-fix2.diff, n#594235, kohei
@@ -4025,11 +4025,8 @@ toolbar-decorations-fix.diff
SectionOwner => cbosdo
#Only adds the dotted / dashed lines
-[ OOXMLExport321 ]
border-types-dotted-dashed.diff, fate#307731, fate 307730
-[ OOXMLExportDevel ]
-xlsx-shared-border-types-dotted-dashed.diff
#Adds some more types, and more of unifying the drawing methods
#FIXME: Incomplete, not to be included in 3.2.1
diff --git a/patches/dev300/border-types-dotted-dashed-xlsx-part.diff b/patches/dev300/border-types-dotted-dashed-xlsx-part.diff
new file mode 100644
index 0000000..2cd0e8d
--- /dev/null
+++ b/patches/dev300/border-types-dotted-dashed-xlsx-part.diff
@@ -0,0 +1,41 @@
+diff --git sc/source/filter/xlsx/xlsx-xestyle.cxx sc/source/filter/xlsx/xlsx-xestyle.cxx
+index d882080..f60c37f 100644
+--- sc/source/filter/xlsx/xlsx-xestyle.cxx
++++ sc/source/filter/xlsx/xlsx-xestyle.cxx
+@@ -1557,9 +1557,26 @@ void lclGetBorderLine(
+ else if( nOuterWidth > DEF_LINE_WIDTH_2 )
+ rnXclLine = EXC_LINE_THICK;
+ else if( nOuterWidth > DEF_LINE_WIDTH_1 )
++ {
+ rnXclLine = EXC_LINE_MEDIUM;
++ if ( pLine->GetStyle( ) == EXC_LINE_DASHED )
++ rnXclLine = EXC_LINE_MEDIUMDASHED;
++ }
+ else if( nOuterWidth > DEF_LINE_WIDTH_0 )
++ {
+ rnXclLine = EXC_LINE_THIN;
++ switch ( pLine->GetStyle( ) )
++ {
++ case DOTTED:
++ rnXclLine = EXC_LINE_DOTTED;
++ break;
++ case DASHED:
++ rnXclLine = EXC_LINE_DASHED;
++ break;
++ default:
++ break;
++ }
++ }
+ else if( nOuterWidth > 0 )
+ rnXclLine = EXC_LINE_HAIR;
+ else
+@@ -1725,6 +1742,9 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
+ case EXC_LINE_THICK: return "thick";
+ case EXC_LINE_DOUBLE: return "double";
+ case EXC_LINE_HAIR: return "hair";
++ case EXC_LINE_DOTTED: return "dotted";
++ case EXC_LINE_DASHED: return "dashed";
++ case EXC_LINE_MEDIUMDASHED: return "mediumdashed";
+ }
+ return "*unknown*";
+ }
diff --git a/patches/dev300/border-types-dotted-dashed.diff b/patches/dev300/border-types-dotted-dashed.diff
index 196f663..9c26169 100644
--- a/patches/dev300/border-types-dotted-dashed.diff
+++ b/patches/dev300/border-types-dotted-dashed.diff
@@ -696,47 +696,6 @@ index e18f48b..373d701 100644
// Background patterns --------------------------------------------------------
-diff --git sc/source/filter/xlsx/xlsx-xestyle.cxx sc/source/filter/xlsx/xlsx-xestyle.cxx
-index d882080..f60c37f 100644
---- sc/source/filter/xlsx/xlsx-xestyle.cxx
-+++ sc/source/filter/xlsx/xlsx-xestyle.cxx
-@@ -1557,9 +1557,26 @@ void lclGetBorderLine(
- else if( nOuterWidth > DEF_LINE_WIDTH_2 )
- rnXclLine = EXC_LINE_THICK;
- else if( nOuterWidth > DEF_LINE_WIDTH_1 )
-+ {
- rnXclLine = EXC_LINE_MEDIUM;
-+ if ( pLine->GetStyle( ) == EXC_LINE_DASHED )
-+ rnXclLine = EXC_LINE_MEDIUMDASHED;
-+ }
- else if( nOuterWidth > DEF_LINE_WIDTH_0 )
-+ {
- rnXclLine = EXC_LINE_THIN;
-+ switch ( pLine->GetStyle( ) )
-+ {
-+ case DOTTED:
-+ rnXclLine = EXC_LINE_DOTTED;
-+ break;
-+ case DASHED:
-+ rnXclLine = EXC_LINE_DASHED;
-+ break;
-+ default:
-+ break;
-+ }
-+ }
- else if( nOuterWidth > 0 )
- rnXclLine = EXC_LINE_HAIR;
- else
-@@ -1725,6 +1742,9 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
- case EXC_LINE_THICK: return "thick";
- case EXC_LINE_DOUBLE: return "double";
- case EXC_LINE_HAIR: return "hair";
-+ case EXC_LINE_DOTTED: return "dotted";
-+ case EXC_LINE_DASHED: return "dashed";
-+ case EXC_LINE_MEDIUMDASHED: return "mediumdashed";
- }
- return "*unknown*";
- }
diff --git sc/source/ui/unoobj/cellsuno.cxx sc/source/ui/unoobj/cellsuno.cxx
index 11ecd43..1b1c8a0 100644
--- sc/source/ui/unoobj/cellsuno.cxx
diff --git a/patches/dev300/calc-perf-xls-import-cellstyles-xlsx-part.diff b/patches/dev300/calc-perf-xls-import-cellstyles-xlsx-part.diff
new file mode 100644
index 0000000..3ecd9e8
--- /dev/null
+++ b/patches/dev300/calc-perf-xls-import-cellstyles-xlsx-part.diff
@@ -0,0 +1,35 @@
+diff --git sc/source/filter/xlsx/xistyle.hxx sc/source/filter/xlsx/xistyle.hxx
+index baebad3..138c633 100644
+--- sc/source/filter/xlsx/xistyle.hxx
++++ sc/source/filter/xlsx/xistyle.hxx
+@@ -411,15 +411,6 @@ public:
+ @return A read-only reference to the item set stored internally. */
+ const ScPatternAttr& CreatePattern( bool bSkipPoolDefs = false );
+
+- /** Inserts all formatting attributes to the specified area in the Calc document.
+- @param nForcedNumFmt If not set to NUMBERFORMAT_ENTRY_NOT_FOUND, it will overwrite
+- the number format of the XF. */
+- void ApplyPattern(
+- SCCOL nScCol1, SCROW nScRow1,
+- SCCOL nScCol2, SCROW nScRow2,
+- SCTAB nScTab,
+- ULONG nForceScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND );
+-
+ private:
+ void ReadXF2( XclImpStream& rStrm );
+ void ReadXF3( XclImpStream& rStrm );
+@@ -516,14 +507,6 @@ public:
+ @return The pointer to the cell style sheet, or 0, if there is no style sheet. */
+ ScStyleSheet* CreateStyleSheet( sal_uInt16 nXFIndex );
+
+- /** Inserts formatting attributes from an XF to the specified area in the Calc document.
+- @param nForcedNumFmt If not set to NUMBERFORMAT_ENTRY_NOT_FOUND, it will overwrite
+- the number format of the XF. */
+- void ApplyPattern(
+- SCCOL nScCol1, SCROW nScRow1,
+- SCCOL nScCol2, SCROW nScRow2,
+- SCTAB nScTab, const XclImpXFIndex& rXFIndex );
+-
+ private:
+ typedef ScfDelList< XclImpStyle > XclImpStyleList;
+ typedef ::std::map< sal_uInt16, XclImpStyle* > XclImpStyleMap;
diff --git a/patches/dev300/calc-perf-xls-import-cellstyles.diff b/patches/dev300/calc-perf-xls-import-cellstyles.diff
index f390d3f..578542e 100644
--- a/patches/dev300/calc-perf-xls-import-cellstyles.diff
+++ b/patches/dev300/calc-perf-xls-import-cellstyles.diff
@@ -396,38 +396,3 @@ index e04a79b..14db37e 100644
private:
typedef ScfDelList< XclImpStyle > XclImpStyleList;
typedef ::std::map< sal_uInt16, XclImpStyle* > XclImpStyleMap;
-diff --git sc/source/filter/xlsx/xistyle.hxx sc/source/filter/xlsx/xistyle.hxx
-index baebad3..138c633 100644
---- sc/source/filter/xlsx/xistyle.hxx
-+++ sc/source/filter/xlsx/xistyle.hxx
-@@ -411,15 +411,6 @@ public:
- @return A read-only reference to the item set stored internally. */
- const ScPatternAttr& CreatePattern( bool bSkipPoolDefs = false );
-
-- /** Inserts all formatting attributes to the specified area in the Calc document.
-- @param nForcedNumFmt If not set to NUMBERFORMAT_ENTRY_NOT_FOUND, it will overwrite
-- the number format of the XF. */
-- void ApplyPattern(
-- SCCOL nScCol1, SCROW nScRow1,
-- SCCOL nScCol2, SCROW nScRow2,
-- SCTAB nScTab,
-- ULONG nForceScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND );
--
- private:
- void ReadXF2( XclImpStream& rStrm );
- void ReadXF3( XclImpStream& rStrm );
-@@ -516,14 +507,6 @@ public:
- @return The pointer to the cell style sheet, or 0, if there is no style sheet. */
- ScStyleSheet* CreateStyleSheet( sal_uInt16 nXFIndex );
-
-- /** Inserts formatting attributes from an XF to the specified area in the Calc document.
-- @param nForcedNumFmt If not set to NUMBERFORMAT_ENTRY_NOT_FOUND, it will overwrite
-- the number format of the XF. */
-- void ApplyPattern(
-- SCCOL nScCol1, SCROW nScRow1,
-- SCCOL nScCol2, SCROW nScRow2,
-- SCTAB nScTab, const XclImpXFIndex& rXFIndex );
--
- private:
- typedef ScfDelList< XclImpStyle > XclImpStyleList;
- typedef ::std::map< sal_uInt16, XclImpStyle* > XclImpStyleMap;
More information about the ooo-build-commit
mailing list