[ooo-build-commit] 3 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Aug 12 02:55:16 PDT 2009
patches/dev300/apply | 4 --
patches/dev300/calc-formula-asian-phonetic.diff | 8 ++---
patches/dev300/sc-sheet-gridline-toggle.diff | 6 +---
patches/dev300/sc-skip-overlapped-cells.diff | 34 ------------------------
4 files changed, 6 insertions(+), 46 deletions(-)
New commits:
commit fdc171b0b6da37f050a4e0aa9b0c2bdd6c5e0aa9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 12:53:04 2009 +0300
sc-skip-overlapped-cells.diff is upstream
* patches/dev300/sc-skip-overlapped-cells.diff: Is upstream,
delete. i#86943 is fixed and closed.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4288b6b..2b5100e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1872,10 +1872,6 @@ calc-formula-asian-phonetic.diff, i#80764, i#80765, i#80766, kohei
# Toggle gridline display per sheet.
sc-sheet-gridline-toggle.diff, i#14893, kohei
-# Skip overlapped cells (cells that are hidden under a merged cell) when
-# navigating through cells.
-sc-skip-overlapped-cells.diff, i#86943, n#362674, kohei
-
# Make the formula separators changeable per locale setting, and add new
# configuration page for formula syntax and separators.
diff --git a/patches/dev300/sc-skip-overlapped-cells.diff b/patches/dev300/sc-skip-overlapped-cells.diff
deleted file mode 100644
index 75a4f68..0000000
--- a/patches/dev300/sc-skip-overlapped-cells.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/table1.cxx sc/source/core/data/table1.cxx
---- sc.clean/source/core/data/table1.cxx 2008-03-11 09:39:38.000000000 -0400
-+++ sc/source/core/data/table1.cxx 2008-03-11 17:26:50.000000000 -0400
-@@ -819,6 +819,10 @@ BOOL ScTable::ValidNextPos( SCCOL nCol,
- if (!ValidCol(nCol) || !ValidRow(nRow))
- return FALSE;
-
-+ if (pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED))
-+ // Skip an overlapped cell.
-+ return false;
-+
- if (bMarked && !rMark.IsCellMarked(nCol,nRow))
- return FALSE;
-
-@@ -861,7 +865,8 @@ void ScTable::GetNextPos( SCCOL& rCol, S
- {
- BOOL bUp = ( nMovY < 0 );
- nRow = rMark.GetNextMarked( nCol, nRow, bUp );
-- while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
-+ while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-+ pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
- {
- // #53697# ausgeblendete ueberspringen (s.o.)
- nRow += nMovY;
-@@ -890,7 +895,8 @@ void ScTable::GetNextPos( SCCOL& rCol, S
- else if (nRow > MAXROW)
- nRow = 0;
- nRow = rMark.GetNextMarked( nCol, nRow, bUp );
-- while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
-+ while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
-+ pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
- {
- // #53697# ausgeblendete ueberspringen (s.o.)
- nRow += nMovY;
commit f69c9ed05b03df2e7618e5a7fd101b3cb603eb2e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 12:49:50 2009 +0300
Adapt sc-sheet-gridline-toggle.diff for dev300-m54
* patches/dev300/sc-sheet-gridline-toggle.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/sc-sheet-gridline-toggle.diff b/patches/dev300/sc-sheet-gridline-toggle.diff
index d78f6a2..e4a5046 100644
--- a/patches/dev300/sc-sheet-gridline-toggle.diff
+++ b/patches/dev300/sc-sheet-gridline-toggle.diff
@@ -9,18 +9,16 @@ diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/sce
explicit ScExtTabSettings();
};
-diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/sc.hrc sc/inc/sc.hrc
--- sc.clean/inc/sc.hrc 2008-04-01 12:26:30.000000000 -0400
+++ sc/inc/sc.hrc 2008-04-21 13:29:55.000000000 -0400
@@ -833,6 +833,7 @@
- #define FID_TAB_APPEND (TAB_POPUP_START+5)
#define FID_TAB_INDEX (TAB_POPUP_START+6)
#define FID_TAB_RTL (TAB_POPUP_START+7)
-+#define FID_TAB_TOGGLE_GRID (TAB_POPUP_START+8)
+ #define FID_TAB_DESELECTALL (TAB_POPUP_START+8)
++#define FID_TAB_TOGGLE_GRID (TAB_POPUP_START+9)
#define TAB_POPUP_END (DATA_MENU_END + 20)
-Only in sc/inc: sc.hrc.orig
diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/inc/ViewSettingsSequenceDefines.hxx sc/inc/ViewSettingsSequenceDefines.hxx
--- sc.clean/inc/ViewSettingsSequenceDefines.hxx 2008-04-01 12:26:30.000000000 -0400
+++ sc/inc/ViewSettingsSequenceDefines.hxx 2008-04-21 13:29:55.000000000 -0400
commit 3680610097a36d5d607d59c65d6532317a854f2a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 12 12:47:39 2009 +0300
Adapt calc-formula-asian-phonetic.diff for dev300-m54
* patches/dev300/calc-formula-asian-phonetic.diff: Adapt for
dev300-m54.
diff --git a/patches/dev300/calc-formula-asian-phonetic.diff b/patches/dev300/calc-formula-asian-phonetic.diff
index 910606f..f3e6ab7 100644
--- a/patches/dev300/calc-formula-asian-phonetic.diff
+++ b/patches/dev300/calc-formula-asian-phonetic.diff
@@ -1754,15 +1754,15 @@ index 960a317..c643ba8 100644
@@ -71,6 +71,7 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
::boost::optional< rtl::OUString > pOUTextValue;
::boost::optional< rtl::OUString > pOUTextContent;
- ::boost::optional< rtl::OUString > pOUFormula;
+ ::boost::optional< FormulaWithNamespace > pOUFormula;
+ ::boost::optional< rtl::OUString > pOUPhoneticText;
rtl::OUString* pContentValidationName;
- ScMyImportAnnotation* pMyAnnotation;
+ ::std::auto_ptr< ScXMLAnnotationData > mxAnnotationData;
ScMyImpDetectiveObjVec* pDetectiveObjVec;
@@ -142,6 +143,13 @@ public:
- virtual void EndElement();
+ void SetCellRangeSource( const ::com::sun::star::table::CellAddress& rPosition );
- void AddAnnotation(ScMyImportAnnotation* pValue) { pMyAnnotation = pValue; }
+ virtual void EndElement();
+
+ /**
+ * Set phonetic text.
More information about the ooo-build-commit
mailing list