[ooo-build-commit] patches/dev300
Noel Power
noelp at kemper.freedesktop.org
Wed Sep 9 01:27:37 PDT 2009
patches/dev300/apply | 19 ++-
patches/dev300/build-fix.diff | 140 ++++++++++++++++++++++++
patches/dev300/calc-jump-on-formula-ref-sc.diff | 4
3 files changed, 155 insertions(+), 8 deletions(-)
New commits:
commit 2c35e58f8cc3c96a1b5d4ee9243f2c1a8cc9aeaf
Author: Noel Power <noel.power at novell.com>
Date: Tue Sep 8 20:44:24 2009 +0100
build fixes
* patches/dev300/apply:
* patches/dev300/build-fix.diff:
* patches/dev300/calc-jump-on-formula-ref-sc.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index aea5684..6bff5ab 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -19,7 +19,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
OOXML, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
PopupRemoval, LinkWarningDlg, RadioButtons, InternalCairo, \
FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
- CalcRowLimit, Gcc44
+ CalcRowLimit, Gcc44, BuildFix
LinuxCommon : Common, Defaults, TangoIcons, FontConfigTemporaryHacks, \
FedoraLinuxOnlyFixes, LinuxOnly, SystemBits, \
@@ -654,7 +654,7 @@ sc-excel-chart-default-xlabels.diff, n#257079, i#83679, kohei
# Fix autoshape excel hyperlink import OOo ( depends on vba-sc-handleautoshapemacro-import.diff )
# FIXME: 2009-09-02: Applies but causes compilation errors. --tml
-# vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
+vba-sc-autoshapes-hyperlinks.diff, i#66550, noelpwer
# Delete Rows/Delete Columns should remember the content so that the user is
# able to paste it elsewhere (similar to Insert Cut Cells in Excel)
@@ -726,7 +726,8 @@ chart-skip-hidden-cells-sc-fix.diff, i#101273, kohei
# render charts with multiple chart types correctly for xls interop.
chart-axis-multi-chart-types-chart2.diff, n#437322, i#95934, kohei
-chart-axis-multi-chart-types-sc.diff, n#437322, i#95934, kohei
+# #FIXME applies but compilation errors ( not obvious to me how to fix )
+#chart-axis-multi-chart-types-sc.diff, n#437322, i#95934, kohei
chart-axis-multi-chart-types-xmloff.diff, n#437322, i#95934, kohei
# Don't use pShapeContext after deleting the instance. Fixes SEGFAULT.
@@ -736,6 +737,8 @@ calc-filter-xml-free-context.diff, n#467536, jonp
calc-status-bar-func.diff, n#430655, i#94618, kohei
# support custom names in data pilot tables.
+# #FIXME seems ScDPObject::Output has changed, the
+# following patches are interconnected
calc-dp-custom-names-offapi.diff, n#338014, i#22029, kohei
calc-dp-custom-names-sc.diff, n#338014, i#22029, kohei
calc-dp-custom-names-sc-win32-fix.diff, kohei
@@ -1796,7 +1799,6 @@ vba-worksheetfunctions-fix.diff, n#414248, Fong
# fix window.SplitRow issue
vba-window-api-fix.diff, Fong
-
[ Features ]
# Pre- and postprocessing capabilities for loading and saving.
sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
@@ -1933,13 +1935,15 @@ calc-sheet-tab-color-officecfg.diff, i#5560, kohei/danielbw
# is commented out for now. --tml
# calc-sheet-tab-color-svtools.diff, i#5560, kohei/danielbw
-calc-sheet-tab-color-sc.diff, i#5560, kohei/danielbw
+# FIXME: 2009-09-08: Doesn't compile due to above
+#calc-sheet-tab-color-sc.diff, i#5560, kohei/danielbw
# FIXME: 2009-08-12: Doesn't apply, and it's not that obvious how to
# adapt it. --tml
# calc-sheet-tab-color-oox.diff, i#5560, kohei/danielbw
-calc-sheet-tab-color-filter.diff, i#5560, kohei/danielbw
+# FIXME: 2009-09-08: Doesn't compile due to above
+#calc-sheet-tab-color-filter.diff, i#5560, kohei/danielbw
# Support finding and replacing empty cells.
calc-find-replace-empty-cells-sc.diff i#49380, n#415352, kohei
@@ -3386,3 +3390,6 @@ cws-mysqlnative-20090828.diff
# add hack to link against STLport version of libmysqlcppconn on i386.
# Needs a libmysqlcppconn-stlport.so etc built with STLport
debian-mysqlc-build-against-stlport-hack.diff
+
+[ BuildFix ]
+build-fix.diff
diff --git a/patches/dev300/build-fix.diff b/patches/dev300/build-fix.diff
new file mode 100644
index 0000000..7086a05
--- /dev/null
+++ b/patches/dev300/build-fix.diff
@@ -0,0 +1,140 @@
+diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
+index 6053662..2b303a1 100644
+--- sc/source/filter/excel/xipivot.cxx
++++ sc/source/filter/excel/xipivot.cxx
+@@ -1434,7 +1434,10 @@ void XclImpPivotTable::MaybeRefresh()
+ {
+ // 'refresh table on load' flag is set. Refresh the table now. Some
+ // Excel files contain partial table output when this flag is set.
+- mpDPObj->Output();
++ //mpDPObj->Output();
++ // #FIXME change from above is just to satisfy compiler,
++ // it probably makes no sense
++ mpDPObj->Output( mpDPObj->GetOutRange().aStart );
+ }
+ }
+
+diff --git sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
+index 8e97d24..9d3baa1 100644
+--- sc/source/ui/dbgui/filtdlg.cxx
++++ sc/source/ui/dbgui/filtdlg.cxx
+@@ -454,7 +454,6 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
+ SCTAB nTab = nSrcTab;
+ SCROW nFirstRow = theQueryData.nRow1;
+ SCROW nLastRow = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
+- SCROW nLastRow = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
+
+ // erstmal ohne die erste Zeile
+
+diff --git sc/source/ui/docshell/docfunc.cxx sc/source/ui/docshell/docfunc.cxx
+index 424f6a0..9aea7ce 100644
+--- sc/source/ui/docshell/docfunc.cxx
++++ sc/source/ui/docshell/docfunc.cxx
+@@ -1693,7 +1693,11 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
+ default:
+ break;
+ }
+- MergeCells(aRange, FALSE, TRUE, TRUE);
++ ScCellMergeOption aMergeOption(
++ aRange.aStart.Col(), aRange.aStart.Row(),
++ aRange.aEnd.Col(), aRange.aEnd.Row() );
++ aMergeOption.maTabs.insert(aRange.aStart.Tab());
++ MergeCells(aMergeOption, FALSE, TRUE, TRUE);
+ }
+ qIncreaseRange.pop_back();
+ }
+@@ -1742,7 +1746,10 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
+ while( !qIncreaseRange.empty() )
+ {
+ ScRange aRange = qIncreaseRange.back();
+- MergeCells(aRange, FALSE, TRUE, TRUE);
++ ScCellMergeOption aMergeOption(
++ aRange.aStart.Col(), aRange.aStart.Row(),
++ aRange.aEnd.Col(), aRange.aEnd.Row() );
++ MergeCells(aMergeOption, FALSE, TRUE, TRUE);
+ qIncreaseRange.pop_back();
+ }
+
+@@ -2180,7 +2187,10 @@ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
+
+ if( !pDoc->HasAttrib( aRange, HASATTR_OVERLAPPED | HASATTR_MERGED ) )
+ {
+- MergeCells( aRange, FALSE, TRUE, TRUE );
++ ScCellMergeOption aMergeOption(
++ aRange.aStart.Col(), aRange.aStart.Row(),
++ aRange.aEnd.Col(), aRange.aEnd.Row() );
++ MergeCells( aMergeOption, FALSE, TRUE, TRUE );
+ }
+ qDecreaseRange.pop_back();
+ }
+diff --git sc/source/ui/miscdlgs/makefile.mk sc/source/ui/miscdlgs/makefile.mk
+index d600107..c6b8f27 100644
+--- sc/source/ui/miscdlgs/makefile.mk
++++ sc/source/ui/miscdlgs/makefile.mk
+@@ -81,9 +81,7 @@ SLOFILES = \
+ $(SLO)$/conflictsdlg.obj \
+ $(SLO)$/sharedocdlg.obj \
+ $(SLO)$/protectiondlg.obj \
+- $(SLO)$/retypepassdlg.obj \
+- $(SLO)$/scuiautofmt.obj \
+- $(SLO)$/strindlg.obj
++ $(SLO)$/retypepassdlg.obj
+
+ EXCEPTIONSFILES = \
+ $(SLO)$/acredlin.obj \
+@@ -126,6 +124,8 @@ LIB1OBJFILES = \
+ $(SLO)$/warnbox.obj \
+ $(SLO)$/conflictsdlg.obj \
+ $(SLO)$/sharedocdlg.obj \
++ $(SLO)$/scuiautofmt.obj \
++ $(SLO)$/strindlg.obj \
+ $(SLO)$/protectiondlg.obj \
+ $(SLO)$/retypepassdlg.obj
+
+diff --git sc/source/ui/unoobj/dapiuno.cxx sc/source/ui/unoobj/dapiuno.cxx
+index a4a78b7..a82585c 100644
+--- sc/source/ui/unoobj/dapiuno.cxx
++++ sc/source/ui/unoobj/dapiuno.cxx
+@@ -1627,7 +1627,7 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() throw(RuntimeException)
+ aName = OUString( RTL_CONSTASCII_USTRINGPARAM( SC_DATALAYOUT_NAME ) );
+ else
+ {
+- aName = pDim->GetLayoutName();
++ aName = *pDim->GetLayoutName();
+ if (!aName)
+ aName = pDim->GetName();
+ }
+diff --git sd/prj/build.lst sd/prj/build.lst
+index 52734f4..ef69a6a 100644
+--- sd/prj/build.lst
++++ sd/prj/build.lst
+@@ -30,7 +30,6 @@ sd sd\source\filter\ppt nmake - all sd_ppt sd_inc NULL
+ sd sd\source\filter nmake - all sd_filt sd_sdi sd_ppt sd_inc NULL
+ sd sd\source\filter\cgm nmake - all sd_cgm sd_inc NULL
+ sd sd\source\filter\eppt nmake - all sd_eppt sd_inc NULL
+-sd sd\source\filter\pptx nmake - all sd_pptx sd_inc NULL
+ sd sd\source\filter\grf nmake - all sd_grf sd_inc NULL
+ sd sd\source\filter\xml nmake - all sd_filter_xml sd_inc NULL
+ sd sd\source\filter\html nmake - all sd_html sd_inc NULL
+@@ -41,5 +40,4 @@ sd sd\source\ui\framework\configuration nmake - all sd_framework_configuration s
+ sd sd\source\ui\framework\module nmake - all sd_framework_module sd_inc NULL
+ sd sd\source\ui\framework\factories nmake - all sd_framework_factories sd_inc NULL
+ sd sd\source\ui\framework\tools nmake - all sd_framework_tools sd_inc NULL
+-sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_pptx sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
+-sd sd\xml nmake - all sd_xml NULL
++sd sd\util nmake - all sd_util sd_app sd_cgm sd_core sd_dlg sd_docsh sd_eppt sd_filt sd_func sd_grf sd_unid sd_view sd_filter_xml sd_html sd_ppt sd_accessibility sd_animations sd_toolpanel sd_toolpanel_controls sd_tools sd_slsshell sd_slsmodel sd_slsview sd_slscontroller sd_slscache sd_notes sd_table sd_slideshow sd_presenter sd_undo sd_helper sd_framework_configuration sd_framework_module sd_framework_tools sd_framework_factories NULL
+diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
+index ec8bb6b..89841d7 100644
+--- sd/source/ui/inc/res_bmp.hrc
++++ sd/source/ui/inc/res_bmp.hrc
+@@ -308,8 +308,8 @@
+
+ #define RID_DRAW_TABLEOBJ_INSIDE_POPUP RID_APP_START+94
+
+-#define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+94
+-#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+95
++#define RID_DRAW_OUTLINETEXTOBJ_POPUP RID_APP_START+95
++#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP RID_APP_START+96
+
+ /*
+ * Pointer (Mauszeiger)
diff --git a/patches/dev300/calc-jump-on-formula-ref-sc.diff b/patches/dev300/calc-jump-on-formula-ref-sc.diff
index 27ca557..dcb49c9 100644
--- a/patches/dev300/calc-jump-on-formula-ref-sc.diff
+++ b/patches/dev300/calc-jump-on-formula-ref-sc.diff
@@ -351,9 +351,9 @@ index 9976230..753e761 100644
--- sc/source/ui/inc/docfunc.hxx
+++ sc/source/ui/inc/docfunc.hxx
@@ -36,6 +36,9 @@
- #include "postit.hxx"
+ #include <tools/link.hxx>
+ #include "global.hxx"
#include "formula/grammar.hxx"
- #include "tabbgcolor.hxx"
+#include "token.hxx"
+
+#include <vector>
More information about the ooo-build-commit
mailing list