diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:43 +0200 |
commit | b4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch) | |
tree | 26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/inc/bigrange.hxx | |
parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) |
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Feb 8 18:07:42 2011 +0100
Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)
commit 737b6a92adca9a8285370918671b93b56a028537
Author: Jan Holesovsky <kendy@suse.cz>
Date: Mon Feb 7 21:23:21 2011 +0100
Branch libreoffice-3-3-1
This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e
Author: Jani Monoses <jani.monoses@canonical.com>
Date: Thu Jan 27 15:33:06 2011 +0200
Remove unused declaration
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
sc/source/core/tool/token.cxx | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 96bee1507119ca0525845022019d90f0694996aa
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 20 23:44:52 2011 -0500
Fixed incorrect page number in page preview mode. (fdo#33155)
When the window is large enough to show several 'Page X' strings,
the page number was not properly incremented. This commit fixes
it.
sc/source/ui/view/gridwin4.cxx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Wed Jan 19 00:24:24 2011 -0500
Fixed incorrect import of cell attributes from Excel documents.
When a cell with non-default formatting attribute starts with non-first
row in a column, the filter would incorrectly apply the same format to
all the cells above it if they didn't have any formats. This commit
fixes it.
sc/source/filter/excel/xistyle.cxx | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit af63319fcdeea3f9b5018eab83ef5a9e64905446
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:18:07 2011 -0500
Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c.
I created a patch between before and after the merge commit, and
reverse-applied it. This is because if you revert a merge commit
in git you are denying all future merges from that branch. I wasn't
sure if we really wanted that.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/inc/document.hxx | 22 +------
sc/inc/drwlayer.hxx | 2 +-
sc/inc/table.hxx | 16 +-----
sc/source/core/data/document.cxx | 7 +--
sc/source/core/data/drwlayer.cxx | 6 +-
sc/source/core/data/table1.cxx | 38 ++++--------
sc/source/core/data/table2.cxx | 91 ++++++------------------------
sc/source/core/data/table3.cxx | 71 +----------------------
sc/source/filter/xml/xmlrowi.cxx | 17 +----
sc/source/ui/docshell/externalrefmgr.cxx | 7 +-
sc/source/ui/view/dbfunc.cxx | 5 +-
sc/source/ui/view/tabvwshe.cxx | 4 +-
12 files changed, 52 insertions(+), 234 deletions(-)
commit 5ada5635cff38af87830b091b36159cf80e4cf5d
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:04:14 2011 -0500
Revert "This is also part of the merge."
This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/source/core/data/table3.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit c900e3db767518b7a60eaf24bdf298c94315f685
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 23:05:56 2011 +0100
Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.
If you want to build something cool, unstable, and risky, use master.
commit 15d298ba7c4e89b043b3077e17747ba027a62c43
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:39:06 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: calc_libreoffice-3.3.1.1
split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'sc/inc/bigrange.hxx')
-rw-r--r-- | sc/inc/bigrange.hxx | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index ac92d30a27cf..c74f765af0f6 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,9 +40,9 @@ static const INT32 nInt32Max = 0x7fffffff; class ScBigAddress { - INT32 nRow; - INT32 nCol; - INT32 nTab; + INT32 nRow; + INT32 nCol; + INT32 nTab; public: ScBigAddress() : nRow(0), nCol(0), nTab(0) {} @@ -53,33 +53,33 @@ public: ScBigAddress( const ScAddress& r ) : nRow( r.Row() ), nCol( r.Col() ), nTab( r.Tab() ) {} - INT32 Col() const { return nCol; } - INT32 Row() const { return nRow; } - INT32 Tab() const { return nTab; } + INT32 Col() const { return nCol; } + INT32 Row() const { return nRow; } + INT32 Tab() const { return nTab; } - void Set( INT32 nColP, INT32 nRowP, INT32 nTabP ) + void Set( INT32 nColP, INT32 nRowP, INT32 nTabP ) { nCol = nColP; nRow = nRowP; nTab = nTabP; } - void SetCol( INT32 nColP ) { nCol = nColP; } - void SetRow( INT32 nRowP ) { nRow = nRowP; } - void SetTab( INT32 nTabP ) { nTab = nTabP; } - void IncCol( INT32 n = 1 ) { nCol += n; } - void IncRow( INT32 n = 1 ) { nRow += n; } - void IncTab( INT32 n = 1 ) { nTab += n; } - - void GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const + void SetCol( INT32 nColP ) { nCol = nColP; } + void SetRow( INT32 nRowP ) { nRow = nRowP; } + void SetTab( INT32 nTabP ) { nTab = nTabP; } + void IncCol( INT32 n = 1 ) { nCol += n; } + void IncRow( INT32 n = 1 ) { nRow += n; } + void IncTab( INT32 n = 1 ) { nTab += n; } + + void GetVars( INT32& nColP, INT32& nRowP, INT32& nTabP ) const { nColP = nCol; nRowP = nRow; nTabP = nTab; } - inline void PutInOrder( ScBigAddress& r ); - inline BOOL IsValid( const ScDocument* ) const; - inline ScAddress MakeAddress() const; + inline void PutInOrder( ScBigAddress& r ); + inline BOOL IsValid( const ScDocument* ) const; + inline ScAddress MakeAddress() const; - ScBigAddress& operator=( const ScBigAddress& r ) + ScBigAddress& operator=( const ScBigAddress& r ) { nCol = r.nCol; nRow = r.nRow; nTab = r.nTab; return *this; } - ScBigAddress& operator=( const ScAddress& r ) + ScBigAddress& operator=( const ScAddress& r ) { nCol = r.Col(); nRow = r.Row(); nTab = r.Tab(); return *this; } - int operator==( const ScBigAddress& r ) const + int operator==( const ScBigAddress& r ) const { return nCol == r.nCol && nRow == r.nRow && nTab == r.nTab; } - int operator!=( const ScBigAddress& r ) const + int operator!=( const ScBigAddress& r ) const { return !operator==( r ); } friend inline SvStream& operator<< ( SvStream& rStream, const ScBigAddress& rAdr ); @@ -112,7 +112,7 @@ inline void ScBigAddress::PutInOrder( ScBigAddress& r ) inline BOOL ScBigAddress::IsValid( const ScDocument* pDoc ) const -{ //! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab +{ //! Min/Max sind ok, kennzeichnen ganze Col/Row/Tab return ((0 <= nCol && nCol <= MAXCOL) || nCol == nInt32Min || nCol == nInt32Max) && @@ -173,8 +173,8 @@ class ScBigRange { public: - ScBigAddress aStart; - ScBigAddress aEnd; + ScBigAddress aStart; + ScBigAddress aEnd; ScBigRange() : aStart(), aEnd() {} ScBigRange( const ScBigAddress& s, const ScBigAddress& e ) @@ -194,31 +194,31 @@ public: : aStart( nCol1, nRow1, nTab1 ), aEnd( nCol2, nRow2, nTab2 ) {} - void Set( INT32 nCol1, INT32 nRow1, INT32 nTab1, + void Set( INT32 nCol1, INT32 nRow1, INT32 nTab1, INT32 nCol2, INT32 nRow2, INT32 nTab2 ) { aStart.Set( nCol1, nRow1, nTab1 ); aEnd.Set( nCol2, nRow2, nTab2 ); } - void GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1, + void GetVars( INT32& nCol1, INT32& nRow1, INT32& nTab1, INT32& nCol2, INT32& nRow2, INT32& nTab2 ) const { aStart.GetVars( nCol1, nRow1, nTab1 ); aEnd.GetVars( nCol2, nRow2, nTab2 ); } - BOOL IsValid( const ScDocument* pDoc ) const + BOOL IsValid( const ScDocument* pDoc ) const { return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); } - inline ScRange MakeRange() const + inline ScRange MakeRange() const { return ScRange( aStart.MakeAddress(), aEnd.MakeAddress() ); } - inline BOOL In( const ScBigAddress& ) const; // ist Address& in Range? - inline BOOL In( const ScBigRange& ) const; // ist Range& in Range? - inline BOOL Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? + inline BOOL In( const ScBigAddress& ) const; // ist Address& in Range? + inline BOOL In( const ScBigRange& ) const; // ist Range& in Range? + inline BOOL Intersects( const ScBigRange& ) const; // ueberschneiden sich zwei Ranges? - ScBigRange& operator=( const ScBigRange& r ) + ScBigRange& operator=( const ScBigRange& r ) { aStart = r.aStart; aEnd = r.aEnd; return *this; } - int operator==( const ScBigRange& r ) const + int operator==( const ScBigRange& r ) const { return (aStart == r.aStart) && (aEnd == r.aEnd); } - int operator!=( const ScBigRange& r ) const + int operator!=( const ScBigRange& r ) const { return !operator==( r ); } friend inline SvStream& operator<< ( SvStream& rStream, const ScBigRange& rRange ); |