diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 17:18:37 +0100 |
commit | d672102cc70fa4b24eed730e89e9e766cc10a525 (patch) | |
tree | ee6e081a403e1e23af6ec7850a34eb10fc7fc8fd /sc/inc | |
parent | 9617758b4b0997f5981a1303684ba9c9a4dd148b (diff) | |
parent | 6f68642b7b2310b902264849a5ffc5dca6c15510 (diff) |
removetooltypes01: Rebase to DEV300m98
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/addruno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/charthelper.hxx | 11 | ||||
-rw-r--r-- | sc/inc/clipparam.hxx | 12 | ||||
-rw-r--r-- | sc/inc/document.hxx | 6 | ||||
-rw-r--r-- | sc/inc/docuno.hxx | 2 | ||||
-rw-r--r-- | sc/inc/fmtuno.hxx | 6 | ||||
-rwxr-xr-x[-rw-r--r--] | sc/inc/pch/precompiled_sc.hxx | 4 | ||||
-rw-r--r-- | sc/inc/sc.hrc | 1 | ||||
-rw-r--r-- | sc/inc/unonames.hxx | 2 |
9 files changed, 32 insertions, 14 deletions
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index d6df571a29aa..6e71230b21d4 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -47,7 +47,7 @@ private: sal_Int32 nRefSheet; sal_Bool bIsRange; - sal_Bool ParseUIString( const String& rUIString ); + sal_Bool ParseUIString( const String& rUIString, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_OOO ); public: diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx index b7c3279370cf..8ee894e6a55a 100644 --- a/sc/inc/charthelper.hxx +++ b/sc/inc/charthelper.hxx @@ -31,10 +31,15 @@ #include <tools/solar.h> #include "address.hxx" #include "global.hxx" +#include "rangelst.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> class SdrObject; +class SdrPage; +class ScModelObj; + +typedef ::std::vector< ScRangeList > ScRangeListVector; /** Use this to handle charts in a calc document */ @@ -49,6 +54,12 @@ public: ::com::sun::star::uno::Sequence< rtl::OUString >& rRanges ); static void SetChartRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDoc, const ::com::sun::star::uno::Sequence< rtl::OUString >& rRanges ); + + static void AddRangesIfProtectedChart( ScRangeListVector& rRangesVector, ScDocument* pDocument, SdrObject* pObject ); + static void FillProtectedChartRangesVector( ScRangeListVector& rRangesVector, ScDocument* pDocument, SdrPage* pPage ); + static void GetChartNames( ::std::vector< ::rtl::OUString >& rChartNames, SdrPage* pPage ); + static void CreateProtectedChartListenersAndNotify( ScDocument* pDoc, SdrPage* pPage, ScModelObj* pModelObj, SCTAB nTab, + const ScRangeListVector& rRangesVector, const ::std::vector< ::rtl::OUString >& rExcludedChartNames, bool bSameDoc = true ); }; #endif diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx index 78b5474229d1..ce2d4ef30f46 100644 --- a/sc/inc/clipparam.hxx +++ b/sc/inc/clipparam.hxx @@ -30,6 +30,7 @@ #include "rangelst.hxx" #include "rangenam.hxx" +#include "charthelper.hxx" #include <vector> @@ -41,9 +42,11 @@ struct ScClipParam { enum Direction { Unspecified, Column, Row }; - ScRangeList maRanges; - Direction meDirection; - bool mbCutMode; + ScRangeList maRanges; + Direction meDirection; + bool mbCutMode; + sal_uInt32 mnSourceDocID; + ScRangeListVector maProtectedChartRangesVector; ScClipParam(); ScClipParam(const ScRange& rRange, bool bCutMode); @@ -70,6 +73,9 @@ struct ScClipParam ScRange getWholeRange() const; void transpose(); + + sal_uInt32 getSourceDocID() const { return mnSourceDocID; } + void setSourceDocID( sal_uInt32 nVal ) { mnSourceDocID = nVal; } }; // ============================================================================ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index d550ea023878..c7fbb59340bd 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1513,8 +1513,10 @@ public: sal_Bool ContinueOnlineSpelling(); // sal_True = etwas gefunden - sal_Bool IsIdleDisabled() const { return bIdleDisabled; } - void DisableIdle(sal_Bool bDo) { bIdleDisabled = bDo; } + void RepaintRange( const ScRange& rRange ); + + sal_Bool IsIdleDisabled() const { return bIdleDisabled; } + void DisableIdle(sal_Bool bDo) { bIdleDisabled = bDo; } sal_Bool IsDetectiveDirty() const { return bDetectiveDirty; } void SetDetectiveDirty(sal_Bool bSet) { bDetectiveDirty = bSet; } diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 5a1535686e74..e152b4a88f97 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -135,6 +135,8 @@ public: void AfterXMLLoading(sal_Bool bRet); ScSheetSaveData* GetSheetSaveData(); + void RepaintRange( const ScRange& rRange ); + bool HasChangesListeners() const; void NotifyChanges( const ::rtl::OUString& rOperation, const ScRangeList& rRanges, diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 62a020d68d6d..f57b05350d67 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -95,7 +95,6 @@ public: void FillFormat( ScConditionalFormat& rFormat, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar) const; - void DataChanged(); // XSheetConditionalEntries virtual void SAL_CALL addNew( const ::com::sun::star::uno::Sequence< @@ -157,13 +156,11 @@ class ScTableConditionalEntry : public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo > { private: - ScTableConditionalFormat* pParent; ScCondFormatEntryItem aData; ScTableConditionalEntry(); // disabled public: - ScTableConditionalEntry(ScTableConditionalFormat* pPar, - const ScCondFormatEntryItem& aItem); + ScTableConditionalEntry(const ScCondFormatEntryItem& aItem); virtual ~ScTableConditionalEntry(); void GetData(ScCondFormatEntryItem& rData) const; @@ -241,7 +238,6 @@ public: ScValidationData* CreateValidationData( ScDocument* pDoc, formula::FormulaGrammar::Grammar eGrammar ) const; - void DataChanged(); // XSheetCondition virtual ::com::sun::star::sheet::ConditionOperator SAL_CALL getOperator() diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 048d7b638d57..e90a8c46b6a3 100644..100755 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -218,7 +218,7 @@ #include <vcl/dndhelp.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> #include <vcl/gdimtf.hxx> #include <vcl/inputctx.hxx> #include <vcl/jobset.hxx> @@ -235,7 +235,7 @@ #include <vcl/svapp.hxx> #include <vcl/vclevent.hxx> #include <vcl/window.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vos/macros.hxx> #include <vos/object.hxx> #include <vos/types.hxx> diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 159da72a34d2..b38bec784b54 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -928,7 +928,6 @@ #define STR_REPLCELLSWARN (STR_START + 91) #define SCSTR_DPFUNCLISTBOX (STR_START + 92) -#define STR_PRINT_NOTHING (STR_START + 93) #define SCSTR_ALLFILTER (STR_START + 94) #define SCSTR_MOREBTN_MOREOPTIONS (STR_START + 95) #define SCSTR_MOREBTN_FEWEROPTIONS (STR_START + 96) diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 1e56743d8129..a9c08c2884fd 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -528,6 +528,7 @@ #define SC_UNO_ZOOMTYPE "ZoomType" #define SC_UNO_ZOOMVALUE "ZoomValue" #define SC_UNO_UPDTEMPL "UpdateFromTemplate" +#define SC_UNO_VISAREASCREEN "VisibleAreaOnScreen" /*Stampit enable/disable print cancel */ #define SC_UNO_ALLOWPRINTJOBCANCEL "AllowPrintJobCancel" @@ -610,6 +611,7 @@ #define SC_UNONAME_ADDRESS "Address" #define SC_UNONAME_UIREPR "UserInterfaceRepresentation" #define SC_UNONAME_PERSREPR "PersistentRepresentation" +#define SC_UNONAME_XLA1REPR "XLA1Representation" #define SC_UNONAME_REFSHEET "ReferenceSheet" // --> PB 2004-08-23 #i33095# Security Options |