summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/compiler.hxx6
-rw-r--r--sc/inc/dbcolect.hxx5
-rw-r--r--sc/inc/document.hxx4
-rw-r--r--sc/inc/docuno.hxx2
-rw-r--r--sc/inc/dpobject.hxx3
-rw-r--r--sc/inc/dpsave.hxx2
-rw-r--r--sc/inc/externalrefmgr.hxx9
-rw-r--r--sc/inc/table.hxx3
-rw-r--r--sc/inc/token.hxx33
9 files changed, 40 insertions, 27 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 27845bbc50cf..e2c863dace7d 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -361,6 +361,12 @@ public:
static void CheckTabQuotes( String& aTabName,
const formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO );
+ /** Analyzes a string for a 'Doc'#Tab construct, or 'Do''c'#Tab etc..
+
+ @returns the position of the unquoted # hash mark in 'Doc'#Tab, or
+ STRING_NOTFOUND if none. */
+ static xub_StrLen GetDocTabPos( const String& rString );
+
static sal_Bool EnQuote( String& rStr );
sal_Unicode GetNativeAddressSymbol( Convention::SpecialSymbolType eType ) const;
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx
index 2398a142ee4e..32eeb2d65353 100644
--- a/sc/inc/dbcolect.hxx
+++ b/sc/inc/dbcolect.hxx
@@ -2,7 +2,7 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
@@ -44,7 +44,7 @@ class ScDocument;
class ScDBData : public ScDataObject, public ScRefreshTimer
{
-
+friend class ScDBCollection;
private:
// DBParam
String aName;
@@ -219,6 +219,7 @@ public:
virtual sal_Bool IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
+ ScDBData* GetFilterDBAtTable(SCTAB nTab) const;
sal_Bool SearchName( const String& rName, sal_uInt16& rIndex ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3786b6b850b0..ecbd73e6cd4e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2,7 +2,7 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
@@ -505,7 +505,7 @@ public:
ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab,
sal_Bool bStartOnly = sal_False) const;
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
-
+ ScDBData* GetFilterDBAtTable(SCTAB nTab) const;
//UNUSED2008-05 ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab,
//UNUSED2008-05 sal_Bool bStartOnly = sal_False) const;
SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const;
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index e152b4a88f97..f213806762d8 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -129,7 +129,7 @@ public:
ScDocument* GetDocument() const;
SfxObjectShell* GetEmbeddedObject() const;
- void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL );
+ void UpdateAllRowHeights( const ScMarkData* pTabMark = NULL, bool bCalcOutputFactor = false );
void BeforeXMLLoading();
void AfterXMLLoading(sal_Bool bRet);
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 8cbc6aa8e16a..5890ca847c08 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -116,6 +116,7 @@ private:
SC_DLLPRIVATE void CreateOutput();
sal_Bool bRefresh;
long mnCacheId;
+ bool mbCreatingTableData;
public:
// Wang Xu Ming -- 2009-8-17
@@ -152,7 +153,7 @@ public:
void SetHeaderLayout(bool bUseGrid);
bool GetHeaderLayout() const;
- void SetSheetDesc(const ScSheetSourceDesc& rDesc);
+ void SetSheetDesc(const ScSheetSourceDesc& rDesc, bool bFromRefUpdate = false);
void SetImportDesc(const ScImportSourceDesc& rDesc);
void SetServiceData(const ScDPServiceDesc& rDesc);
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index bd84e599d984..b5c36e9d2f72 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -46,6 +46,7 @@ namespace com { namespace sun { namespace star { namespace sheet {
class ScDPDimensionSaveData;
class ScDPTableData;
+class ScDPObject;
// --------------------------------------------------------------------
//
@@ -272,6 +273,7 @@ public:
SC_DLLPUBLIC ScDPDimensionSaveData* GetDimensionData(); // create if not there
void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied
void BuildAllDimensionMembers(ScDPTableData* pData);
+ void BuildAllDimensionMembersFromSource(ScDPObject* pDPObj);
/**
* Check whether a dimension has one or more invisible members.
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 818920885493..3e78232db55a 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -257,8 +257,6 @@ public:
void getAllTableNames(sal_uInt16 nFileId, ::std::vector<String>& rTabNames) const;
SCsTAB getTabSpan( sal_uInt16 nFileId, const String& rStartTabName, const String& rEndTabName ) const;
void getAllNumberFormats(::std::vector<sal_uInt32>& rNumFmts) const;
- bool hasCacheTable(sal_uInt16 nFileId, const String& rTabName) const;
- size_t getCacheTableCount(sal_uInt16 nFileId) const;
/**
* Set all tables of a document as referenced, used only during
@@ -508,8 +506,6 @@ public:
*/
void getAllCachedNumberFormats(::std::vector<sal_uInt32>& rNumFmts) const;
- bool hasCacheTable(sal_uInt16 nFileId, const String& rTabName) const;
- size_t getCacheTableCount(sal_uInt16 nFileId) const;
sal_uInt16 getExternalFileCount() const;
/**
@@ -646,6 +642,11 @@ public:
void resetSrcFileData(const String& rBaseFileUrl);
/**
+ * Replace the original URL wirh the real URL that was generated from the relative URL.
+ */
+ void updateAbsAfterLoad();
+
+ /**
* Stop tracking a specific formula cell.
*
* @param pCell pointer to cell that formerly contained external
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b51cc084594d..5ac110373257 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -2,7 +2,7 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
@@ -684,6 +684,7 @@ public:
/// @return the index of the last changed row (flags and row height, auto pagebreak is ignored).
SCROW GetLastChangedRow() const;
+ sal_Bool IsDataFiltered() const;
sal_uInt8 GetColFlags( SCCOL nCol ) const;
sal_uInt8 GetRowFlags( SCROW nRow ) const;
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 13a8038a4109..28cefeec8554 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -198,14 +198,14 @@ public:
ScExternalSingleRefToken( const ScExternalSingleRefToken& r );
virtual ~ScExternalSingleRefToken();
- virtual sal_uInt16 GetIndex() const;
+ virtual sal_uInt16 GetIndex() const;
virtual const String& GetString() const;
virtual const ScSingleRefData& GetSingleRef() const;
- virtual ScSingleRefData& GetSingleRef();
- virtual void CalcAbsIfRel( const ScAddress& );
- virtual void CalcRelFromAbs( const ScAddress& );
+ virtual ScSingleRefData& GetSingleRef();
+ virtual void CalcAbsIfRel( const ScAddress& );
+ virtual void CalcRelFromAbs( const ScAddress& );
virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const;
- virtual FormulaToken* Clone() const { return new ScExternalSingleRefToken(*this); }
+ virtual FormulaToken* Clone() const { return new ScExternalSingleRefToken(*this); }
};
@@ -220,20 +220,21 @@ private:
public:
ScExternalDoubleRefToken( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& r );
ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r );
+ explicit ScExternalDoubleRefToken( const ScExternalSingleRefToken& r );
virtual ~ScExternalDoubleRefToken();
- virtual sal_uInt16 GetIndex() const;
- virtual const String& GetString() const;
- virtual const ScSingleRefData& GetSingleRef() const;
- virtual ScSingleRefData& GetSingleRef();
- virtual const ScSingleRefData& GetSingleRef2() const;
- virtual ScSingleRefData& GetSingleRef2();
- virtual const ScComplexRefData& GetDoubleRef() const;
- virtual ScComplexRefData& GetDoubleRef();
- virtual void CalcAbsIfRel( const ScAddress& );
- virtual void CalcRelFromAbs( const ScAddress& );
+ virtual sal_uInt16 GetIndex() const;
+ virtual const String& GetString() const;
+ virtual const ScSingleRefData& GetSingleRef() const;
+ virtual ScSingleRefData& GetSingleRef();
+ virtual const ScSingleRefData& GetSingleRef2() const;
+ virtual ScSingleRefData& GetSingleRef2();
+ virtual const ScComplexRefData& GetDoubleRef() const;
+ virtual ScComplexRefData& GetDoubleRef();
+ virtual void CalcAbsIfRel( const ScAddress& );
+ virtual void CalcRelFromAbs( const ScAddress& );
virtual sal_Bool operator==( const formula::FormulaToken& rToken ) const;
- virtual FormulaToken* Clone() const { return new ScExternalDoubleRefToken(*this); }
+ virtual FormulaToken* Clone() const { return new ScExternalDoubleRefToken(*this); }
};
generated by cgit (git 2.34.1) at 2024-06-13 00:25:05 +0000