summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/attarray.hxx5
-rw-r--r--sc/inc/attrib.hxx24
-rw-r--r--sc/inc/colorscale.hxx26
-rw-r--r--sc/inc/column.hxx2
-rw-r--r--sc/inc/compiler.hxx2
-rw-r--r--sc/inc/document.hxx8
-rw-r--r--sc/inc/sc.hrc8
-rw-r--r--sc/inc/scabstdlg.hxx15
-rw-r--r--sc/inc/scitems.hxx87
-rw-r--r--sc/inc/shapeuno.hxx2
-rw-r--r--sc/inc/stlsheet.hxx10
-rw-r--r--sc/inc/table.hxx4
-rw-r--r--sc/inc/xmlwrap.hxx4
13 files changed, 114 insertions, 83 deletions
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 1f8d9f21e49f..6598341123ca 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -96,7 +96,7 @@ friend class ScDocument; // for FillInfo
friend class ScDocumentIterator;
friend class ScAttrIterator;
friend class ScHorizontalAttrIterator;
-friend void lcl_IterGetNumberFormat( sal_uLong& nFormat,
+friend void ScAttrArray_IterGetNumberFormat( sal_uLong& nFormat,
const ScAttrArray*& rpArr, SCROW& nAttrEndRow,
const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc );
@@ -138,6 +138,9 @@ public:
void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
const ::editeng::SvxBorderLine* pLine, bool bColorOnly );
+ void AddCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex );
+ void RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex );
+
void ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich );
void ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement );
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 0418d78723ed..eb051fd8e1ac 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -393,6 +393,30 @@ private:
sal_uInt16 mnHeight;
};
+class ScCondFormatItem : public SfxPoolItem
+{
+public:
+ TYPEINFO();
+
+ explicit ScCondFormatItem();
+ explicit ScCondFormatItem(sal_uInt32 nIndex);
+ explicit ScCondFormatItem(const std::vector<sal_uInt32>& nIndex);
+
+ virtual ~ScCondFormatItem();
+
+ virtual int operator==(const SfxPoolItem& rCmp ) const;
+ virtual ScCondFormatItem* Clone( SfxItemPool* = 0 ) const;
+
+ const std::vector<sal_uInt32>& GetCondFormatData() const;
+ void AddCondFormatData( sal_uInt32 nIndex );
+ void SetCondFormatData( const std::vector<sal_uInt32>& aIndex );
+ void RemoveCondFormatData( sal_uInt32 nIndex );
+
+private:
+
+ std::vector<sal_uInt32> maIndex;
+};
+
// ============================================================================
#endif
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index df3e17a66507..92f88f3359b4 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -45,16 +45,18 @@ class ScFormulaCell;
class ScTokenArray;
struct ScDataBarInfo;
+// don't change the order
+// they are also used in the dialog to determine the position
+// in the list box
enum ScColorScaleEntryType
{
- COLORSCALE_VALUE,
+ COLORSCALE_AUTO,
COLORSCALE_MIN,
COLORSCALE_MAX,
- COLORSCALE_PERCENT,
COLORSCALE_PERCENTILE,
+ COLORSCALE_VALUE,
+ COLORSCALE_PERCENT,
COLORSCALE_FORMULA,
- COLORSCALE_AUTOMIN,
- COLORSCALE_AUTOMAX
};
class SC_DLLPUBLIC ScColorScaleEntry
@@ -189,10 +191,24 @@ public:
virtual void DataChanged(const ScRange& rRange) = 0;
virtual void SetParent(ScConditionalFormat* pParent);
+ virtual void startRendering();
+ virtual void endRendering();
+
protected:
- void getValues( std::vector<double>& rValues ) const;
+ std::vector<double>& getValues() const;
+
+ double getMinValue() const;
+ double getMaxValue() const;
ScConditionalFormat* mpParent;
+
+private:
+
+ struct ScColorFormatCache
+ {
+ std::vector<double> maValues;
+ };
+ mutable boost::scoped_ptr<ScColorFormatCache> mpCache;
};
class SC_DLLPUBLIC ScColorScaleFormat : public ScColorFormat
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 34e05cbc6368..3206637e7cfe 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -317,6 +317,8 @@ public:
void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark);
void ApplySelectionLineStyle( const ScMarkData& rMark,
const ::editeng::SvxBorderLine* pLine, bool bColorOnly );
+ void AddCondFormat(SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex );
+ void RemoveCondFormat(SCROW nStartRow, SCROW nEndRow, sal_uInt32 nIndex );
const ScStyleSheet* GetStyle( SCROW nRow ) const;
const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const;
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 32a54f8202f7..86e46c5723ce 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -130,7 +130,7 @@ struct ScRawToken: private ScRawTokenBase
// Friends that use a temporary ScRawToken on the stack (and therefor need
// the private dtor) and know what they're doing..
friend class ScTokenArray;
- friend sal_uInt16 lcl_ScRawTokenOffset();
+ static sal_uInt16 sbyteOffset();
public:
union {
double nValue;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index da7b57521025..390002e98664 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -358,9 +358,6 @@ private:
bool bIsEmbedded; // display/adjust Embedded area?
- // no SetDirty for ScFormulaCell::CompileTokenArray but at the end of
- // ScDocument::CompileAll[WithFormats], CopyScenario, CopyBlockFromClip
- bool bNoSetDirty;
// no broadcast, construct no listener during insert from a different
// Doc (per filter or the like ), not until CompileAll / CalcAfterLoad
bool bInsertingFromOtherDoc;
@@ -1155,6 +1152,8 @@ public:
SC_DLLPUBLIC const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) const;
const ScPatternAttr* GetSelectionPattern( const ScMarkData& rMark, bool bDeep = true );
ScPatternAttr* CreateSelectionPattern( const ScMarkData& rMark, bool bDeep = true );
+ SC_DLLPUBLIC void AddCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex );
+ void RemoveCondFormatData( const ScRangeList& rRange, SCTAB nTab, sal_uInt32 nIndex );
SC_DLLPUBLIC ScConditionalFormat* GetCondFormat( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
SC_DLLPUBLIC const SfxItemSet* GetCondResult( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
@@ -1189,7 +1188,6 @@ public:
SC_DLLPUBLIC sal_uLong AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab );
void DeleteConditionalFormat( sal_uLong nIndex, SCTAB nTab );
- SC_DLLPUBLIC void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges, SCTAB nTab );
void ConditionalChanged( sal_uLong nKey, SCTAB nTab );
void SetCondFormList( ScConditionalFormatList* pList, SCTAB nTab );
@@ -1549,8 +1547,6 @@ public:
SC_DLLPUBLIC sal_uInt32 GetRangeOverflowType() const { return nRangeOverflowType; }
// for broadcasting/listening
- void SetNoSetDirty( bool bVal ) { bNoSetDirty = bVal; }
- bool GetNoSetDirty() const { return bNoSetDirty; }
void SetInsertingFromOtherDoc( bool bVal ) { bInsertingFromOtherDoc = bVal; }
bool IsInsertingFromOtherDoc() const { return bInsertingFromOtherDoc; }
void SetLoadingMedium( bool bVal );
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 51cebf39f182..efec7ab11b6a 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -250,7 +250,9 @@
#define SID_OPENDLG_OPTSOLVER (SC_MESSAGE_START + 60)
#define SID_VALIDITY_REFERENCE (SC_MESSAGE_START + 61)
#define SID_OPENDLG_CONDFRMT_MANAGER (SC_MESSAGE_START + 62)
-#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
+#define SC_HINT_NAVIGATOR_UPDATEALL (SC_MESSAGE_START + 65)
+#define SID_OPENDLG_COLORSCALE (SC_MESSAGE_START + 66)
+#define SID_OPENDLG_DATABAR (SC_MESSAGE_START + 67)
// functions
@@ -527,6 +529,9 @@
#define SID_NEW_SLOTS (SID_KEYFUNC_END)
#define SID_NEW_TABLENAME (SID_NEW_SLOTS+1)
+
+#define SID_EXPORT_AS_GRAPHIC (SID_NEW_SLOTS+2)
+
#define FID_MERGE_TOGGLE (SID_NEW_SLOTS+10)
#define SID_ATTR_ROWHEADERS (SID_NEW_SLOTS+11)
#define SID_ATTR_COLHEADERS (SID_NEW_SLOTS+12)
@@ -1124,4 +1129,3 @@
#define RID_SCPAGE_DEFAULTS (SC_OOO_BUILD_START + 10)
#endif
-
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 7081ddb5b4b0..d09027cad4cf 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -84,20 +84,12 @@ public:
virtual sal_Bool IsRow() = 0;
};
-class AbstractScCondFormatDlg : public VclAbstractDialog
-{
-public:
- virtual ScConditionalFormat* GetConditionalFormat() = 0;
-};
-
class AbstractScCondFormatManagerDlg : public VclAbstractDialog
{
public:
virtual ScConditionalFormatList* GetConditionalFormatList() = 0;
-};
-class AbstractScDataBarSettingsDlg : public VclAbstractDialog
-{
+ virtual bool CondFormatsChanged() = 0;
};
class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog //add for ScDataPilotDatabaseDlg
@@ -363,14 +355,9 @@ public:
sal_Bool bColDefault = sal_True ) = 0;
virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0; //add for ScSortWarningDlg
- virtual AbstractScCondFormatDlg* CreateScCondFormatDlg (Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat,
- const ScRangeList& rList, const ScAddress& rPos, int nId ) = 0; //add for ScCondFormatDlg
-
virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList,
const ScAddress& rPos, int nId ) = 0;
- virtual AbstractScDataBarSettingsDlg* CreateScDataBarSetttingsDlg (Window* pParent, ScDocument* pDoc, int nId ) = 0; //add for ScDataBarSettingsDlg
-
virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg ( Window* pParent, sal_Bool bEnableExternal, int nId ) = 0; //add for ScDataPilotSourceTypeDlg
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 57073f34e36a..e644854373f0 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -117,53 +117,52 @@
#define ATTR_SHADOW 152
#define ATTR_VALIDDATA 153
#define ATTR_CONDITIONAL 154
-#define ATTR_COLORSCALE 155
-#define ATTR_PATTERN_END 155 // end cell-attribute-pattern
+#define ATTR_PATTERN_END 154 // end cell-attribute-pattern
-#define ATTR_PATTERN 156
+#define ATTR_PATTERN 155
// page attributes
-#define ATTR_LRSPACE 157 // editor: PageDesc-TabPage
-#define ATTR_ULSPACE 158
-#define ATTR_PAGE 159
-#define ATTR_PAGE_PAPERTRAY 160
-#define ATTR_PAGE_PAPERBIN 161
-#define ATTR_PAGE_SIZE 162
-#define ATTR_PAGE_MAXSIZE 163
-#define ATTR_PAGE_HORCENTER 164
-#define ATTR_PAGE_VERCENTER 165
-
-#define ATTR_PAGE_ON 166 // editor: header/footer-page
-#define ATTR_PAGE_DYNAMIC 167
-#define ATTR_PAGE_SHARED 168
-
-#define ATTR_PAGE_NOTES 169 // editor: table
-#define ATTR_PAGE_GRID 170
-#define ATTR_PAGE_HEADERS 171
-#define ATTR_PAGE_CHARTS 172
-#define ATTR_PAGE_OBJECTS 173
-#define ATTR_PAGE_DRAWINGS 174
-#define ATTR_PAGE_TOPDOWN 175
-#define ATTR_PAGE_SCALE 176
-#define ATTR_PAGE_SCALETOPAGES 177
-#define ATTR_PAGE_FIRSTPAGENO 178
-
-#define ATTR_PAGE_PRINTAREA 179 // editor: print areas
-#define ATTR_PAGE_REPEATROW 180
-#define ATTR_PAGE_REPEATCOL 181
-#define ATTR_PAGE_PRINTTABLES 182
-
-#define ATTR_PAGE_HEADERLEFT 183 // contents of header/
-#define ATTR_PAGE_FOOTERLEFT 184 // footer (left)
-#define ATTR_PAGE_HEADERRIGHT 185 // contents of header/
-#define ATTR_PAGE_FOOTERRIGHT 186 // footer (right)
-#define ATTR_PAGE_HEADERSET 187 // the corresponding sets
-#define ATTR_PAGE_FOOTERSET 188
-
-#define ATTR_PAGE_FORMULAS 189
-#define ATTR_PAGE_NULLVALS 190
-
-#define ATTR_PAGE_SCALETO 191 // #i8868# scale printout to width/height
+#define ATTR_LRSPACE 156 // editor: PageDesc-TabPage
+#define ATTR_ULSPACE 157
+#define ATTR_PAGE 158
+#define ATTR_PAGE_PAPERTRAY 159
+#define ATTR_PAGE_PAPERBIN 160
+#define ATTR_PAGE_SIZE 161
+#define ATTR_PAGE_MAXSIZE 162
+#define ATTR_PAGE_HORCENTER 163
+#define ATTR_PAGE_VERCENTER 164
+
+#define ATTR_PAGE_ON 165 // editor: header/footer-page
+#define ATTR_PAGE_DYNAMIC 166
+#define ATTR_PAGE_SHARED 167
+
+#define ATTR_PAGE_NOTES 168 // editor: table
+#define ATTR_PAGE_GRID 169
+#define ATTR_PAGE_HEADERS 170
+#define ATTR_PAGE_CHARTS 171
+#define ATTR_PAGE_OBJECTS 172
+#define ATTR_PAGE_DRAWINGS 173
+#define ATTR_PAGE_TOPDOWN 174
+#define ATTR_PAGE_SCALE 175
+#define ATTR_PAGE_SCALETOPAGES 176
+#define ATTR_PAGE_FIRSTPAGENO 177
+
+#define ATTR_PAGE_PRINTAREA 178 // editor: print areas
+#define ATTR_PAGE_REPEATROW 179
+#define ATTR_PAGE_REPEATCOL 180
+#define ATTR_PAGE_PRINTTABLES 181
+
+#define ATTR_PAGE_HEADERLEFT 182 // contents of header/
+#define ATTR_PAGE_FOOTERLEFT 183 // footer (left)
+#define ATTR_PAGE_HEADERRIGHT 184 // contents of header/
+#define ATTR_PAGE_FOOTERRIGHT 185 // footer (right)
+#define ATTR_PAGE_HEADERSET 186 // the corresponding sets
+#define ATTR_PAGE_FOOTERSET 187
+
+#define ATTR_PAGE_FORMULAS 188
+#define ATTR_PAGE_NULLVALS 189
+
+#define ATTR_PAGE_SCALETO 190 // #i8868# scale printout to width/height
#define ATTR_ENDINDEX ATTR_PAGE_SCALETO // end of pool-range
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 3c1c0e76b6ed..c376f14e2f53 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -72,7 +72,7 @@ class ScShapeObj :public ScShapeObj_Base
,public ScShapeObj_TextBase
{
private:
-friend ScMacroInfo* lcl_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate );
+ friend ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate );
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > mxShapeAgg;
// cached pointers to avoid repeated queryAggregation calls:
::com::sun::star::beans::XPropertySet* pShapePropertySet;
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index 2e5c13072869..c66d53642b4e 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -51,17 +51,17 @@ public:
ScStyleSheet( const ScStyleSheet& rStyle );
- virtual sal_Bool SetParent ( const String& rParentName );
+ virtual bool SetParent ( const String& rParentName );
virtual SfxItemSet& GetItemSet ();
- virtual sal_Bool IsUsed () const;
- virtual sal_Bool HasFollowSupport () const;
- virtual sal_Bool HasParentSupport () const;
+ virtual bool IsUsed () const;
+ virtual bool HasFollowSupport () const;
+ virtual bool HasParentSupport () const;
virtual const String& GetName() const;
virtual const String& GetParent() const;
virtual const String& GetFollow() const;
- virtual sal_Bool SetName( const String& );
+ virtual bool SetName( const String& );
void SetUsage( ScStyleSheet::Usage eUse ) const
{ eUsage = eUse; }
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 2b205e5c3042..c630cb743574 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -543,6 +543,8 @@ public:
void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, bool bPutToPool = false );
void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
const ScPatternAttr& rPattern, short nNewType );
+ void AddCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex );
+ void RemoveCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex );
void ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle );
void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle );
@@ -777,8 +779,6 @@ public:
SCCOL nCol,
SCROW nRowStart, SCROW nRowEnd ) const;
- void FindConditionalFormat( sal_uLong nKey, ScRangeList& rRanges ) const;
-
void IncRecalcLevel();
void DecRecalcLevel( bool bUpdateNoteCaptionPos = true );
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index e30df936708e..2e378a4a1d09 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
namespace uno { class XInterface; }
namespace embed { class XStorage; }
namespace xml {
- namespace sax { struct InputSource; } }
+ namespace sax { struct InputSource; class XParser; } }
} } }
class ScXMLImportWrapper
@@ -51,7 +51,7 @@ class ScXMLImportWrapper
sal_uInt32 ImportFromComponent(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& xServiceFactory,
com::sun::star::uno::Reference<com::sun::star::frame::XModel>& xModel,
- com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& xXMLParser,
+ com::sun::star::uno::Reference<com::sun::star::xml::sax::XParser>& xParser,
com::sun::star::xml::sax::InputSource& aParserInput,
const rtl::OUString& sComponentName, const rtl::OUString& sDocName, const rtl::OUString& sOldDocName,
com::sun::star::uno::Sequence<com::sun::star::uno::Any>& aArgs,
generated by cgit (git 2.34.1) at 2025-01-28 02:26:50 +0000