summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc/uiitems.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:04:43 +0200
commitb4e4583b94e78d6e81ab07894cfc0e99cefa33c1 (patch)
tree26e22c8ab20d2c38bc88dfcc041c8143e0609557 /sc/source/ui/inc/uiitems.hxx
parent69bb367315288b644439dc46d34743a2575a3527 (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/ui/inc/uiitems.hxx')
-rw-r--r--sc/source/ui/inc/uiitems.hxx148
1 files changed, 74 insertions, 74 deletions
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index 4c6ae0914780..a06398ce54a8 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.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
@@ -51,7 +51,7 @@ class ScInputStatusItem : public SfxPoolItem
ScAddress aStartPos;
ScAddress aEndPos;
String aString;
- EditTextObject* pEditData;
+ EditTextObject* pEditData;
public:
TYPEINFO();
@@ -70,27 +70,27 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- const ScAddress& GetPos() const { return aCursorPos; }
+ const ScAddress& GetPos() const { return aCursorPos; }
const ScAddress& GetStartPos() const { return aStartPos; }
- const ScAddress& GetEndPos() const { return aEndPos; }
+ const ScAddress& GetEndPos() const { return aEndPos; }
SCTAB GetTab() const { return aCursorPos.Tab(); }
SCCOL GetCol() const { return aCursorPos.Col(); }
SCROW GetRow() const { return aCursorPos.Row(); }
SCCOL GetStartCol() const { return aStartPos.Col(); }
SCROW GetStartRow() const { return aStartPos.Row(); }
- SCCOL GetEndCol() const { return aEndPos.Col(); }
- SCROW GetEndRow() const { return aEndPos.Row(); }
+ SCCOL GetEndCol() const { return aEndPos.Col(); }
+ SCROW GetEndRow() const { return aEndPos.Row(); }
const String& GetString() const { return aString; }
- const EditTextObject* GetEditData() const { return pEditData; }
+ const EditTextObject* GetEditData() const { return pEditData; }
};
-#define SC_TAB_INSERTED 1
-#define SC_TAB_DELETED 2
-#define SC_TAB_MOVED 3
-#define SC_TAB_COPIED 4
-#define SC_TAB_HIDDEN 5
+#define SC_TAB_INSERTED 1
+#define SC_TAB_DELETED 2
+#define SC_TAB_MOVED 3
+#define SC_TAB_COPIED 4
+#define SC_TAB_HIDDEN 5
class ScTablesHint : public SfxHint
{
@@ -103,15 +103,15 @@ public:
ScTablesHint(USHORT nNewId, SCTAB nTable1, SCTAB nTable2=0);
~ScTablesHint();
- USHORT GetId() const { return nId; }
- SCTAB GetTab1() const { return nTab1; }
- SCTAB GetTab2() const { return nTab2; }
+ USHORT GetId() const { return nId; }
+ SCTAB GetTab1() const { return nTab1; }
+ SCTAB GetTab2() const { return nTab2; }
};
class ScEditViewHint : public SfxHint
{
- ScEditEngineDefaulter* pEditEngine;
- ScAddress aCursorPos;
+ ScEditEngineDefaulter* pEditEngine;
+ ScAddress aCursorPos;
public:
TYPEINFO();
@@ -121,7 +121,7 @@ public:
SCCOL GetCol() const { return aCursorPos.Col(); }
SCROW GetRow() const { return aCursorPos.Row(); }
SCTAB GetTab() const { return aCursorPos.Tab(); }
- ScEditEngineDefaulter* GetEngine() const { return pEditEngine; }
+ ScEditEngineDefaulter* GetEngine() const { return pEditEngine; }
private:
ScEditViewHint(); // disabled
@@ -137,8 +137,8 @@ public:
ScIndexHint(USHORT nNewId, USHORT nIdx);
~ScIndexHint();
- USHORT GetId() const { return nId; }
- USHORT GetIndex() const { return nIndex; }
+ USHORT GetId() const { return nId; }
+ USHORT GetIndex() const { return nIndex; }
};
//----------------------------------------------------------------------------
@@ -148,11 +148,11 @@ class SC_DLLPUBLIC ScSortItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScSortItem( USHORT nWhich,
- ScViewData* ptrViewData,
- const ScSortParam* pSortData );
- ScSortItem( USHORT nWhich,
- const ScSortParam* pSortData );
+ ScSortItem( USHORT nWhich,
+ ScViewData* ptrViewData,
+ const ScSortParam* pSortData );
+ ScSortItem( USHORT nWhich,
+ const ScSortParam* pSortData );
ScSortItem( const ScSortItem& rItem );
~ScSortItem();
@@ -161,12 +161,12 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
- ScViewData* GetViewData () const { return pViewData; }
- const ScSortParam& GetSortData () const { return theSortData; }
+ ScViewData* GetViewData () const { return pViewData; }
+ const ScSortParam& GetSortData () const { return theSortData; }
private:
- ScViewData* pViewData;
- ScSortParam theSortData;
+ ScViewData* pViewData;
+ ScSortParam theSortData;
};
//----------------------------------------------------------------------------
@@ -176,11 +176,11 @@ class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScQueryItem( USHORT nWhich,
- ScViewData* ptrViewData,
- const ScQueryParam* pQueryData );
- ScQueryItem( USHORT nWhich,
- const ScQueryParam* pQueryData );
+ ScQueryItem( USHORT nWhich,
+ ScViewData* ptrViewData,
+ const ScQueryParam* pQueryData );
+ ScQueryItem( USHORT nWhich,
+ const ScQueryParam* pQueryData );
ScQueryItem( const ScQueryItem& rItem );
~ScQueryItem();
@@ -188,17 +188,17 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- ScViewData* GetViewData () const { return pViewData; }
- const ScQueryParam& GetQueryData() const { return theQueryData; }
+ ScViewData* GetViewData () const { return pViewData; }
+ const ScQueryParam& GetQueryData() const { return theQueryData; }
- BOOL GetAdvancedQuerySource(ScRange& rSource) const;
- void SetAdvancedQuerySource(const ScRange* pSource);
+ BOOL GetAdvancedQuerySource(ScRange& rSource) const;
+ void SetAdvancedQuerySource(const ScRange* pSource);
private:
- ScViewData* pViewData;
- ScQueryParam theQueryData;
- BOOL bIsAdvanced;
- ScRange aAdvSource;
+ ScViewData* pViewData;
+ ScQueryParam theQueryData;
+ BOOL bIsAdvanced;
+ ScRange aAdvSource;
};
//----------------------------------------------------------------------------
@@ -208,12 +208,12 @@ class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScSubTotalItem( USHORT nWhich,
- ScViewData* ptrViewData,
- const ScSubTotalParam* pSubTotalData );
- ScSubTotalItem( USHORT nWhich,
- const ScSubTotalParam* pSubTotalData );
- ScSubTotalItem( const ScSubTotalItem& rItem );
+ ScSubTotalItem( USHORT nWhich,
+ ScViewData* ptrViewData,
+ const ScSubTotalParam* pSubTotalData );
+ ScSubTotalItem( USHORT nWhich,
+ const ScSubTotalParam* pSubTotalData );
+ ScSubTotalItem( const ScSubTotalItem& rItem );
~ScSubTotalItem();
virtual String GetValueText() const;
@@ -221,12 +221,12 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberUd ) const;
- ScViewData* GetViewData () const { return pViewData; }
- const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; }
+ ScViewData* GetViewData () const { return pViewData; }
+ const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; }
private:
- ScViewData* pViewData;
- ScSubTotalParam theSubTotalData;
+ ScViewData* pViewData;
+ ScSubTotalParam theSubTotalData;
};
//----------------------------------------------------------------------------
@@ -244,11 +244,11 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- void SetUserList ( const ScUserList& rUserList );
- ScUserList* GetUserList () const { return pUserList; }
+ void SetUserList ( const ScUserList& rUserList );
+ ScUserList* GetUserList () const { return pUserList; }
private:
- ScUserList* pUserList;
+ ScUserList* pUserList;
};
//----------------------------------------------------------------------------
@@ -258,9 +258,9 @@ class ScConsolidateItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScConsolidateItem( USHORT nWhich,
+ ScConsolidateItem( USHORT nWhich,
const ScConsolidateParam* pParam );
- ScConsolidateItem( const ScConsolidateItem& rItem );
+ ScConsolidateItem( const ScConsolidateItem& rItem );
~ScConsolidateItem();
virtual String GetValueText() const;
@@ -270,7 +270,7 @@ public:
const ScConsolidateParam& GetData() const { return theConsData; }
private:
- ScConsolidateParam theConsData;
+ ScConsolidateParam theConsData;
};
//----------------------------------------------------------------------------
@@ -282,21 +282,21 @@ public:
TYPEINFO();
ScPivotItem( USHORT nWhich, const ScDPSaveData* pData,
const ScRange* pRange, BOOL bNew );
- ScPivotItem( const ScPivotItem& rItem );
+ ScPivotItem( const ScPivotItem& rItem );
~ScPivotItem();
virtual String GetValueText() const;
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- const ScDPSaveData& GetData() const { return *pSaveData; }
- const ScRange& GetDestRange() const { return aDestRange; }
- BOOL IsNewSheet() const { return bNewSheet; }
+ const ScDPSaveData& GetData() const { return *pSaveData; }
+ const ScRange& GetDestRange() const { return aDestRange; }
+ BOOL IsNewSheet() const { return bNewSheet; }
private:
- ScDPSaveData* pSaveData;
- ScRange aDestRange;
- BOOL bNewSheet;
+ ScDPSaveData* pSaveData;
+ ScRange aDestRange;
+ BOOL bNewSheet;
};
//----------------------------------------------------------------------------
@@ -306,9 +306,9 @@ class ScSolveItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScSolveItem( USHORT nWhich,
+ ScSolveItem( USHORT nWhich,
const ScSolveParam* pParam );
- ScSolveItem( const ScSolveItem& rItem );
+ ScSolveItem( const ScSolveItem& rItem );
~ScSolveItem();
virtual String GetValueText() const;
@@ -318,7 +318,7 @@ public:
const ScSolveParam& GetData() const { return theSolveData; }
private:
- ScSolveParam theSolveData;
+ ScSolveParam theSolveData;
};
//----------------------------------------------------------------------------
@@ -328,9 +328,9 @@ class ScTabOpItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScTabOpItem( USHORT nWhich,
+ ScTabOpItem( USHORT nWhich,
const ScTabOpParam* pParam );
- ScTabOpItem( const ScTabOpItem& rItem );
+ ScTabOpItem( const ScTabOpItem& rItem );
~ScTabOpItem();
virtual String GetValueText() const;
@@ -340,7 +340,7 @@ public:
const ScTabOpParam& GetData() const { return theTabOpData; }
private:
- ScTabOpParam theTabOpData;
+ ScTabOpParam theTabOpData;
};
//----------------------------------------------------------------------------
@@ -351,7 +351,7 @@ class ScCondFrmtItem : public SfxPoolItem
public:
TYPEINFO();
ScCondFrmtItem( USHORT nWhich,
-//! const ScConditionalFormat* pCondFrmt );
+//! const ScConditionalFormat* pCondFrmt );
const ScConditionalFormat& rCondFrmt );
ScCondFrmtItem( const ScCondFrmtItem& rItem );
~ScCondFrmtItem();
@@ -360,10 +360,10 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- const ScConditionalFormat& GetData() const { return theCondFrmtData; }
+ const ScConditionalFormat& GetData() const { return theCondFrmtData; }
private:
- ScConditionalFormat theCondFrmtData;
+ ScConditionalFormat theCondFrmtData;
};