From 2ff88c4a1b305bd0fcabd4d37b04920d15947291 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 19 Apr 2012 14:25:54 +0200 Subject: Revert "do not include contents of huge sc/sd/sw libs into tiny unittests" The need to export symbols for tests is apparently not considered worth the big extra disk space. This reverts commit 69d46dd7a6adfffd71da055bb65108c80d27395f. Conflicts: sd/CppunitTest_sd_uimpress.mk sw/CppunitTest_sw_swdoc_test.mk --- sc/inc/document.hxx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'sc/inc/document.hxx') diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 11e247e78ce4..fbb06b9b1233 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -482,8 +482,8 @@ public: SC_DLLPUBLIC void GetRangeNameMap(std::map& rRangeName); SC_DLLPUBLIC ScRangeName* GetRangeName(SCTAB nTab) const; SC_DLLPUBLIC ScRangeName* GetRangeName() const; - SC_DLLPUBLIC void SetRangeName(SCTAB nTab, ScRangeName* pNew); - SC_DLLPUBLIC void SetRangeName( ScRangeName* pNewRangeName ); + void SetRangeName(SCTAB nTab, ScRangeName* pNew); + void SetRangeName( ScRangeName* pNewRangeName ); SCTAB GetMaxTableNumber() { return static_cast(maTabs.size()) - 1; } void SetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber = nNumber; } @@ -598,8 +598,8 @@ public: SC_DLLPUBLIC bool RenameTab( SCTAB nTab, const rtl::OUString& rName, bool bUpdateRef = true, bool bExternalDocument = false ); - SC_DLLPUBLIC bool MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress = NULL ); - SC_DLLPUBLIC bool CopyTab( SCTAB nOldPos, SCTAB nNewPos, + bool MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress = NULL ); + bool CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyMarked = NULL ); SC_DLLPUBLIC sal_uLong TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, bool bInsertNew = true, @@ -607,8 +607,8 @@ public: SC_DLLPUBLIC void TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos); SC_DLLPUBLIC void SetVisible( SCTAB nTab, bool bVisible ); SC_DLLPUBLIC bool IsVisible( SCTAB nTab ) const; - SC_DLLPUBLIC bool IsStreamValid( SCTAB nTab ) const; - SC_DLLPUBLIC void SetStreamValid( SCTAB nTab, bool bSet, bool bIgnoreLock = false ); + bool IsStreamValid( SCTAB nTab ) const; + void SetStreamValid( SCTAB nTab, bool bSet, bool bIgnoreLock = false ); void LockStreamValid( bool bLock ); bool IsStreamValidLocked() const { return mbStreamValidLocked; } bool IsPendingRowHeights( SCTAB nTab ) const; @@ -848,9 +848,9 @@ public: SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true ); void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); - SC_DLLPUBLIC bool IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + bool IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes = false ) const; - SC_DLLPUBLIC bool IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + bool IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bLeftIsEmpty = false, ScRange* pLastRange = NULL, @@ -876,7 +876,7 @@ public: void SetDirty( const ScRange& ); void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp void InterpretDirtyCells( const ScRangeList& rRanges ); - SC_DLLPUBLIC void CalcAll(); + void CalcAll(); SC_DLLPUBLIC void CalcAfterLoad(); void CompileAll(); void CompileXML(); @@ -896,7 +896,7 @@ public: void ClearLookupCaches(); // calculate automatically - SC_DLLPUBLIC void SetAutoCalc( bool bNewAutoCalc ); + void SetAutoCalc( bool bNewAutoCalc ); bool GetAutoCalc() const { return bAutoCalc; } // calculate automatically in/from/for ScDocShell disabled void SetAutoCalcShellDisabled( bool bNew ) { bAutoCalcShellDisabled = bNew; } @@ -973,19 +973,19 @@ public: SCCOL& rEndCol, SCROW& rEndRow ); void LimitChartIfAll( ScRangeListRef& rRangeList ); - SC_DLLPUBLIC bool InsertRow( SCCOL nStartCol, SCTAB nStartTab, + bool InsertRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); SC_DLLPUBLIC bool InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL ); - SC_DLLPUBLIC void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, + void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL, const ScMarkData* pTabMark = NULL ); SC_DLLPUBLIC void DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL ); - SC_DLLPUBLIC bool InsertCol( SCROW nStartRow, SCTAB nStartTab, + bool InsertCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); @@ -1033,13 +1033,13 @@ public: const ScMarkData& rMark ); void DeleteObjectsInSelection( const ScMarkData& rMark ); - SC_DLLPUBLIC void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, sal_uInt16 nDelFlag); void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, sal_uInt16 nDelFlag); void DeleteAreaTab(const ScRange& rRange, sal_uInt16 nDelFlag); - SC_DLLPUBLIC void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, + void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, const ScMarkData* pMarks = NULL, bool bAllTabs = false, bool bKeepScenarioFlags = false, bool bIncludeObjects = false, bool bCloneNoteCaptions = true, bool bUseRangeForVBA = false ); @@ -1060,7 +1060,7 @@ public: const ScMarkData& rMark, sal_uInt16 nInsFlag ); /** If pDestRanges is given it overrides rDestRange, rDestRange in this case is the overall encompassing range. */ - SC_DLLPUBLIC void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, + void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, sal_uInt16 nInsFlag, ScDocument* pRefUndoDoc = NULL, ScDocument* pClipDoc = NULL, @@ -1478,7 +1478,7 @@ public: SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; void Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bKeepQuery ); - SC_DLLPUBLIC SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub ); + SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub ); SC_DLLPUBLIC bool CreateQueryParam( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, ScQueryParam& rQueryParam ); void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rStr); @@ -1663,7 +1663,7 @@ public: SvtListener* pListener ); void PutInFormulaTree( ScFormulaCell* pCell ); void RemoveFromFormulaTree( ScFormulaCell* pCell ); - SC_DLLPUBLIC void CalcFormulaTree( bool bOnlyForced = false, + void CalcFormulaTree( bool bOnlyForced = false, bool bNoProgressBar = false ); void ClearFormulaTree(); void AppendToFormulaTrack( ScFormulaCell* pCell ); -- cgit