diff options
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/document.hxx | 1 | ||||
-rw-r--r-- | sc/inc/globalnames.hxx | 2 | ||||
-rw-r--r-- | sc/inc/rangenam.hxx | 6 | ||||
-rw-r--r-- | sc/inc/scabstdlg.hxx | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 02cc60d7ff71..3095f0c6cd36 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -467,6 +467,7 @@ public: SC_DLLPUBLIC void GetAllTabRangeNames(ScRangeName::TabNameCopyMap& rRangeNames) const; SC_DLLPUBLIC void SetAllTabRangeNames(const ScRangeName::TabNameCopyMap& rRangeNames); void GetTabRangeNameMap(std::map<rtl::OUString, ScRangeName*>& rRangeName); + void GetRangeNameMap(std::map<rtl::OUString, ScRangeName*>& rRangeName); SC_DLLPUBLIC ScRangeName* GetRangeName(SCTAB nTab) const; SC_DLLPUBLIC ScRangeName* GetRangeName() const; void SetRangeName(SCTAB nTab, ScRangeName* pNew); diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx index a36fa5b93f12..33ac520c8a5f 100644 --- a/sc/inc/globalnames.hxx +++ b/sc/inc/globalnames.hxx @@ -32,6 +32,8 @@ #define STR_DB_LOCAL_NONAME "__Anonymous_Sheet_DB__" #define STR_DB_GLOBAL_NONAME "__Anonymous_DB__" +#define STR_GLOBAL_RANGE_NAME "__Global_Range_Name__" + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 32d31ff0e0b2..04a77c422811 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -124,7 +124,7 @@ public: sal_uInt16 GetIndex() const { return nIndex; } ScTokenArray* GetCode() { return pCode; } const ScTokenArray* GetCode() const { return pCode; } - sal_uInt16 GetErrCode() const; + SC_DLLPUBLIC sal_uInt16 GetErrCode() const; bool HasReferences() const; void SetDocument( ScDocument* pDocument){ pDoc = pDocument; } ScDocument* GetDocument() const { return pDoc; } @@ -204,8 +204,8 @@ public: SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange& rRange) const; SC_DLLPUBLIC ScRangeData* findByName(const rtl::OUString& rName); SC_DLLPUBLIC const ScRangeData* findByName(const rtl::OUString& rName) const; - ScRangeData* findByUpperName(const rtl::OUString& rName); - const ScRangeData* findByUpperName(const rtl::OUString& rName) const; + SC_DLLPUBLIC ScRangeData* findByUpperName(const rtl::OUString& rName); + SC_DLLPUBLIC const ScRangeData* findByUpperName(const rtl::OUString& rName) const; SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i); void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz); diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index c62a2eb80484..ecb6fe610915 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -424,7 +424,8 @@ public: virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, const ScRangeName* pList, //add for ScNamePasteDlg const ScRangeName* pLocalList, int nId , bool bInsList=true ) = 0; - virtual AbstractScNameAddDlg* CreateScNameAddDlg ( Window* pParent, ScDocument* pDoc, int nId) = 0; + virtual AbstractScNameAddDlg* CreateScNameAddDlg ( Window* pParent, ScDocument* pDoc, std::map<rtl::OUString, ScRangeName*> aRangeMap, + const ScAddress& aCursorPos, const bool bUndo, int nId) = 0; virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ) = 0; |