diff options
182 files changed, 465 insertions, 469 deletions
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index ca2b53205460..7c38d97f57f9 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -51,8 +51,8 @@ class ScAutoFormatsObj : public ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo > { private: - ScAutoFormatObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); - ScAutoFormatObj* GetObjectByName_Impl(const OUString& aName); + static ScAutoFormatObj* GetObjectByIndex_Impl(sal_uInt16 nIndex); + static ScAutoFormatObj* GetObjectByName_Impl(const OUString& aName); public: ScAutoFormatsObj(); diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 5399308a4646..c73af70c2b8c 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -124,13 +124,13 @@ class ScAppCfg : public ScAppOptions DECL_LINK( MiscCommitHdl, void* ); DECL_LINK( CompatCommitHdl, void* ); - com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetInputPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetRevisionPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetContentPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetSortListPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetMiscPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetCompatPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetInputPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetRevisionPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetContentPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetSortListPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetMiscPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetCompatPropertyNames(); public: ScAppCfg(); diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 935178bd4b46..129e884e4ce8 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -41,7 +41,7 @@ private: bool bAddUndo; bool bInCreate; bool bDoInsert; // is set to FALSE for first update - bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName ); + static bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName ); public: TYPEINFO_OVERRIDE(); diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 8c4b695a6dd3..afc28efd3185 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -1228,7 +1228,7 @@ public: void AppendCloned( ScChangeAction* pAppend ); SC_DLLPUBLIC ScChangeTrack* Clone( ScDocument* pDocument ) const; - void MergeActionState( ScChangeAction* pAct, const ScChangeAction* pOtherAct ); + static void MergeActionState( ScChangeAction* pAct, const ScChangeAction* pOtherAct ); }; #endif diff --git a/sc/inc/clkernelthread.hxx b/sc/inc/clkernelthread.hxx index 154ec48ba55a..358da116addd 100644 --- a/sc/inc/clkernelthread.hxx +++ b/sc/inc/clkernelthread.hxx @@ -47,8 +47,8 @@ private: osl::Mutex maQueueMutex; osl::Condition maQueueCondition; std::queue<CLBuildKernelWorkItem> maQueue; - void produce(); - void consume(); + static void produce(); + static void consume(); }; } diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index d7bc4be8a5c7..9d9679308d49 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -193,7 +193,7 @@ public: ScRefCellValue GetCellValue( SCROW nRow ) const; ScRefCellValue GetCellValue( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow ) const; - ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ) const; + static ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ); const sc::CellTextAttr* GetCellTextAttr( SCROW nRow ) const; const sc::CellTextAttr* GetCellTextAttr( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow ) const; @@ -610,7 +610,7 @@ public: void InterpretDirtyCells( SCROW nRow1, SCROW nRow2 ); - void JoinNewFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell ) const; + static void JoinNewFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell ); /** * Detach a formula cell that's about to be deleted, or removed from diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 3052b3760a65..09ee64ca1438 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -572,7 +572,7 @@ public: void setFunction(com::sun::star::sheet::GeneralFunction Function); com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction > getSubtotals() const; void setSubtotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction >& rFunctions); - OUString getCurrentPage() const; + static OUString getCurrentPage(); void setCurrentPage(const OUString& sPage); void setUseCurrentPage(bool bUse); const com::sun::star::sheet::DataPilotFieldAutoShowInfo* getAutoShowInfo(); @@ -593,7 +593,7 @@ public: void setGroupInfo(const com::sun::star::sheet::DataPilotFieldGroupInfo* pInfo); // XDataPilotFieldGrouping - bool HasString(const com::sun::star::uno::Sequence< OUString >& aItems, const OUString& aString); + static bool HasString(const com::sun::star::uno::Sequence< OUString >& aItems, const OUString& aString); virtual com::sun::star::uno::Reference < com::sun::star::sheet::XDataPilotField > SAL_CALL createNameGroup(const com::sun::star::uno::Sequence< OUString >& aItems) throw (::com::sun::star::uno::RuntimeException, diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 700e14408787..3624c04740da 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -65,7 +65,7 @@ private: class ScDefaultsCfg : public ScDefaultsOptions, public utl::ConfigItem { private: - com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; public: diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 3a23fa0104b4..6c0136f12f72 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -170,8 +170,8 @@ class ScDocCfg : public ScDocOptions DECL_LINK( CalcCommitHdl, void* ); DECL_LINK( LayoutCommitHdl, void* ); - com::sun::star::uno::Sequence<OUString> GetCalcPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetCalcPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); public: ScDocCfg(); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index e5e6a5b4363d..910f4d2ee884 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -777,7 +777,7 @@ public: sal_Int64 GetNewUnoId() { return ++nUnoObjectId; } void AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges ); - bool IsChart( const SdrObject* pObject ); + static bool IsChart( const SdrObject* pObject ); SC_DLLPUBLIC void UpdateAllCharts(); void UpdateChartRef( UpdateRefMode eUpdateRefMode, @@ -1793,10 +1793,10 @@ public: bool GetHasMacroFunc() const { return bHasMacroFunc; } void SetHasMacroFunc(bool bSet) { bHasMacroFunc = bSet; } - bool CheckMacroWarn(); + static bool CheckMacroWarn(); void SetRangeOverflowType(sal_uInt32 nType) { nRangeOverflowType = nType; } - bool HasRangeOverflow() const { return nRangeOverflowType != 0; } + bool HasRangeOverflow() const { return nRangeOverflowType != 0; } SC_DLLPUBLIC sal_uInt32 GetRangeOverflowType() const { return nRangeOverflowType; } // for broadcasting/listening diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx index e97a209dcbf3..863b217241af 100644 --- a/sc/inc/dpcache.hxx +++ b/sc/inc/dpcache.hxx @@ -154,7 +154,7 @@ public: sal_uLong GetNumberFormat( long nDim ) const; bool IsDateDimension( long nDim ) const ; long GetDimMemberCount(long nDim) const; - SCROW GetOrder( long nDim, SCROW nIndex ) const; + static SCROW GetOrder( long nDim, SCROW nIndex ); const IndexArrayType* GetFieldIndexArray( size_t nDim ) const; const ItemsType& GetDimMemberValues( SCCOL nDim ) const; diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx index 8bd1a4104c5c..8ec5f8bd19fc 100644 --- a/sc/inc/dpfilteredcache.hxx +++ b/sc/inc/dpfilteredcache.hxx @@ -140,7 +140,7 @@ public: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& rTabData, const std::unordered_set<sal_Int32>& rRepeatIfEmptyDims); - SCROW getOrder(long nDim, SCROW nIndex) const; + static SCROW getOrder(long nDim, SCROW nIndex); void clear(); bool empty() const; diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 46e20001be0b..9004151b6d8a 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -356,7 +356,7 @@ public: ScDPCache* getExistingCache( sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); - com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> createRowSet( + static com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> createRowSet( sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand); void updateCache( diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index 024003d709dd..0a455d95db7b 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -160,7 +160,7 @@ protected: }; void FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPFilteredCache& rCacheTable, const CalcInfo& rInfo, CalcRowData& rData); - void ProcessRowData(CalcInfo& rInfo, const CalcRowData& rData, bool bAutoShow); + static void ProcessRowData(CalcInfo& rInfo, const CalcRowData& rData, bool bAutoShow); void CalcResultsFromCacheTable(const ScDPFilteredCache& rCacheTable, CalcInfo& rInfo, bool bAutoShow); private: diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index f26526419207..8f680e50d1fc 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -745,7 +745,7 @@ private: * * @return range name token array */ - ScExternalRefCache::TokenArrayRef getRangeNameTokensFromSrcDoc( + static ScExternalRefCache::TokenArrayRef getRangeNameTokensFromSrcDoc( sal_uInt16 nFileId, ScDocument* pSrcDoc, OUString& rName); ScDocument* getInMemorySrcDocument(sal_uInt16 nFileId); diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index d080a6683ae2..a9381cee3702 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -32,7 +32,7 @@ private: double fExcelColScale; double fExcelRowScale; - com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 59ce099aab05..5b71b2a81a25 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -101,8 +101,8 @@ private: class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem { typedef std::map<OUString,sal_uInt16> PropsToIds; - com::sun::star::uno::Sequence<OUString> GetPropertyNames(); - ScFormulaCfg::PropsToIds GetPropNamesToId(); + static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static ScFormulaCfg::PropsToIds GetPropNamesToId(); void UpdateFromProperties( const com::sun::star::uno::Sequence<OUString>& rNames ); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index cd82ef0d5336..e2f6b8d91954 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -79,7 +79,7 @@ public: class ScInputCfg : public ScInputOptions, public utl::ConfigItem { - com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index ab3fe003a812..2bd348aac885 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -75,7 +75,7 @@ private: class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem { private: - com::sun::star::uno::Sequence<OUString> GetPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 4da7e9f42ba0..90e5873820f9 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -44,43 +44,43 @@ public: ScRangeUtil() {} ~ScRangeUtil() {} - bool MakeArea ( const OUString& rAreaStr, + static bool MakeArea ( const OUString& rAreaStr, ScArea& rArea, ScDocument* pDoc, SCTAB nTab, - ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; + ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ); - void CutPosString ( const OUString& theAreaStr, - OUString& thePosStr ) const; + static void CutPosString ( const OUString& theAreaStr, + OUString& thePosStr ); - bool IsAbsTabArea ( const OUString& rAreaStr, + static bool IsAbsTabArea ( const OUString& rAreaStr, ScDocument* pDoc, ScArea*** pppAreas = 0, sal_uInt16* pAreaCount = 0, bool bAcceptCellRef = false, - ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; + ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ); - bool IsAbsArea ( const OUString& rAreaStr, + static bool IsAbsArea ( const OUString& rAreaStr, ScDocument* pDoc, SCTAB nTab, OUString* pCompleteStr = 0, ScRefAddress* pStartPos = 0, ScRefAddress* pEndPos = 0, - ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; + ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ); - bool IsAbsPos ( const OUString& rPosStr, + static bool IsAbsPos ( const OUString& rPosStr, ScDocument* pDoc, SCTAB nTab, OUString* pCompleteStr = 0, ScRefAddress* pPosTripel = 0, - ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; + ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ); - bool MakeRangeFromName ( const OUString& rName, + static bool MakeRangeFromName( const OUString& rName, ScDocument* pDoc, SCTAB nCurTab, ScRange& rRange, RutlNameScope eScope=RUTL_NAMES, - ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; + ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ); }; class SC_DLLPUBLIC ScRangeStringConverter diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 31d90b6b00d8..f51949b0596e 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -137,7 +137,7 @@ public: void Execute( SfxRequest& rReq ); void GetState( SfxItemSet& rSet ); - void HideDisabledSlots( SfxItemSet& rSet ); + static void HideDisabledSlots( SfxItemSet& rSet ); void AnythingChanged(); @@ -154,7 +154,7 @@ public: const ScClipData& GetClipData() const { return *mpClipData;} void SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ); - ScDocument* GetClipDoc(); // called from document - should be removed later + static ScDocument* GetClipDoc(); // called from document - should be removed later // X selection: ScSelectionTransferObj* GetSelectionTransfer() const { return pSelTransfer; } @@ -185,7 +185,7 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO SC_DLLPUBLIC void SetInputOptions ( const ScInputOptions& rOpt ); void SetPrintOptions ( const ScPrintOptions& rOpt ); void InsertEntryToLRUList(sal_uInt16 nFIndex); - void RecentFunctionsChanged(); + static void RecentFunctionsChanged(); static void GetSpellSettings( sal_uInt16& rDefLang, sal_uInt16& rCjkLang, sal_uInt16& rCtlLang, bool& rAutoSpell ); diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx index 6446097ed57b..7cc5eebafece 100644 --- a/sc/inc/stlalgorithm.hxx +++ b/sc/inc/stlalgorithm.hxx @@ -48,14 +48,14 @@ public: template<typename _Type2> AlignedAllocator(const AlignedAllocator<_Type2,_Alignment>&) {} - void construct(T* p, const value_type& val) { new(p) value_type(val); } - void destroy(T* p) + static void construct(T* p, const value_type& val) { new(p) value_type(val); } + static void destroy(T* p) { p->~value_type(); (void)p; // avoid bogus MSVC '12 "unreferenced formal parameter" warning } - size_type max_size() const + static size_type max_size() { return std::numeric_limits<size_type>::max() / sizeof(value_type); } @@ -63,12 +63,12 @@ public: bool operator== (const AlignedAllocator&) const { return true; } bool operator!= (const AlignedAllocator&) const { return false; } - pointer allocate(size_type n) + static pointer allocate(size_type n) { return static_cast<pointer>(rtl_allocateAlignedMemory(_Alignment, n*sizeof(value_type))); } - void deallocate(pointer p, size_type) + static void deallocate(pointer p, size_type) { rtl_freeAlignedMemory(p); } diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 2b37a283849b..7454188f04a7 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -1052,7 +1052,7 @@ private: // use the global sort parameter: bool IsSorted(SCCOLROW nStart, SCCOLROW nEnd) const; - void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); + static void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 ); short CompareCell( sal_uInt16 nSort, ScRefCellValue& rCell1, SCCOL nCell1Col, SCROW nCell1Row, diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index c4104de139a2..82756e5193b5 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -141,9 +141,9 @@ class ScViewCfg : public ScViewOptions DECL_LINK( DisplayCommitHdl, void* ); DECL_LINK( GridCommitHdl, void* ); - com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetDisplayPropertyNames(); - com::sun::star::uno::Sequence<OUString> GetGridPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetLayoutPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetDisplayPropertyNames(); + static com::sun::star::uno::Sequence<OUString> GetGridPropertyNames(); public: ScViewCfg(); diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx index 22534e4b9c8e..915ffc62992c 100644 --- a/sc/qa/unit/helper/csv_handler.hxx +++ b/sc/qa/unit/helper/csv_handler.hxx @@ -91,11 +91,11 @@ public: mnTab(nTab), meStringType(eType) {} - void begin_parse() {} + static void begin_parse() {} - void end_parse() {} + static void end_parse() {} - void begin_row() {} + static void begin_row() {} void end_row() { @@ -190,11 +190,11 @@ public: mnRow(0), mnTab(nTab) {} - void begin_parse() {} + static void begin_parse() {} - void end_parse() {} + static void end_parse() {} - void begin_row() {} + static void begin_row() {} void end_row() { diff --git a/sc/qa/unit/helper/sorthelper.hxx b/sc/qa/unit/helper/sorthelper.hxx index e82b8c2e8248..2e8110727648 100644 --- a/sc/qa/unit/helper/sorthelper.hxx +++ b/sc/qa/unit/helper/sorthelper.hxx @@ -24,7 +24,7 @@ public: { mbSortRefUpdate = changeTo(bSortRefUpdate); } - bool changeTo(bool bSortRefUpdate) + static bool changeTo(bool bSortRefUpdate) { ScInputOptions aInputOptions = SC_MOD()->GetInputOptions(); bool bRet = aInputOptions.GetSortRefUpdate(); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index f9540b2bcc9c..83431ee1d18e 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -125,7 +125,7 @@ public: mrDiff = getTimeDiff(aTimeAfter, maTimeBefore); } - double getTimeDiff(const TimeValue& t1, const TimeValue& t2) const + static double getTimeDiff(const TimeValue& t1, const TimeValue& t2) { double tv1 = t1.Seconds; double tv2 = t2.Seconds; diff --git a/sc/qa/unit/ucalc_sort.cxx b/sc/qa/unit/ucalc_sort.cxx index 37c7da81977d..76909f99330c 100644 --- a/sc/qa/unit/ucalc_sort.cxx +++ b/sc/qa/unit/ucalc_sort.cxx @@ -820,7 +820,7 @@ void Test::testSortRefUpdate() m_pDoc->SetString(ScAddress(2,1+i,0), "=RC[-2]"); // Turn off reference update on sort. - aSortTypeSet.changeTo(false); + SortTypeSetter::changeTo(false); bSorted = aFunc.Sort(0, aSortData, true, true, true); CPPUNIT_ASSERT(bSorted); diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 767fb7b10712..f63d7dbf63e0 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -696,7 +696,7 @@ ScBroadcastAreaSlotMachine::~ScBroadcastAreaSlotMachine() } inline SCSIZE ScBroadcastAreaSlotMachine::ComputeSlotOffset( - const ScAddress& rAddress ) const + const ScAddress& rAddress ) { SCROW nRow = rAddress.Row(); SCCOL nCol = rAddress.Col(); @@ -720,7 +720,7 @@ inline SCSIZE ScBroadcastAreaSlotMachine::ComputeSlotOffset( } void ScBroadcastAreaSlotMachine::ComputeAreaPoints( const ScRange& rRange, - SCSIZE& rStart, SCSIZE& rEnd, SCSIZE& rRowBreak ) const + SCSIZE& rStart, SCSIZE& rEnd, SCSIZE& rRowBreak ) { rStart = ComputeSlotOffset( rRange.aStart ); rEnd = ComputeSlotOffset( rRange.aEnd ); diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index d76837410805..9accde974966 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -731,7 +731,7 @@ ScRefCellValue ScColumn::GetCellValue( sc::ColumnBlockConstPosition& rBlockPos, return GetCellValue(aPos.first, aPos.second); } -ScRefCellValue ScColumn::GetCellValue( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ) const +ScRefCellValue ScColumn::GetCellValue( const sc::CellStoreType::const_iterator& itPos, size_t nOffset ) { ScRefCellValue aVal; // Defaults to empty cell. switch (itPos->type) @@ -2436,7 +2436,7 @@ public: miPos = aPos.first; sc::SharedFormulaUtil::unshareFormulaCell(aPos, *pCell); pCell->UpdateTranspose(maSource, maDest, mpUndoDoc); - mrColumn.JoinNewFormulaCell(aPos, *pCell); + ScColumn::JoinNewFormulaCell(aPos, *pCell); } }; @@ -2459,7 +2459,7 @@ public: miPos = aPos.first; sc::SharedFormulaUtil::unshareFormulaCell(aPos, *pCell); pCell->UpdateGrow(maArea, mnGrowX, mnGrowY); - mrColumn.JoinNewFormulaCell(aPos, *pCell); + ScColumn::JoinNewFormulaCell(aPos, *pCell); } }; @@ -2873,7 +2873,7 @@ public: pCell->GetCode()->SetCodeError(0); OUString aFormula = pCell->GetFormula(mrCxt); pCell->Compile(mrCxt, aFormula, false); - mrColumn.JoinNewFormulaCell(aPos, *pCell); + ScColumn::JoinNewFormulaCell(aPos, *pCell); mbCompiled = true; } diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 890a1dbc429a..6c9922605a4f 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -258,7 +258,7 @@ sc::CellStoreType::iterator ScColumn::GetPositionToInsert( SCROW nRow ) } void ScColumn::JoinNewFormulaCell( - const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell ) const + const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell ) { // Check the previous row position for possible grouping. if (aPos.first->type == sc::element_type_formula && aPos.second > 0) @@ -603,7 +603,7 @@ class EmptyCells ScColumn& mrColumn; sc::ColumnBlockPosition& mrPos; - void splitFormulaGrouping(const sc::CellStoreType::position_type& rPos) + static void splitFormulaGrouping(const sc::CellStoreType::position_type& rPos) { if (rPos.first->type == sc::element_type_formula) { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index bf359efcd584..d521bd6ce3e5 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1052,7 +1052,7 @@ void ScDocument::UpdateReference( // After moving, no clipboard move ref-updates are possible if (rCxt.meMode != URM_COPY && IsClipboardSource()) { - ScDocument* pClipDoc = SC_MOD()->GetClipDoc(); + ScDocument* pClipDoc = ScModule::GetClipDoc(); if (pClipDoc) pClipDoc->GetClipParam().mbCutMode = false; } diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 973a62380668..f9c378483c6c 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -2065,7 +2065,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam, if (!pClipDoc) { OSL_TRACE("CopyToClip: no ClipDoc"); - pClipDoc = SC_MOD()->GetClipDoc(); + pClipDoc = ScModule::GetClipDoc(); } if (pShell->GetMedium()) @@ -2174,7 +2174,7 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1, if (!pClipDoc) { OSL_TRACE("CopyTabToClip: no ClipDoc"); - pClipDoc = SC_MOD()->GetClipDoc(); + pClipDoc = ScModule::GetClipDoc(); } if (pShell->GetMedium()) @@ -2447,7 +2447,7 @@ void ScDocument::SetClipParam(const ScClipParam& rParam) bool ScDocument::IsClipboardSource() const { - ScDocument* pClipDoc = SC_MOD()->GetClipDoc(); + ScDocument* pClipDoc = ScModule::GetClipDoc(); return pClipDoc && pClipDoc->xPoolHelper.is() && xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool(); } @@ -2672,7 +2672,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar if (!pClipDoc) { OSL_FAIL("CopyFromClip: no ClipDoc"); - pClipDoc = SC_MOD()->GetClipDoc(); + pClipDoc = ScModule::GetClipDoc(); } if (!pClipDoc->bIsClip || !pClipDoc->GetTableCount()) diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 77a28480969e..56d9c07f732c 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -1167,12 +1167,11 @@ sal_Int32 ScDPCache::GetGroupType(long nDim) const return 0; } -SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex) const +SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex) { return nIndex; } -; #if DEBUG_PIVOT_TABLE diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 8487da42cfee..ec47eab23690 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -373,9 +373,9 @@ void ScDPFilteredCache::filterTable(const vector<Criterion>& rCriteria, Sequence rTabData[i] = tableData[i]; } -SCROW ScDPFilteredCache::getOrder(long nDim, SCROW nIndex) const +SCROW ScDPFilteredCache::getOrder(long nDim, SCROW nIndex) { - return mrCache.GetOrder(nDim, nIndex); + return ScDPCache::GetOrder(nDim, nIndex); } void ScDPFilteredCache::clear() diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index 073ff59be0bc..ad16b25477ec 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -286,8 +286,8 @@ long ScDPTableData::Compare( long nDim, long nDataId1, long nDataId2) if ( getIsDataLayoutDimension(nDim) ) return 0; - long n1 = GetCacheTable().getOrder(nDim, nDataId1); - long n2 = GetCacheTable().getOrder(nDim, nDataId2); + long n1 = ScDPFilteredCache::getOrder(nDim, nDataId1); + long n2 = ScDPFilteredCache::getOrder(nDim, nDataId2); if ( n1 > n2 ) return 1; else if ( n1 == n2 ) diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index aab8e59814cb..6b5f634201d2 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2178,7 +2178,7 @@ class QueryEvaluator CollatorWrapper* mpCollator; const bool mbMatchWholeCell; - bool isPartialTextMatchOp(const ScQueryEntry& rEntry) const + static bool isPartialTextMatchOp(const ScQueryEntry& rEntry) { switch (rEntry.eOp) { @@ -2196,7 +2196,7 @@ class QueryEvaluator return false; } - bool isTextMatchOp(const ScQueryEntry& rEntry) const + static bool isTextMatchOp(const ScQueryEntry& rEntry) { if (isPartialTextMatchOp(rEntry)) return true; diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 4b47cf4525a2..bb19d024f4f1 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -186,7 +186,7 @@ bool ScValidationData::DoScript( const ScAddress& rPos, const OUString& rInput, { ScDocument* pDocument = GetDocument(); SfxObjectShell* pDocSh = pDocument->GetDocumentShell(); - if ( !pDocSh || !pDocument->CheckMacroWarn() ) + if ( !pDocSh || !ScDocument::CheckMacroWarn() ) return false; bool bScriptReturnedFalse = false; // default: do not abort @@ -272,7 +272,7 @@ bool ScValidationData::DoMacro( const ScAddress& rPos, const OUString& rInput, ScDocument* pDocument = GetDocument(); SfxObjectShell* pDocSh = pDocument->GetDocumentShell(); - if ( !pDocSh || !pDocument->CheckMacroWarn() ) + if ( !pDocSh || !ScDocument::CheckMacroWarn() ) return false; bool bDone = false; diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 80b108e744aa..f4d28c9a7e76 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -175,7 +175,7 @@ private: /** Finally erase all areas pushed as to-be-erased. */ void FinallyEraseAreas(); - bool isMarkedErased( const ScBroadcastAreas::const_iterator& rIter ) const + static bool isMarkedErased( const ScBroadcastAreas::const_iterator& rIter ) { return rIter->mbErasure; } @@ -301,10 +301,10 @@ private: ScBroadcastArea *pEOUpdateChain; sal_uLong nInBulkBroadcast; - inline SCSIZE ComputeSlotOffset( const ScAddress& rAddress ) const; - void ComputeAreaPoints( const ScRange& rRange, + static inline SCSIZE ComputeSlotOffset( const ScAddress& rAddress ); + static void ComputeAreaPoints( const ScRange& rRange, SCSIZE& nStart, SCSIZE& nEnd, - SCSIZE& nRowBreak ) const; + SCSIZE& nRowBreak ); public: ScBroadcastAreaSlotMachine( ScDocument* pDoc ); diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 047552480e56..ee5d9410420e 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -207,7 +207,7 @@ double GetCellValue( const ScAddress&, ScRefCellValue& rCell ); double GetCellValueOrZero( const ScAddress&, ScRefCellValue& rCell ); double GetValueCellValue( const ScAddress&, double fOrig ); void GetCellString( svl::SharedString& rStr, ScRefCellValue& rCell ); -sal_uInt16 GetCellErrCode( const ScRefCellValue& rCell ); +static sal_uInt16 GetCellErrCode( const ScRefCellValue& rCell ); bool CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr); @@ -358,7 +358,7 @@ ScMatrixRef CreateMatrixFromDoubleRef( const formula::FormulaToken* pToken, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ); inline ScTokenMatrixMap& GetTokenMatrixMap(); -ScTokenMatrixMap* CreateTokenMatrixMap(); +static ScTokenMatrixMap* CreateTokenMatrixMap(); ScMatrixRef GetMatrix(); sc::RangeMatrix GetRangeMatrix(); @@ -380,7 +380,7 @@ inline void CurFmtToFuncFmt() not sanitized. FALSE if not and fVal was adapted. */ -inline bool CheckStringPositionArgument( double & fVal ); +static inline bool CheckStringPositionArgument( double & fVal ); /** Obtain a double suitable as string position or length argument. Returns -1 if the number is Inf or NaN or less than 0 or greater than some @@ -613,7 +613,7 @@ void ScGetWeekOfYear(); void ScEasterSunday(); sal_uInt16 GetWeekendAndHolidayMasks( const sal_uInt8 nParamCount, const sal_uInt32 nNullDate, ::std::vector<double>& rSortArray, OUString& rWeekendDays, bool bWeekendMask[ 7 ] ); -inline sal_Int16 GetDayOfWeek( sal_Int32 n ); +static inline sal_Int16 GetDayOfWeek( sal_Int32 n ); void ScNetWorkdays_MS(); void ScWorkday_MS(); void ScGetHour(); @@ -664,28 +664,28 @@ void ScIRR(); void ScMIRR(); void ScISPMT(); -double ScGetBw(double fZins, double fZzr, double fRmz, +static double ScGetBw(double fZins, double fZzr, double fRmz, double fZw, double fF); void ScPV(); void ScSYD(); -double ScGetGDA(double fWert, double fRest, double fDauer, +static double ScGetGDA(double fWert, double fRest, double fDauer, double fPeriode, double fFactor); void ScDDB(); void ScDB(); -double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, +static double ScInterVDB(double fWert,double fRest,double fDauer,double fDauer1, double fPeriode,double fFactor); void ScVDB(); void ScDuration(); void ScSLN(); -double ScGetRmz(double fZins, double fZzr, double fBw, +static double ScGetRmz(double fZins, double fZzr, double fBw, double fZw, double fF); void ScPMT(); void ScRRI(); -double ScGetZw(double fZins, double fZzr, double fRmz, +static double ScGetZw(double fZins, double fZzr, double fRmz, double fBw, double fF); void ScFV(); void ScNper(); -bool RateIteration(double fNper, double fPayment, double fPv, +static bool RateIteration(double fNper, double fPayment, double fPv, double fFv, double fPayType, double& fGuess); void ScRate(); double ScGetCompoundInterest(double fZins, double fZr, double fZzr, double fBw, @@ -698,13 +698,13 @@ void ScEffective(); void ScNominal(); void ScMod(); void ScIntercept(); -double ScGetGCD(double fx, double fy); +static double ScGetGCD(double fx, double fy); void ScGCD(); void ScLCM(); // matrix functions void ScMatValue(); -void MEMat(const ScMatrixRef& mM, SCSIZE n); +static void MEMat(const ScMatrixRef& mM, SCSIZE n); void ScMatDet(); void ScMatInv(); void ScMatMult(); @@ -740,8 +740,8 @@ void ScForecast(); void ScNoName(); void ScBadName(); // Statistics: -double taylor(const double* pPolynom, sal_uInt16 nMax, double x); -double gauss(double x); +static double taylor(const double* pPolynom, sal_uInt16 nMax, double x); +static double gauss(double x); public: static SC_DLLPUBLIC double phi(double x); @@ -753,15 +753,15 @@ double GetBetaDist(double x, double alpha, double beta); //cumulative distribut double GetBetaDistPDF(double fX, double fA, double fB); //probability density function) double GetChiDist(double fChi, double fDF); // for LEGACY.CHIDIST, returns right tail double GetChiSqDistCDF(double fX, double fDF); // for CHISQDIST, returns left tail -double GetChiSqDistPDF(double fX, double fDF); // probability density function +static double GetChiSqDistPDF(double fX, double fDF); // probability density function double GetFDist(double x, double fF1, double fF2); double GetTDist( double T, double fDF, int nType ); double Fakultaet(double x); -double BinomKoeff(double n, double k); +static double BinomKoeff(double n, double k); double GetGamma(double x); -double GetLogGamma(double x); +static double GetLogGamma(double x); double GetBeta(double fAlpha, double fBeta); -double GetLogBeta(double fAlpha, double fBeta); +static double GetLogBeta(double fAlpha, double fBeta); double GetBinomDistPMF(double x, double n, double p); //probability mass function double GetHypGeomDist( double x, double n, double M, double N ); void ScLogGamma(); @@ -820,7 +820,7 @@ double GetPercentile( ::std::vector<double> & rArray, double fPercentile ); double GetPercentileExclusive( ::std::vector<double> & rArray, double fPercentile ); void GetNumberSequenceArray( sal_uInt8 nParamCount, ::std::vector<double>& rArray, bool bConvertTextInArray ); void GetSortArray( sal_uInt8 nParamCount, ::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder, bool bConvertTextInArray ); -void QuickSort(::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder = NULL); +static void QuickSort(::std::vector<double>& rSortArray, ::std::vector<long>* pIndexOrder = NULL); void ScModalValue(); void ScModalValue_Multi(); void ScAveDev(); @@ -833,7 +833,7 @@ void ScChiTest(); void ScRank( bool bAverage ); void ScPercentile( bool bInclusive ); void ScPercentrank( bool bInclusive ); -double GetPercentrank( ::std::vector<double> & rArray, double fVal, bool bInclusive ); +static double GetPercentrank( ::std::vector<double> & rArray, double fVal, bool bInclusive ); void ScLarge(); void ScSmall(); void ScFrequency(); diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx index dcb6c50bbe49..ba087149262a 100644 --- a/sc/source/core/opencl/opbase.hxx +++ b/sc/source/core/opencl/opbase.hxx @@ -177,7 +177,7 @@ public: virtual std::string GetBottom() { return "";}; virtual std::string Gen2( const std::string&/*lhs*/, const std::string&/*rhs*/ ) const { return "";} - std::string Gen( ArgVector& /*argVector*/ ) { return "";}; + static std::string Gen( ArgVector& /*argVector*/ ) { return "";}; virtual std::string BinFuncName() const { return "";}; virtual void BinInlineFun( std::set<std::string>&, std::set<std::string>& ) { } @@ -210,15 +210,15 @@ public: class CheckVariables : public Normal { public: - void GenTmpVariables( std::stringstream& ss, SubArguments& vSubArguments ); - void CheckSubArgumentIsNan( std::stringstream& ss, + static void GenTmpVariables( std::stringstream& ss, SubArguments& vSubArguments ); + static void CheckSubArgumentIsNan( std::stringstream& ss, SubArguments& vSubArguments, int argumentNum ); - void CheckAllSubArgumentIsNan( std::stringstream& ss, + static void CheckAllSubArgumentIsNan( std::stringstream& ss, SubArguments& vSubArguments ); // only check isNan - void CheckSubArgumentIsNan2( std::stringstream& ss, + static void CheckSubArgumentIsNan2( std::stringstream& ss, SubArguments& vSubArguments, int argumentNum, std::string p ); - void UnrollDoubleVector( std::stringstream& ss, + static void UnrollDoubleVector( std::stringstream& ss, std::stringstream& unrollstr, const formula::DoubleVectorRefToken* pCurDVR, int nCurWindowSize ); }; diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 0b1d2eabbd6e..eba465ec8eab 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -56,7 +56,7 @@ sal_uInt16 lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAl SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && pDoc->IsChart( pObject ) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart( pObject ) ) { OUString aName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); bool bHit = true; diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index d71643dae148..9d07d881a218 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -57,7 +57,7 @@ std::vector< WeakReference< frame::XModel > > lcl_getAllLivingCharts( ScDocument SdrObject* pObject = aIter.Next(); while (pObject) { - if( pDoc->IsChart( pObject ) ) + if( ScDocument::IsChart( pObject ) ) { uno::Reference< embed::XEmbeddedObject > xIPObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); uno::Reference< embed::XComponentSupplier > xCompSupp( xIPObj, uno::UNO_QUERY ); diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index c07f0eae3fb9..f2350e28b4ec 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -763,11 +763,11 @@ struct ConventionOOO_A1 : public Convention_A1 rBuf.append('.'); } - void MakeOneRefStrImpl( + static void MakeOneRefStrImpl( OUStringBuffer& rBuffer, const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScSingleRefData& rRef, const ScAddress& rAbsRef, - bool bForceTab, bool bODF ) const + bool bForceTab, bool bODF ) { if( rRef.IsFlag3D() || bForceTab ) { @@ -849,9 +849,9 @@ struct ConventionOOO_A1 : public Convention_A1 return lcl_makeExternalNameStr( rFile, rName, '#', false); } - bool makeExternalSingleRefStr( + static bool makeExternalSingleRefStr( OUStringBuffer& rBuffer, const OUString& rFileName, const OUString& rTabName, - const ScSingleRefData& rRef, const ScAddress& rPos, bool bDisplayTabName, bool bEncodeUrl ) const + const ScSingleRefData& rRef, const ScAddress& rPos, bool bDisplayTabName, bool bEncodeUrl ) { ScAddress aAbsRef = rRef.toAbs(rPos); if (bDisplayTabName) @@ -881,9 +881,9 @@ struct ConventionOOO_A1 : public Convention_A1 return true; } - void makeExternalRefStrImpl( + static void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef, bool bODF ) const + const OUString& rTabName, const ScSingleRefData& rRef, bool bODF ) { if (bODF) rBuffer.append( '['); @@ -901,10 +901,10 @@ struct ConventionOOO_A1 : public Convention_A1 makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabName, rRef, false); } - void makeExternalRefStrImpl( + static void makeExternalRefStrImpl( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef, bool bODF ) const + const ScComplexRefData& rRef, bool bODF ) { ScRange aAbsRange = rRef.toAbs(rPos); @@ -1188,7 +1188,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL ConventionXL_A1() : Convention_A1( FormulaGrammar::CONV_XL_A1 ) { } ConventionXL_A1( FormulaGrammar::AddressConvention eConv ) : Convention_A1( eConv ) { } - void makeSingleCellStr( OUStringBuffer& rBuf, const ScSingleRefData& rRef, const ScAddress& rAbs ) const + static void makeSingleCellStr( OUStringBuffer& rBuf, const ScSingleRefData& rRef, const ScAddress& rAbs ) { if (!rRef.IsColRel()) rBuf.append('$'); diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index e1de1a6d648c..fb1dc3996834 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3120,7 +3120,7 @@ void ScInterpreter::ScMacro() OUString aMacro( pCur->GetExternal() ); SfxObjectShell* pDocSh = pDok->GetDocumentShell(); - if ( !pDocSh || !pDok->CheckMacroWarn() ) + if ( !pDocSh || !ScDocument::CheckMacroWarn() ) { PushNoValue(); // without DocShell no CallBasic return; diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 41fe8e0cde83..e101463d2d13 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -35,7 +35,7 @@ bool ScRangeUtil::MakeArea( const OUString& rAreaStr, ScArea& rArea, ScDocument* pDoc, SCTAB nTab, - ScAddress::Details const & rDetails ) const + ScAddress::Details const & rDetails ) { // Input in rAreaStr: "$Tabelle1.$A1:$D17" @@ -66,7 +66,7 @@ bool ScRangeUtil::MakeArea( const OUString& rAreaStr, } void ScRangeUtil::CutPosString( const OUString& theAreaStr, - OUString& thePosStr ) const + OUString& thePosStr ) { OUString aPosStr; // BROKEN BROKEN BROKEN @@ -87,7 +87,7 @@ bool ScRangeUtil::IsAbsTabArea( const OUString& rAreaStr, ScArea*** pppAreas, sal_uInt16* pAreaCount, bool /* bAcceptCellRef */, - ScAddress::Details const & rDetails ) const + ScAddress::Details const & rDetails ) { OSL_ENSURE( pDoc, "No document given!" ); if ( !pDoc ) @@ -175,7 +175,7 @@ bool ScRangeUtil::IsAbsArea( const OUString& rAreaStr, OUString* pCompleteStr, ScRefAddress* pStartPos, ScRefAddress* pEndPos, - ScAddress::Details const & rDetails ) const + ScAddress::Details const & rDetails ) { ScRefAddress startPos; ScRefAddress endPos; @@ -213,7 +213,7 @@ bool ScRangeUtil::IsAbsPos( const OUString& rPosStr, SCTAB nTab, OUString* pCompleteStr, ScRefAddress* pPosTripel, - ScAddress::Details const & rDetails ) const + ScAddress::Details const & rDetails ) { ScRefAddress thePos; @@ -239,7 +239,7 @@ bool ScRangeUtil::MakeRangeFromName ( SCTAB nCurTab, ScRange& rRange, RutlNameScope eScope, - ScAddress::Details const & rDetails ) const + ScAddress::Details const & rDetails ) { bool bResult = false; ScRangeUtil aRangeUtil; diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 400c260fde99..fa099dd57ce1 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -2605,7 +2605,7 @@ public: return maCOp(char{}, maOp, 0, mfVal, maString); } - bool useFunctionForEmpty() const + static bool useFunctionForEmpty() { return true; } diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 4e5ad522dc6d..08399552c2a3 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -115,7 +115,7 @@ void ImportExcel::Formula( // This is a shared formula. Get the token array from the shared formula pool. SCCOL nSharedCol; SCROW nSharedRow; - if (pFormConv->ReadSharedFormulaPosition(maStrm, nSharedCol, nSharedRow)) + if (ExcelToSc::ReadSharedFormulaPosition(maStrm, nSharedCol, nSharedRow)) { ScAddress aRefPos(nSharedCol, nSharedRow, GetCurrScTab()); const ScTokenArray* pSharedCode = pFormConv->GetSharedFormula(aRefPos); diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index fe0afcf05c53..02d7078f30f1 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -1209,7 +1209,7 @@ FltError ImportExcel8::Read() case EXC_ID_CONDFMT: rCondFmtMgr.ReadCondfmt( maStrm ); break; case EXC_ID_CF: rCondFmtMgr.ReadCF( maStrm ); break; - case EXC_ID_DVAL: rValidMgr.ReadDval( maStrm ); break; + case EXC_ID_DVAL: XclImpValidationManager::ReadDval( maStrm ); break; case EXC_ID_DV: rValidMgr.ReadDV( maStrm ); break; case EXC_ID_QSI: rWQBfr.ReadQsi( maStrm ); break; diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 735995f53f52..4b6c300cd4a0 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -1149,10 +1149,9 @@ void XclExpChFontBase::ConvertFontBase( const XclExpChRoot& rRoot, const ScfProp ConvertFontBase( rRoot, rRoot.ConvertFont( rPropSet, rRoot.GetDefApiScript() ) ); } -void XclExpChFontBase::ConvertRotationBase( - const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, bool bSupportsStacked ) +void XclExpChFontBase::ConvertRotationBase(const ScfPropertySet& rPropSet, bool bSupportsStacked ) { - sal_uInt16 nRotation = rRoot.GetChartPropSetHelper().ReadRotationProperties( rPropSet, bSupportsStacked ); + sal_uInt16 nRotation = XclChPropSetHelper::ReadRotationProperties( rPropSet, bSupportsStacked ); SetRotation( nRotation ); } @@ -1209,7 +1208,7 @@ void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, ConvertFontBase( GetChRoot(), nFontIdx ); // rotation - ConvertRotationBase( GetChRoot(), aTitleProp, true ); + ConvertRotationBase( aTitleProp, true ); // manual text position - only for main title mxFramePos.reset( new XclExpChFramePos( EXC_CHFRAMEPOS_PARENT, EXC_CHFRAMEPOS_PARENT ) ); @@ -1302,7 +1301,7 @@ bool XclExpChText::ConvertDataLabel( const ScfPropertySet& rPropSet, { // font settings ConvertFontBase( GetChRoot(), rPropSet ); - ConvertRotationBase( GetChRoot(), rPropSet, false ); + ConvertRotationBase( rPropSet, false ); // label placement sal_Int32 nPlacement = 0; sal_uInt16 nLabelPos = EXC_CHTEXT_POS_AUTO; @@ -1444,7 +1443,7 @@ XclExpChMarkerFormat::XclExpChMarkerFormat( const XclExpChRoot& rRoot ) : void XclExpChMarkerFormat::Convert( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx ) { - rRoot.GetChartPropSetHelper().ReadMarkerProperties( maData, rPropSet, nFormatIdx ); + XclChPropSetHelper::ReadMarkerProperties( maData, rPropSet, nFormatIdx ); /* Set marker line/fill color to series line color. TODO: remove this if OOChart supports own colors in markers. */ Color aLineColor; @@ -2995,7 +2994,7 @@ void XclExpChAxis::Convert( Reference< XAxis > xAxis, Reference< XAxis > xCrossi // axis label formatting and rotation ConvertFontBase( GetChRoot(), aAxisProp ); - ConvertRotationBase( GetChRoot(), aAxisProp, true ); + ConvertRotationBase( aAxisProp, true ); // axis number format sal_Int32 nApiNumFmt = 0; diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index fe045567bfd0..9caee24d6d43 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -473,7 +473,7 @@ void XclExpControlHelper::ConvertSheetLinks( Reference< XShape > xShape ) } } -void XclExpControlHelper::WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ) const +void XclExpControlHelper::WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ) { sal_uInt16 nFmlaSize = rTokArr.GetSize(); rStrm << nFmlaSize << sal_uInt32( 0 ); @@ -482,7 +482,7 @@ void XclExpControlHelper::WriteFormula( XclExpStream& rStrm, const XclTokenArray rStrm << sal_uInt8( 0 ); } -void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ) const +void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ) { rStrm.StartRecord( nSubRecId, (rTokArr.GetSize() + 5) & ~1 ); WriteFormula( rStrm, rTokArr ); diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index df22f9838c84..6fd5e8269e94 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -171,11 +171,11 @@ public: private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; - void WriteBool( XclExpStream& rStrm, bool bValue ); - void WriteDouble( XclExpStream& rStrm, double fValue ); - void WriteString( XclExpStream& rStrm, const OUString& rValue ); - void WriteError( XclExpStream& rStrm, sal_uInt8 nErrCode ); - void WriteEmpty( XclExpStream& rStrm ); + static void WriteBool( XclExpStream& rStrm, bool bValue ); + static void WriteDouble( XclExpStream& rStrm, double fValue ); + static void WriteString( XclExpStream& rStrm, const OUString& rValue ); + static void WriteError( XclExpStream& rStrm, sal_uInt8 nErrCode ); + static void WriteEmpty( XclExpStream& rStrm ); private: typedef ::std::vector< Any > CachedValues; diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 035a186a9d03..bc80de83de1b 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -837,7 +837,7 @@ void XclExpPivotCache::WriteSxdb( XclExpStream& rStrm ) const rStrm.EndRecord(); } -void XclExpPivotCache::WriteSxdbex( XclExpStream& rStrm ) const +void XclExpPivotCache::WriteSxdbex( XclExpStream& rStrm ) { rStrm.StartRecord( EXC_ID_SXDBEX, 12 ); rStrm << EXC_SXDBEX_CREATION_DATE @@ -1452,7 +1452,7 @@ void XclExpPivotTable::WriteSxview( XclExpStream& rStrm ) const rStrm.EndRecord(); } -void XclExpPivotTable::WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ) const +void XclExpPivotTable::WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ) { if( !rFields.empty() ) { @@ -1489,7 +1489,7 @@ void XclExpPivotTable::WriteSxdiList( XclExpStream& rStrm ) const } } -void XclExpPivotTable::WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) const +void XclExpPivotTable::WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) { if( nLineCount > 0 ) { diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 8b323b021cbe..22656a195895 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -303,7 +303,7 @@ bool XclExpRoot::IsDocumentEncrypted() const return false; } -uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUString& aPass ) const +uno::Sequence< beans::NamedValue > XclExpRoot::GenerateEncryptionData( const OUString& aPass ) { uno::Sequence< beans::NamedValue > aEncryptionData; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 2eb50959e479..99706cc48fba 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -574,12 +574,12 @@ void XclExpBiff8Encrypter::Init( const Sequence< NamedValue >& rEncryptionData ) } } -sal_uInt32 XclExpBiff8Encrypter::GetBlockPos( sal_Size nStrmPos ) const +sal_uInt32 XclExpBiff8Encrypter::GetBlockPos( sal_Size nStrmPos ) { return static_cast< sal_uInt32 >( nStrmPos / EXC_ENCR_BLOCKSIZE ); } -sal_uInt16 XclExpBiff8Encrypter::GetOffsetInBlock( sal_Size nStrmPos ) const +sal_uInt16 XclExpBiff8Encrypter::GetOffsetInBlock( sal_Size nStrmPos ) { return static_cast< sal_uInt16 >( nStrmPos % EXC_ENCR_BLOCKSIZE ); } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index f04240de2c56..46ecbfb558ec 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -261,7 +261,7 @@ public: private: /** Returns the Excel index of a 0-based color index. */ - inline sal_uInt16 GetXclIndex( sal_uInt32 nIndex ) const + static inline sal_uInt16 GetXclIndex( sal_uInt32 nIndex ) { return static_cast< sal_uInt16 >( nIndex + EXC_COLOR_USEROFFSET ); } /** Returns the original inserted color represented by the color ID nColorId. */ diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index b0b3834d5250..4444dc0edc7b 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -922,9 +922,9 @@ void XclImpChFontBase::ConvertFontBase( const XclImpChRoot& rRoot, ScfPropertySe rRoot.ConvertFont( rPropSet, GetFontIndex(), &aFontColor ); } -void XclImpChFontBase::ConvertRotationBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, bool bSupportsStacked ) const +void XclImpChFontBase::ConvertRotationBase( ScfPropertySet& rPropSet, bool bSupportsStacked ) const { - rRoot.GetChartPropSetHelper().WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); + XclChPropSetHelper::WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); } XclImpChFont::XclImpChFont() : @@ -1061,7 +1061,7 @@ void XclImpChText::ConvertFont( ScfPropertySet& rPropSet ) const void XclImpChText::ConvertRotation( ScfPropertySet& rPropSet, bool bSupportsStacked ) const { - ConvertRotationBase( GetChRoot(), rPropSet, bSupportsStacked ); + ConvertRotationBase( rPropSet, bSupportsStacked ); } void XclImpChText::ConvertFrame( ScfPropertySet& rPropSet ) const @@ -1300,11 +1300,11 @@ void XclImpChMarkerFormat::Convert( const XclImpChRoot& rRoot, default: aMarkerFmt.mnMarkerSize = EXC_CHMARKERFORMAT_SINGLESIZE; } aMarkerFmt.mnMarkerType = XclChartHelper::GetAutoMarkerType( nFormatIdx ); - rRoot.GetChartPropSetHelper().WriteMarkerProperties( rPropSet, aMarkerFmt ); + XclChPropSetHelper::WriteMarkerProperties( rPropSet, aMarkerFmt ); } else { - rRoot.GetChartPropSetHelper().WriteMarkerProperties( rPropSet, maData ); + XclChPropSetHelper::WriteMarkerProperties( rPropSet, maData ); } } @@ -3333,7 +3333,7 @@ Reference< XAxis > XclImpChAxis::CreateAxis( const XclImpChTypeGroup& rTypeGroup else if( const XclImpChText* pDefText = GetChartData().GetDefaultText( EXC_CHTEXTTYPE_AXISLABEL ) ) pDefText->ConvertFont( aAxisProp ); // label text rotation - ConvertRotationBase( GetChRoot(), aAxisProp, true ); + ConvertRotationBase( aAxisProp, true ); // number format sal_uInt32 nScNumFmt = GetNumFmtBuffer().GetScFormat( mnNumFmtIdx ); if( nScNumFmt != NUMBERFORMAT_ENTRY_NOT_FOUND ) diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 4f31285eacfd..1232b97de518 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -350,7 +350,7 @@ XclImpExtName::XclImpExtName( XclImpSupbook& rSupbook, XclImpStream& rStrm, XclS if( eSubType == EXC_SBTYPE_ADDIN ) { meType = xlExtAddIn; - maName = rStrm.GetRoot().GetScAddInName( maName ); + maName = XclImpRoot::GetScAddInName( maName ); } else if ( (eSubType == EXC_SBTYPE_EUROTOOL) && maName.equalsIgnoreAsciiCase( "EUROCONVERT" ) ) diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index f6507e4319d2..08380801042a 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -266,7 +266,7 @@ XclImpTabViewSettings& XclImpRoot::GetTabViewSettings() const return *mrImpData.mxTabViewSett; } -OUString XclImpRoot::GetScAddInName( const OUString& rXclName ) const +OUString XclImpRoot::GetScAddInName( const OUString& rXclName ) { OUString aScName; if( ScGlobal::GetAddInCollection()->GetCalcName( rXclName, aScName ) ) diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index dc2f79151552..f5efccef8d7e 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -304,12 +304,12 @@ sal_uInt16 XclImpBiff8Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal return nRet; } -sal_uInt32 XclImpBiff8Decrypter::GetBlock( sal_Size nStrmPos ) const +sal_uInt32 XclImpBiff8Decrypter::GetBlock( sal_Size nStrmPos ) { return static_cast< sal_uInt32 >( nStrmPos / EXC_ENCR_BLOCKSIZE ); } -sal_uInt16 XclImpBiff8Decrypter::GetOffset( sal_Size nStrmPos ) const +sal_uInt16 XclImpBiff8Decrypter::GetOffset( sal_Size nStrmPos ) { return static_cast< sal_uInt16 >( nStrmPos % EXC_ENCR_BLOCKSIZE ); } diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index dc46cca851c4..57d0743f1642 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -3119,7 +3119,7 @@ class CSSHandler public: CSSHandler(ScHTMLStyles& rStyles) : mrStyles(rStyles) {} - void at_rule_name(const char* /*p*/, size_t /*n*/) + static void at_rule_name(const char* /*p*/, size_t /*n*/) { // TODO: For now, we ignore at-rule properties. } @@ -3141,18 +3141,18 @@ public: maPropValue = MemStr(p, n); } - void begin_parse() {} + static void begin_parse() {} - void end_parse() {} + static void end_parse() {} - void begin_block() {} + static void begin_block() {} void end_block() { maSelectorNames.clear(); } - void begin_property() {} + static void begin_property() {} void end_property() { diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 0ca6fdd8e9c7..df1e4d7068c0 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -368,8 +368,8 @@ protected: const XclExpRoot& rRoot, ScChangeTrack& rChangeTrack ); - inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; - inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; + static inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ); + static inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ); inline sal_uInt16 GetTabId( SCTAB nTabId ) const; inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; @@ -413,13 +413,13 @@ public: inline sal_uInt32 GetActionNumber() const { return nIndex; } }; -inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const +inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) { rStrm << (sal_uInt16) rAddress.Row() << (sal_uInt16) rAddress.Col(); } -inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const +inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) { rStrm << (sal_uInt16) rRange.aStart.Row() << (sal_uInt16) rRange.aEnd.Row() @@ -472,7 +472,7 @@ private: XclExpChTrData* pNewData; sal_uInt16 nOldLength; // this is not the record size - void MakeEmptyChTrData( XclExpChTrData*& rpData ); + static void MakeEmptyChTrData( XclExpChTrData*& rpData ); protected: ScAddress aPosition; diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 69d031a093e6..27f060b2f7e7 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -333,13 +333,13 @@ public: @param nSheet Sheet index to be inserted into orAddress. @return true = Cell address could be parsed from the passed string. */ - bool convertToCellAddressUnchecked( + static bool convertToCellAddressUnchecked( ::com::sun::star::table::CellAddress& orAddress, const OUString& rString, sal_Int16 nSheet ); - bool convertToCellAddressUnchecked( - com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) const; + static bool convertToCellAddressUnchecked( + com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -380,7 +380,7 @@ public: @param rBinAddress Binary cell address struct. @param nSheet Sheet index to be inserted into orAddress. */ - void convertToCellAddressUnchecked( + static void convertToCellAddressUnchecked( ::com::sun::star::table::CellAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ); @@ -470,7 +470,7 @@ public: @param nSheet Sheet index to be inserted into orRange. @return true = Range address could be parsed from the passed string. */ - bool convertToCellRangeUnchecked( + static bool convertToCellRangeUnchecked( ::com::sun::star::table::CellRangeAddress& orRange, const OUString& rString, sal_Int16 nSheet ); @@ -512,7 +512,7 @@ public: @param rBinRange Binary cell range struct. @param nSheet Sheet index to be inserted into orRange. */ - void convertToCellRangeUnchecked( + static void convertToCellRangeUnchecked( ::com::sun::star::table::CellRangeAddress& orRange, const BinRange& rBinRange, sal_Int16 nSheet ); diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 357ecdb8c72d..2963e7d6e53e 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -86,11 +86,11 @@ public: DATASET GetNextDataset(); - const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ); + static const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ); bool ScanFloatVal( const sal_Unicode* pStart ); - inline bool IsNumber( const sal_Unicode cChar ); - inline bool IsNumberEnding( const sal_Unicode cChar ); + static inline bool IsNumber( const sal_Unicode cChar ); + static inline bool IsNumberEnding( const sal_Unicode cChar ); static inline bool IsV( const sal_Unicode* pRef ); diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index bb533e9767ae..4a2362e0f808 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -61,7 +61,7 @@ public: void GetDummy( const ScTokenArray*& ); const ScTokenArray* GetBoolErr( XclBoolError ); - bool ReadSharedFormulaPosition( XclImpStream& rStrm, SCCOL& rCol, SCROW& rRow ); + static bool ReadSharedFormulaPosition( XclImpStream& rStrm, SCCOL& rCol, SCROW& rRow ); const ScTokenArray* GetSharedFormula( const ScAddress& rRefPos ) const; static void SetError( ScFormulaCell& rCell, const ConvErr eErr ); @@ -76,7 +76,7 @@ public: XclImpStream& aIn ); void ReadExtensionArray( unsigned int n, XclImpStream& aIn ); - void ReadExtensionNlr( XclImpStream& aIn ); + static void ReadExtensionNlr( XclImpStream& aIn ); void ReadExtensionMemArea( XclImpStream& aIn ); }; diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index 83b7bb47ccb6..ebf67558bd9a 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -578,7 +578,7 @@ public: /** Returns the library type associated with the passed URL of a function library (function add-in). */ - FunctionLibraryType getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const; + static FunctionLibraryType getFuncLibTypeFromLibraryName( const OUString& rLibraryName ); protected: /** Returns the list of all function infos. */ diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index bb00ad9aaa06..65a4cec69103 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -160,12 +160,12 @@ class ScHTMLExport : public ScExportBase SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - OString BorderToStyle(const char* pBorderName, + static OString BorderToStyle(const char* pBorderName, const editeng::SvxBorderLine* pLine, bool& bInsertSemicolon); - sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight ); - const char* GetFontSizeCss( sal_uInt16 nHeight ); + static sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight ); + static const char* GetFontSizeCss( sal_uInt16 nHeight ); sal_uInt16 ToPixel( sal_uInt16 nTwips ); Size MMToPixel( const Size& r100thMMSize ); void IncIndent( short nVal ); diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index b582498b3458..de1ccfd3b316 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -181,7 +181,7 @@ private: DECL_LINK( HTMLImportHdl, ImportInfo* ); void NewActEntry( ScEEParseEntry* ); - void EntryEnd( ScEEParseEntry*, const ESelection& ); + static void EntryEnd( ScEEParseEntry*, const ESelection& ); void ProcToken( ImportInfo* ); void CloseEntry( ImportInfo* ); void NextRow( ImportInfo* ); @@ -526,7 +526,7 @@ private: void ImplDataOff(); /** Inserts additional formatting options from import info into the item set. */ - void ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo ); + static void ProcessFormatOptions( SfxItemSet& rItemSet, const ImportInfo& rInfo ); /** Updates the document column/row size of the specified column or row. @descr Only increases the present count, never decreases. */ diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 81f477ee0589..6cf450d63e95 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -84,7 +84,7 @@ private: inline void Type( const sal_uInt16 nNew ) { nType = nNew; } }; - void MakeFont( ENTRY* pEntry ); + static void MakeFont( ENTRY* pEntry ); public: const static sal_uInt16 nSize = 8; void Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet ); diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index a4e0746411a5..b32407199063 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -306,8 +306,8 @@ public: private: /** Tries to write the passed value to the passed sheet position. */ - void writeItemToSourceDataCell( WorksheetHelper& rSheetHelper, - sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) const; + static void writeItemToSourceDataCell( WorksheetHelper& rSheetHelper, + sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ); /** Tries to write the value of a shared item to the passed sheet position. */ void writeSharedItemToSourceDataCell( WorksheetHelper& rSheetHelper, sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nItemIdx ) const; diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 27bad9f26c8d..dbf575aa9c07 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -68,10 +68,10 @@ public: void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString ); void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); void IncToken( TokenId &aParam ); - DefTokenId IndexToToken( sal_uInt16 nToken ); - FUNC_TYPE IndexToType( sal_uInt8 nToken ); - DefTokenId IndexToDLLId( sal_uInt16 nIndex ); - const sal_Char* getString( sal_uInt8 nIndex ); + static DefTokenId IndexToToken( sal_uInt16 nToken ); + static FUNC_TYPE IndexToType( sal_uInt8 nToken ); + static DefTokenId IndexToDLLId( sal_uInt16 nIndex ); + static const sal_Char* getString( sal_uInt8 nIndex ); }; #endif diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index d3c291c63495..ee5d5760e0a3 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -789,7 +789,7 @@ public: void LoadCol(SCCOL Col, SCTAB Tab); void LoadColAttr(SCCOL Col, SCTAB Tab); void LoadAttr(Sc10ColAttr& rAttr); - void ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey); + static void ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey); void LoadObjects(); }; diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index a7c47e20c30f..5701244767b9 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -808,8 +808,8 @@ private: /** Inserts the passed cell style object into the internal maps. */ void insertCellStyle( CellStyleRef xCellStyle ); /** Creates the style sheet described by the passed cell style object. */ - OUString createCellStyle( const CellStyleRef& rxCellStyle ) const; - ::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ) const; + static OUString createCellStyle( const CellStyleRef& rxCellStyle ); + static ::ScStyleSheet* getCellStyleSheet( const CellStyleRef& rxCellStyle ); private: typedef RefVector< CellStyle > CellStyleVector; diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index 2f6f192a95bb..f314733c7b46 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -82,7 +82,7 @@ public: /** Imports protection settings from the sheetProtection element. */ void importSheetProtection( const AttributeList& rAttribs ); /** Imports enhanced protection settings from the protectedRanges element. */ - void importProtectedRanges( const AttributeList& rAttribs ); + static void importProtectedRanges( const AttributeList& rAttribs ); /** Imports enhanced protection settings from the protectedRange element. */ void importProtectedRange( const AttributeList& rAttribs ); /** Imports protection settings from the sheetProtection element of a chart sheet. */ diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index c38925f18cdb..e6adff59b61e 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -482,7 +482,7 @@ public: /** Creates a CHFONT record from the passed font index, calls virtual function SetFont(). */ void ConvertFontBase( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet ); /** Converts rotation settings, calls virtual function SetRotation(). */ - void ConvertRotationBase( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, bool bSupportsStacked ); + void ConvertRotationBase( const ScfPropertySet& rPropSet, bool bSupportsStacked ); }; /** Represents the CHTEXT record group containing text object properties. diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 8a960f5db307..07334c2122af 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -154,7 +154,7 @@ private: @param rRanges The cell range list to fill. @param xLabelRangesRef The core range list with all ranges. @param nScTab The current Calc sheet index. */ - void FillRangeList( ScRangeList& rScRanges, + static void FillRangeList( ScRangeList& rScRanges, ScRangePairListRef xLabelRangesRef, SCTAB nScTab ); private: diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 6ef12e5de038..56b183a39e82 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -179,9 +179,9 @@ protected: inline sal_uInt16 GetSourceEntryCount() const { return mnEntryCount; } /** Writes a formula with special style only valid in OBJ records. */ - void WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ) const; + static void WriteFormula( XclExpStream& rStrm, const XclTokenArray& rTokArr ); /** Writes a formula subrecord with special style only valid in OBJ records. */ - void WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ) const; + static void WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId, const XclTokenArray& rTokArr ); private: XclTokenArrayRef mxCellLink; /// Formula for linked cell. diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 952443814a0b..dafd0884d37f 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -188,7 +188,7 @@ public: /** Writes related records into Workbook stream and creates the pivot cache storage stream. */ void Save( XclExpStream& rStrm ); - void SaveXml( XclExpXmlStream& rStrm ); + static void SaveXml( XclExpXmlStream& rStrm ); private: /** Returns read/write access to a pivot cache field. */ @@ -212,7 +212,7 @@ private: /** Writes the SXDB record. */ void WriteSxdb( XclExpStream& rStrm ) const; /** Writes the SXDBEX record. */ - void WriteSxdbex( XclExpStream& rStrm ) const; + static void WriteSxdbex( XclExpStream& rStrm ); /** Writes the SXINDEXLIST record list containing the item index table. */ void WriteSxindexlistList( XclExpStream& rStrm ) const; @@ -372,13 +372,13 @@ private: /** Writes the SXVIEW record starting the pivot table. */ void WriteSxview( XclExpStream& rStrm ) const; /** Writes an SXIVD record for row field or column field order. */ - void WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ) const; + static void WriteSxivd( XclExpStream& rStrm, const ScfUInt16Vec& rFields ); /** Writes the SXPI record containing page field info. */ void WriteSxpi( XclExpStream& rStrm ) const; /** Writes all SXDI records containing info about the data fields. */ void WriteSxdiList( XclExpStream& rStrm ) const; /** Writes a dummy SXLI records containing item layout info. */ - void WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ) const; + static void WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sal_uInt16 nIndexCount ); /** Writes the SXEX records containing additional pivot table info. */ void WriteSxex( XclExpStream& rStrm ) const; diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 3bd970f8b388..7f1b6dd980b5 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -171,7 +171,7 @@ public: bool IsDocumentEncrypted() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ) const; + static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateEncryptionData( const OUString& aPass ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData() const; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GenerateDefaultEncryptionData() const; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index fd41b7362610..90549b7110ed 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -224,8 +224,8 @@ public: private: void Init( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aEncryptionData ); - sal_uInt32 GetBlockPos( sal_Size nStrmPos ) const; - sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ) const; + static sal_uInt32 GetBlockPos( sal_Size nStrmPos ); + static sal_uInt16 GetOffsetInBlock( sal_Size nStrmPos ); private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 981899d36e36..b33077465fc3 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -443,7 +443,7 @@ public: /** Converts and writes the contained font settings to the passed property set. */ void ConvertFontBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet ) const; /** Converts and writes the contained rotation settings to the passed property set. */ - void ConvertRotationBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, bool bSupportsStacked ) const; + void ConvertRotationBase( ScfPropertySet& rPropSet, bool bSupportsStacked ) const; }; /** The CHFONT record containing a font index for text objects. */ diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 2e376f94c51a..181a199745eb 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -170,7 +170,7 @@ public: explicit XclImpValidationManager( const XclImpRoot& rRoot ); /** Reads a DVAL record and sets marks the dropdown arrow control to be ignored. */ - void ReadDval( XclImpStream& rStrm ); + static void ReadDval( XclImpStream& rStrm ); /** Reads a DV record and inserts validation data into the document. */ void ReadDV( XclImpStream& rStrm ); diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index 949750a0eb36..7db16978b8d2 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -201,7 +201,7 @@ public: XclImpTabViewSettings& GetTabViewSettings() const; /** Returns the Calc add-in function name for an Excel function name. */ - OUString GetScAddInName( const OUString& rXclName ) const; + static OUString GetScAddInName( const OUString& rXclName ); /** Returns true, if the document contains a VB project. */ inline bool HasBasic() const { return mrImpData.mbHasBasic; } diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 85e949888b80..72bb9ab6e986 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -139,9 +139,9 @@ private: virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; /** Returns the block number corresponding to the passed stream position. */ - sal_uInt32 GetBlock( sal_Size nStrmPos ) const; + static sal_uInt32 GetBlock( sal_Size nStrmPos ); /** Returns the block offset corresponding to the passed stream position. */ - sal_uInt16 GetOffset( sal_Size nStrmPos ) const; + static sal_uInt16 GetOffset( sal_Size nStrmPos ); private: ::msfilter::MSCodec_Std97 maCodec; /// Crypto algorithm implementation. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index a527284042aa..f7ffec4d4049 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -1336,12 +1336,12 @@ public: const ScfPropertySet& rPropSet, XclChPropertyMode ePropMode ); /** Reads all marker properties from the passed property set. */ - void ReadMarkerProperties( + static void ReadMarkerProperties( XclChMarkerFormat& rMarkerFmt, const ScfPropertySet& rPropSet, sal_uInt16 nFormatIdx ); /** Reads rotation properties from the passed property set. */ - sal_uInt16 ReadRotationProperties( + static sal_uInt16 ReadRotationProperties( const ScfPropertySet& rPropSet, bool bSupportsStacked ); @@ -1367,11 +1367,11 @@ public: sal_uInt32 nDffFillType, XclChPropertyMode ePropMode ); /** Writes all marker properties to the passed property set. */ - void WriteMarkerProperties( + static void WriteMarkerProperties( ScfPropertySet& rPropSet, const XclChMarkerFormat& rMarkerFmt ); /** Writes rotation properties to the passed property set. */ - void WriteRotationProperties( + static void WriteRotationProperties( ScfPropertySet& rPropSet, sal_uInt16 nRotation, bool bSupportsStacked ); diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 920476511e83..95319ce19566 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -348,7 +348,7 @@ bool AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress, } bool AddressConverter::convertToCellAddressUnchecked( - com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) const + com::sun::star::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) { orAddress.Sheet = nSheet; return parseOoxAddress2d(orAddress.Column, orAddress.Row, pStr); diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index b4453464265b..982daa1a7466 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -534,14 +534,14 @@ AutoFilter::AutoFilter( const WorkbookHelper& rHelper ) : void AutoFilter::importAutoFilter( const AttributeList& rAttribs, sal_Int16 nSheet ) { OUString aRangeStr = rAttribs.getString( XML_ref, OUString() ); - getAddressConverter().convertToCellRangeUnchecked( maRange, aRangeStr, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maRange, aRangeStr, nSheet ); } void AutoFilter::importAutoFilter( SequenceInputStream& rStrm, sal_Int16 nSheet ) { BinRange aBinRange; rStrm >> aBinRange; - getAddressConverter().convertToCellRangeUnchecked( maRange, aBinRange, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maRange, aBinRange, nSheet ); } FilterColumn& AutoFilter::createFilterColumn() diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index 9f74748c5779..d126cf02098a 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -104,7 +104,7 @@ void Comment::importComment( const AttributeList& rAttribs ) { maModel.mnAuthorId = rAttribs.getInteger( XML_authorId, -1 ); // cell range will be checked while inserting the comment into the document - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); } void Comment::importCommentPr( const AttributeList& rAttribs ) @@ -124,7 +124,7 @@ void Comment::importComment( SequenceInputStream& rStrm ) maModel.mnAuthorId = rStrm.readInt32(); rStrm >> aBinRange; // cell range will be checked while inserting the comment into the document - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() ); } RichStringRef Comment::createText() diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index ca1715c08181..896c898307b0 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -567,7 +567,7 @@ void ExternalLink::setExternalTargetUrl( const OUString& rTargetUrl, const OUStr else if( rTargetType == CREATE_MSOFFICE_RELATION_TYPE( "xlExternalLinkPath/xlLibrary" ) ) { meLinkType = LINKTYPE_LIBRARY; - meFuncLibType = getFormulaParser().getFuncLibTypeFromLibraryName( rTargetUrl ); + meFuncLibType = FunctionProvider::getFuncLibTypeFromLibraryName( rTargetUrl ); } OSL_ENSURE( meLinkType != LINKTYPE_UNKNOWN, "ExternalLink::setExternalTargetUrl - empty target URL or unknown target type" ); diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 408d5e170457..a590a3c29f05 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -1146,7 +1146,7 @@ const FunctionInfo* FunctionProvider::getFuncInfoFromMacroName( const OUString& return mxFuncImpl->maMacroFuncs.get( rFuncName ).get(); } -FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) const +FunctionLibraryType FunctionProvider::getFuncLibTypeFromLibraryName( const OUString& rLibraryName ) { #define OOX_XLS_IS_LIBNAME( libname, basename ) (libname.equalsIgnoreAsciiCase( basename ".XLA" ) || libname.equalsIgnoreAsciiCase( basename ".XLAM" )) diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 63ff5be43f79..4a48cf257e92 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -530,7 +530,7 @@ private: // reference conversion --------------------------------------------------- void initReference2d( SingleReference& orApiRef ) const; - void initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) const; + static void initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ); void convertReference( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const; void convertReference( ComplexReference& orApiRef, const BinSingleRef2d& rRef1, const BinSingleRef2d& rRef2, bool bDeleted, bool bRelativeAsOffset ) const; void convertReference2d( SingleReference& orApiRef, const BinSingleRef2d& rRef, bool bDeleted, bool bRelativeAsOffset ) const; @@ -1108,7 +1108,7 @@ void FormulaParserImpl::initReference2d( SingleReference& orApiRef ) const } } -void FormulaParserImpl::initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) const +void FormulaParserImpl::initReference3d( SingleReference& orApiRef, sal_Int32 nSheet, bool bSameSheet ) { orApiRef.Flags = SHEET_3D; if( nSheet < 0 ) diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index da6e770d8905..e35eaaeb00f0 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -996,7 +996,7 @@ void PivotCacheField::importPCItemIndex( BiffInputStream& rStrm, WorksheetHelper // private -------------------------------------------------------------------- void PivotCacheField::writeItemToSourceDataCell( WorksheetHelper& rSheetHelper, - sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) const + sal_Int32 nCol, sal_Int32 nRow, const PivotCacheItem& rItem ) { if( rItem.getType() != XML_m ) { @@ -1094,7 +1094,7 @@ void PivotCache::importWorksheetSource( const AttributeList& rAttribs, const Rel // resolve URL of external document maTargetUrl = rRelations.getExternalTargetFromRelId( maSheetSrcModel.maRelId ); // store range address unchecked with sheet index 0, will be resolved/checked later - getAddressConverter().convertToCellRangeUnchecked( maSheetSrcModel.maRange, rAttribs.getString( XML_ref, OUString() ), 0 ); + AddressConverter::convertToCellRangeUnchecked( maSheetSrcModel.maRange, rAttribs.getString( XML_ref, OUString() ), 0 ); } void PivotCache::importPCDefinition( SequenceInputStream& rStrm ) @@ -1149,7 +1149,7 @@ void PivotCache::importPCDSheetSource( SequenceInputStream& rStrm, const Relatio BinRange aBinRange; rStrm >> aBinRange; // store range address unchecked with sheet index 0, will be resolved/checked later - getAddressConverter().convertToCellRangeUnchecked( maSheetSrcModel.maRange, aBinRange, 0 ); + AddressConverter::convertToCellRangeUnchecked( maSheetSrcModel.maRange, aBinRange, 0 ); } else { diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index ec574e36b327..04b02687de07 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -962,7 +962,7 @@ void PivotTable::importPivotTableDefinition( const AttributeList& rAttribs ) void PivotTable::importLocation( const AttributeList& rAttribs, sal_Int16 nSheet ) { - getAddressConverter().convertToCellRangeUnchecked( maLocationModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); + AddressConverter::convertToCellRangeUnchecked( maLocationModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); maLocationModel.mnFirstHeaderRow = rAttribs.getInteger( XML_firstHeaderRow, 0 ); maLocationModel.mnFirstDataRow = rAttribs.getInteger( XML_firstDataRow, 0 ); maLocationModel.mnFirstDataCol = rAttribs.getInteger( XML_firstDataCol, 0 ); @@ -1087,7 +1087,7 @@ void PivotTable::importPTLocation( SequenceInputStream& rStrm, sal_Int16 nSheet maLocationModel.mnFirstDataCol = rStrm.readInt32(); maLocationModel.mnRowPageCount = rStrm.readInt32(); maLocationModel.mnColPageCount = rStrm.readInt32(); - getAddressConverter().convertToCellRangeUnchecked( maLocationModel.maRange, aBinRange, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maLocationModel.maRange, aBinRange, nSheet ); } void PivotTable::importPTRowFields( SequenceInputStream& rStrm ) diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 946fad940a08..2308953879a8 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -70,7 +70,7 @@ void Scenario::importScenario( const AttributeList& rAttribs ) void Scenario::importInputCells( const AttributeList& rAttribs ) { ScenarioCellModel aModel; - getAddressConverter().convertToCellAddressUnchecked( aModel.maPos, rAttribs.getString( XML_r, OUString() ), mnSheet ); + AddressConverter::convertToCellAddressUnchecked( aModel.maPos, rAttribs.getString( XML_r, OUString() ), mnSheet ); aModel.maValue = rAttribs.getXString( XML_val, OUString() ); aModel.mnNumFmtId = rAttribs.getInteger( XML_numFmtId, 0 ); aModel.mbDeleted = rAttribs.getBool( XML_deleted, false ); @@ -95,7 +95,7 @@ void Scenario::importInputCells( SequenceInputStream& rStrm ) rStrm.skip( 8 ); aModel.mnNumFmtId = rStrm.readuInt16(); rStrm >> aModel.maValue; - getAddressConverter().convertToCellAddressUnchecked( aModel.maPos, aPos, mnSheet ); + AddressConverter::convertToCellAddressUnchecked( aModel.maPos, aPos, mnSheet ); maCells.push_back( aModel ); } diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 39995a1a9504..5e73b6856359 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2839,7 +2839,7 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle ) } } -::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle ) const +::ScStyleSheet* CellStyleBuffer::getCellStyleSheet( const CellStyleRef& rxCellStyle ) { ::ScStyleSheet* pStyleSheet = NULL; if ( rxCellStyle.get() ) @@ -2847,7 +2847,7 @@ void CellStyleBuffer::insertCellStyle( CellStyleRef xCellStyle ) return pStyleSheet; } -OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) const +OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) { if( rxCellStyle.get() ) { diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index d70c8c532a83..65aaf64ee6f9 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -52,7 +52,7 @@ Table::Table( const WorkbookHelper& rHelper ) : void Table::importTable( const AttributeList& rAttribs, sal_Int16 nSheet ) { - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, rAttribs.getString( XML_ref, OUString() ), nSheet ); maModel.maProgName = rAttribs.getXString( XML_name, OUString() ); maModel.maDisplayName = rAttribs.getXString( XML_displayName, OUString() ); maModel.mnId = rAttribs.getInteger( XML_id, -1 ); @@ -73,7 +73,7 @@ void Table::importTable( SequenceInputStream& rStrm, sal_Int16 nSheet ) rStrm.skip( 32 ); rStrm >> maModel.maProgName >> maModel.maDisplayName; - getAddressConverter().convertToCellRangeUnchecked( maModel.maRange, aBinRange, nSheet ); + AddressConverter::convertToCellRangeUnchecked( maModel.maRange, aBinRange, nSheet ); static const sal_Int32 spnTypes[] = { XML_worksheet, XML_TOKEN_INVALID, XML_TOKEN_INVALID, XML_queryTable }; maModel.mnType = STATIC_ARRAY_SELECT( spnTypes, nType, XML_TOKEN_INVALID ); } diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index c25004ecff3c..96db289d4e7f 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -663,7 +663,7 @@ void WorkbookGlobals::recalcFormulaCells() { // Ask the user if full re-calculation is desired. ScopedVclPtrInstance<QueryBox> aBox( - rDocSh.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_XLS)); aBox->SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED)); diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index 666550f4b7da..1eb803d678e5 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -244,7 +244,7 @@ ContextHandlerRef WorksheetFragment::onCreateContext( sal_Int32 nElement, const case XLS_TOKEN( dimension ): importDimension( rAttribs ); break; case XLS_TOKEN( sheetFormatPr ): importSheetFormatPr( rAttribs ); break; case XLS_TOKEN( sheetProtection ): getWorksheetSettings().importSheetProtection( rAttribs ); break; - case XLS_TOKEN( protectedRanges ): getWorksheetSettings().importProtectedRanges( rAttribs ); return this; + case XLS_TOKEN( protectedRanges ): WorksheetSettings::importProtectedRanges( rAttribs ); return this; case XLS_TOKEN( phoneticPr ): getWorksheetSettings().importPhoneticPr( rAttribs ); break; case XLS_TOKEN( printOptions ): getPageSettings().importPrintOptions( rAttribs ); break; case XLS_TOKEN( pageMargins ): getPageSettings().importPageMargins( rAttribs ); break; @@ -499,7 +499,7 @@ void WorksheetFragment::importPageSetUpPr( const AttributeList& rAttribs ) void WorksheetFragment::importDimension( const AttributeList& rAttribs ) { CellRangeAddress aRange; - getAddressConverter().convertToCellRangeUnchecked( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( aRange, rAttribs.getString( XML_ref, OUString() ), getSheetIndex() ); /* OOXML stores the used area, if existing, or "A1" if the sheet is empty. In case of "A1", the dimension at the WorksheetHelper object will not be set. If the cell A1 exists, the used area will be updated while @@ -611,7 +611,7 @@ void WorksheetFragment::importDimension( SequenceInputStream& rStrm ) BinRange aBinRange; aBinRange.read( rStrm ); CellRangeAddress aRange; - getAddressConverter().convertToCellRangeUnchecked( aRange, aBinRange, getSheetIndex() ); + AddressConverter::convertToCellRangeUnchecked( aRange, aBinRange, getSheetIndex() ); /* BIFF12 stores the used area, if existing, or "A1" if the sheet is empty. In case of "A1", the dimension at the WorksheetHelper object will not be set. If the cell A1 exists, the used area will be updated diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 793bec5de0a8..e887f7a7f86f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -66,7 +66,7 @@ ScXMLExportDataPilot::~ScXMLExportDataPilot() } OUString ScXMLExportDataPilot::getDPOperatorXML( - const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const + const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) { switch (aFilterOperator) { diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index 33ef30b7799c..e7fbf755407b 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -41,7 +41,7 @@ class ScXMLExportDataPilot ScXMLExport& rExport; ScDocument* pDoc; - OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions) const; + static OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const bool bUseRegularExpressions); void WriteDPCondition(const ScQueryEntry& aQueryEntry, bool bIsCaseSensitive, bool bUseRegularExpressions); void WriteDPFilter(const ScQueryParam& aQueryParam); diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index f7c0aa6d11eb..e9bf1236546c 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -363,7 +363,7 @@ private: } } - OUString getOperatorXML(const ScQueryEntry& rEntry, bool bRegExp) const + static OUString getOperatorXML(const ScQueryEntry& rEntry, bool bRegExp) { switch (rEntry.eOp) { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 20b9c9a7d3dc..2f44ce658fc0 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -84,16 +84,16 @@ private: const OUString sMacroName; public: - ScMyValidationsContainer(); - ~ScMyValidationsContainer(); - bool AddValidation(const com::sun::star::uno::Any& aAny, + ScMyValidationsContainer(); + ~ScMyValidationsContainer(); + bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); - OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); - void WriteMessage(ScXMLExport& rExport, + static OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); + static OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + static void WriteMessage(ScXMLExport& rExport, const OUString& sTitle, const OUString& sMessage, const bool bShowMessage, const bool bIsHelpMessage); - void WriteValidations(ScXMLExport& rExport); + void WriteValidations(ScXMLExport& rExport); const OUString& GetValidationName(const sal_Int32 nIndex); }; @@ -115,7 +115,7 @@ class ScMyDefaultStyles { ScMyDefaultStyleList maColDefaults; - sal_Int32 GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, + static sal_Int32 GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, const sal_Int32 nTable, const sal_Int32 nPos, const sal_Int32 i, bool& bIsAutoStyle); public: diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index c404d4722aeb..bb1b11effad1 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -94,7 +94,7 @@ class ScMyStyleRanges : public SvRefBase ::boost::shared_ptr<ScSimpleRangeList> mpUndefinedList; ScMyCurrencyStylesSet* pCurrencyList; - void SetStylesToRanges(const ::std::list<ScRange>& rList, + static void SetStylesToRanges(const ::std::list<ScRange>& rList, const OUString* pStyleName, const sal_Int16 nCellType, const OUString* pCurrency, ScXMLImport& rImport); public: @@ -147,7 +147,7 @@ class ScMyStylesImportHelper void AddDefaultRange(const ScRange& rRange); void AddSingleRange(const ScRange& rRange); void AddRange(); - bool IsEqual(const OUString* pFirst, const OUString* pSecond) + static bool IsEqual(const OUString* pFirst, const OUString* pSecond) { return ((pFirst && pSecond && pFirst->equals(*pSecond)) || (!pFirst && !pSecond) || diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index ed6e28d6f807..6280175b73f4 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -52,7 +52,7 @@ XMLTableShapeImportHelper::~XMLTableShapeImportHelper() { } -void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const +void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) { if ( sType == "com.sun.star.drawing.ControlShape" ) nLayerID = SC_LAYER_CONTROLS; @@ -159,7 +159,7 @@ void XMLTableShapeImportHelper::finishShape( // also when anchored to the sheet // -> call AddOLE with invalid cell position (checked in ScMyShapeResizer::ResizeShapes) - if (rTables.IsOLE(rShape)) + if (ScMyTables::IsOLE(rShape)) rTables.AddOLE(rShape, *pRangeList); } diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index de9ac029d0b3..41634f06d9f7 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -37,7 +37,7 @@ public: XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper=0 ); virtual ~XMLTableShapeImportHelper(); - void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const; + static void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType); virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) SAL_OVERRIDE; diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 8cdbd82e8cc4..3ddd5bfe618a 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -3656,12 +3656,12 @@ void ScXMLExport::SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgres } } -bool ScXMLExport::IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const +bool ScXMLExport::IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) { return (aCell1.nType == aCell2.nType); } -bool ScXMLExport::IsEditCell(ScMyCell& rCell) const +bool ScXMLExport::IsEditCell(ScMyCell& rCell) { return rCell.maBaseCell.meType == CELLTYPE_EDIT; } diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 2a5a6ea2dc52..e4630b44122f 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -147,7 +147,7 @@ class ScXMLExport : public SvXMLExport void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, + static com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, const sal_Int32 nTable); // ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); void GetAreaLinks( ScMyAreaLinksContainer& rAreaLinks ); @@ -176,7 +176,7 @@ class ScXMLExport : public SvXMLExport void GetColumnRowHeader(bool& bHasColumnHeader, com::sun::star::table::CellRangeAddress& aColumnHeaderRange, bool& bHasRowHeader, com::sun::star::table::CellRangeAddress& aRowHeaderRange, OUString& rPrintRanges) const; - void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); + static void FillFieldGroup(ScOutlineArray* pFields, ScMyOpenCloseColumnRowGroup* pGroups); void FillColumnRowGroups(); bool GetMerged (const com::sun::star::table::CellRangeAddress* pCellRange, @@ -194,8 +194,8 @@ class ScXMLExport : public SvXMLExport void WriteTableShapes(); void SetRepeatAttribute(sal_Int32 nEqualCellCount, bool bIncProgress); - bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2) const; - bool IsEditCell(ScMyCell& rCell) const; + static bool IsCellTypeEqual (const ScMyCell& aCell1, const ScMyCell& aCell2); + static bool IsEditCell(ScMyCell& rCell); bool IsCellEqual(ScMyCell& aCell1, ScMyCell& aCell2); void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index f48894257f3c..f500690c9ed1 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -382,7 +382,7 @@ SvXMLImportContext *ScXMLConditionContext::CreateChildContext( sal_uInt16 nPrefi } void ScXMLConditionContext::GetOperator( - const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const + const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) { rParam.bRegExp = false; if (IsXMLToken(aOpStr, XML_MATCH)) @@ -822,7 +822,7 @@ SvXMLImportContext *ScXMLDPConditionContext::CreateChildContext( sal_uInt16 nPre } void ScXMLDPConditionContext::getOperatorXML( - const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const + const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) { bUseRegularExpressions = false; if (IsXMLToken(sTempOperator, XML_MATCH)) diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index e22fe1e6d81b..2df7a49d20e7 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -169,7 +169,7 @@ public: virtual void EndElement() SAL_OVERRIDE; - void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; + static void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry); void AddSetItem(const ScQueryEntry::Item& rItem); }; @@ -341,8 +341,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - void getOperatorXML( - const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; + static void getOperatorXML( + const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions); virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 5823cd3c42fc..777e68b6dce6 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -3022,7 +3022,7 @@ throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeE UnlockSolarMutex(); } -sal_Int32 ScXMLImport::GetRangeType(const OUString& sRangeType) const +sal_Int32 ScXMLImport::GetRangeType(const OUString& sRangeType) { sal_Int32 nRangeType(0); OUStringBuffer sBuffer; @@ -3108,7 +3108,7 @@ public: using namespace formula; const OUString& aType = r.sRangeType; - sal_uInt32 nUnoType = mrXmlImport.GetRangeType(aType); + sal_uInt32 nUnoType = ScXMLImport::GetRangeType(aType); sal_uInt16 nNewType = RT_NAME; if ( nUnoType & sheet::NamedRangeFlag::FILTER_CRITERIA ) nNewType |= RT_CRITERIA; diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 766ab01a6927..c26a71016a81 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -1214,7 +1214,7 @@ public: void SetRangeOverflowType(sal_uInt32 nType); - sal_Int32 GetRangeType(const OUString& sRangeType) const; + static sal_Int32 GetRangeType(const OUString& sRangeType); void SetNamedRanges(); void SetSheetNamedRanges(); void SetLabelRanges(); diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index d3656d8c6b72..2e4e98a3234a 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -79,7 +79,7 @@ public: void SetRowStyle(const OUString& rCellStyleName); void AddColumn(bool bIsCovered); void FixupOLEs() { aFixupOLEs.FixupOLEs(); } - bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const + static bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) { return ScMyOLEFixer::IsOLE(rShape); } void DeleteTable(); ScAddress GetCurrentCellPos() const { return maCurrentCellPos; }; diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 4b1c96b071c9..a4e94cc9ecab 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -133,7 +133,7 @@ struct ScShapeDataLess msZOrder( "ZOrder" ) { } - void ConvertLayerId(sal_Int16& rLayerID) const // changes the number of the LayerId so it the accessibility order + static void ConvertLayerId(sal_Int16& rLayerID) // changes the number of the LayerId so it the accessibility order { switch (rLayerID) { @@ -330,8 +330,8 @@ private: bool FindShape(const uno::Reference<drawing::XShape>& xShape, SortedShapes::iterator& rItr) const; - sal_Int8 Compare(const ScAccessibleShapeData* pData1, - const ScAccessibleShapeData* pData2) const; + static sal_Int8 Compare(const ScAccessibleShapeData* pData1, + const ScAccessibleShapeData* pData2); }; ScChildrenShapes::ScChildrenShapes(ScAccessibleDocument* pAccessibleDocument, ScTabViewShell* pViewShell, ScSplitPos eSplitPos) @@ -1361,7 +1361,7 @@ bool ScChildrenShapes::FindShape(const uno::Reference<drawing::XShape>& xShape, } sal_Int8 ScChildrenShapes::Compare(const ScAccessibleShapeData* pData1, - const ScAccessibleShapeData* pData2) const + const ScAccessibleShapeData* pData2) { ScShapeDataLess aLess; @@ -2343,7 +2343,7 @@ OUString ScAccessibleDocument::GetCurrentCellName() const return sName; } -OUString ScAccessibleDocument::GetCurrentCellDescription() const +OUString ScAccessibleDocument::GetCurrentCellDescription() { return OUString(); } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 08db9aa7fc63..c127841e54f0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -106,8 +106,8 @@ private: ::accessibility::AccessibleTextHelper* CreateTextHelper(const OUString& rString, const Rectangle& rVisRect, const ScAddress& aCellPos, bool bMarkNote, sal_Int32 nChildOffset) const; sal_Int32 AddNotes(const ScPreviewLocationData& rData, const Rectangle& rVisRect, bool bMark, ScAccNotes& rNotes); - sal_Int8 CompareCell(const ScAddress& aCell1, const ScAddress& aCell2); - void CollectChildren(const ScAccNote& rNote, ScXAccList& rList); + static sal_Int8 CompareCell(const ScAddress& aCell1, const ScAddress& aCell2); + static void CollectChildren(const ScAccNote& rNote, ScXAccList& rList); sal_Int32 CheckChanges(const ScPreviewLocationData& rData, const Rectangle& rVisRect, bool bMark, ScAccNotes& rOldNotes, ScAccNotes& rNewNotes, ScXAccList& rOldParas, ScXAccList& rNewParas); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index db2c1bb1b52d..83452ead290b 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -307,7 +307,7 @@ void ScInputWindow::SetInputHandler( ScInputHandler* pNew ) } } -bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) const +bool ScInputWindow::UseSubTotal(ScRangeList* pRangeList) { bool bSubTotal = false; ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); @@ -2289,9 +2289,9 @@ static ScNameInputType lcl_GetInputType( const OUString& rText ) eRet = SC_NAME_INPUT_RANGE; else if ( aAddress.Parse( rText, pDoc, eConv ) & SCA_VALID ) eRet = SC_NAME_INPUT_CELL; - else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_NAMES, eConv ) ) + else if ( ScRangeUtil::MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_NAMES, eConv ) ) eRet = SC_NAME_INPUT_NAMEDRANGE; - else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_DBASE, eConv ) ) + else if ( ScRangeUtil::MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_DBASE, eConv ) ) eRet = SC_NAME_INPUT_DATABASE; else if ( comphelper::string::isdigitAsciiString( rText ) && ( nNumeric = rText.toInt32() ) > 0 && nNumeric <= MAXROW+1 ) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 116aada89a07..a31b5280faa2 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1004,7 +1004,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) { pAppCfg->SetKeyBindingType(eNew); bSaveAppOptions = true; - pDocSh->ResetKeyBindings(eNew); + ScDocShell::ResetKeyBindings(eNew); } } @@ -1283,7 +1283,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) if ( pDoc && bCalcAll ) { - WaitObject aWait( pDocSh->GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); pDoc->CalcAll(); if ( pViewSh ) pViewSh->UpdateCharts( true ); diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 943900dfeea0..069aed3e0e39 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -351,7 +351,7 @@ void ScConditionFrmtEntry::Deselect() } -sal_Int32 ScConditionFrmtEntry::ConditionModeToEntryPos( ScConditionMode eMode ) const +sal_Int32 ScConditionFrmtEntry::ConditionModeToEntryPos( ScConditionMode eMode ) { for ( sal_Int32 i = 0; i < NUM_COND_ENTRIES; ++i ) { @@ -364,13 +364,13 @@ sal_Int32 ScConditionFrmtEntry::ConditionModeToEntryPos( ScConditionMode eMode ) return 0; } -ScConditionMode ScConditionFrmtEntry::EntryPosToConditionMode( sal_Int32 aEntryPos ) const +ScConditionMode ScConditionFrmtEntry::EntryPosToConditionMode( sal_Int32 aEntryPos ) { assert( 0 <= aEntryPos && aEntryPos < NUM_COND_ENTRIES ); return mpEntryToCond[aEntryPos]; } -sal_Int32 ScConditionFrmtEntry::GetNumberEditFields( ScConditionMode eMode ) const +sal_Int32 ScConditionFrmtEntry::GetNumberEditFields( ScConditionMode eMode ) { switch(eMode) { diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 1b84ae626154..03fb45ce8d04 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -325,15 +325,15 @@ bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) if ( pEd == pEdDataArea ) { - bEditOk = pRangeUtil->IsAbsArea( pEd->GetText(), pDoc, + bEditOk = ScRangeUtil::IsAbsArea( pEd->GetText(), pDoc, nTab, &theCompleteStr, NULL, NULL, eConv ); } else if ( pEd == pEdDestArea ) { OUString aPosStr; - pRangeUtil->CutPosString( pEd->GetText(), aPosStr ); - bEditOk = pRangeUtil->IsAbsPos( aPosStr, pDoc, + ScRangeUtil::CutPosString( pEd->GetText(), aPosStr ); + bEditOk = ScRangeUtil::IsAbsPos( aPosStr, pDoc, nTab, &theCompleteStr, NULL, eConv ); } @@ -374,7 +374,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) OUString aDestPosStr( pEdDestArea->GetText() ); const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if ( pRangeUtil->IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) ) + if ( ScRangeUtil::IsAbsPos( aDestPosStr, pDoc, nTab, NULL, &aDestAddress, eConv ) ) { ScConsolidateParam theOutParam( theConsData ); ScArea** ppDataAreas = new ScArea*[nDataAreaCount]; @@ -384,7 +384,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) for ( i=0; i<nDataAreaCount; i++ ) { pArea = new ScArea; - pRangeUtil->MakeArea( pLbConsAreas->GetEntry( i ), + ScRangeUtil::MakeArea( pLbConsAreas->GetEntry( i ), *pArea, pDoc, nTab, eConv ); ppDataAreas[i] = pArea; } @@ -435,7 +435,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) sal_uInt16 nAreaCount = 0; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if ( pRangeUtil->IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, true, eConv ) ) + if ( ScRangeUtil::IsAbsTabArea( aNewEntry, pDoc, &ppAreas, &nAreaCount, true, eConv ) ) { // IsAbsTabArea() creates an array of ScArea pointers, // which have been created dynamically as well. @@ -511,7 +511,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) OUString aString( pAreaData[nSelPos-1].aStrArea ); if ( pLb == pLbDestArea ) - pRangeUtil->CutPosString( aString, aString ); + ScRangeUtil::CutPosString( aString, aString ); pEd->SetText( aString ); diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index b859d0be9b05..1aaf8e19eddd 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -79,10 +79,10 @@ public: CSVHandler( DataStream::Line& rLine, size_t nColCount ) : mrLine(rLine), mnColCount(nColCount), mnCols(0), mpLineHead(rLine.maLine.getStr()) {} - void begin_parse() {} - void end_parse() {} - void begin_row() {} - void end_row() {} + static void begin_parse() {} + static void end_parse() {} + static void begin_row() {} + static void end_row() {} void cell(const char* p, size_t n) { diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 17b61326f4f2..95f33cf9882b 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -524,7 +524,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // Adjust aLocalParam cols/rows to used data area. Keep sticky top row or // column (depending on direction) in any case, not just if it has headers, @@ -710,7 +710,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); bool bKeepSub = false; // bestehende Teilergebnisse wiederholen? ScSubTotalParam aSubTotalParam; @@ -987,7 +987,7 @@ bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, if (rParam.bReplace) if (rDoc.TestRemoveSubTotals( nTab, rParam )) { - bOk = ( MessBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + bOk = ( MessBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), // "StarCalc" "Daten loeschen?" ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_1 ) ).Execute() @@ -996,7 +996,7 @@ bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, if (bOk) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocShellModificator aModificator( rDocShell ); ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert @@ -1229,7 +1229,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb OSL_ASSERT(pOldObj && pNewObj && pOldObj != pNewObj); ScDocShellModificator aModificator( rDocShell ); - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScRangeList aRanges; aRanges.Append(pOldObj->GetOutRange()); @@ -1278,7 +1278,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb // OutRange of pOldObj (pDestObj) is still old area if (!lcl_EmptyExcept(&rDoc, aNewOut, pOldObj->GetOutRange())) { - ScopedVclPtrInstance<QueryBox> aBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScopedVclPtrInstance<QueryBox> aBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY) ); if (aBox->Execute() == RET_NO) { @@ -1312,7 +1312,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb bool ScDBDocFunc::RemovePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) { ScDocShellModificator aModificator(rDocShell); - WaitObject aWait(rDocShell.GetActiveDialogParent()); + WaitObject aWait(ScDocShell::GetActiveDialogParent()); if (!isEditable(rDocShell, rDPObj.GetOutRange(), bApi)) return false; @@ -1363,7 +1363,7 @@ bool ScDBDocFunc::RemovePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) bool ScDBDocFunc::CreatePivotTable(const ScDPObject& rDPObj, bool bRecord, bool bApi) { ScDocShellModificator aModificator(rDocShell); - WaitObject aWait(rDocShell.GetActiveDialogParent()); + WaitObject aWait(ScDocShell::GetActiveDialogParent()); // At least one cell in the output range should be editable. Check in advance. if (!isEditable(rDocShell, ScRange(rDPObj.GetOutRange().aStart), bApi)) @@ -1431,7 +1431,7 @@ bool ScDBDocFunc::CreatePivotTable(const ScDPObject& rDPObj, bool bRecord, bool if (!bEmpty) { ScopedVclPtrInstance<QueryBox> aBox( - rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY)); if (aBox->Execute() == RET_NO) @@ -1464,7 +1464,7 @@ bool ScDBDocFunc::CreatePivotTable(const ScDPObject& rDPObj, bool bRecord, bool bool ScDBDocFunc::UpdatePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) { ScDocShellModificator aModificator( rDocShell ); - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); if (!isEditable(rDocShell, rDPObj.GetOutRange(), bApi)) return false; @@ -1504,7 +1504,7 @@ bool ScDBDocFunc::UpdatePivotTable(ScDPObject& rDPObj, bool bRecord, bool bApi) { if (!lcl_EmptyExcept(&rDoc, aNewOut, rDPObj.GetOutRange())) { - ScopedVclPtrInstance<QueryBox> aBox( rDocShell.GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + ScopedVclPtrInstance<QueryBox> aBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), ScGlobal::GetRscString(STR_PIVOT_NOTEMPTY) ); if (aBox->Execute() == RET_NO) { @@ -1602,7 +1602,7 @@ void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessD const ScDBData* pData = rDBColl.getNamedDBs().findByUpperName(ScGlobal::pCharClass->uppercase(rTarget)); if (!pData) { - ScopedVclPtrInstance<InfoBox> aInfoBox( rDocShell.GetActiveDialogParent(), + ScopedVclPtrInstance<InfoBox> aInfoBox( ScDocShell::GetActiveDialogParent(), ScGlobal::GetRscString( STR_TARGETNOTFOUND ) ); aInfoBox->Execute(); return; diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index f45baa6a6029..b7ea4ca7022e 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -137,7 +137,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = ScDocShell::GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); ScDocShellModificator aModificator( rDocShell ); @@ -635,7 +635,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nErrStringId = STR_MSSG_IMPORTDATA_0; aErrorMessage = ScGlobal::GetRscString( nErrStringId ); } - ScopedVclPtrInstance< InfoBox > aInfoBox( rDocShell.GetActiveDialogParent(), aErrorMessage ); + ScopedVclPtrInstance< InfoBox > aInfoBox( ScDocShell::GetActiveDialogParent(), aErrorMessage ); aInfoBox->Execute(); } diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 305ab149d229..5546bb95c875 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -373,7 +373,7 @@ bool ScDocFunc::DetectiveMarkInvalid(SCTAB nTab) bool bUndo (rDoc.IsUndoEnabled()); ScDrawLayer* pModel = rDoc.GetDrawLayer(); - vcl::Window* pWaitWin = rDocShell.GetActiveDialogParent(); + vcl::Window* pWaitWin = ScDocShell::GetActiveDialogParent(); if (pWaitWin) pWaitWin->EnterWait(); if (bUndo) @@ -1755,7 +1755,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, return false; } - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pRefUndoDoc = NULL; ScRefUndoData* pUndoData = NULL; @@ -2321,7 +2321,7 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; @@ -2974,7 +2974,7 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ) bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bool bApi ) { bool bSuccess = false; - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocShellModificator aModificator( rDocShell ); @@ -3026,7 +3026,7 @@ bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bo bool ScDocFunc::DeleteTable( SCTAB nTab, bool bRecord, bool /* bApi */ ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocShellModificator aModificator( rDocShell ); @@ -3756,7 +3756,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) { if (!bApi) { - ScopedVclPtrInstance< InfoBox > aBox( rDocShell.GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); + ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); aBox->Execute(); } return false; @@ -3786,7 +3786,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) { if (!bApi) { - ScopedVclPtrInstance< InfoBox > aBox( rDocShell.GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); + ScopedVclPtrInstance< InfoBox > aBox( ScDocShell::GetActiveDialogParent(), OUString( ScResId( SCSTR_WRONGPASSWORD ) ) ); aBox->Execute(); } return false; @@ -3951,7 +3951,7 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( nFormatNo < pAutoFormat->size() && aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); bool bSize = pAutoFormat->findByIndex(nFormatNo)->GetIncludeWidthHeight(); @@ -4055,7 +4055,7 @@ bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocument* pUndoDoc = NULL; @@ -4142,7 +4142,7 @@ bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); rDoc.SetDirty( rRange, false ); if ( bRecord ) { @@ -4285,7 +4285,7 @@ bool ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScRange aSourceArea = aRange; ScRange aDestArea = aRange; @@ -4393,7 +4393,7 @@ bool ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, ScEditableTester aTester( &rDoc, nStartCol,nStartRow, nEndCol,nEndRow, aMark ); if ( aTester.IsEditable() ) { - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScRange aSourceArea = rRange; ScRange aDestArea = rRange; @@ -4573,7 +4573,7 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e return false; } - WaitObject aWait( rDocShell.GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); ScDocument* pUndoDoc = NULL; if ( bRecord ) @@ -4920,7 +4920,7 @@ void ScDocFunc::CreateOneName( ScRangeName& rList, aMessage += aName; aMessage += aTemplate.getToken( 1, '#' ); - short nResult = QueryBox( rDocShell.GetActiveDialogParent(), + short nResult = QueryBox( ScDocShell::GetActiveDialogParent(), WinBits(WB_YES_NO_CANCEL | WB_DEF_YES), aMessage ).Execute(); if ( nResult == RET_YES ) diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index b97bf8675e89..2bb995f36829 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -1091,7 +1091,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck ScChangeAction* pAct = pThisTrack->GetLast(); if ( pAct && pAct->GetActionNumber() > nOldActionMax ) { - pThisTrack->MergeActionState( pAct, pSourceAction ); + ScChangeTrack::MergeActionState( pAct, pSourceAction ); } } diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 515ed542a921..994c51fda678 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1194,7 +1194,7 @@ void ScDocShell::DoRecalc( bool bApi ) } else { - pSh->UpdateInputLine(); // InputEnterHandler + ScTabView::UpdateInputLine(); // InputEnterHandler pSh->UpdateInputHandler(); } } @@ -1225,7 +1225,7 @@ void ScDocShell::DoHardRecalc( bool /* bApi */ ) ScTabViewShell* pSh = GetBestViewShell(); if ( pSh ) { - pSh->UpdateInputLine(); // InputEnterHandler + ScTabView::UpdateInputLine(); // InputEnterHandler pSh->UpdateInputHandler(); } aDocument.CalcAll(); diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 74e1e3251153..85bcad965b24 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -3018,9 +3018,7 @@ void ScExternalRefManager::Notify( SfxBroadcaster&, const SfxHint& rHint ) { case SFX_EVENT_PREPARECLOSEDOC: { - SfxObjectShell* pObjShell = static_cast<const SfxEventHint&>( rHint ).GetObjShell(); - ScDocShell* pDocShell = static_cast< ScDocShell* >( pObjShell ); - ScopedVclPtrInstance<WarningBox> aBox( pDocShell->GetActiveDialogParent(), WinBits( WB_OK ), + ScopedVclPtrInstance<WarningBox> aBox( ScDocShell::GetActiveDialogParent(), WinBits( WB_OK ), ScGlobal::GetRscString( STR_CLOSE_WITH_UNSAVED_REFS ) ); aBox->Execute(); } diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index e11b6be89f79..6e75c9bacc0d 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1452,7 +1452,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) if ( !mbApi && nStartCol != nEndCol && !pDoc->IsBlockEmpty( nTab, nStartCol + 1, nStartRow, nEndCol, nRow ) ) { - ScopedVclPtrInstance< ScReplaceWarnBox > aBox( pDocSh->GetActiveDialogParent() ); + ScopedVclPtrInstance< ScReplaceWarnBox > aBox( ScDocShell::GetActiveDialogParent() ); if ( aBox->Execute() != RET_YES ) { return false; diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index e9f160fb13f8..0e216a34fa1f 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -107,9 +107,9 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, pInputHdl->NotifyChange( NULL ); ScFormulaReferenceHelper::enableInput( false ); - m_aHelper.EnableSpreadsheets(); + ScFormulaReferenceHelper::EnableSpreadsheets(); m_aHelper.Init(); - m_aHelper.SetDispatcherLock( true ); + ScFormulaReferenceHelper::SetDispatcherLock( true ); notifyChange(); fill(); @@ -495,7 +495,7 @@ void ScFormulaDlg::HideReference( bool bDoneRefMode ) } void ScFormulaDlg::ViewShellChanged() { - m_aHelper.ViewShellChanged(); + ScFormulaReferenceHelper::ViewShellChanged(); } void ScFormulaDlg::AddRefEntry( ) { @@ -525,7 +525,7 @@ void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked) if ( aStrItem.GetValue().isEmpty() ) aRetItem.SetValue( false ); // sal_False = Cancel - m_aHelper.SetDispatcherLock( false ); // turn off modal-mode + ScFormulaReferenceHelper::SetDispatcherLock( false ); // turn off modal-mode clear(); @@ -535,7 +535,7 @@ void ScFormulaDlg::dispatch(bool _bOK, bool _bMatrixChecked) } void ScFormulaDlg::setDispatcherLock( bool bLock ) { - m_aHelper.SetDispatcherLock( bLock ); + ScFormulaReferenceHelper::SetDispatcherLock( bLock ); } void ScFormulaDlg::setReferenceInput(const formula::FormEditData* _pData) { diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 75bd457b4ad0..d5206a5fc60a 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -169,7 +169,7 @@ private: ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); bool IsSelected(); - ScDocument* GetDocument(ScTabViewShell* mpViewShell); + static ScDocument* GetDocument(ScTabViewShell* mpViewShell); ::std::unique_ptr< SvxEditSource > CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos); diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index a8f3180b3090..a181c241c276 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -109,7 +109,7 @@ protected: ScCsvControl& implGetControl() const; /** Returns the first child of rxParentObj, which has the role nRole. */ - XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole ) + static XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole ) throw( ::com::sun::star::uno::RuntimeException ); /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */ ::utl::AccessibleStateSetHelper* implCreateStateSet(); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 0d47e004205c..154aaa11eafe 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -312,7 +312,7 @@ private: void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); OUString GetCurrentCellName() const; - OUString GetCurrentCellDescription() const; + static OUString GetCurrentCellDescription(); Rectangle GetVisibleArea_Impl() const; com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetScAccFlowToSequence(); diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index b74360f5c743..3bc2d3c43772 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -291,8 +291,8 @@ private: void CreateSortedMarkedCells(); void AddMarkedRange(const ScRange& rRange); - ScDocument* GetDocument(ScTabViewShell* pViewShell); - Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); + static ScDocument* GetDocument(ScTabViewShell* pViewShell); + static Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); Rectangle GetVisCells(const Rectangle& rVisArea); typedef std::vector<ScMyAddress> VEC_MYADDR; @@ -339,8 +339,8 @@ public: bool IsScAddrFormulaSel (const ScAddress &addr) const; bool IsFormulaMode(); ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex); - bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize); - bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet); + static bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize); + static bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet); }; #endif diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 2d4601b6c92b..649e79e17261 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -105,7 +105,7 @@ private: ScAccessibleCell* mpAccessibleCell; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScTabViewShell* pViewShell); + static ScDocShell* GetDocShell(ScTabViewShell* pViewShell); }; class ScAccessibleEditObjectTextData : public ScAccessibleTextData @@ -179,7 +179,7 @@ private: ScPreviewShell* mpViewShell; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScPreviewShell* pViewShell); + static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData @@ -205,7 +205,7 @@ private: bool mbRowHeader; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScPreviewShell* pViewShell); + static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; class ScAccessibleHeaderTextData : public ScAccessibleTextData diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 0b1d068149aa..3a5d75bab737 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -42,7 +42,7 @@ private: AnovaFactor meFactor; - void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput, + static void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput, FormulaTemplate& aTemplate, OUString& sFormula, GroupedBy aGroupedBy, ScRange* pResultRange); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 833b541709dc..0c2363a0b5a1 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -89,9 +89,9 @@ public: inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } bool DoClose( sal_uInt16 nId ); - void SetDispatcherLock( bool bLock ); - void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); - void ViewShellChanged(); + static void SetDispatcherLock( bool bLock ); + static void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); + static void ViewShellChanged(); static void enableInput(bool _bInput); @@ -99,7 +99,7 @@ protected: vcl::Window* GetWindow(){ return m_pWindow; } public: - bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } + static bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } bool CanInputDone( bool bForced ){ return pRefEdit && (bForced || !pRefBtn); } }; @@ -129,7 +129,7 @@ private: protected: bool DoClose( sal_uInt16 nId ); - void SetDispatcherLock( bool bLock ); + static void SetDispatcherLock( bool bLock ); virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; @@ -166,7 +166,7 @@ public: public: bool EnterRefMode(); bool LeaveRefMode(); - inline bool CanInputStart( const formula::RefEdit *pEdit ); + static inline bool CanInputStart( const formula::RefEdit *pEdit ); inline bool CanInputDone( bool bForced ); }; @@ -310,7 +310,7 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit ) { - return m_aHelper.CanInputStart( pEdit ); + return ScFormulaReferenceHelper::CanInputStart( pEdit ); } inline bool ScRefHandler::CanInputDone( bool bForced ) diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 2318cf86acc5..3beb0784296a 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -104,7 +104,7 @@ public: void ExecutePage( SfxRequest& rReq ); void ExecutePageSel( SfxRequest& rReq ); void ExecuteMove( SfxRequest& rReq ); - void GetStateCursor( SfxItemSet& rSet ); + static void GetStateCursor( SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index e0d1e8cb187f..22ddf7ddeea1 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -108,11 +108,11 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener DECL_LINK( OnEdChanged, Edit* ); // Searches the lookup table for the entry position, given condition mode - sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ) const; + static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); // Accesses the lookup table for the condition mode, given entry position - ScConditionMode EntryPosToConditionMode( sal_Int32 aEntryPos ) const; + static ScConditionMode EntryPosToConditionMode( sal_Int32 aEntryPos ); // Returns the number of edit fields used for a given condition mode - sal_Int32 GetNumberEditFields( ScConditionMode eMode ) const; + static sal_Int32 GetNumberEditFields( ScConditionMode eMode ); protected: virtual void Select() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 3c429d11a021..229c12055b42 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -145,7 +145,7 @@ private: OUString GetActionString( const ScChangeAction* pAction, ScDocument* pDoc ); void HandleListBoxSelection( bool bSelectHandle ); - void SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ); + static void SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ); void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index c71f7e979927..0c09811eb3dd 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -97,8 +97,8 @@ private: DECL_LINK( ModifyHdl, formula::RefEdit* ); DECL_LINK( SelectHdl, ListBox* ); - ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos ); - sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc ); + static ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos ); + static sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CONSDLG_HXX diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index f0c8be5e8374..f103f12c4de0 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -245,7 +245,7 @@ public: void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); void GetSbxState( SfxItemSet &rSet ); - void GetDrawObjState( SfxItemSet &rSet ); + static void GetDrawObjState( SfxItemSet &rSet ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); @@ -276,7 +276,7 @@ public: void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const OUString& rStyle ); - vcl::Window* GetActiveDialogParent(); + static vcl::Window* GetActiveDialogParent(); void ErrorMessage( sal_uInt16 nGlobStrId ); bool IsEditable() const; @@ -419,7 +419,7 @@ public: void SetSolverSaveData( const ScOptSolverSave& rData ); ScSheetSaveData* GetSheetSaveData(); - void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ); + static void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ); // password protection for Calc (derived from SfxObjectShell) // see also: FID_CHG_RECORD, SID_CHG_PROTECT diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 3f12fe64bb86..ec203b227a52 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -59,7 +59,7 @@ public: ScDrawShell(ScViewData* pData); virtual ~ScDrawShell(); - void StateDisableItems( SfxItemSet &rSet ); + static void StateDisableItems( SfxItemSet &rSet ); void ExecDrawAttr(SfxRequest& rReq); void GetDrawAttrState(SfxItemSet &rSet); @@ -85,7 +85,7 @@ public: ScDrawView* GetDrawView(); - bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); + static bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); void GetDrawAttrStateForIFBX( SfxItemSet& rSet ); ::rtl::OUString GetSidebarContextName(); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index 65dbeadfe3a3..16c718c0b32c 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -52,7 +52,7 @@ public: ScDrawTextObjectBar(ScViewData* pData); virtual ~ScDrawTextObjectBar(); - void StateDisableItems( SfxItemSet &rSet ); + static void StateDisableItems( SfxItemSet &rSet ); void Execute( SfxRequest &rReq ); void ExecuteTrans( SfxRequest& rReq ); @@ -73,7 +73,7 @@ public: private: void ExecuteGlobal( SfxRequest &rReq ); // called by Execute for all objects - void GetGlobalClipState( SfxItemSet& rSet ); + static void GetGlobalClipState( SfxItemSet& rSet ); void ExecutePasteContents( SfxRequest &rReq ); bool IsNoteEdit(); }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index b525b189c18f..0f069f8d435c 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -102,10 +102,10 @@ public: protected: virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - void SaveLRUEntry(const ScFuncDesc* pFuncDesc); + static void SaveLRUEntry(const ScFuncDesc* pFuncDesc); - bool IsInputHdl(ScInputHandler* pHdl); - ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); + static bool IsInputHdl(ScInputHandler* pHdl); + static ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FORMULA_HXX diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index e38ca5c08f74..d6edc1c4c73b 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -100,7 +100,7 @@ public: virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: - void ImpForceQuadratic(Rectangle& rRect); + static void ImpForceQuadratic(Rectangle& rRect); public: // #i33136# diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index e311e15f8141..3aca0c89fefd 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -142,7 +142,7 @@ public: bool ImportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); - bool ImportData( const OUString& rMimeType, + static bool ImportData( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); bool ExportData( const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index dfad789dcf40..e5820b8ed39d 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -134,7 +134,7 @@ private: bool StartTable( sal_Unicode cTyped, bool bFromCommand, bool bInputActivated ); void RemoveSelection(); void UpdateFormulaMode(); - void InvalidateAttribs(); + static void InvalidateAttribs(); void ImplCreateEditEngine(); DECL_LINK( DelayTimer, Timer* ); void GetColData(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index bd1650a3e877..aba78346df6b 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -285,7 +285,7 @@ protected: virtual void SetText( const OUString& rString ) SAL_OVERRIDE; virtual OUString GetText() const SAL_OVERRIDE; - bool UseSubTotal( ScRangeList* pRangeList ) const; + static bool UseSubTotal( ScRangeList* pRangeList ); bool IsPointerAtResizePos(); private: VclPtr<ScPosWnd> aWndPos; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index f87e3dd99519..f9827f8dc63c 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -56,7 +56,7 @@ private: InitListener* mpInitListener; - void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry); + static void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry); void Init(); void CheckForFormulaString(); const ScRangeData* findRangeData(const ScRangeNameLine& rLine); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index a7d801741c0c..cb23e7ab61b9 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -140,9 +140,9 @@ private: void EvalText (); void ExecuteCol (); - SCCOL AlphaToNum ( OUString& rStr ); - SCCOL NumStrToAlpha ( OUString& rStr ); - SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); + static SCCOL AlphaToNum ( OUString& rStr ); + static SCCOL NumStrToAlpha ( OUString& rStr ); + static SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); }; // class RowEdit @@ -272,8 +272,8 @@ private: void SetCurrentObject( const OUString& rName ); void SetCurrentDoc( const OUString& rDocName ); - ScTabViewShell* GetTabViewShell() const; - ScNavigatorSettings* GetNavigatorSettings(); + static ScTabViewShell* GetTabViewShell(); + static ScNavigatorSettings* GetNavigatorSettings(); bool GetViewData(); void UpdateColumn ( const SCCOL* pCol = NULL ); diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index a5f25ec50955..fa0cc5dfc913 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -95,8 +95,8 @@ private: void RemoveFromDefinedList(); void SetSelectDefinedList(); bool IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj); - bool IsDateEntry(EditTextObject* pTextObj); - bool IsExtFileNameEntry(EditTextObject* pTextObj); + static bool IsDateEntry(EditTextObject* pTextObj); + static bool IsExtFileNameEntry(EditTextObject* pTextObj); DECL_LINK( ListHdl_Impl, ListBox* ); DECL_LINK( ClickHdl, PushButton* ); DECL_LINK( MenuHdl, ScExtIButton* ); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 98109e1cf086..7b00360bcfd1 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -304,7 +304,7 @@ public: void UpdateDrawTextOutliner(); void DigitLanguageChanged(); - void UpdateInputLine(); + static void UpdateInputLine(); void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, bool bPaint = true ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index c06fdf2a44d9..4bc50e5ed59a 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -278,7 +278,7 @@ public: void GetImageMapState( SfxItemSet& rSet ); void ExecTbx( SfxRequest& rReq ); - void GetTbxState( SfxItemSet& rSet ); + static void GetTbxState( SfxItemSet& rSet ); void ExecuteSave( SfxRequest& rReq ); void GetSaveState( SfxItemSet& rSet ); @@ -287,8 +287,8 @@ public: void ExecuteUndo(SfxRequest& rReq); void GetUndoState(SfxItemSet &rSet); - void ExecuteSbx( SfxRequest& rReq ); - void GetSbxState( SfxItemSet& rSet ); + static void ExecuteSbx( SfxRequest& rReq ); + static void GetSbxState( SfxItemSet& rSet ); void ExecuteObject(SfxRequest& rReq); void GetObjectState(SfxItemSet &rSet); @@ -382,11 +382,11 @@ public: void ForceMove() { Move(); } - SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ); + static SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ); - void UpdateNumberFormatter ( const SvxNumberInfoItem& rInfoItem ); + static void UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ); - void ExecuteCellFormatDlg ( SfxRequest& rReq, const OString &rTabPage = OString()); + void ExecuteCellFormatDlg( SfxRequest& rReq, const OString &rTabPage = OString()); bool GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode = 0 ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index ecc8e0305483..a54536c11f79 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -65,8 +65,8 @@ protected: private: void Init (); void FillListBoxes (); - ScSubTotalFunc LbPosToFunc ( sal_uInt16 nPos ); - sal_uInt16 FuncToLbPos ( ScSubTotalFunc eFunc ); + static ScSubTotalFunc LbPosToFunc ( sal_uInt16 nPos ); + static sal_uInt16 FuncToLbPos ( ScSubTotalFunc eFunc ); sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 682fc0c3421f..a0c8663df0d9 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -85,7 +85,7 @@ private: void Init (); size_t UpdateUserListBox (); void UpdateEntries ( size_t nList ); - void MakeListStr ( OUString& rListStr ); + static void MakeListStr ( OUString& rListStr ); void AddNewList ( const OUString& rEntriesStr ); void RemoveList ( size_t nList ); void ModifyList ( size_t nSelList, diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index c768dbcfc393..2e696f189014 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -340,7 +340,7 @@ public: void UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAttr = NULL ); // Internal helper functions protected: - void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine, + static void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine, const ::editeng::SvxBorderLine* pDestLine, const ::editeng::SvxBorderLine* pSrcLine, bool bColor ); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index d2084b4b79e6..6ea1343fc242 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -165,7 +165,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUStr aRange.aEnd.SetTab( aRange.aStart.Tab() ); rRanges.Append( aRange ); } - else if ( aRangeUtil.MakeRangeFromName( aRangeStr, pDoc, nRefTab, aRange, RUTL_NAMES, aDetails ) ) + else if ( ScRangeUtil::MakeRangeFromName( aRangeStr, pDoc, nRefTab, aRange, RUTL_NAMES, aDetails ) ) rRanges.Append( aRange ); else bError = true; @@ -812,11 +812,11 @@ bool ScRefHandler::EnterRefMode() ScFormulaReferenceHelper::enableInput( false ); - m_aHelper.EnableSpreadsheets(); + ScFormulaReferenceHelper::EnableSpreadsheets(); m_aHelper.Init(); - m_aHelper.SetDispatcherLock( true ); + ScFormulaReferenceHelper::SetDispatcherLock( true ); return m_bInRefMode = true; } @@ -898,12 +898,12 @@ bool ScRefHandler::DoClose( sal_uInt16 nId ) void ScRefHandler::SetDispatcherLock( bool bLock ) { - m_aHelper.SetDispatcherLock( bLock ); + ScFormulaReferenceHelper::SetDispatcherLock( bLock ); } void ScRefHandler::ViewShellChanged() { - m_aHelper.ViewShellChanged(); + ScFormulaReferenceHelper::ViewShellChanged(); } void ScRefHandler::AddRefEntry() @@ -952,14 +952,14 @@ void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool if(m_rWindow->IsVisible()) { ScFormulaReferenceHelper::enableInput( false ); - m_aHelper.EnableSpreadsheets(); - m_aHelper.SetDispatcherLock( true ); + ScFormulaReferenceHelper::EnableSpreadsheets(); + ScFormulaReferenceHelper::SetDispatcherLock( true ); aIdle.Start(); } else { ScFormulaReferenceHelper::enableInput( true ); - m_aHelper.SetDispatcherLock( false ); /*//! here and in DoClose ?*/ + ScFormulaReferenceHelper::SetDispatcherLock( false ); /*//! here and in DoClose ?*/ } } } diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 8bc45a74e074..361c92b5937b 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -834,7 +834,7 @@ bool ScOptSolverDlg::ParseRef( ScRange& rRange, const OUString& rInput, bool bAl rRange.aEnd.SetTab( rRange.aStart.Tab() ); return ( bAllowRange || rRange.aStart == rRange.aEnd ); } - else if ( aRangeUtil.MakeRangeFromName( rInput, &mrDoc, mnCurTab, rRange, RUTL_NAMES, aDetails ) ) + else if ( ScRangeUtil::MakeRangeFromName( rInput, &mrDoc, mnCurTab, rRange, RUTL_NAMES, aDetails ) ) return ( bAllowRange || rRange.aStart == rRange.aEnd ); return false; // not recognized diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 58f875a0d97f..4b8149cf555d 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -495,7 +495,7 @@ void ScContentTree::KeyInput( const KeyEvent& rKEvt ) ScTabViewShell* pScTabViewShell = NULL; ScDrawView* pScDrawView = NULL; if (pScNavigatorDlg!=NULL) - pScTabViewShell=pScNavigatorDlg->GetTabViewShell(); + pScTabViewShell = ScNavigatorDlg::GetTabViewShell(); if(pScTabViewShell !=NULL) pScDrawView =pScTabViewShell->GetViewData().GetScDrawView(); if(pScDrawView!=NULL) @@ -981,7 +981,7 @@ void ScContentTree::GetDrawNames( sal_uInt16 nType ) if(pWindow) pScNavigatorDlg = static_cast<ScNavigatorDlg*>(pWindow); if (pScNavigatorDlg!=NULL) - pScTabViewShell=pScNavigatorDlg->GetTabViewShell(); + pScTabViewShell = ScNavigatorDlg::GetTabViewShell(); if(pScTabViewShell !=NULL) pScDrawView =pScTabViewShell->GetViewData().GetScDrawView(); if(pScDrawView!=NULL) @@ -1623,7 +1623,7 @@ void ScContentTree::SelectDoc(const OUString& rName) // rName wie im Menue/ void ScContentTree::ApplySettings() { - const ScNavigatorSettings* pSettings = pParentWindow->GetNavigatorSettings(); + const ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings(); if( pSettings ) { sal_uInt16 nRootSel = pSettings->GetRootSelected(); @@ -1658,7 +1658,7 @@ void ScContentTree::ApplySettings() void ScContentTree::StoreSettings() const { - ScNavigatorSettings* pSettings = pParentWindow->GetNavigatorSettings(); + ScNavigatorSettings* pSettings = ScNavigatorDlg::GetNavigatorSettings(); if( pSettings ) { for( sal_uInt16 nEntry = 1; nEntry < SC_CONTENT_COUNT; ++nEntry ) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 298359111626..02fc9c1a8ac7 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -992,7 +992,7 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // activat &aDocItem, 0L ); } -ScTabViewShell* ScNavigatorDlg::GetTabViewShell() const +ScTabViewShell* ScNavigatorDlg::GetTabViewShell() { return PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); } diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index fc96ec7aca05..fa1611d17310 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -669,7 +669,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) if ( !theAreaStr.isEmpty() ) { - bAreaOk = pRangeUtil->IsAbsArea( theAreaStr, + bAreaOk = ScRangeUtil::IsAbsArea( theAreaStr, pDoc, pViewData->GetTabNo(), &theAreaStr, @@ -678,7 +678,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) pDoc->GetAddressConvention() ); if ( !bAreaOk ) { - bAreaOk = pRangeUtil->IsAbsPos( theAreaStr, + bAreaOk = ScRangeUtil::IsAbsPos( theAreaStr, pDoc, pViewData->GetTabNo(), &theAreaStr, diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index dab38a72a3ef..9296c25d4936 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -99,7 +99,7 @@ private: DECL_LINK( ClickStackHdl, void * ); void Initialize(); - void FormatDegrees(double& dTmp); + static void FormatDegrees(double& dTmp); }; } } // end of namespace ::sc::sidebar diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index fbf3d5a251a5..2154466e9732 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -280,7 +280,7 @@ void ScUndoInsertCells::Undo() if ( pPasteUndo ) pPasteUndo->Undo(); // undo paste first - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference BeginUndo(); DoChange( true ); EndUndo(); @@ -292,7 +292,7 @@ void ScUndoInsertCells::Undo() void ScUndoInsertCells::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important due to TrackFormulas in UpdateReference BeginRedo(); DoChange( false ); EndRedo(); @@ -511,7 +511,7 @@ void ScUndoDeleteCells::DoChange( const bool bUndo ) void ScUndoDeleteCells::Undo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginUndo(); DoChange( true ); EndUndo(); @@ -534,7 +534,7 @@ void ScUndoDeleteCells::Undo() void ScUndoDeleteCells::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginRedo(); DoChange( false); EndRedo(); @@ -658,7 +658,7 @@ void ScUndoDeleteMulti::SetChangeTrack() void ScUndoDeleteMulti::Undo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginUndo(); ScDocument& rDoc = pDocShell->GetDocument(); @@ -702,7 +702,7 @@ void ScUndoDeleteMulti::Undo() void ScUndoDeleteMulti::Redo() { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); // important because of TrackFormulas in UpdateReference BeginRedo(); ScDocument& rDoc = pDocShell->GetDocument(); diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index f3b1634ae21b..f387534cc952 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -511,7 +511,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( aNewOpts.SetLRUFuncList(pFuncs.get(), nCount); pScMod->SetAppOptions(aNewOpts); - pScMod->RecentFunctionsChanged(); // update function list child window + ScModule::RecentFunctionsChanged(); // update function list child window } sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index ddcced241548..1201939eafbb 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4991,8 +4991,8 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( else { ScRangeUtil aRangeUtil; - if ( aRangeUtil.MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_NAMES ) || - aRangeUtil.MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_DBASE ) ) + if ( ScRangeUtil::MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_NAMES ) || + ScRangeUtil::MakeRangeFromName( aString, &rDoc, nTab, aCellRange, RUTL_DBASE ) ) bFound = true; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index be94fd2463c2..72b19665bd0a 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -936,7 +936,7 @@ public: } private: - bool splitRangeToken(const ScTokenRef& pToken, ScTokenRef& rStart, ScTokenRef& rEnd) const + static bool splitRangeToken(const ScTokenRef& pToken, ScTokenRef& rStart, ScTokenRef& rEnd) { ScComplexRefData aData; bool bIsRefToken = ScRefTokenHelper::getDoubleRefDataFromToken(aData, pToken); @@ -969,7 +969,7 @@ private: return true; } - void setRelative(ScSingleRefData& rData) const + static void setRelative(ScSingleRefData& rData) { rData.SetColRel(true); rData.SetRowRel(true); diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 226f9fe3feea..10dc39106a11 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -69,7 +69,7 @@ static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OU SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) { uno::Reference < embed::XEmbeddedObject > xObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); if ( xObj.is() ) @@ -131,7 +131,7 @@ ScChartObj* ScChartsObj::GetObjectByIndex_Impl(long nIndex) const SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) { if ( nPos == nIndex ) { @@ -343,7 +343,7 @@ sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exc SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) ++nCount; pObject = aIter.Next(); } @@ -412,7 +412,7 @@ uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::Runti SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && rDoc.IsChart(pObject) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart(pObject) ) { OUString aName; uno::Reference < embed::XEmbeddedObject > xObj = static_cast<SdrOle2Obj*>(pObject)->GetObjRef(); diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index f2978b0caced..fccb164a672f 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -2211,7 +2211,7 @@ void ScDataPilotFieldObj::setSubtotals( const Sequence< GeneralFunction >& rSubt } } -OUString ScDataPilotFieldObj::getCurrentPage() const +OUString ScDataPilotFieldObj::getCurrentPage() { return OUString(); } diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 48266e7594fb..73f674effbc1 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -999,8 +999,8 @@ static bool lcl_ParseTarget( const OUString& rTarget, ScRange& rTargetRange, Rec rTargetRange = aAddress; bRangeValid = true; // cell reference } - else if ( aRangeUtil.MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_NAMES ) || - aRangeUtil.MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_DBASE ) ) + else if ( ScRangeUtil::MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_NAMES ) || + ScRangeUtil::MakeRangeFromName( rTarget, pDoc, nSourceTab, rTargetRange, RUTL_DBASE ) ) { bRangeValid = true; // named range or database range } @@ -1778,7 +1778,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( aResult.Divergence = DBL_MAX; // nichts gefunden if (pDocShell) { - WaitObject aWait( pDocShell->GetActiveDialogParent() ); + WaitObject aWait( ScDocShell::GetActiveDialogParent() ); OUString aGoalString(aGoalValue); ScDocument& rDoc = pDocShell->GetDocument(); double fValue = 0.0; diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index a4b345d1a90b..da36330cb404 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -114,12 +114,12 @@ private: return xProps; } - bool getReplaceCellsWarning() throw ( uno::RuntimeException ) + static bool getReplaceCellsWarning() throw ( uno::RuntimeException ) { return getGlobalSheetSettings()->getReplaceCellsWarning(); } - void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException ) + static void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException ) { getGlobalSheetSettings()->setReplaceCellsWarning( bState ); } diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index 62cd53c85546..02b79e909a0d 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -50,7 +50,7 @@ friend class ScVbaAxis; css::uno::Reference< css::chart::XTwoAxisXSupplier > xTwoAxisXSupplier; css::uno::Reference< css::chart::XTwoAxisYSupplier > xTwoAxisYSupplier; - css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); + static css::uno::Sequence< OUString > getDefaultSeriesDescriptions( sal_Int32 nCount ); css::uno::Sequence< css::uno::Sequence< double > > dblValues; void setDefaultChartType()throw ( css::script::BasicErrorException ) ; void setDiagram( const OUString& _sDiagramType) throw( css::script::BasicErrorException ); diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 1098d5e8da86..f300761c1b51 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -112,13 +112,13 @@ ScVbaFormatCondition::setFormula1( const uno::Any& _aFormula1) throw ( script::B { // getA1Formula *SHOULD* detect whether the formula is r1c1 or A1 syntax // and if R1C1 convert to A1 - ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getA1Formula(_aFormula1) ) ); + ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( ScVbaFormatConditions::getA1Formula(_aFormula1) ) ); } void ScVbaFormatCondition::setFormula2( const uno::Any& _aFormula2) throw ( script::BasicErrorException ) { - ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( lcl_getScVbaFormatConditionsPtr( moFormatConditions )->getA1Formula(_aFormula2)) ); + ScVbaFormatCondition_BASE::setFormula1( uno::makeAny( ScVbaFormatConditions::getA1Formula(_aFormula2)) ); } ::sal_Int32 SAL_CALL diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index 446453d18a40..d8dfef49250d 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -52,7 +52,7 @@ class ScVbaFormatConditions: public ScVbaFormatConditions_BASE public: void notifyRange() throw ( css::script::BasicErrorException ); css::uno::Reference< ov::excel::XFormatCondition > Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2, const css::uno::Reference< ov::excel::XStyle >& _xCalcStyle ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); + static OUString getA1Formula(const css::uno::Any& _aFormula) throw ( css::script::BasicErrorException ); OUString getStyleName(); void removeFormatCondition( const OUString& _sStyleName, bool _bRemoveStyle) throw ( css::script::BasicErrorException ); css::uno::Reference< css::sheet::XSheetConditionalEntries > getSheetConditionalEntries() const { return mxSheetConditionalEntries; } diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx index 8647f9505b65..aa2fe734748b 100644 --- a/sc/source/ui/vba/vbainterior.cxx +++ b/sc/source/ui/vba/vbainterior.cxx @@ -241,7 +241,7 @@ ScVbaInterior::GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 GetMixedColorComp( rFore.GetBlue(), rBack.GetBlue(), nTrans )); } sal_uInt8 -ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) const +ScVbaInterior::GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) { sal_uInt32 nTemp = ((static_cast< sal_Int32 >( nBack ) - nFore) * nTrans) / 0x80 + nFore; return static_cast< sal_uInt8 >( nTemp ); diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 61006de52b3d..59e03b45319b 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -43,13 +43,13 @@ class ScVbaInterior : public ScVbaInterior_BASE css::uno::Reference< css::container::XIndexAccess > getPalette(); css::uno::Reference< css::container::XNameContainer > GetAttributeContainer(); - css::uno::Any SetAttributeData( sal_Int32 nValue ); - sal_Int32 GetAttributeData( css::uno::Any aValue ); + static css::uno::Any SetAttributeData( sal_Int32 nValue ); + static sal_Int32 GetAttributeData( css::uno::Any aValue ); Color GetBackColor(); protected: - Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern ); - Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans ); - sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ) const; + static Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern ); + static Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans ); + static sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ); css::uno::Any GetIndexColor( const sal_Int32& nColorIndex ); sal_Int32 GetColorIndex( const sal_Int32 nColor ); css::uno::Any GetUserDefinedAttributes( const OUString& sName ); diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 61c8bcbb036b..6512f5cd02d6 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -29,8 +29,8 @@ typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ov::excel::XWorkbook > Sc class ScVbaWorkbook : public ScVbaWorkbook_BASE { static css::uno::Sequence< sal_Int32 > ColorData; - bool setFilterPropsFromFormat( sal_Int32 nFormat, css::uno::Sequence< css::beans::PropertyValue >& rProps ); - void initColorData( const css::uno::Sequence< sal_Int32 >& sColors ); + static bool setFilterPropsFromFormat( sal_Int32 nFormat, css::uno::Sequence< css::beans::PropertyValue >& rProps ); + static void initColorData( const css::uno::Sequence< sal_Int32 >& sColors ); void init(); public: diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index c7240e580354..080af1f6e187 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -31,8 +31,8 @@ class ScVbaWorkbooks : public ScVbaWorkbooks_BASE { private: OUString getFileFilterType( const OUString& rString ); - bool isTextFile( const OUString& rString ); - bool isSpreadSheetFile( const OUString& rString ); + static bool isTextFile( const OUString& rString ); + static bool isSpreadSheetFile( const OUString& rString ); static sal_Int16& getCurrentDelim(){ static sal_Int16 nDelim = 44; return nDelim; } public: ScVbaWorkbooks( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext ); diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index 13da170b07c5..7c9f27987bbb 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -45,7 +45,7 @@ sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bo SdrObject* pObject = aIter.Next(); while (pObject) { - if ( pObject->GetObjIdentifier() == OBJ_OLE2 && pDoc->IsChart( pObject ) ) + if ( pObject->GetObjIdentifier() == OBJ_OLE2 && ScDocument::IsChart( pObject ) ) { OUString aName = static_cast<SdrOle2Obj*>(pObject)->GetPersistName(); bool bHit = true; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index e7d08f966401..19b541ac3458 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -397,7 +397,7 @@ void ScDrawView::MarkListHasChanged() if (pObj->GetObjIdentifier() == OBJ_OLE2) { pOle2Obj = static_cast<SdrOle2Obj*>(pObj); - if (!pDoc->IsChart(pObj) ) + if (!ScDocument::IsChart(pObj) ) pViewSh->SetOleObjectShell(true); else pViewSh->SetChartShell(true); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 056d2ca5d3b5..a0fb39694450 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -818,7 +818,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } boost::scoped_ptr<SvxNumberInfoItem> pNumberInfoItem( - pTabViewShell->MakeNumberInfoItem(&rDoc, GetViewData())); + ScTabViewShell::MakeNumberInfoItem(&rDoc, GetViewData())); pDocSh->PutItem( *pNumberInfoItem ); nRsc = RID_SCDLG_STYLES_PAR; @@ -927,7 +927,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( SFX_STYLE_FAMILY_PARA == eFam ) { - pTabViewShell->UpdateNumberFormatter( + ScTabViewShell::UpdateNumberFormatter( static_cast<const SvxNumberInfoItem&>( *(pDocSh->GetItem(SID_ATTR_NUMBERFORMAT_INFO)) )); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 81b6d32627cf..6ec461d681e0 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1016,7 +1016,7 @@ void ScGridWindow::SetCellSelectionPixel(int nType, int nPixelX, int nPixelY) if (pInputHandler && pInputHandler->IsInputMode()) { // we need to switch off the editeng - pViewShell->UpdateInputLine(); + ScTabView::UpdateInputLine(); pViewShell->UpdateInputHandler(); } diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 3ea3d0dfeafd..41604f9f6182 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -329,7 +329,7 @@ vcl::Window* ScSpellingEngine::GetDialogParent() return pWin; // fall back to standard dialog parent - return mrDocShell.GetActiveDialogParent(); + return ScDocShell::GetActiveDialogParent(); } ScConversionParam::ScConversionParam( ScConversionType eConvType ) : diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index d4d3068818d1..88b2fc6fb9e9 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -295,8 +295,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { ScRangeUtil aRangeUtil; formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || - aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) ) + if( ScRangeUtil::MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || + ScRangeUtil::MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) ) { nResult |= SCA_VALID; if( aScRange.aStart.Tab() != nTab ) diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index d2c9d38ab3a3..da021a2c9e56 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -498,7 +498,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( bOptChanged ) { pScMod->SetAppOptions(aAppOpt); - pScMod->RecentFunctionsChanged(); + ScModule::RecentFunctionsChanged(); } } |