summaryrefslogtreecommitdiff
path: root/sc/inc/docoptio.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/inc/docoptio.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
Notes: split repo tag: calc_libreoffice-3.3.1.1 split repo tag: calc_libreoffice-3.3.1.2
Diffstat (limited to 'sc/inc/docoptio.hxx')
-rw-r--r--sc/inc/docoptio.hxx126
1 files changed, 63 insertions, 63 deletions
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 2733e968bbd4..5458b8f108f2 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.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
@@ -39,21 +39,21 @@
class SC_DLLPUBLIC ScDocOptions
{
- double fIterEps; // Epsilon-Wert dazu
- USHORT nIterCount; // Anzahl
+ double fIterEps; // Epsilon-Wert dazu
+ USHORT nIterCount; // Anzahl
sal_uInt16 nPrecStandardFormat; // precision for standard format
ScOptionsUtil::KeyBindingType eKeyBindingType;
- USHORT nDay; // Nulldatum:
+ USHORT nDay; // Nulldatum:
USHORT nMonth;
USHORT nYear;
- USHORT nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird
- USHORT nTabDistance; // Abstand Standardtabulatoren
- BOOL bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen
- BOOL bIsIter; // Iteration bei cirk. Ref
- BOOL bCalcAsShown; // berechnen wie angezeigt (Precision)
- BOOL bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen
- BOOL bDoAutoSpell; // Auto-Spelling
- BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen
+ USHORT nYear2000; // bis zu welcher zweistelligen Jahreszahl 20xx angenommen wird
+ USHORT nTabDistance; // Abstand Standardtabulatoren
+ BOOL bIsIgnoreCase; // Gross-/Kleinschr. bei Vergleichen
+ BOOL bIsIter; // Iteration bei cirk. Ref
+ BOOL bCalcAsShown; // berechnen wie angezeigt (Precision)
+ BOOL bMatchWholeCell; // Suchkriterien muessen ganze Zelle matchen
+ BOOL bDoAutoSpell; // Auto-Spelling
+ BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen
BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled
bool bUseEnglishFuncName; // use English function name even if the locale is not English.
::formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax
@@ -67,20 +67,20 @@ public:
ScDocOptions( const ScDocOptions& rCpy );
~ScDocOptions();
- BOOL IsLookUpColRowNames() const { return bLookUpColRowNames; }
+ BOOL IsLookUpColRowNames() const { return bLookUpColRowNames; }
void SetLookUpColRowNames( BOOL bVal ) { bLookUpColRowNames = bVal; }
- BOOL IsAutoSpell() const { return bDoAutoSpell; }
- void SetAutoSpell( BOOL bVal ) { bDoAutoSpell = bVal; }
- BOOL IsMatchWholeCell() const { return bMatchWholeCell; }
+ BOOL IsAutoSpell() const { return bDoAutoSpell; }
+ void SetAutoSpell( BOOL bVal ) { bDoAutoSpell = bVal; }
+ BOOL IsMatchWholeCell() const { return bMatchWholeCell; }
void SetMatchWholeCell( BOOL bVal ){ bMatchWholeCell = bVal; }
- BOOL IsIgnoreCase() const { return bIsIgnoreCase; }
- void SetIgnoreCase( BOOL bVal ) { bIsIgnoreCase = bVal; }
- BOOL IsIter() const { return bIsIter; }
- void SetIter( BOOL bVal ) { bIsIter = bVal; }
- USHORT GetIterCount() const { return nIterCount; }
+ BOOL IsIgnoreCase() const { return bIsIgnoreCase; }
+ void SetIgnoreCase( BOOL bVal ) { bIsIgnoreCase = bVal; }
+ BOOL IsIter() const { return bIsIter; }
+ void SetIter( BOOL bVal ) { bIsIter = bVal; }
+ USHORT GetIterCount() const { return nIterCount; }
void SetIterCount( USHORT nCount) { nIterCount = nCount; }
- double GetIterEps() const { return fIterEps; }
- void SetIterEps( double fEps ) { fIterEps = fEps; }
+ double GetIterEps() const { return fIterEps; }
+ void SetIterEps( double fEps ) { fIterEps = fEps; }
void GetDate( USHORT& rD, USHORT& rM, USHORT& rY ) const
{ rD = nDay; rM = nMonth; rY = nYear;}
@@ -89,11 +89,11 @@ public:
USHORT GetTabDistance() const { return nTabDistance;}
void SetTabDistance( USHORT nTabDist ) {nTabDistance = nTabDist;}
- void ResetDocOptions();
+ void ResetDocOptions();
- inline const ScDocOptions& operator=( const ScDocOptions& rOpt );
- inline int operator==( const ScDocOptions& rOpt ) const;
- inline int operator!=( const ScDocOptions& rOpt ) const;
+ inline const ScDocOptions& operator=( const ScDocOptions& rOpt );
+ inline int operator==( const ScDocOptions& rOpt ) const;
+ inline int operator!=( const ScDocOptions& rOpt ) const;
sal_uInt16 GetStdPrecision() const { return nPrecStandardFormat; }
void SetStdPrecision( sal_uInt16 n ) { nPrecStandardFormat = n; }
@@ -101,11 +101,11 @@ public:
ScOptionsUtil::KeyBindingType GetKeyBindingType() const { return eKeyBindingType; }
void SetKeyBindingType( ScOptionsUtil::KeyBindingType e ) { eKeyBindingType = e; }
- BOOL IsCalcAsShown() const { return bCalcAsShown; }
- void SetCalcAsShown( BOOL bVal ) { bCalcAsShown = bVal; }
+ BOOL IsCalcAsShown() const { return bCalcAsShown; }
+ void SetCalcAsShown( BOOL bVal ) { bCalcAsShown = bVal; }
- void SetYear2000( USHORT nVal ) { nYear2000 = nVal; }
- USHORT GetYear2000() const { return nYear2000; }
+ void SetYear2000( USHORT nVal ) { nYear2000 = nVal; }
+ USHORT GetYear2000() const { return nYear2000; }
void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; }
@@ -131,21 +131,21 @@ public:
inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
{
- bIsIgnoreCase = rCpy.bIsIgnoreCase;
- bIsIter = rCpy.bIsIter;
- nIterCount = rCpy.nIterCount;
- fIterEps = rCpy.fIterEps;
+ bIsIgnoreCase = rCpy.bIsIgnoreCase;
+ bIsIter = rCpy.bIsIter;
+ nIterCount = rCpy.nIterCount;
+ fIterEps = rCpy.fIterEps;
nPrecStandardFormat = rCpy.nPrecStandardFormat;
eKeyBindingType = rCpy.eKeyBindingType;
- nDay = rCpy.nDay;
- nMonth = rCpy.nMonth;
- nYear = rCpy.nYear;
- nYear2000 = rCpy.nYear2000;
- nTabDistance = rCpy.nTabDistance;
- bCalcAsShown = rCpy.bCalcAsShown;
- bMatchWholeCell = rCpy.bMatchWholeCell;
- bDoAutoSpell = rCpy.bDoAutoSpell;
- bLookUpColRowNames = rCpy.bLookUpColRowNames;
+ nDay = rCpy.nDay;
+ nMonth = rCpy.nMonth;
+ nYear = rCpy.nYear;
+ nYear2000 = rCpy.nYear2000;
+ nTabDistance = rCpy.nTabDistance;
+ bCalcAsShown = rCpy.bCalcAsShown;
+ bMatchWholeCell = rCpy.bMatchWholeCell;
+ bDoAutoSpell = rCpy.bDoAutoSpell;
+ bLookUpColRowNames = rCpy.bLookUpColRowNames;
bFormulaRegexEnabled= rCpy.bFormulaRegexEnabled;
bUseEnglishFuncName = rCpy.bUseEnglishFuncName;
eFormulaGrammar = rCpy.eFormulaGrammar;
@@ -159,21 +159,21 @@ inline const ScDocOptions& ScDocOptions::operator=( const ScDocOptions& rCpy )
inline int ScDocOptions::operator==( const ScDocOptions& rOpt ) const
{
return (
- rOpt.bIsIgnoreCase == bIsIgnoreCase
- && rOpt.bIsIter == bIsIter
- && rOpt.nIterCount == nIterCount
- && rOpt.fIterEps == fIterEps
- && rOpt.nPrecStandardFormat == nPrecStandardFormat
+ rOpt.bIsIgnoreCase == bIsIgnoreCase
+ && rOpt.bIsIter == bIsIter
+ && rOpt.nIterCount == nIterCount
+ && rOpt.fIterEps == fIterEps
+ && rOpt.nPrecStandardFormat == nPrecStandardFormat
&& rOpt.eKeyBindingType == eKeyBindingType
- && rOpt.nDay == nDay
- && rOpt.nMonth == nMonth
- && rOpt.nYear == nYear
- && rOpt.nYear2000 == nYear2000
- && rOpt.nTabDistance == nTabDistance
- && rOpt.bCalcAsShown == bCalcAsShown
- && rOpt.bMatchWholeCell == bMatchWholeCell
- && rOpt.bDoAutoSpell == bDoAutoSpell
- && rOpt.bLookUpColRowNames == bLookUpColRowNames
+ && rOpt.nDay == nDay
+ && rOpt.nMonth == nMonth
+ && rOpt.nYear == nYear
+ && rOpt.nYear2000 == nYear2000
+ && rOpt.nTabDistance == nTabDistance
+ && rOpt.bCalcAsShown == bCalcAsShown
+ && rOpt.bMatchWholeCell == bMatchWholeCell
+ && rOpt.bDoAutoSpell == bDoAutoSpell
+ && rOpt.bLookUpColRowNames == bLookUpColRowNames
&& rOpt.bFormulaRegexEnabled == bFormulaRegexEnabled
&& rOpt.bUseEnglishFuncName == bUseEnglishFuncName
&& rOpt.eFormulaGrammar == eFormulaGrammar
@@ -205,21 +205,21 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- const ScDocOptions& GetDocOptions() const { return theOptions; }
+ const ScDocOptions& GetDocOptions() const { return theOptions; }
private:
ScDocOptions theOptions;
};
//==================================================================
-// Config Item containing document options
+// Config Item containing document options
//==================================================================
class ScDocCfg : public ScDocOptions
{
- ScLinkConfigItem aCalcItem;
+ ScLinkConfigItem aCalcItem;
ScLinkConfigItem aFormulaItem;
- ScLinkConfigItem aLayoutItem;
+ ScLinkConfigItem aLayoutItem;
ScLinkConfigItem aCompatItem;
DECL_LINK( CalcCommitHdl, void* );
@@ -235,7 +235,7 @@ class ScDocCfg : public ScDocOptions
public:
ScDocCfg();
- void SetOptions( const ScDocOptions& rNew );
+ void SetOptions( const ScDocOptions& rNew );
};