sc/inc/formulacell.hxx | 62 ++++++++++++++----------------
sc/inc/postit.hxx | 10 ++--
sc/qa/unit/filters-test.cxx | 6 +-
sc/qa/unit/helper/qahelper.cxx | 5 ++
sc/qa/unit/helper/qahelper.hxx | 4 -
sc/qa/unit/subsequent_export-test.cxx | 6 +-
sc/qa/unit/subsequent_filters-test.cxx | 28 ++++++-------
sc/source/core/data/formulacell.cxx | 68 +++++++++++++++++++++++++++++++++
sc/source/core/data/postit.cxx | 25 ++++++++++++
9 files changed, 155 insertions(+), 59 deletions(-)
New commits:
commit dd9d213166ebc0cd618b03dc131c4b9d8dc041ff
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Tue Jul 9 14:52:34 2013 -0400
Hide this global aFileFormats. This doesn't work well with MSVC.
Change-Id: I449902e0516dd9782c6e95c407cbb898dc843ced
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 44156ea..1d7eeca 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -133,8 +133,8 @@ void ScFiltersTest::testCVEs()
void ScFiltersTest::testDir(osl::Directory& rDir, sal_uInt32 nType)
{
- OUString aFilterName(aFileFormats[nType].pFilterName,
strlen(aFileFormats[nType].pFilterName), RTL_TEXTENCODING_UTF8) ;
- OUString aFilterType(aFileFormats[nType].pTypeName,
strlen(aFileFormats[nType].pTypeName), RTL_TEXTENCODING_UTF8);
+ OUString aFilterName(getFileFormats()[nType].pFilterName,
strlen(getFileFormats()[nType].pFilterName), RTL_TEXTENCODING_UTF8) ;
+ OUString aFilterType(getFileFormats()[nType].pTypeName,
strlen(getFileFormats()[nType].pTypeName), RTL_TEXTENCODING_UTF8);
osl::DirectoryItem aItem;
osl::FileStatus
aFileStatus(osl_FileStatus_Mask_FileURL|osl_FileStatus_Mask_Type);
@@ -146,7 +146,7 @@ void ScFiltersTest::testDir(osl::Directory& rDir,
sal_uInt32 nType)
//OStringBuffer aMessage("Failed loading: ");
//aMessage.append(OUStringToOString(sURL, RTL_TEXTENCODING_UTF8));
- unsigned int nFormatType = aFileFormats[nType].nFormatType;
+ unsigned int nFormatType = getFileFormats()[nType].nFormatType;
unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
ScDocShellRef xDocSh = load(sURL, aFilterName, OUString(),
aFilterType, nFormatType, nClipboardId );
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 5692b8d..8cf45f5 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -162,6 +162,11 @@ ScDocShellRef ScBootstrapFixture::loadDoc(
return load(bReadWrite, aFileName, aFilterName, OUString(), aFilterType,
nFormatType, nClipboardId, nFormatType);
}
+const FileFormat* ScBootstrapFixture::getFileFormats()
+{
+ return aFileFormats;
+}
+
void ScBootstrapFixture::createFileURL(
const OUString& aFileBase, const OUString& aFileExtension, OUString&
rFilePath)
{
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index bec76e8..58aa429 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -76,8 +76,6 @@ struct FileFormat {
const char* pName; const char* pFilterName; const char* pTypeName;
unsigned int nFormatType;
};
-SC_DLLPUBLIC extern FileFormat aFileFormats[];
-
// Why is this here and not in osl, and using the already existing file
// handling APIs? Do we really want to add arbitrary new file handling
// wrappers here and there (and then having to handle the Android (and
@@ -141,6 +139,8 @@ protected:
ScDocShellRef loadDoc(const OUString& rFileName, sal_Int32 nFormat, bool
bReadWrite = false );
public:
+ static const FileFormat* getFileFormats();
+
ScBootstrapFixture( const OUString& rsBaseString ) : m_aBaseString(
rsBaseString ) {}
void createFileURL(const OUString& aFileBase, const OUString&
aFileExtension, OUString& rFilePath);
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index d73ca8a..05b0c35 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -139,9 +139,9 @@ void ScExportTest::testPasswordExport()
CPPUNIT_ASSERT(pDoc);
sal_Int32 nFormat = ODS;
- OUString aFilterName(aFileFormats[nFormat].pFilterName,
strlen(aFileFormats[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
- OUString aFilterType(aFileFormats[nFormat].pTypeName,
strlen(aFileFormats[nFormat].pTypeName), RTL_TEXTENCODING_UTF8);
- ScDocShellRef xDocSh = saveAndReloadPassword(pShell, aFilterName,
OUString(), aFilterType, aFileFormats[nFormat].nFormatType);
+ OUString aFilterName(getFileFormats()[nFormat].pFilterName,
strlen(getFileFormats()[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
+ OUString aFilterType(getFileFormats()[nFormat].pTypeName,
strlen(getFileFormats()[nFormat].pTypeName), RTL_TEXTENCODING_UTF8);
+ ScDocShellRef xDocSh = saveAndReloadPassword(pShell, aFilterName,
OUString(), aFilterType, getFileFormats()[nFormat].nFormatType);
CPPUNIT_ASSERT(xDocSh.Is());
ScDocument* pLoadedDoc = xDocSh->GetDocument();
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 48c519d..5f2ac1e 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1165,14 +1165,14 @@ void ScFiltersTest::testDataValidityODS()
void ScFiltersTest::testBrokenQuotesCSV()
{
const OUString aFileNameBase("fdo48621_broken_quotes.");
- OUString aFileExtension(aFileFormats[CSV].pName,
strlen(aFileFormats[CSV].pName), RTL_TEXTENCODING_UTF8 );
- OUString aFilterName(aFileFormats[CSV].pFilterName,
strlen(aFileFormats[CSV].pFilterName), RTL_TEXTENCODING_UTF8) ;
+ OUString aFileExtension(getFileFormats()[CSV].pName,
strlen(getFileFormats()[CSV].pName), RTL_TEXTENCODING_UTF8 );
+ OUString aFilterName(getFileFormats()[CSV].pFilterName,
strlen(getFileFormats()[CSV].pFilterName), RTL_TEXTENCODING_UTF8) ;
OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
- OUString aFilterType(aFileFormats[CSV].pTypeName,
strlen(aFileFormats[CSV].pTypeName), RTL_TEXTENCODING_UTF8);
- std::cout << aFileFormats[CSV].pName << " Test" << std::endl;
+ OUString aFilterType(getFileFormats()[CSV].pTypeName,
strlen(getFileFormats()[CSV].pTypeName), RTL_TEXTENCODING_UTF8);
+ std::cout << getFileFormats()[CSV].pName << " Test" << std::endl;
- unsigned int nFormatType = aFileFormats[CSV].nFormatType;
+ unsigned int nFormatType = getFileFormats()[CSV].nFormatType;
unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName,
OUString(), aFilterType,
nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
@@ -1193,14 +1193,14 @@ void ScFiltersTest::testBrokenQuotesCSV()
void ScFiltersTest::testCellValueXLSX()
{
const OUString aFileNameBase("cell-value.");
- OUString aFileExtension(aFileFormats[XLSX].pName,
strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 );
- OUString aFilterName(aFileFormats[XLSX].pFilterName,
strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
+ OUString aFileExtension(getFileFormats()[XLSX].pName,
strlen(getFileFormats()[XLSX].pName), RTL_TEXTENCODING_UTF8 );
+ OUString aFilterName(getFileFormats()[XLSX].pFilterName,
strlen(getFileFormats()[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
- OUString aFilterType(aFileFormats[XLSX].pTypeName,
strlen(aFileFormats[XLSX].pTypeName), RTL_TEXTENCODING_UTF8);
- std::cout << aFileFormats[XLSX].pName << " Test" << std::endl;
+ OUString aFilterType(getFileFormats()[XLSX].pTypeName,
strlen(getFileFormats()[XLSX].pTypeName), RTL_TEXTENCODING_UTF8);
+ std::cout << getFileFormats()[XLSX].pName << " Test" << std::endl;
- unsigned int nFormatType = aFileFormats[XLSX].nFormatType;
+ unsigned int nFormatType = getFileFormats()[XLSX].nFormatType;
unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
ScDocShellRef xDocSh = ScBootstrapFixture::load( aFileName, aFilterName,
OUString(), aFilterType,
nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
@@ -1218,16 +1218,16 @@ void ScFiltersTest::testCellValueXLSX()
void ScFiltersTest::testPassword_Impl(const OUString& aFileNameBase)
{
- OUString aFileExtension(aFileFormats[0].pName,
strlen(aFileFormats[0].pName), RTL_TEXTENCODING_UTF8 );
- OUString aFilterName(aFileFormats[0].pFilterName,
strlen(aFileFormats[0].pFilterName), RTL_TEXTENCODING_UTF8) ;
+ OUString aFileExtension(getFileFormats()[0].pName,
strlen(getFileFormats()[0].pName), RTL_TEXTENCODING_UTF8 );
+ OUString aFilterName(getFileFormats()[0].pFilterName,
strlen(getFileFormats()[0].pFilterName), RTL_TEXTENCODING_UTF8) ;
OUString aFileName;
createFileURL(aFileNameBase, aFileExtension, aFileName);
- OUString aFilterType(aFileFormats[0].pTypeName,
strlen(aFileFormats[0].pTypeName), RTL_TEXTENCODING_UTF8);
+ OUString aFilterType(getFileFormats()[0].pTypeName,
strlen(getFileFormats()[0].pTypeName), RTL_TEXTENCODING_UTF8);
sal_uInt32 nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
SfxFilter* aFilter = new SfxFilter(
aFilterName,
- OUString(), aFileFormats[0].nFormatType, nFormat, aFilterType, 0,
OUString(),
+ OUString(), getFileFormats()[0].nFormatType, nFormat, aFilterType, 0,
OUString(),
OUString(), OUString("private:factory/scalc*") );
aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
commit 827530ce3f91b092c09daa5138ebadf435f63562
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
Date: Tue Jul 9 14:48:39 2013 -0400
More removal of implicit inlines, while I'm at it....
Change-Id: I944e9539f9cea13d2da640d3da1588d44d5570b3
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 3258e21..0c61371 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -148,15 +148,15 @@ public:
void SetDirtyVar();
// If setting entire document dirty after load, no broadcasts but still
append to FormulaTree.
void SetDirtyAfterLoad();
- inline void ResetTableOpDirtyVar() { bTableOpDirty = false; }
+ void ResetTableOpDirtyVar();
void SetTableOpDirty();
bool IsDirtyOrInTableOpDirty() const;
- bool GetDirty() const { return bDirty; }
- void ResetDirty() { bDirty = false; }
- bool NeedsListening() const { return bNeedListening; }
- void SetNeedsListening( bool bVar ) { bNeedListening = bVar; }
- void SetNeedNumberFormat( bool bVal ) { mbNeedsNumberFormat =
bVal; }
- short GetFormatType() const { return nFormatType; }
+ bool GetDirty() const;
+ void ResetDirty();
+ bool NeedsListening() const;
+ void SetNeedsListening( bool bVar );
+ void SetNeedNumberFormat( bool bVal );
+ short GetFormatType() const;
void Compile(const OUString& rFormula,
bool bNoListening = false,
const formula::FormulaGrammar::Grammar =
formula::FormulaGrammar::GRAM_DEFAULT );
@@ -165,8 +165,8 @@ public:
void CalcAfterLoad();
bool MarkUsedExternalReferences();
void Interpret();
- inline bool IsIterCell() const { return bIsIterCell; }
- inline sal_uInt16 GetSeenInIteration() const { return nSeenInIteration; }
+ bool IsIterCell() const;
+ sal_uInt16 GetSeenInIteration() const;
bool HasOneReference( ScRange& r ) const;
/* Checks if the formula contains reference list that can be
@@ -200,7 +200,7 @@ public:
bool TestTabRefAbs(SCTAB nTable);
void UpdateCompile( bool bForceIfNameInUse = false );
void FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const;
- bool IsSubTotal() const { return
bSubTotal; }
+ bool IsSubTotal() const;
bool IsChanged() const;
void SetChanged(bool b);
bool IsEmpty(); // formula::svEmptyCell result
@@ -219,51 +219,49 @@ public:
sal_uInt16 GetErrCode(); // interpret first if necessary
sal_uInt16 GetRawError(); // don't interpret, just return code or
result error
bool GetErrorOrValue( sal_uInt16& rErr, double& rVal );
- sal_uInt8 GetMatrixFlag() const { return
cMatrixFlag; }
- ScTokenArray* GetCode() const { return pCode; }
+ sal_uInt8 GetMatrixFlag() const;
+ ScTokenArray* GetCode() const;
- bool IsRunning() const { return bRunning;
}
- void SetRunning( bool bVal ) { bRunning = bVal;
}
+ bool IsRunning() const;
+ void SetRunning( bool bVal );
void CompileDBFormula();
void CompileDBFormula( bool bCreateFormulaString );
void CompileNameFormula( bool bCreateFormulaString );
void CompileColRowNameFormula();
- ScFormulaCell* GetPrevious() const { return pPrevious; }
- ScFormulaCell* GetNext() const { return pNext; }
- void SetPrevious( ScFormulaCell* pF ) { pPrevious = pF; }
- void SetNext( ScFormulaCell* pF ) { pNext = pF; }
- ScFormulaCell* GetPreviousTrack() const { return
pPreviousTrack; }
- ScFormulaCell* GetNextTrack() const { return
pNextTrack; }
- void SetPreviousTrack( ScFormulaCell* pF ) { pPreviousTrack =
pF; }
- void SetNextTrack( ScFormulaCell* pF ) { pNextTrack = pF;
}
+ ScFormulaCell* GetPrevious() const;
+ ScFormulaCell* GetNext() const;
+ void SetPrevious( ScFormulaCell* pF );
+ void SetNext( ScFormulaCell* pF );
+ ScFormulaCell* GetPreviousTrack() const;
+ ScFormulaCell* GetNextTrack() const;
+ void SetPreviousTrack( ScFormulaCell* pF );
+ void SetNextTrack( ScFormulaCell* pF );
virtual void Notify( SvtBroadcaster& rBC, const SfxHint& rHint);
- void SetCompile( bool bVal ) { bCompile = bVal; }
- ScDocument* GetDocument() const { return pDocument; }
+ void SetCompile( bool bVal );
+ ScDocument* GetDocument() const;
void SetMatColsRows( SCCOL nCols, SCROW nRows, bool
bDirtyFlag=true );
void GetMatColsRows( SCCOL& nCols, SCROW& nRows ) const;
// cell belongs to ChangeTrack and not to the real document
- void SetInChangeTrack( bool bVal ) { bInChangeTrack = bVal; }
- bool IsInChangeTrack() const { return bInChangeTrack; }
+ void SetInChangeTrack( bool bVal );
+ bool IsInChangeTrack() const;
// For import filters!
void AddRecalcMode( formula::ScRecalcMode );
/** For import only: set a double result. */
- void SetHybridDouble( double n ) { aResult.SetHybridDouble(
n); }
+ void SetHybridDouble( double n );
/** For import only: set a string result.
If for whatever reason you have to use both, SetHybridDouble() and
SetHybridString() or SetHybridFormula(), use SetHybridDouble() first
for performance reasons.*/
- void SetHybridString( const OUString& r )
- { aResult.SetHybridString( r); }
+ void SetHybridString( const OUString& r );
/** For import only: set a temporary formula string to be compiled later.
If for whatever reason you have to use both, SetHybridDouble() and
SetHybridString() or SetHybridFormula(), use SetHybridDouble() first
for performance reasons.*/
- void SetHybridFormula( const OUString& r,
- const formula::FormulaGrammar::Grammar
eGrammar )
- { aResult.SetHybridFormula( r); eTempGrammar =
eGrammar; }
+ void SetHybridFormula(
+ const OUString& r, const formula::FormulaGrammar::Grammar eGrammar );
void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef&
pMat, formula::FormulaToken* pUL );
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 0c401d5..2359dcf 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -99,12 +99,12 @@ public:
bool bCloneCaption ) const;
/** Returns the data struct containing all note settings. */
- inline const ScNoteData& GetNoteData() const { return maNoteData; }
+ const ScNoteData& GetNoteData() const;
/** Returns the creation date of this note. */
- inline const OUString& GetDate() const { return maNoteData.maDate; }
+ const OUString& GetDate() const;
/** Sets a new creation date for this note. */
- inline void SetDate( const OUString& rDate ) { maNoteData.maDate =
rDate; }
+ void SetDate( const OUString& rDate );
/** Returns the author date of this note. */
const OUString& GetAuthor() const;
@@ -126,7 +126,7 @@ public:
/** Returns an existing note caption object. returns null, if the note
contains initial caption data needed to construct a caption object. */
- inline SdrCaptionObj* GetCaption() const { return maNoteData.mpCaption; }
+ SdrCaptionObj* GetCaption() const;
/** Returns the caption object of this note. Creates the caption object, if
the note contains initial caption data instead of the caption. */
SdrCaptionObj* GetOrCreateCaption( const ScAddress& rPos ) const;
@@ -136,7 +136,7 @@ public:
/** Shows or hides the note caption object. */
void ShowCaption( const ScAddress& rPos, bool bShow = true
);
/** Returns true, if the caption object is visible. */
- inline bool IsCaptionShown() const { return maNoteData.mbShown; }
+ bool IsCaptionShown() const;
/** Shows or hides the caption temporarily (does not change internal
visibility state). */
void ShowCaptionTemp( const ScAddress& rPos, bool bShow =
true );
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index a7aff76..17653c9 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -704,6 +704,13 @@ void ScFormulaCell::GetResultDimensions( SCSIZE& rCols,
SCSIZE& rRows )
}
}
+bool ScFormulaCell::GetDirty() const { return bDirty; }
+void ScFormulaCell::ResetDirty() { bDirty = false; }
+bool ScFormulaCell::NeedsListening() const { return bNeedListening; }
+void ScFormulaCell::SetNeedsListening( bool bVar ) { bNeedListening = bVar; }
+void ScFormulaCell::SetNeedNumberFormat( bool bVal ) { mbNeedsNumberFormat =
bVal; }
+short ScFormulaCell::GetFormatType() const { return nFormatType; }
+
void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening,
const FormulaGrammar::Grammar eGrammar )
{
@@ -1143,6 +1150,9 @@ void ScFormulaCell::Interpret()
}
}
+bool ScFormulaCell::IsIterCell() const { return bIsIterCell; }
+sal_uInt16 ScFormulaCell::GetSeenInIteration() const { return
nSeenInIteration; }
+
void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
{
class RecursionCounter
@@ -1454,6 +1464,15 @@ void ScFormulaCell::InterpretTail(
ScInterpretTailParameter eTailParam )
}
}
+void ScFormulaCell::SetCompile( bool bVal )
+{
+ bCompile = bVal;
+}
+
+ScDocument* ScFormulaCell::GetDocument() const
+{
+ return pDocument;
+}
void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag )
{
@@ -1482,6 +1501,15 @@ void ScFormulaCell::GetMatColsRows( SCCOL & nCols, SCROW
& nRows ) const
}
}
+void ScFormulaCell::SetInChangeTrack( bool bVal )
+{
+ bInChangeTrack = bVal;
+}
+
+bool ScFormulaCell::IsInChangeTrack() const
+{
+ return bInChangeTrack;
+}
void ScFormulaCell::Notify( SvtBroadcaster&, const SfxHint& rHint)
{
@@ -1565,6 +1593,11 @@ void ScFormulaCell::SetDirtyAfterLoad()
pDocument->PutInFormulaTree( this );
}
+void ScFormulaCell::ResetTableOpDirtyVar()
+{
+ bTableOpDirty = false;
+}
+
void ScFormulaCell::SetTableOpDirty()
{
if ( !IsInChangeTrack() )
@@ -1636,6 +1669,22 @@ void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits )
pCode->AddRecalcMode( nBits );
}
+void ScFormulaCell::SetHybridDouble( double n )
+{
+ aResult.SetHybridDouble( n);
+}
+
+void ScFormulaCell::SetHybridString( const OUString& r )
+{
+ aResult.SetHybridString( r);
+}
+
+void ScFormulaCell::SetHybridFormula( const OUString& r,
+ const formula::FormulaGrammar::Grammar
eGrammar )
+{
+ aResult.SetHybridFormula( r); eTempGrammar = eGrammar;
+}
+
// Dynamically create the URLField on a mouse-over action on a hyperlink()
cell.
void ScFormulaCell::GetURLResult( OUString& rURL, OUString& rCellText )
{
@@ -2748,6 +2797,11 @@ void
ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const
lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() );
}
+bool ScFormulaCell::IsSubTotal() const
+{
+ return bSubTotal;
+}
+
bool ScFormulaCell::IsChanged() const
{
return bChanged;
@@ -2758,6 +2812,11 @@ void ScFormulaCell::SetChanged(bool b)
bChanged = b;
}
+sal_uInt8 ScFormulaCell::GetMatrixFlag() const {
return cMatrixFlag; }
+ScTokenArray* ScFormulaCell::GetCode() const {
return pCode; }
+bool ScFormulaCell::IsRunning() const {
return bRunning; }
+void ScFormulaCell::SetRunning( bool bVal ) {
bRunning = bVal; }
+
void ScFormulaCell::CompileDBFormula()
{
for( FormulaToken* p = pCode->First(); p; p = pCode->Next() )
@@ -2886,6 +2945,15 @@ void ScFormulaCell::CompileColRowNameFormula()
}
}
+ScFormulaCell* ScFormulaCell::GetPrevious() const { return
pPrevious; }
+ScFormulaCell* ScFormulaCell::GetNext() const { return
pNext; }
+void ScFormulaCell::SetPrevious( ScFormulaCell* pF ) { pPrevious
= pF; }
+void ScFormulaCell::SetNext( ScFormulaCell* pF ) { pNext =
pF; }
+ScFormulaCell* ScFormulaCell::GetPreviousTrack() const {
return pPreviousTrack; }
+ScFormulaCell* ScFormulaCell::GetNextTrack() const {
return pNextTrack; }
+void ScFormulaCell::SetPreviousTrack( ScFormulaCell* pF ) {
pPreviousTrack = pF; }
+void ScFormulaCell::SetNextTrack( ScFormulaCell* pF ) {
pNextTrack = pF; }
+
ScFormulaCellGroupRef ScFormulaCell::GetCellGroup()
{
return xGroup;
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 1cee407..8331021 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -530,6 +530,21 @@ ScPostIt* ScPostIt::Clone( const ScAddress& rOwnPos,
ScDocument& rDestDoc, const
return bCloneCaption ? new ScPostIt( rDestDoc, rDestPos, *this ) : new
ScPostIt( rDestDoc, rDestPos, maNoteData, false );
}
+const ScNoteData& ScPostIt::GetNoteData() const
+{
+ return maNoteData;
+}
+
+const OUString& ScPostIt::GetDate() const
+{
+ return maNoteData.maDate;
+}
+
+void ScPostIt::SetDate( const OUString& rDate )
+{
+ maNoteData.maDate = rDate;
+}
+
const OUString& ScPostIt::GetAuthor() const
{
return maNoteData.maAuthor;
@@ -586,6 +601,11 @@ void ScPostIt::SetText( const ScAddress& rPos, const
OUString& rText )
maNoteData.mpCaption->SetText( rText );
}
+SdrCaptionObj* ScPostIt::GetCaption() const
+{
+ return maNoteData.mpCaption;
+}
+
SdrCaptionObj* ScPostIt::GetOrCreateCaption( const ScAddress& rPos ) const
{
CreateCaptionFromInitData( rPos );
@@ -609,6 +629,11 @@ void ScPostIt::ShowCaption( const ScAddress& rPos, bool
bShow )
ScCaptionUtil::SetCaptionLayer( *maNoteData.mpCaption, bShow );
}
+bool ScPostIt::IsCaptionShown() const
+{
+ return maNoteData.mbShown;
+}
+
void ScPostIt::ShowCaptionTemp( const ScAddress& rPos, bool bShow )
{
CreateCaptionFromInitData( rPos );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
