[ooo-build-commit] .: patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon May 24 14:03:27 PDT 2010
patches/dev300/apply | 12 ++++++------
patches/dev300/calc-filter-by-date-strip-time.diff | 2 +-
patches/dev300/calc-filter-dbf-precision.diff | 2 +-
patches/dev300/calc-insert-current-time-sc.diff | 2 +-
patches/dev300/calc-perf-xls-import-cellstyles.diff | 2 +-
patches/dev300/optional-outplace-ole.diff | 2 +-
patches/dev300/sc-dbrange-dynamic-resize.diff | 3 +--
7 files changed, 12 insertions(+), 13 deletions(-)
New commits:
commit ffcdc145df85962c89406a57807b33c1c959e34c
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon May 24 17:02:50 2010 -0400
More build fixes for dev300-m77.
I had to temporarily disable all of xlsx export patches.
* patches/dev300/apply:
* patches/dev300/calc-filter-by-date-strip-time.diff:
* patches/dev300/calc-filter-dbf-precision.diff:
* patches/dev300/calc-insert-current-time-sc.diff:
* patches/dev300/calc-perf-xls-import-cellstyles.diff:
* patches/dev300/optional-outplace-ole.diff:
* patches/dev300/sc-dbrange-dynamic-resize.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5620bb3..394d68b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3032,13 +3032,13 @@ pptx-fix-connector-crash.diff, n#499129, thorsten
# separate libraries as well, so that we are safe wrt. the binary export
# FIXME: Remove this patch (and update the other xlsx patches) after 3.1 is
# branched
-xlsx-filter-as-a-separate-lib.diff
+# FIXME dev300-m77 xlsx-filter-as-a-separate-lib.diff
# patch generated by bin/gen-xlsx-copy-of-xls.sh
-xlsx-filter-as-a-separate-lib-xls-copy.diff
+# FIXME dev300-m77 xlsx-filter-as-a-separate-lib-xls-copy.diff
# patch to check that in sc/source/filter/xlsx we are using only the copied
# versions of the headers (if 2 versions exist), not the unpatched ones
# [Should be updated when bin/gen-xlsx-copy-of-xls.sh changes]
-xlsx-filter-as-a-separate-lib-guards.diff
+# FIXME dev300-m77 xlsx-filter-as-a-separate-lib-guards.diff
# Snapshot of the xlsx export filter at the time of creation of ooxml03
# This is until 0453-Fix-formatted-text-change-tracking.patch, inluding, and
@@ -3080,9 +3080,9 @@ xlsx-filter-as-a-separate-lib-guards.diff
# FIXME dev300-m77 oox-smartart-import-xlsx-part.diff
# xlsx-specific part of calc-perf-xls-import-cellstyles.diff
-calc-perf-xls-import-cellstyles-xlsx-part.diff
+# FIXME dev300-m77 calc-perf-xls-import-cellstyles-xlsx-part.diff
# xlsx-specific part of border-types-dotted-dashed.diff
-border-types-dotted-dashed-xlsx-part.diff
+# FIXME dev300-m77 border-types-dotted-dashed-xlsx-part.diff
[ OOXMLExportDevel ]
# this is shared binary/ooxml filter, WIP
@@ -3103,7 +3103,7 @@ xlsx-shared-oox-calc-export-export-pivot-content.diff
xlsx-shared-oox-calc-export-sotstorage-init.diff
#xlsx-shared-xlsx-export-row-limit-fix.diff
xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
-#xlsx-shared-xlsx-export-perf-rowbuffer.diff
+#xlsx-shared-xlsx-e xport-perf-rowbuffer.diff
[ OOXMLExport ]
# hack to ignore writerfilter when odf-converter is present
diff --git a/patches/dev300/calc-filter-by-date-strip-time.diff b/patches/dev300/calc-filter-by-date-strip-time.diff
index 50b662e..bf5160a 100644
--- a/patches/dev300/calc-filter-by-date-strip-time.diff
+++ b/patches/dev300/calc-filter-by-date-strip-time.diff
@@ -266,7 +266,7 @@ index 7d0f7f5..daac685 100644
#include "cellform.hxx"
#include "postit.hxx"
#include "queryparam.hxx"
-+#include "svtools/zformat.hxx"
++#include "svl/zformat.hxx"
#include <vector>
diff --git a/patches/dev300/calc-filter-dbf-precision.diff b/patches/dev300/calc-filter-dbf-precision.diff
index 6cde924..29d366e 100644
--- a/patches/dev300/calc-filter-dbf-precision.diff
+++ b/patches/dev300/calc-filter-dbf-precision.diff
@@ -45,7 +45,7 @@ index 1c30f8d..88145cf 100644
#include "dbdocutl.hxx"
#include "dociter.hxx"
#include "globstr.hrc"
-+#include "svtools/zformat.hxx"
++#include "svl/zformat.hxx"
+#include "svl/intitem.hxx"
+#include "patattr.hxx"
+#include "scitems.hxx"
diff --git a/patches/dev300/calc-insert-current-time-sc.diff b/patches/dev300/calc-insert-current-time-sc.diff
index 84a3542..c242839 100644
--- a/patches/dev300/calc-insert-current-time-sc.diff
+++ b/patches/dev300/calc-insert-current-time-sc.diff
@@ -177,7 +177,7 @@ index ce62dd0..736f363 100644
#include <sfx2/dispatch.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/sound.hxx>
-+#include "svtools/zforlist.hxx"
++#include "svl/zforlist.hxx"
#include "viewfunc.hxx"
#include "detfunc.hxx"
diff --git a/patches/dev300/calc-perf-xls-import-cellstyles.diff b/patches/dev300/calc-perf-xls-import-cellstyles.diff
index 52b0778..89664e5 100644
--- a/patches/dev300/calc-perf-xls-import-cellstyles.diff
+++ b/patches/dev300/calc-perf-xls-import-cellstyles.diff
@@ -179,7 +179,7 @@ index b1ce3a0..6279033 100644
#include "root.hxx"
#include "colrowst.hxx"
-+#include "svtools/poolcach.hxx"
++#include "svl/poolcach.hxx"
+
+#include <list>
+
diff --git a/patches/dev300/optional-outplace-ole.diff b/patches/dev300/optional-outplace-ole.diff
index 0f3cb5c..5b2aac1 100644
--- a/patches/dev300/optional-outplace-ole.diff
+++ b/patches/dev300/optional-outplace-ole.diff
@@ -264,7 +264,7 @@ index 88eecb9..76d553c 100644
+ const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
+ if (rMarkList.GetMarkCount() == 1)
+ {
-+ BOOL bOle = GetViewFrame()->GetFrame()->IsInPlace();
++ BOOL bOle = GetViewFrame()->GetFrame().IsInPlace();
+ SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
+ if( pObj && pObj->ISA( SdrOle2Obj ) && !bOle )
+ {
diff --git a/patches/dev300/sc-dbrange-dynamic-resize.diff b/patches/dev300/sc-dbrange-dynamic-resize.diff
index 846d506..a87217b 100644
--- a/patches/dev300/sc-dbrange-dynamic-resize.diff
+++ b/patches/dev300/sc-dbrange-dynamic-resize.diff
@@ -284,8 +284,7 @@ index 308df11..bc87d02 100644
pData = pDocSh->GetDBData(
ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(),
GetViewData()->GetTabNo() ),
-- eMode, SC_DBSEL_KEEP );
-+ eMode, SC_DBSEL_KEEP, FALSE );
+ eMode, SC_DBSEL_KEEP );
+ if (!pData)
+ return NULL;
More information about the ooo-build-commit
mailing list