diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2012-04-07 18:37:50 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-07 18:40:25 +0200 |
commit | 69d46dd7a6adfffd71da055bb65108c80d27395f (patch) | |
tree | 3c9cd0e46c656584edc4ae65245ec32e18249bc1 | |
parent | 5b5301618fde17693f5299c2a55ae91fe8a12b11 (diff) |
do not include contents of huge sc/sd/sw libs into tiny unittests
This decreases debug build dir size by about 0.5G for gcc and 1G for clang.
-rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 3 | ||||
-rw-r--r-- | sc/inc/clipparam.hxx | 3 | ||||
-rw-r--r-- | sc/inc/document.hxx | 36 | ||||
-rw-r--r-- | sc/inc/dpobject.hxx | 20 | ||||
-rw-r--r-- | sc/inc/dpsave.hxx | 10 | ||||
-rw-r--r-- | sc/inc/dpshttab.hxx | 4 | ||||
-rw-r--r-- | sc/inc/externalrefmgr.hxx | 4 | ||||
-rw-r--r-- | sc/inc/global.hxx | 2 | ||||
-rw-r--r-- | sc/inc/pivot.hxx | 4 | ||||
-rw-r--r-- | sc/inc/rangenam.hxx | 4 | ||||
-rw-r--r-- | sc/inc/reffind.hxx | 2 | ||||
-rw-r--r-- | sc/inc/scdll.hxx | 3 | ||||
-rw-r--r-- | sc/inc/stringutil.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/refundo.hxx | 3 | ||||
-rw-r--r-- | sc/source/ui/inc/undoblk.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/undotab.hxx | 4 | ||||
-rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 3 | ||||
-rw-r--r-- | sd/inc/drawdoc.hxx | 2 | ||||
-rw-r--r-- | sd/inc/sddll.hxx | 3 | ||||
-rw-r--r-- | sw/CppunitTest_sw_swdoc_test.mk | 3 | ||||
-rw-r--r-- | sw/inc/docufld.hxx | 2 | ||||
-rw-r--r-- | sw/inc/swdll.hxx | 3 | ||||
-rw-r--r-- | sw/inc/swscanner.hxx | 3 |
23 files changed, 64 insertions, 61 deletions
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index b154d1de1f13..d4de63ff57c3 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -35,8 +35,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \ sc/qa/unit/ucalc \ )) -$(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc)) - $(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \ $(WORKDIR)/AllLangRes/for \ $(WORKDIR)/AllLangRes/forui \ @@ -60,6 +58,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \ salhelper \ sax \ sb \ + sc \ sfx \ sot \ svl \ diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx index 63b4c9aecf53..c7ecd2a85098 100644 --- a/sc/inc/clipparam.hxx +++ b/sc/inc/clipparam.hxx @@ -32,6 +32,7 @@ #include "rangelst.hxx" #include "rangenam.hxx" #include "charthelper.hxx" +#include "scdllapi.h" #include <vector> @@ -50,7 +51,7 @@ struct ScClipParam ScRangeListVector maProtectedChartRangesVector; ScClipParam(); - ScClipParam(const ScRange& rRange, bool bCutMode); + SC_DLLPUBLIC ScClipParam(const ScRange& rRange, bool bCutMode); explicit ScClipParam(const ScClipParam& r); bool isMultiRange() const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 1c0477cd6e3b..99bbc54ac44b 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -483,8 +483,8 @@ public: SC_DLLPUBLIC void GetRangeNameMap(std::map<rtl::OUString, ScRangeName*>& rRangeName); SC_DLLPUBLIC ScRangeName* GetRangeName(SCTAB nTab) const; SC_DLLPUBLIC ScRangeName* GetRangeName() const; - void SetRangeName(SCTAB nTab, ScRangeName* pNew); - void SetRangeName( ScRangeName* pNewRangeName ); + SC_DLLPUBLIC void SetRangeName(SCTAB nTab, ScRangeName* pNew); + SC_DLLPUBLIC void SetRangeName( ScRangeName* pNewRangeName ); SCTAB GetMaxTableNumber() { return static_cast<SCTAB>(maTabs.size()) - 1; } void SetMaxTableNumber(SCTAB nNumber) { nMaxTableNumber = nNumber; } @@ -599,8 +599,8 @@ public: SC_DLLPUBLIC bool RenameTab( SCTAB nTab, const rtl::OUString& rName, bool bUpdateRef = true, bool bExternalDocument = false ); - bool MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress = NULL ); - bool CopyTab( SCTAB nOldPos, SCTAB nNewPos, + SC_DLLPUBLIC bool MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress = NULL ); + SC_DLLPUBLIC bool CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyMarked = NULL ); SC_DLLPUBLIC sal_uLong TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, bool bInsertNew = true, @@ -608,8 +608,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; - bool IsStreamValid( SCTAB nTab ) const; - void SetStreamValid( SCTAB nTab, bool bSet, bool bIgnoreLock = false ); + SC_DLLPUBLIC bool IsStreamValid( SCTAB nTab ) const; + SC_DLLPUBLIC void SetStreamValid( SCTAB nTab, bool bSet, bool bIgnoreLock = false ); void LockStreamValid( bool bLock ); bool IsStreamValidLocked() const { return mbStreamValidLocked; } bool IsPendingRowHeights( SCTAB nTab ) const; @@ -849,9 +849,9 @@ public: SCCOL nEndCol, SCROW nEndRow, bool bDeleteCaptions = true ); void RemoveMerge( SCCOL nCol, SCROW nRow, SCTAB nTab ); - bool IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC bool IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bIgnoreNotes = false ) const; - bool IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, + SC_DLLPUBLIC bool IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool bLeftIsEmpty = false, ScRange* pLastRange = NULL, @@ -877,7 +877,7 @@ public: void SetDirty( const ScRange& ); void SetTableOpDirty( const ScRange& ); // for Interpreter TableOp void InterpretDirtyCells( const ScRangeList& rRanges ); - void CalcAll(); + SC_DLLPUBLIC void CalcAll(); SC_DLLPUBLIC void CalcAfterLoad(); void CompileAll(); void CompileXML(); @@ -897,7 +897,7 @@ public: void ClearLookupCaches(); // calculate automatically - void SetAutoCalc( bool bNewAutoCalc ); + SC_DLLPUBLIC void SetAutoCalc( bool bNewAutoCalc ); bool GetAutoCalc() const { return bAutoCalc; } // calculate automatically in/from/for ScDocShell disabled void SetAutoCalcShellDisabled( bool bNew ) { bAutoCalcShellDisabled = bNew; } @@ -974,19 +974,19 @@ public: SCCOL& rEndCol, SCROW& rEndRow ); void LimitChartIfAll( ScRangeListRef& rRangeList ); - bool InsertRow( SCCOL nStartCol, SCTAB nStartTab, + SC_DLLPUBLIC 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 ); - void DeleteRow( SCCOL nStartCol, SCTAB nStartTab, + SC_DLLPUBLIC 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 ); - bool InsertCol( SCROW nStartRow, SCTAB nStartTab, + SC_DLLPUBLIC bool InsertCol( SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL, const ScMarkData* pTabMark = NULL ); @@ -1034,13 +1034,13 @@ public: const ScMarkData& rMark ); void DeleteObjectsInSelection( const ScMarkData& rMark ); - void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, + SC_DLLPUBLIC 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); - void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc, + SC_DLLPUBLIC 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 ); @@ -1061,7 +1061,7 @@ public: const ScMarkData& rMark, sal_uInt16 nInsFlag ); /** If pDestRanges is given it overrides rDestRange, rDestRange in this case is the overall encompassing range. */ - void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, + SC_DLLPUBLIC void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, sal_uInt16 nInsFlag, ScDocument* pRefUndoDoc = NULL, ScDocument* pClipDoc = NULL, @@ -1479,7 +1479,7 @@ public: SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const; void Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bKeepQuery ); - SCSIZE Query( SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeepSub ); + SC_DLLPUBLIC 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); @@ -1664,7 +1664,7 @@ public: SvtListener* pListener ); void PutInFormulaTree( ScFormulaCell* pCell ); void RemoveFromFormulaTree( ScFormulaCell* pCell ); - void CalcFormulaTree( bool bOnlyForced = false, + SC_DLLPUBLIC void CalcFormulaTree( bool bOnlyForced = false, bool bNoProgressBar = false ); void ClearFormulaTree(); void AppendToFormulaTrack( ScFormulaCell* pCell ); diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 4f97b404ad79..d27efef168c2 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -283,9 +283,9 @@ public: ScDocument* mpDoc; public: SheetCaches(ScDocument* pDoc); - bool hasCache(const ScRange& rRange) const; + SC_DLLPUBLIC bool hasCache(const ScRange& rRange) const; const ScDPCache* getCache(const ScRange& rRange, const ScDPDimensionSaveData* pDimData); - size_t size() const; + SC_DLLPUBLIC size_t size() const; void updateReference( UpdateRefMode eMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz); @@ -308,10 +308,10 @@ public: ScDocument* mpDoc; public: NameCaches(ScDocument* pDoc); - bool hasCache(const rtl::OUString& rName) const; + SC_DLLPUBLIC bool hasCache(const rtl::OUString& rName) const; const ScDPCache* getCache( const ::rtl::OUString& rName, const ScRange& rRange, const ScDPDimensionSaveData* pDimData); - size_t size() const; + SC_DLLPUBLIC size_t size() const; private: ScDPCache* getExistingCache(const rtl::OUString& rName); @@ -370,8 +370,8 @@ public: ScDPCollection(const ScDPCollection& r); ~ScDPCollection(); - sal_uLong ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs); - bool ReloadGroupsInCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs); + SC_DLLPUBLIC sal_uLong ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs); + SC_DLLPUBLIC bool ReloadGroupsInCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs); SC_DLLPUBLIC size_t GetCount() const; SC_DLLPUBLIC ScDPObject* operator[](size_t nIndex); @@ -395,15 +395,15 @@ public: * * @return new name for data pilot object. */ - ::rtl::OUString CreateNewName( sal_uInt16 nMin = 1 ) const; + SC_DLLPUBLIC ::rtl::OUString CreateNewName( sal_uInt16 nMin = 1 ) const; - void FreeTable(ScDPObject* pDPObj); + SC_DLLPUBLIC void FreeTable(ScDPObject* pDPObj); SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj); bool HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const; - SheetCaches& GetSheetCaches(); - NameCaches& GetNameCaches(); + SC_DLLPUBLIC SheetCaches& GetSheetCaches(); + SC_DLLPUBLIC NameCaches& GetNameCaches(); DBCaches& GetDBCaches(); private: diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index c4df4eda7b76..5dbfac5514b5 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -258,7 +258,7 @@ private: public: SC_DLLPUBLIC ScDPSaveData(); - ScDPSaveData(const ScDPSaveData& r); + SC_DLLPUBLIC ScDPSaveData(const ScDPSaveData& r); SC_DLLPUBLIC ~ScDPSaveData(); ScDPSaveData& operator= ( const ScDPSaveData& r ); @@ -294,7 +294,7 @@ public: * manages its life cycle; hence the caller must * <i>not</i> delete this object. */ - ScDPSaveDimension* GetDimensionByName(const ::rtl::OUString& rName); + SC_DLLPUBLIC ScDPSaveDimension* GetDimensionByName(const ::rtl::OUString& rName); SC_DLLPUBLIC ScDPSaveDimension* GetDataLayoutDimension(); SC_DLLPUBLIC ScDPSaveDimension* GetExistingDataLayoutDimension() const; @@ -310,7 +310,7 @@ public: ScDPSaveDimension* GetFirstDimension(::com::sun::star::sheet::DataPilotFieldOrientation eOrientation); long GetDataDimensionCount() const; - void SetPosition( ScDPSaveDimension* pDim, long nNew ); + SC_DLLPUBLIC void SetPosition( ScDPSaveDimension* pDim, long nNew ); SC_DLLPUBLIC void SetColumnGrand( bool bSet ); bool GetColumnGrand() const { return bool(nColumnGrandMode); } @@ -319,11 +319,11 @@ public: bool GetRowGrand() const { return bool(nRowGrandMode); } - void SetIgnoreEmptyRows( bool bSet ); + SC_DLLPUBLIC void SetIgnoreEmptyRows( bool bSet ); bool GetIgnoreEmptyRows() const { return bool(nIgnoreEmptyMode); } - void SetRepeatIfEmpty( bool bSet ); + SC_DLLPUBLIC void SetRepeatIfEmpty( bool bSet ); bool GetRepeatIfEmpty() const { return bool(nRepeatEmptyMode); } diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index 38a0d589e235..6ff443e7a037 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -75,8 +75,8 @@ public: SC_DLLPUBLIC void SetRangeName(const ::rtl::OUString& rName); SC_DLLPUBLIC const ::rtl::OUString& GetRangeName() const; bool HasRangeName() const; - void SetQueryParam(const ScQueryParam& rParam); - const ScQueryParam& GetQueryParam() const; + SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rParam); + SC_DLLPUBLIC const ScQueryParam& GetQueryParam() const; bool operator== ( const ScSheetSourceDesc& rOther ) const; SC_DLLPUBLIC const ScDPCache* CreateCache(const ScDPDimensionSaveData* pDimData) const; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 1f7b1322c082..41190340af4d 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -173,11 +173,11 @@ public: ReferencedFlag getReferencedFlag() const; bool isReferenced() const; /// Obtain a sorted vector of rows. - void getAllRows(::std::vector<SCROW>& rRows, SCROW nLow = 0, SCROW nHigh = MAXROW) const; + SC_DLLPUBLIC void getAllRows(::std::vector<SCROW>& rRows, SCROW nLow = 0, SCROW nHigh = MAXROW) const; /// Returns the half-open range of used rows in this table. Returns [0,0) if table is empty. SC_DLLPUBLIC ::std::pair< SCROW, SCROW > getRowRange() const; /// Obtain a sorted vector of columns. - void getAllCols(SCROW nRow, ::std::vector<SCCOL>& rCols, SCCOL nLow = 0, SCCOL nHigh = MAXCOL) const; + SC_DLLPUBLIC void getAllCols(SCROW nRow, ::std::vector<SCCOL>& rCols, SCCOL nLow = 0, SCCOL nHigh = MAXCOL) const; /// Returns the half-open range of used columns in the specified row. Returns [0,0) if row is empty. SC_DLLPUBLIC ::std::pair< SCCOL, SCCOL > getColRange( SCROW nRow ) const; void getAllNumberFormats(::std::vector<sal_uInt32>& rNumFmts) const; diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index ac10094ab4d1..6172652978f7 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -609,7 +609,7 @@ public: static bool HasStarCalcFunctionList(); static ScFunctionList* GetStarCalcFunctionList(); - static ScFunctionMgr* GetStarCalcFunctionMgr(); + SC_DLLPUBLIC static ScFunctionMgr* GetStarCalcFunctionMgr(); static void ResetFunctionList(); static String GetErrorString(sal_uInt16 nErrNumber); diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 27f3dbc38c2a..1484ad474c23 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -105,9 +105,9 @@ struct ScPivotParam bool bMakeTotalCol; bool bMakeTotalRow; - ScPivotParam(); + SC_DLLPUBLIC ScPivotParam(); ScPivotParam( const ScPivotParam& r ); - ~ScPivotParam(); + SC_DLLPUBLIC ~ScPivotParam(); ScPivotParam& operator= ( const ScPivotParam& r ); bool operator== ( const ScPivotParam& r ) const; diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 3d8f626e0594..03a715954ba8 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -195,7 +195,7 @@ public: typedef DataType::const_iterator const_iterator; typedef DataType::iterator iterator; - ScRangeName(); + SC_DLLPUBLIC ScRangeName(); SC_DLLPUBLIC ScRangeName(const ScRangeName& r); SC_DLLPUBLIC const ScRangeData* findByRange(const ScRange& rRange) const; @@ -236,7 +236,7 @@ public: * valid. */ void erase(const iterator& itr); - void clear(); + SC_DLLPUBLIC void clear(); bool operator== (const ScRangeName& r) const; }; diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx index 63dcf12c65e8..d45023d1ab18 100644 --- a/sc/inc/reffind.hxx +++ b/sc/inc/reffind.hxx @@ -36,7 +36,7 @@ class ScDocument; // ----------------------------------------------------------------------- -class ScRefFinder +class SC_DLLPUBLIC ScRefFinder { private: String aFormula; diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index e446ea6f658f..1ed8c69597e9 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -39,6 +39,7 @@ class SfxFilter; #include <sfx2/sfxdefs.hxx> #include <sfx2/module.hxx> #include <sfx2/docfac.hxx> +#include "scdllapi.h" /** * This class is a wrapper for a Load-On-Demand-DLL. One instance per @@ -47,7 +48,7 @@ class SfxFilter; * * Remember: Do export this class! It is used by the application. */ -class ScDLL +class SC_DLLPUBLIC ScDLL { public: // Ctor/Dtor must be linked to the application diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 7874175767aa..66b68a2dd7e8 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -83,7 +83,7 @@ public: * * @return true if the string is a valid number, false otherwise. */ - static bool parseSimpleNumber( + SC_DLLPUBLIC static bool parseSimpleNumber( const ::rtl::OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal); }; diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx index 25de386d023e..58daeca392d2 100644 --- a/sc/source/ui/inc/refundo.hxx +++ b/sc/source/ui/inc/refundo.hxx @@ -30,6 +30,7 @@ #define SC_REFUNDO_HXX #include <tools/solar.h> +#include "scdllapi.h" class ScDocument; class ScDBCollection; @@ -57,7 +58,7 @@ private: ScUnoRefList* pUnoRefs; public: - ScRefUndoData( const ScDocument* pDoc ); + SC_DLLPUBLIC ScRefUndoData( const ScDocument* pDoc ); ~ScRefUndoData(); void DeleteUnchanged( const ScDocument* pDoc ); diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 255c59a27f54..4b83a9e61250 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -199,7 +199,7 @@ class ScUndoPaste: public ScMultiBlockUndo { public: TYPEINFO(); - ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges, + SC_DLLPUBLIC ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges, const ScMarkData& rMark, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, sal_uInt16 nNewFlags, diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index d2dfedfe36c4..8ab64f248879 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -143,7 +143,7 @@ class ScUndoRenameTab: public ScSimpleUndo { public: TYPEINFO(); - ScUndoRenameTab( + SC_DLLPUBLIC ScUndoRenameTab( ScDocShell* pNewDocShell, SCTAB nT, const String& rOldName, @@ -228,7 +228,7 @@ class ScUndoTabColor: public ScSimpleUndo { public: TYPEINFO(); - ScUndoTabColor( + SC_DLLPUBLIC ScUndoTabColor( ScDocShell* pNewDocShell, SCTAB nT, const Color& aOTabBgColor, diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index ba7cb3cb08dc..2bec206feebe 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -41,8 +41,6 @@ $(eval $(call gb_CppunitTest_add_api,sd_uimpress,\ udkapi \ )) -$(eval $(call gb_CppunitTest_add_library_objects,sd_uimpress,sd)) - $(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\ avmedia \ basegfx \ @@ -58,6 +56,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\ sal \ salhelper \ sb \ + sd \ sfx \ sot \ svl \ diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 05abd620878f..8ff0d3db1f36 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -218,7 +218,7 @@ public: TYPEINFO(); - SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh); + SD_DLLPUBLIC SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh); ~SdDrawDocument(); virtual SdrModel* AllocModel() const; diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx index 642d655418db..7f432b70a32a 100644 --- a/sd/inc/sddll.hxx +++ b/sd/inc/sddll.hxx @@ -31,6 +31,7 @@ #include <sfx2/module.hxx> #include <sfx2/sfxdefs.hxx> +#include "sddllapi.h" class SvFactory; class SotFactory; @@ -48,7 +49,7 @@ class SfxFilter; |* \************************************************************************/ -class SdDLL +class SD_DLLPUBLIC SdDLL { protected: static void RegisterFactorys(); diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 164ddaaaf115..34d32f9c2889 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -34,8 +34,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_swdoc_test, \ sw/qa/core/Test-BigPtrArray \ )) -$(eval $(call gb_CppunitTest_add_library_objects,sw_swdoc_test,sw)) - $(eval $(call gb_CppunitTest_add_linked_libs,sw_swdoc_test, \ avmedia \ basegfx \ @@ -58,6 +56,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sw_swdoc_test, \ svt \ svx \ svxcore \ + sw \ swd \ test \ tk \ diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index b110d681edeb..f2ed7f6419d1 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -229,7 +229,7 @@ public: Filename --------------------------------------------------------------------*/ -class SwFileNameFieldType : public SwFieldType +class SW_DLLPUBLIC SwFileNameFieldType : public SwFieldType { SwDoc *pDoc; public: diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx index 154f67062b8d..6f4bde8ff3c9 100644 --- a/sw/inc/swdll.hxx +++ b/sw/inc/swdll.hxx @@ -30,6 +30,7 @@ #include <sfx2/sfxdefs.hxx> #include <sfx2/module.hxx> +#include "swdllapi.h" namespace sw { class Filters; } @@ -40,7 +41,7 @@ namespace sw { class Filters; } */ namespace SwGlobals { - void ensure(); + SW_DLLPUBLIC void ensure(); sw::Filters & getFilters(); } diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index d1c6fe91e10f..1bec6c2b7fb0 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -30,6 +30,7 @@ #include <i18npool/lang.h> #include <modeltoviewhelper.hxx> +#include "swdllapi.h" class SwTxtNode; @@ -39,7 +40,7 @@ class SwTxtNode; * nacheinander zur Verfuegung stellt. *************************************************************************/ -class SwScanner +class SW_DLLPUBLIC SwScanner { rtl::OUString aWord; const SwTxtNode& rNode; |