diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-04 10:24:45 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-11 08:01:24 +0200 |
| commit | caad0f6c79909f2fb4865ac8395fc1798b8be7a6 (patch) | |
| tree | 3e88a00425eadfebb08ca673d929ea60a4c6a0c7 /sc/inc/document.hxx | |
| parent | integrate color formats into conditional formats (diff) | |
| download | core-caad0f6c79909f2fb4865ac8395fc1798b8be7a6.tar.gz core-caad0f6c79909f2fb4865ac8395fc1798b8be7a6.zip | |
adjust import/export code to merged conditional formats
Change-Id: Ib9cd4e09e55ff2413db8e1daf45624d695e3113d
Diffstat (limited to 'sc/inc/document.hxx')
| -rw-r--r-- | sc/inc/document.hxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 90d2f768b1ec..cc2780f694aa 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -97,7 +97,6 @@ class ScChartListenerCollection; class ScConditionalFormat; class ScConditionalFormatList; class ScColorFormat; -class ScColorFormatList; class ScDBCollection; class ScDBData; class ScDetOpData; @@ -1165,7 +1164,7 @@ public: const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, bool bDeep = true ); - const ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; + SC_DLLPUBLIC ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const; const SfxPoolItem* GetEffItem( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const; @@ -1196,8 +1195,7 @@ public: void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ); void ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ); - SC_DLLPUBLIC sal_uLong AddCondFormat( const ScConditionalFormat& rNew, SCTAB nTab ); - SC_DLLPUBLIC sal_uLong AddColorFormat( ScColorFormat* pNew, SCTAB nTab ); + SC_DLLPUBLIC sal_uLong AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab ); SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, SCTAB nTab, ScRangeList& rRanges ); SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab ); void ConditionalChanged( sal_uLong nKey, SCTAB nTab ); @@ -1208,9 +1206,6 @@ public: SC_DLLPUBLIC ScConditionalFormatList* GetCondFormList( SCTAB nTab ) const; - SC_DLLPUBLIC const ScColorFormatList* GetColorScaleList(SCTAB nTab) const; - SC_DLLPUBLIC ScColorFormatList* GetColorScaleList(SCTAB nTab); - ScValidationDataList* GetValidationList() const { return pValidationList; } |