summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/cellsuno.hxx42
-rw-r--r--sc/inc/collect.hxx58
-rw-r--r--sc/inc/defltuno.hxx2
-rw-r--r--sc/inc/docoptio.hxx1
-rw-r--r--sc/inc/docuno.hxx2
-rw-r--r--sc/inc/fielduno.hxx4
-rw-r--r--sc/inc/funcuno.hxx1
-rw-r--r--sc/inc/global.hxx18
-rw-r--r--sc/inc/optuno.hxx17
-rw-r--r--sc/inc/styleuno.hxx7
10 files changed, 87 insertions, 65 deletions
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index ababb5ac5..1eb76e879 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -112,7 +112,7 @@ class ScPatternAttr;
class SvxBorderLine;
class SvxBoxItem;
class SvxBoxInfoItem;
-
+class SvxItemPropertySet;
class ScLinkListener : public SvtListener
{
@@ -178,7 +178,7 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet
friend class ooo::vba::ScVbaCellRangeAccess;
private:
- SfxItemPropertySet aPropSet;
+ const SfxItemPropertySet* pPropSet;
ScDocShell* pDocShell;
ScLinkListener* pValueListener;
ScPatternAttr* pCurrentFlat;
@@ -221,11 +221,11 @@ protected:
// GetItemPropertyMap for derived classes must contain all entries, including base class
virtual const SfxItemPropertyMap* GetItemPropertyMap();
virtual ::com::sun::star::beans::PropertyState GetOnePropertyState(
- USHORT nItemWhich, const SfxItemPropertyMap* pMap );
- virtual void GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ USHORT nItemWhich, const SfxItemPropertySimpleEntry* pEntry );
+ virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
@@ -610,16 +610,16 @@ class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase,
public com::sun::star::table::XColumnRowRange
{
private:
- SfxItemPropertySet aRangePropSet;
+ const SfxItemPropertySet* pRangePropSet;
ScRange aRange;
protected:
const ScRange& GetRange() const { return aRange; }
virtual const SfxItemPropertyMap* GetItemPropertyMap();
- virtual void GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
@@ -825,7 +825,7 @@ class ScCellObj : public ScCellRangeObj,
{
private:
SvxUnoText* pUnoText;
- SfxItemPropertySet aCellPropSet;
+ const SfxItemPropertySet* pCellPropSet;
ScAddress aCellPos;
sal_Int16 nActionLockCount;
@@ -839,16 +839,16 @@ private:
protected:
virtual const SfxItemPropertyMap* GetItemPropertyMap();
- virtual void GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
public:
- static const SfxItemPropertyMap* GetEditPropertyMap();
+ static const SvxItemPropertySet* GetEditPropertySet();
static const SfxItemPropertyMap* GetCellPropertyMap();
ScCellObj(ScDocShell* pDocSh, const ScAddress& rP);
@@ -1006,17 +1006,17 @@ class ScTableSheetObj : public ScCellRangeObj,
friend class ScTableSheetsObj; // fuer insertByName()
private:
- SfxItemPropertySet aSheetPropSet;
+ const SfxItemPropertySet* pSheetPropSet;
SCTAB GetTab_Impl() const;
void PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges );
protected:
virtual const SfxItemPropertyMap* GetItemPropertyMap();
- virtual void GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
@@ -1240,14 +1240,14 @@ class ScTableColumnObj : public ScCellRangeObj,
public com::sun::star::container::XNamed
{
private:
- SfxItemPropertySet aColPropSet;
+ const SfxItemPropertySet* pColPropSet;
protected:
virtual const SfxItemPropertyMap* GetItemPropertyMap();
- virtual void GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
@@ -1291,14 +1291,14 @@ public:
class ScTableRowObj : public ScCellRangeObj
{
private:
- SfxItemPropertySet aRowPropSet;
+ const SfxItemPropertySet* pRowPropSet;
protected:
virtual const SfxItemPropertyMap* GetItemPropertyMap();
- virtual void GetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
::com::sun::star::uno::Any& )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ virtual void SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx
index c54926194..49931d1b8 100644
--- a/sc/inc/collect.hxx
+++ b/sc/inc/collect.hxx
@@ -53,8 +53,8 @@ class SC_DLLPUBLIC ScDataObject
{
public:
ScDataObject() {}
- virtual ~ScDataObject();
- virtual ScDataObject* Clone() const = 0;
+ virtual ~ScDataObject();
+ virtual ScDataObject* Clone() const = 0;
};
class SC_DLLPUBLIC ScCollection : public ScDataObject
@@ -65,29 +65,29 @@ protected:
USHORT nDelta;
ScDataObject** pItems;
public:
- ScCollection(USHORT nLim = 4, USHORT nDel = 4);
- ScCollection(const ScCollection& rCollection);
- virtual ~ScCollection();
+ ScCollection(USHORT nLim = 4, USHORT nDel = 4);
+ ScCollection(const ScCollection& rCollection);
+ virtual ~ScCollection();
- virtual ScDataObject* Clone() const;
+ virtual ScDataObject* Clone() const;
- void AtFree(USHORT nIndex);
- void Free(ScDataObject* pScDataObject);
- void FreeAll();
+ void AtFree(USHORT nIndex);
+ void Free(ScDataObject* pScDataObject);
+ void FreeAll();
- BOOL AtInsert(USHORT nIndex, ScDataObject* pScDataObject);
- virtual BOOL Insert(ScDataObject* pScDataObject);
+ BOOL AtInsert(USHORT nIndex, ScDataObject* pScDataObject);
+ virtual BOOL Insert(ScDataObject* pScDataObject);
- ScDataObject* At(USHORT nIndex) const;
- virtual USHORT IndexOf(ScDataObject* pScDataObject) const;
- USHORT GetCount() const { return nCount; }
+ ScDataObject* At(USHORT nIndex) const;
+ virtual USHORT IndexOf(ScDataObject* pScDataObject) const;
+ USHORT GetCount() const { return nCount; }
ScDataObject* operator[]( const USHORT nIndex) const {return At(nIndex);}
- ScCollection& operator=( const ScCollection& rCol );
+ ScCollection& operator=( const ScCollection& rCol );
};
-class SC_DLLPUBLIC ScSortedCollection : public ScCollection
+class SC_DLLPUBLIC ScSortedCollection : public ScCollection
{
private:
BOOL bDuplicates;
@@ -96,19 +96,19 @@ protected:
void SetDups( BOOL bVal ) { bDuplicates = bVal; }
BOOL IsDups() const { return bDuplicates; }
public:
- ScSortedCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE);
- ScSortedCollection(const ScSortedCollection& rScSortedCollection) :
+ ScSortedCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE);
+ ScSortedCollection(const ScSortedCollection& rScSortedCollection) :
ScCollection(rScSortedCollection),
bDuplicates(rScSortedCollection.bDuplicates) {}
- virtual USHORT IndexOf(ScDataObject* pScDataObject) const;
- virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const = 0;
- virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
- BOOL Search(ScDataObject* pScDataObject, USHORT& rIndex) const;
- virtual BOOL Insert(ScDataObject* pScDataObject);
- virtual BOOL InsertPos(ScDataObject* pScDataObject, USHORT& nIndex);
+ virtual USHORT IndexOf(ScDataObject* pScDataObject) const;
+ virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const = 0;
+ virtual BOOL IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const;
+ BOOL Search(ScDataObject* pScDataObject, USHORT& rIndex) const;
+ virtual BOOL Insert(ScDataObject* pScDataObject);
+ virtual BOOL InsertPos(ScDataObject* pScDataObject, USHORT& nIndex);
- BOOL operator==(const ScSortedCollection& rCmp) const;
+ BOOL operator==(const ScSortedCollection& rCmp) const;
};
@@ -199,16 +199,16 @@ public:
TypedScStrCollection( const TypedScStrCollection& rCpy )
: ScSortedCollection( rCpy ) { bCaseSensitive = rCpy.bCaseSensitive; }
- virtual ScDataObject* Clone() const;
- virtual short Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const;
+ virtual ScDataObject* Clone() const;
+ virtual short Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const;
TypedStrData* operator[]( const USHORT nIndex) const
{ return (TypedStrData*)At(nIndex); }
void SetCaseSensitive( BOOL bSet ) { bCaseSensitive = bSet; }
- BOOL FindText( const String& rStart, String& rResult, USHORT& rPos, BOOL bBack ) const;
- BOOL GetExactMatch( String& rString ) const;
+ BOOL FindText( const String& rStart, String& rResult, USHORT& rPos, BOOL bBack ) const;
+ BOOL GetExactMatch( String& rString ) const;
};
#endif
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 5b3a1a7ce..abcf0145d 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -36,6 +36,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <cppuhelper/implbase3.hxx>
+#include <svtools/itemprop.hxx>
class ScDocShell;
@@ -48,6 +49,7 @@ class ScDocDefaultsObj : public ::cppu::WeakImplHelper3<
{
private:
ScDocShell* pDocShell;
+ SfxItemPropertyMap aPropertyMap;
void ItemsChanged();
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index f533c4bf9..0ca7c28b1 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -33,6 +33,7 @@
#include <unotools/configitem.hxx>
#include <svtools/poolitem.hxx>
+#include <svtools/itemprop.hxx>
#include "scdllapi.h"
#include "optutil.hxx"
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index e631f7137..f8511035c 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -112,6 +112,8 @@ private:
ScMarkData& rMark, ScPrintSelectionStatus& rStatus ) const;
rtl::OUString maBuildId;
+protected:
+ const SfxItemPropertySet& GetPropertySet() const { return aPropSet; }
public:
ScModelObj(ScDocShell* pDocSh);
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 621f44262..c09a1b66c 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -138,7 +138,7 @@ class ScCellFieldObj : public ScMutexHelper,
public SfxListener
{
private:
- SfxItemPropertySet aPropSet;
+ const SfxItemPropertySet* pPropSet;
ScDocShell* pDocShell;
ScAddress aCellPos;
SvxEditSource* pEditSource;
@@ -337,7 +337,7 @@ class ScHeaderFieldObj : public ScMutexHelper,
public ::com::sun::star::lang::XServiceInfo
{
private:
- SfxItemPropertySet aPropSet;
+ const SfxItemPropertySet* pPropSet;
ScHeaderFooterContentObj* pContentObj;
USHORT nPart;
UINT16 nType;
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 1c53f8588..e10940b1a 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -74,6 +74,7 @@ class ScFunctionAccess : public cppu::WeakImplHelper3<
private:
ScTempDocCache aDocCache;
ScDocOptions* pOptions;
+ SfxItemPropertyMap aPropertyMap;
BOOL bInvalid;
public:
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 96fa9d4cb..9f900237e 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -841,17 +841,17 @@ public:
ScQueryParam( const ScQueryParam& r );
~ScQueryParam();
- SCSIZE GetEntryCount() const { return nEntryCount; }
- ScQueryEntry& GetEntry(SCSIZE n) const { return pEntries[n]; }
- void Resize(SCSIZE nNew);
+ SCSIZE GetEntryCount() const { return nEntryCount; }
+ ScQueryEntry& GetEntry(SCSIZE n) const { return pEntries[n]; }
+ void Resize(SCSIZE nNew);
- ScQueryParam& operator= ( const ScQueryParam& r );
- BOOL operator== ( const ScQueryParam& rOther ) const;
- void Clear ();
- void DeleteQuery( SCSIZE nPos );
+ ScQueryParam& operator= ( const ScQueryParam& r );
+ BOOL operator== ( const ScQueryParam& rOther ) const;
+ void Clear ();
+ void DeleteQuery( SCSIZE nPos );
- void MoveToDest();
- void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
+ void MoveToDest();
+ void FillInExcelSyntax(String& aCellStr, SCSIZE nIndex);
};
// -----------------------------------------------------------------------
diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx
index 3e90432c9..525420cf5 100644
--- a/sc/inc/optuno.hxx
+++ b/sc/inc/optuno.hxx
@@ -34,17 +34,32 @@
#include "docuno.hxx"
#include "docoptio.hxx"
+#define PROP_UNO_CALCASSHOWN 1
+#define PROP_UNO_DEFTABSTOP 2
+#define PROP_UNO_IGNORECASE 3
+#define PROP_UNO_ITERENABLED 4
+#define PROP_UNO_ITERCOUNT 5
+#define PROP_UNO_ITEREPSILON 6
+#define PROP_UNO_LOOKUPLABELS 7
+#define PROP_UNO_MATCHWHOLE 8
+#define PROP_UNO_NULLDATE 9
+#define PROP_UNO_SPELLONLINE 10
+#define PROP_UNO_STANDARDDEC 11
+#define PROP_UNO_REGEXENABLED 12
+
class ScDocOptionsHelper
{
public:
- static const SfxItemPropertyMap* GetPropertyMap();
+ static const SfxItemPropertyMapEntry* GetPropertyMap();
static sal_Bool setPropertyValue( ScDocOptions& rOptions,
+ const SfxItemPropertyMap& rPropMap,
const ::rtl::OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue );
static ::com::sun::star::uno::Any getPropertyValue(
const ScDocOptions& rOptions,
+ const SfxItemPropertyMap& rPropMap,
const ::rtl::OUString& PropertyName );
};
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index ca2e38515..c0629e638 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -224,14 +224,15 @@ class ScStyleObj : public ::cppu::WeakImplHelper7<
public SfxListener
{
private:
- SfxItemPropertySet aPropSet;
+ const SfxItemPropertySet* pPropSet;
ScDocShell* pDocShell;
SfxStyleFamily eFamily; // Familie
String aStyleName;
SfxStyleSheetBase* GetStyle_Impl();
- const SfxItemSet* GetStyleItemSet_Impl( const String& rPropName, const SfxItemPropertyMap*& rpMapEntry );
- void SetOnePropertyValue( const SfxItemPropertyMap* pMap,
+ const SfxItemSet* GetStyleItemSet_Impl( const ::rtl::OUString& rPropName, const SfxItemPropertySimpleEntry*& rpEntry );
+ void SetOnePropertyValue( const ::rtl::OUString& rPropertyName,
+ const SfxItemPropertySimpleEntry* pEntry,
const ::com::sun::star::uno::Any* pValue )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-17 06:12:56 +0000