diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-04-29 05:16:36 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-04-29 05:16:36 +0200 |
| commit | 2f32b639a988cde82849a1da7641b0be7943d25b (patch) | |
| tree | 791aba8c48d6de81e67d791eb0fca7b7bdf578e7 /sc/inc/column.hxx | |
| parent | b1caadf8d9f10884f59f18ec1dc42b4fd99236c4 (diff) | |
| parent | 4f7a90a20425a4319a0a06ca5b6716cac5f9e0cd (diff) | |
rebased to m77.
Diffstat (limited to 'sc/inc/column.hxx')
| -rw-r--r-- | sc/inc/column.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 3386b3ebec67..7ad5c96f4dfb 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -142,7 +142,7 @@ public: //UNUSED2009-05 BOOL HasLines( SCROW nRow1, SCROW nRow2, Rectangle& rSizes, //UNUSED2009-05 BOOL bLeft, BOOL bRight ) const; - BOOL HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; + bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const; BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const; BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, @@ -235,7 +235,9 @@ public: // TRUE = Zahlformat gesetzt BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString, - formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO ); + formula::FormulaGrammar::AddressConvention conv = formula::FormulaGrammar::CONV_OOO, + SvNumberFormatter* pFormatter = NULL, + bool bDetectNumberFormat = true ); void SetValue( SCROW nRow, const double& rVal); void SetError( SCROW nRow, const USHORT nError); |