[ooo-build-commit] 3 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 11 00:05:51 PDT 2009
patches/dev300/apply | 6 ++---
patches/dev300/calc-multi-range-copy-paste.diff | 26 ++++++++----------------
patches/dev300/sc-copy-source-border.diff | 2 -
3 files changed, 13 insertions(+), 21 deletions(-)
New commits:
commit d3025dd0eb2743f1320022c5bf5125e00e86fc9e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:59:56 2009 +0300
sc-copy-on-merged-cells.diff seems to be unneeded
* patches/dev300/apply: The issue that sc-copy-on-merged-cells.diff
fixes is marked as fixed and closed, so presumably it is
unneeded. The upstream code is different from that in this
patch, though. Move it to UnUsedButNotYetRemovedFromGit.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e869ba7..18d511a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -696,9 +696,6 @@ sc-print-selected-sheets.diff, n#335684, i#45497, jonp
# Allow biffdump.cxx to compile on 64-bit platforms
sc-biffdump.diff, i#82184, jonp
-# Allow to copy-paste on merged cells.
-sc-copy-on-merged-cells.diff, i#7500, mloiseleur
-
# Allow insertion of cell range that cuts across merged areas.
# (temporarily disabled as it causes memory exhaustion problem on
# column insert in empty document).
@@ -2273,6 +2270,9 @@ sc-standard-filter-options-ods-hack.diff, i#35579, jonp
# preserve line breaks when referencing it in formula.
calc-multiline-formula-ref.diff, i#35913, kohei
+# Allow to copy-paste on merged cells.
+sc-copy-on-merged-cells.diff, i#7500, mloiseleur
+
[ Store ]
SectionOwner => rodo
commit 16fa747c9999e2ba4f15cdd77eb20ab521faad29
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:56:33 2009 +0300
Adapt sc-copy-source-border.diff for dev300
* patches/dev300/sc-copy-source-border.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/sc-copy-source-border.diff b/patches/dev300/sc-copy-source-border.diff
index e317729..3ef55ef 100644
--- a/patches/dev300/sc-copy-source-border.diff
+++ b/patches/dev300/sc-copy-source-border.diff
@@ -35,9 +35,9 @@ index 5bcc6c8..3d7f3d4 100644
#include "cellsh.hxx"
#include "tabprotection.hxx"
+#include "clipparam.hxx"
+ #include "postit.hxx"
// #114409#
- #include <vcl/salbtype.hxx> // FRound
@@ -396,6 +397,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
DragSourceHelper( this ),
mpOOCursors( NULL ),
commit bd57f2464ad21dffa94c1d0baeca5b1a441716dd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 09:54:51 2009 +0300
Adapt calc-multi-range-copy-paste.diff for dev300
* patches/dev300/calc-multi-range-copy-paste.diff: Adapt for
dev300-m54.
diff --git a/patches/dev300/calc-multi-range-copy-paste.diff b/patches/dev300/calc-multi-range-copy-paste.diff
index d7856d0..c17efcf 100644
--- a/patches/dev300/calc-multi-range-copy-paste.diff
+++ b/patches/dev300/calc-multi-range-copy-paste.diff
@@ -134,8 +134,6 @@ index 64ac9a0..5b17512 100644
const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const;
const ScPatternAttr* GetPattern( SCROW nRow ) const;
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index f392382..87a9343 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
@@ -138,6 +138,8 @@ class ScAutoNameCache;
@@ -144,9 +142,9 @@ index f392382..87a9343 100644
struct ScLookupCacheMapImpl;
+struct ScClipParam;
+struct ScClipRangeNameData;
+ class SfxUndoManager;
+ class ScFormulaParserPool;
- namespace com { namespace sun { namespace star {
- namespace lang {
@@ -286,6 +288,7 @@ private:
ScFieldEditEngine* pCacheFieldEditEngine;
@@ -558,8 +556,6 @@ index 721a66f..555c3e8 100644
void ScColumn::SetDirtyVar()
{
-diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index db40577..8894d1b 100644
--- sc/source/core/data/documen2.cxx
+++ sc/source/core/data/documen2.cxx
@@ -95,6 +95,7 @@
@@ -567,17 +563,17 @@ index db40577..8894d1b 100644
#include "externalrefmgr.hxx"
#include "tabprotection.hxx"
+#include "clipparam.hxx"
+ #include "formulaparserpool.hxx"
// pImpl because including lookupcache.hxx in document.hxx isn't wanted, and
- // dtor plus helpers are convenient.
@@ -153,6 +154,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
- pScriptTypeData( NULL ),
+ pScriptTypeData( NULL ),
pCacheFieldEditEngine( NULL ),
pDocProtection( NULL ),
+ mpClipParam( NULL ),
- pExternalRefMgr( NULL ),
- pViewOptions( NULL ),
- pDocOptions( NULL ),
+ pViewOptions( NULL ),
+ pDocOptions( NULL ),
+ pExtDocOptions( NULL ),
@@ -181,7 +183,6 @@ ScDocument::ScDocument( ScDocumentMode eMode,
bForcedFormulaPending( FALSE ),
bCalculatingFormulaTree( FALSE ),
@@ -620,8 +616,6 @@ index db40577..8894d1b 100644
pTab[nDestPos]->SetTabNo(nDestPos);
if ( !bResultsOnly )
-diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
-index 6143b5b..03267f7 100644
--- sc/source/core/data/documen3.cxx
+++ sc/source/core/data/documen3.cxx
@@ -79,6 +79,7 @@
@@ -629,9 +623,9 @@ index 6143b5b..03267f7 100644
#include "svtools/PasswordHelper.hxx"
#include "tabprotection.hxx"
+#include "clipparam.hxx"
+ #include "formulaparserpool.hxx"
#include <memory>
-
@@ -890,7 +891,7 @@ void ScDocument::UpdateReference( UpdateRefMode eUpdateRefMode,
{
ScDocument* pClipDoc = SC_MOD()->GetClipDoc();
@@ -1571,8 +1565,6 @@ index ddfa8e9..e782dd2 100644
// nur wegen Matrix nicht editierbar? Matrix nicht zerreissen
//! schlaegt nicht zu, wenn geschuetzt UND Matrix, aber damit
//! muss man leben.. wird in Copy-Routine abgefangen, sonst
-diff --git sc/source/ui/view/cellsh1.cxx sc/source/ui/view/cellsh1.cxx
-index e297ee8..dfb2928 100644
--- sc/source/ui/view/cellsh1.cxx
+++ sc/source/ui/view/cellsh1.cxx
@@ -104,6 +104,7 @@
@@ -1580,9 +1572,9 @@ index e297ee8..dfb2928 100644
#include "dpgroup.hxx" // for ScDPNumGroupInfo
#include "spellparam.hxx"
+#include "clipparam.hxx"
+ #include "postit.hxx"
#include "globstr.hrc"
- #include "scui_def.hxx" //CHINA001
@@ -2243,7 +2244,13 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa
pTabViewShell->PasteFromSystem();
else
More information about the ooo-build-commit
mailing list