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/source/filter/inc/XclImpChangeTrack.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/source/filter/inc/XclImpChangeTrack.hxx')
-rw-r--r-- | sc/source/filter/inc/XclImpChangeTrack.hxx | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 0bed2ca49c2f..11f253bcb8fd 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.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 @@ -47,10 +47,10 @@ class XclImpChTrFmlConverter; struct XclImpChTrRecHeader { - sal_uInt32 nSize; - sal_uInt32 nIndex; - sal_uInt16 nOpCode; - sal_uInt16 nAccept; + sal_uInt32 nSize; + sal_uInt32 nIndex; + sal_uInt16 nOpCode; + sal_uInt16 nAccept; }; inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecHeader ) @@ -64,59 +64,59 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecH class XclImpChangeTrack : protected XclImpRoot { private: - XclImpChTrRecHeader aRecHeader; - String sOldUsername; + XclImpChTrRecHeader aRecHeader; + String sOldUsername; - ScChangeTrack* pChangeTrack; + ScChangeTrack* pChangeTrack; SotStorageStreamRef xInStrm; // input stream - XclImpStream* pStrm; // stream import class - sal_uInt16 nTabIdCount; - sal_Bool bGlobExit; // global exit loop + XclImpStream* pStrm; // stream import class + sal_uInt16 nTabIdCount; + sal_Bool bGlobExit; // global exit loop enum { nmBase, nmFound, nmNested } - eNestedMode; // action with nested content actions + eNestedMode; // action with nested content actions - inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; } + inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; } - void DoAcceptRejectAction( ScChangeAction* pAction ); - void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast ); + void DoAcceptRejectAction( ScChangeAction* pAction ); + void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast ); - void DoInsertRange( const ScRange& rRange ); - void DoDeleteRange( const ScRange& rRange ); + void DoInsertRange( const ScRange& rRange ); + void DoDeleteRange( const ScRange& rRange ); - inline sal_uInt8 LookAtuInt8(); - inline double ReadRK(); - inline sal_Bool ReadBool(); - inline void Read2DAddress( ScAddress& rAddress ); - inline void Read2DRange( ScRange& rRange ); + inline sal_uInt8 LookAtuInt8(); + inline double ReadRK(); + inline sal_Bool ReadBool(); + inline void Read2DAddress( ScAddress& rAddress ); + inline void Read2DRange( ScRange& rRange ); SCTAB ReadTabNum(); - void ReadDateTime( DateTime& rDateTime ); + void ReadDateTime( DateTime& rDateTime ); - inline void ReadString( String& rString ); - inline void IgnoreString(); + inline void ReadString( String& rString ); + inline void IgnoreString(); - sal_Bool CheckRecord( sal_uInt16 nOpCode ); + sal_Bool CheckRecord( sal_uInt16 nOpCode ); - void ReadFormula( + void ReadFormula( ScTokenArray*& rpTokenArray, const ScAddress& rPosition ); - void ReadCell( + void ReadCell( ScBaseCell*& rpCell, sal_uInt32& rFormat, sal_uInt16 nFlags, const ScAddress& rPosition ); - void ReadChTrInsert(); // 0x0137 - void ReadChTrInfo(); // 0x0138 - void ReadChTrCellContent(); // 0x013B - void ReadChTrTabId(); // 0x013D - void ReadChTrMoveRange(); // 0x0140 - void ReadChTrInsertTab(); // 0x014D - void InitNestedMode(); // 0x014E, 0x0150 - void ReadNestedRecords(); - sal_Bool EndNestedMode(); // 0x014F, 0x0151 + void ReadChTrInsert(); // 0x0137 + void ReadChTrInfo(); // 0x0138 + void ReadChTrCellContent(); // 0x013B + void ReadChTrTabId(); // 0x013D + void ReadChTrMoveRange(); // 0x0140 + void ReadChTrInsertTab(); // 0x014D + void InitNestedMode(); // 0x014E, 0x0150 + void ReadNestedRecords(); + sal_Bool EndNestedMode(); // 0x014F, 0x0151 - void ReadRecords(); + void ReadRecords(); public: XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ); @@ -124,9 +124,9 @@ public: // reads extended 3D ref info following the formulas, returns sc tab nums // ( called by XclImpChTrFmlConverter::Read3DTabReference() ) - sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo ); + sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo ); - void Apply(); + void Apply(); }; inline sal_uInt8 XclImpChangeTrack::LookAtuInt8() @@ -178,15 +178,15 @@ inline void XclImpChangeTrack::IgnoreString() class XclImpChTrFmlConverter : public ExcelToSc8 { private: - XclImpChangeTrack& rChangeTrack; + XclImpChangeTrack& rChangeTrack; virtual bool Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ); public: - inline XclImpChTrFmlConverter( + inline XclImpChTrFmlConverter( const XclImpRoot& rRoot, XclImpChangeTrack& rXclChTr ); - virtual ~XclImpChTrFmlConverter(); + virtual ~XclImpChTrFmlConverter(); }; inline XclImpChTrFmlConverter::XclImpChTrFmlConverter( |