[ooo-build-commit] .: 3 commits - patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Sep 15 12:54:14 PDT 2010
patches/dev300/apply | 11 -
patches/dev300/calc-external-defined-names-enable.diff | 34 ----
patches/dev300/calc-xls-disable-adjust-row-height.diff | 27 ---
patches/dev300/chart-subtitle-xls-export.diff | 134 -----------------
4 files changed, 206 deletions(-)
New commits:
commit 8149c47159c0c439221c12efb43e6f69f9f01273
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Sep 15 21:53:49 2010 +0200
calc-xls-disable-adjust-row-height.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d55e8e4..c98cbc4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -524,10 +524,6 @@ sw-ww8-styles-import-fix.diff, i#21939, cbosdo
[ CalcFixes ]
-# Don't adjust row height on xls load for better layout preservation and
-# faster file load.
-calc-xls-disable-adjust-row-height.diff, kohei
-
# Support Excel English grammar needed for VBA and (probably) for xlsx filter.
calc-grammar-xls-english-offapi.diff, kohei
diff --git a/patches/dev300/calc-xls-disable-adjust-row-height.diff b/patches/dev300/calc-xls-disable-adjust-row-height.diff
deleted file mode 100644
index d7d2110..0000000
--- a/patches/dev300/calc-xls-disable-adjust-row-height.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- sc/source/filter/excel/read.cxx | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index 9c8e268..1c38ead 100644
---- sc/source/filter/excel/read.cxx
-+++ sc/source/filter/excel/read.cxx
-@@ -1211,10 +1211,13 @@ FltError ImportExcel8::Read( void )
- GetPivotTableManager().ConvertPivotTables();
-
- pProgress.reset();
--
-+#if 0
-+ // Excel documents look much better without this call; better in the
-+ // sense that the row heights are identical to the original heights in
-+ // Excel.
- if (pD->IsAdjustHeightEnabled())
- AdjustRowHeight();
--
-+#endif
- PostDocLoad();
-
- pD->CalcAfterLoad();
---
-1.7.0.1
-
commit 60cddf7bc6caa1ce7bff0a206e4104f4d7795fbb
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Sep 15 21:44:42 2010 +0200
calc-external-defined-names-enable.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5d7fcd5..d55e8e4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -524,9 +524,6 @@ sw-ww8-styles-import-fix.diff, i#21939, cbosdo
[ CalcFixes ]
-# Enable external defined name import on xls documents.
-calc-external-defined-names-enable.diff, kohei
-
# Don't adjust row height on xls load for better layout preservation and
# faster file load.
calc-xls-disable-adjust-row-height.diff, kohei
diff --git a/patches/dev300/calc-external-defined-names-enable.diff b/patches/dev300/calc-external-defined-names-enable.diff
deleted file mode 100644
index 9e7a914..0000000
--- a/patches/dev300/calc-external-defined-names-enable.diff
+++ /dev/null
@@ -1,34 +0,0 @@
----
- sc/source/core/tool/compiler.cxx | 2 +-
- sc/source/filter/excel/excform8.cxx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index 7e40f59..80e4098 100644
---- sc/source/core/tool/compiler.cxx
-+++ sc/source/core/tool/compiler.cxx
-@@ -2946,7 +2946,7 @@ bool ScCompiler::IsExternalNamedRange( const String& rSymbol )
- * spec first. Until then don't pretend to support external names that
- * wouldn't survive a save and reload cycle, return false instead. */
-
--#if 0
-+#if 1
- if (!pConv)
- return false;
-
-diff --git sc/source/filter/excel/excform8.cxx sc/source/filter/excel/excform8.cxx
-index ab5dc89..e0af01f 100644
---- sc/source/filter/excel/excform8.cxx
-+++ sc/source/filter/excel/excform8.cxx
-@@ -636,7 +636,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
- * external name reference can be stored in ODF,
- * which remains to be done for #i3740#. Until then
- * create a #NAME? token. */
--#if 0
-+#if 1
- sal_uInt16 nFileId;
- if (!GetExternalFileIdFromXti(nXtiIndex, nFileId) || !pExtName->HasFormulaTokens())
- {
---
-1.7.0.1
-
commit 8287225d5264b9c5af1fbb0d3bdffe67d0b7c136
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Sep 15 21:41:03 2010 +0200
chart-subtitle-xls-export.diff: Migrated to git
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7f230b8..5d7fcd5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -524,10 +524,6 @@ sw-ww8-styles-import-fix.diff, i#21939, cbosdo
[ CalcFixes ]
-# Squeeze chart's subtitle into the 2nd line of the main title when exporting
-# to xls.
-chart-subtitle-xls-export.diff, i#92357, kohei
-
# Enable external defined name import on xls documents.
calc-external-defined-names-enable.diff, kohei
diff --git a/patches/dev300/chart-subtitle-xls-export.diff b/patches/dev300/chart-subtitle-xls-export.diff
deleted file mode 100644
index fea98b3..0000000
--- a/patches/dev300/chart-subtitle-xls-export.diff
+++ /dev/null
@@ -1,134 +0,0 @@
----
- sc/source/filter/excel/xechart.cxx | 45 ++++++++++++++++++++++++++++++++---
- sc/source/filter/inc/xechart.hxx | 4 ++-
- 2 files changed, 44 insertions(+), 5 deletions(-)
-
-diff --git sc/source/filter/excel/xechart.cxx sc/source/filter/excel/xechart.cxx
-index 76a2cfc..251bac3 100644
---- sc/source/filter/excel/xechart.cxx
-+++ sc/source/filter/excel/xechart.cxx
-@@ -34,6 +34,7 @@
- #include <com/sun/star/i18n/ScriptType.hpp>
- #include <com/sun/star/drawing/FillStyle.hpp>
- #include <com/sun/star/drawing/XShapes.hpp>
-+#include <com/sun/star/chart/XChartDocument.hpp>
- #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
- #include <com/sun/star/chart/ChartAxisPosition.hpp>
- #include <com/sun/star/chart/DataLabelPlacement.hpp>
-@@ -1027,6 +1028,13 @@ void XclExpChSourceLink::ConvertNumFmt( const ScfPropertySet& rPropSet, bool bPe
- }
- }
-
-+void XclExpChSourceLink::AppendString( const String& rStr )
-+{
-+ if (!mxString.is())
-+ return;
-+ XclExpStringHelper::AppendString( *mxString, GetRoot(), rStr );
-+}
-+
- void XclExpChSourceLink::Save( XclExpStream& rStrm )
- {
- // CHFORMATRUNS record
-@@ -1156,7 +1164,7 @@ void XclExpChText::SetRotation( sal_uInt16 nRotation )
- ::insert_value( maData.mnFlags, XclTools::GetXclOrientFromRot( nRotation ), 8, 3 );
- }
-
--void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget )
-+void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, const String* pSubTitle )
- {
- switch( nTarget )
- {
-@@ -1178,6 +1186,14 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget
- // string sequence
- mxSrcLink.reset( new XclExpChSourceLink( GetChRoot(), EXC_CHSRCLINK_TITLE ) );
- sal_uInt16 nFontIdx = mxSrcLink->ConvertStringSequence( xTitle->getText() );
-+ if (pSubTitle)
-+ {
-+ // append subtitle as the 2nd line of the title.
-+ String aSubTitle = String::CreateFromAscii("\n");
-+ aSubTitle.Append(*pSubTitle);
-+ mxSrcLink->AppendString(aSubTitle);
-+ }
-+
- ConvertFontBase( GetChRoot(), nFontIdx );
-
- // rotation
-@@ -1386,14 +1402,15 @@ void XclExpChText::WriteBody( XclExpStream& rStrm )
- namespace {
-
- /** Creates and returns an Excel text object from the passed title. */
--XclExpChTextRef lclCreateTitle( const XclExpChRoot& rRoot, Reference< XTitled > xTitled, sal_uInt16 nTarget )
-+XclExpChTextRef lclCreateTitle( const XclExpChRoot& rRoot, Reference< XTitled > xTitled, sal_uInt16 nTarget,
-+ const String* pSubTitle = NULL )
- {
- Reference< XTitle > xTitle;
- if( xTitled.is() )
- xTitle = xTitled->getTitleObject();
-
- XclExpChTextRef xText( new XclExpChText( rRoot ) );
-- xText->ConvertTitle( xTitle, nTarget );
-+ xText->ConvertTitle( xTitle, nTarget, pSubTitle );
- /* Do not delete the CHTEXT group for the main title. A missing CHTEXT
- will be interpreted as auto-generated title showing the series title in
- charts that contain exactly one data series. */
-@@ -3136,6 +3153,23 @@ void XclExpChAxesSet::WriteBody( XclExpStream& rStrm )
-
- // The chart object ===========================================================
-
-+static void lcl_getChartSubTitle(const Reference<XChartDocument>& xChartDoc,
-+ String& rSubTitle)
-+{
-+ Reference< ::com::sun::star::chart::XChartDocument > xChartDoc1(xChartDoc, UNO_QUERY);
-+ if (!xChartDoc1.is())
-+ return;
-+
-+ Reference< XPropertySet > xProp(xChartDoc1->getSubTitle(), UNO_QUERY);
-+ if (!xProp.is())
-+ return;
-+
-+ OUString aTitle;
-+ Any any = xProp->getPropertyValue( OUString::createFromAscii("String") );
-+ if (any >>= aTitle)
-+ rSubTitle = aTitle;
-+}
-+
- XclExpChChart::XclExpChChart( const XclExpRoot& rRoot,
- Reference< XChartDocument > xChartDoc, const Rectangle& rChartRect ) :
- XclExpChGroupBase( XclExpChRoot( rRoot, *this ), EXC_CHFRBLOCK_TYPE_CHART, EXC_ID_CHCHART, 16 )
-@@ -3173,7 +3207,10 @@ XclExpChChart::XclExpChChart( const XclExpRoot& rRoot,
-
- // chart title
- Reference< XTitled > xTitled( xChartDoc, UNO_QUERY );
-- mxTitle = lclCreateTitle( GetChRoot(), xTitled, EXC_CHOBJLINK_TITLE );
-+ String aSubTitle;
-+ lcl_getChartSubTitle(xChartDoc, aSubTitle);
-+ mxTitle = lclCreateTitle( GetChRoot(), xTitled, EXC_CHOBJLINK_TITLE,
-+ aSubTitle.Len() ? &aSubTitle : NULL );
-
- // diagrams (axes sets)
- sal_uInt16 nFreeGroupIdx = mxPrimAxesSet->Convert( xDiagram, 0 );
-diff --git sc/source/filter/inc/xechart.hxx sc/source/filter/inc/xechart.hxx
-index 4e265f0..a09d1c9 100644
---- sc/source/filter/inc/xechart.hxx
-+++ sc/source/filter/inc/xechart.hxx
-@@ -418,6 +418,8 @@ public:
- /** Converts the number format from the passed property set. */
- void ConvertNumFmt( const ScfPropertySet& rPropSet, bool bPercent );
-
-+ void AppendString( const String& rStr );
-+
- /** Returns true, if this source link contains explicit string data. */
- inline bool HasString() const { return mxString.is() && !mxString->IsEmpty(); }
-
-@@ -529,7 +531,7 @@ public:
- virtual void SetRotation( sal_uInt16 nRotation );
-
- /** Converts all text settings of the passed title text object. */
-- void ConvertTitle( XTitleRef xTitle, sal_uInt16 nTarget );
-+ void ConvertTitle( XTitleRef xTitle, sal_uInt16 nTarget, const String* pSubTitle = NULL );
- /** Converts all text settings of the passed legend. */
- void ConvertLegend( const ScfPropertySet& rPropSet );
- /** Converts all settings of the passed data point caption text object. */
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list