diff options
Diffstat (limited to 'sc/source/ui/inc/docfunc.hxx')
| -rw-r--r-- | sc/source/ui/inc/docfunc.hxx | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 7424f03e138d..0719b640072b 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,6 +33,9 @@ #include "global.hxx" #include "formula/grammar.hxx" #include "tabbgcolor.hxx" +#include "token.hxx" + +#include <vector> class ScEditEngineDefaulter; class SdrUndoAction; @@ -40,20 +44,22 @@ class ScDocShell; class ScMarkData; class ScPatternAttr; class ScRange; +class ScRangeList; class ScRangeName; class ScBaseCell; class ScTokenArray; struct ScTabOpParam; class ScTableProtection; +struct ScCellMergeOption; // --------------------------------------------------------------------------- class ScDocFunc { private: - ScDocShell& rDocShell; + ScDocShell& rDocShell; - sal_Bool AdjustRowHeight( const ScRange& rRange, sal_Bool bPaint = sal_True ); + sal_Bool AdjustRowHeight( const ScRange& rRange, sal_Bool bPaint = true ); void CreateOneName( ScRangeName& rList, SCCOL nPosX, SCROW nPosY, SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, @@ -73,7 +79,9 @@ public: sal_Bool DetectiveAddError(const ScAddress& rPos); sal_Bool DetectiveMarkInvalid(SCTAB nTab); sal_Bool DetectiveDelAll(SCTAB nTab); - sal_Bool DetectiveRefresh(sal_Bool bAutomatic = sal_False); + sal_Bool DetectiveRefresh(sal_Bool bAutomatic = false); + void DetectiveCollectAllPreds(const ScRangeList& rSrcRanges, ::std::vector<ScTokenRef>& rRefTokens); + void DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, ::std::vector<ScTokenRef>& rRefTokens); sal_Bool DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, sal_Bool bRecord, sal_Bool bApi ); @@ -92,8 +100,7 @@ public: // creates a new cell for use with PutCell ScBaseCell* InterpretEnglishString( const ScAddress& rPos, const String& rText, - const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar, - short* pRetFormatType = NULL ); + const String& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ); bool ShowNote( const ScAddress& rPos, bool bShow = true ); inline bool HideNote( const ScAddress& rPos ) { return ShowNote( rPos, false ); } @@ -108,7 +115,7 @@ public: sal_Bool InsertCells( const ScRange& rRange,const ScMarkData* pTabMark, InsCellCmd eCmd, sal_Bool bRecord, sal_Bool bApi, - sal_Bool bPartOfPaste = sal_False ); + sal_Bool bPartOfPaste = false ); sal_Bool DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, DelCellCmd eCmd, sal_Bool bRecord, sal_Bool bApi ); @@ -126,9 +133,7 @@ public: sal_Bool SetLayoutRTL( SCTAB nTab, sal_Bool bRTL, sal_Bool bApi ); -//UNUSED2009-05 sal_Bool SetGrammar( formula::FormulaGrammar::Grammar eGrammar ); - - SC_DLLPUBLIC sal_Bool SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, + SC_DLLPUBLIC sal_Bool SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, SCTAB nTab, ScSizeMode eMode, sal_uInt16 nSizeTwips, sal_Bool bRecord, sal_Bool bApi ); @@ -159,21 +164,24 @@ public: sal_Bool FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, sal_Bool bRecord, sal_Bool bApi ); sal_Bool FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, - FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, + FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, double fStart, double fStep, double fMax, sal_Bool bRecord, sal_Bool bApi ); // FillAuto: rRange wird von Source-Range auf Dest-Range angepasst + SC_DLLPUBLIC sal_Bool FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, sal_uLong nCount, double fStep, double fMax, sal_Bool bRecord, sal_Bool bApi ); + sal_Bool FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir eDir, sal_uLong nCount, sal_Bool bRecord, sal_Bool bApi ); sal_Bool ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, sal_Bool bApi ); - sal_Bool MergeCells( const ScRange& rRange, sal_Bool bContents, + sal_Bool MergeCells( const ScCellMergeOption& rOption, sal_Bool bContents, sal_Bool bRecord, sal_Bool bApi ); sal_Bool UnmergeCells( const ScRange& rRange, sal_Bool bRecord, sal_Bool bApi ); + bool UnmergeCells( const ScCellMergeOption& rOption, sal_Bool bRecord, sal_Bool bApi ); - sal_Bool SetNewRangeNames( ScRangeName* pNewRanges, sal_Bool bApi ); // takes ownership of pNewRanges - sal_Bool ModifyRangeNames( const ScRangeName& rNewRanges, sal_Bool bApi ); + bool SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc = true ); // takes ownership of pNewRanges + bool ModifyRangeNames( const ScRangeName& rNewRanges ); sal_Bool CreateNames( const ScRange& rRange, sal_uInt16 nFlags, sal_Bool bApi ); sal_Bool InsertNameList( const ScAddress& rStartPos, sal_Bool bApi ); @@ -188,3 +196,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |