[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_ucalc.mk sc/inc sc/source sd/CppunitTest_sd_uimpress.mk sd/inc sw/CppunitTest_sw_swdoc_test.mk sw/inc
Lubos Lunak
llunak at kemper.freedesktop.org
Thu Apr 19 05:29:24 PDT 2012
sc/CppunitTest_sc_ucalc.mk | 3 ++-
sc/inc/clipparam.hxx | 3 +--
sc/inc/document.hxx | 36 ++++++++++++++++++------------------
sc/inc/dpobject.hxx | 20 ++++++++++----------
sc/inc/dpsave.hxx | 10 +++++-----
sc/inc/dpshttab.hxx | 4 ++--
sc/inc/externalrefmgr.hxx | 4 ++--
sc/inc/global.hxx | 2 +-
sc/inc/pivot.hxx | 4 ++--
sc/inc/rangenam.hxx | 4 ++--
sc/inc/reffind.hxx | 2 +-
sc/inc/scdll.hxx | 3 +--
sc/inc/stringutil.hxx | 2 +-
sc/source/ui/inc/refundo.hxx | 3 +--
sc/source/ui/inc/undoblk.hxx | 2 +-
sc/source/ui/inc/undotab.hxx | 4 ++--
sc/source/ui/view/preview.cxx | 2 +-
sd/CppunitTest_sd_uimpress.mk | 3 ++-
sd/inc/drawdoc.hxx | 2 +-
sd/inc/sddll.hxx | 3 +--
sw/CppunitTest_sw_swdoc_test.mk | 3 ++-
sw/inc/docufld.hxx | 2 +-
sw/inc/swdll.hxx | 3 +--
sw/inc/swscanner.hxx | 3 +--
24 files changed, 62 insertions(+), 65 deletions(-)
New commits:
commit 2ff88c4a1b305bd0fcabd4d37b04920d15947291
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Thu Apr 19 14:25:54 2012 +0200
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
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index a44f929..cf3beac 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
sc/qa/unit/ucalc \
))
+$(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc,sc))
+
$(call gb_CxxObject_get_target,sc/qa/unit/ucalc): \
$(WORKDIR)/AllLangRes/for \
$(WORKDIR)/AllLangRes/forui \
@@ -56,7 +58,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
salhelper \
sax \
sb \
- sc \
sfx \
sot \
svl \
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index c7ecd2a..63b4c9a 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -32,7 +32,6 @@
#include "rangelst.hxx"
#include "rangenam.hxx"
#include "charthelper.hxx"
-#include "scdllapi.h"
#include <vector>
@@ -51,7 +50,7 @@ struct ScClipParam
ScRangeListVector maProtectedChartRangesVector;
ScClipParam();
- SC_DLLPUBLIC ScClipParam(const ScRange& rRange, bool bCutMode);
+ 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 11e247e..fbb06b9 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -482,8 +482,8 @@ public:
SC_DLLPUBLIC void GetRangeNameMap(std::map<rtl::OUString, ScRangeName*>& 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<SCTAB>(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 );
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index d27efef..4f97b40 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -283,9 +283,9 @@ public:
ScDocument* mpDoc;
public:
SheetCaches(ScDocument* pDoc);
- SC_DLLPUBLIC bool hasCache(const ScRange& rRange) const;
+ bool hasCache(const ScRange& rRange) const;
const ScDPCache* getCache(const ScRange& rRange, const ScDPDimensionSaveData* pDimData);
- SC_DLLPUBLIC size_t size() const;
+ 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);
- SC_DLLPUBLIC bool hasCache(const rtl::OUString& rName) const;
+ bool hasCache(const rtl::OUString& rName) const;
const ScDPCache* getCache(
const ::rtl::OUString& rName, const ScRange& rRange, const ScDPDimensionSaveData* pDimData);
- SC_DLLPUBLIC size_t size() const;
+ size_t size() const;
private:
ScDPCache* getExistingCache(const rtl::OUString& rName);
@@ -370,8 +370,8 @@ public:
ScDPCollection(const ScDPCollection& r);
~ScDPCollection();
- SC_DLLPUBLIC sal_uLong ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs);
- SC_DLLPUBLIC bool ReloadGroupsInCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs);
+ sal_uLong ReloadCache(ScDPObject* pDPObj, std::set<ScDPObject*>& rRefs);
+ 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.
*/
- SC_DLLPUBLIC ::rtl::OUString CreateNewName( sal_uInt16 nMin = 1 ) const;
+ ::rtl::OUString CreateNewName( sal_uInt16 nMin = 1 ) const;
- SC_DLLPUBLIC void FreeTable(ScDPObject* pDPObj);
+ void FreeTable(ScDPObject* pDPObj);
SC_DLLPUBLIC bool InsertNewTable(ScDPObject* pDPObj);
bool HasDPTable(SCCOL nCol, SCROW nRow, SCTAB nTab) const;
- SC_DLLPUBLIC SheetCaches& GetSheetCaches();
- SC_DLLPUBLIC NameCaches& GetNameCaches();
+ SheetCaches& GetSheetCaches();
+ NameCaches& GetNameCaches();
DBCaches& GetDBCaches();
private:
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 5dbfac5..c4df4ed 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -258,7 +258,7 @@ private:
public:
SC_DLLPUBLIC ScDPSaveData();
- SC_DLLPUBLIC ScDPSaveData(const ScDPSaveData& r);
+ 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.
*/
- SC_DLLPUBLIC ScDPSaveDimension* GetDimensionByName(const ::rtl::OUString& rName);
+ 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;
- SC_DLLPUBLIC void SetPosition( ScDPSaveDimension* pDim, long nNew );
+ 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); }
- SC_DLLPUBLIC void SetIgnoreEmptyRows( bool bSet );
+ void SetIgnoreEmptyRows( bool bSet );
bool GetIgnoreEmptyRows() const
{ return bool(nIgnoreEmptyMode); }
- SC_DLLPUBLIC void SetRepeatIfEmpty( bool bSet );
+ void SetRepeatIfEmpty( bool bSet );
bool GetRepeatIfEmpty() const
{ return bool(nRepeatEmptyMode); }
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 6ff443e..38a0d58 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;
- SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rParam);
- SC_DLLPUBLIC const ScQueryParam& GetQueryParam() const;
+ void SetQueryParam(const ScQueryParam& rParam);
+ 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 4119034..1f7b132 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.
- SC_DLLPUBLIC void getAllRows(::std::vector<SCROW>& rRows, SCROW nLow = 0, SCROW nHigh = MAXROW) const;
+ 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.
- SC_DLLPUBLIC void getAllCols(SCROW nRow, ::std::vector<SCCOL>& rCols, SCCOL nLow = 0, SCCOL nHigh = MAXCOL) const;
+ 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 6172652..ac10094 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -609,7 +609,7 @@ public:
static bool HasStarCalcFunctionList();
static ScFunctionList* GetStarCalcFunctionList();
- SC_DLLPUBLIC static ScFunctionMgr* GetStarCalcFunctionMgr();
+ 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 1484ad4..27f3dbc 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -105,9 +105,9 @@ struct ScPivotParam
bool bMakeTotalCol;
bool bMakeTotalRow;
- SC_DLLPUBLIC ScPivotParam();
+ ScPivotParam();
ScPivotParam( const ScPivotParam& r );
- SC_DLLPUBLIC ~ScPivotParam();
+ ~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 03a7159..3d8f626 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;
- SC_DLLPUBLIC ScRangeName();
+ 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);
- SC_DLLPUBLIC void clear();
+ void clear();
bool operator== (const ScRangeName& r) const;
};
diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx
index d45023d..63dcf12 100644
--- a/sc/inc/reffind.hxx
+++ b/sc/inc/reffind.hxx
@@ -36,7 +36,7 @@ class ScDocument;
// -----------------------------------------------------------------------
-class SC_DLLPUBLIC ScRefFinder
+class ScRefFinder
{
private:
String aFormula;
diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx
index 1ed8c69..e446ea6 100644
--- a/sc/inc/scdll.hxx
+++ b/sc/inc/scdll.hxx
@@ -39,7 +39,6 @@ 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
@@ -48,7 +47,7 @@ class SfxFilter;
*
* Remember: Do export this class! It is used by the application.
*/
-class SC_DLLPUBLIC ScDLL
+class ScDLL
{
public:
// Ctor/Dtor must be linked to the application
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index 245714f..954d4bc 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -93,7 +93,7 @@ public:
*
* @return true if the string is a valid number, false otherwise.
*/
- SC_DLLPUBLIC static bool parseSimpleNumber(
+ 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 58daeca..25de386 100644
--- a/sc/source/ui/inc/refundo.hxx
+++ b/sc/source/ui/inc/refundo.hxx
@@ -30,7 +30,6 @@
#define SC_REFUNDO_HXX
#include <tools/solar.h>
-#include "scdllapi.h"
class ScDocument;
class ScDBCollection;
@@ -58,7 +57,7 @@ private:
ScUnoRefList* pUnoRefs;
public:
- SC_DLLPUBLIC ScRefUndoData( const ScDocument* pDoc );
+ 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 4b83a9e..255c59a 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();
- SC_DLLPUBLIC ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges,
+ 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 8ab64f2..d2dfedf 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();
- SC_DLLPUBLIC ScUndoRenameTab(
+ ScUndoRenameTab(
ScDocShell* pNewDocShell,
SCTAB nT,
const String& rOldName,
@@ -228,7 +228,7 @@ class ScUndoTabColor: public ScSimpleUndo
{
public:
TYPEINFO();
- SC_DLLPUBLIC ScUndoTabColor(
+ ScUndoTabColor(
ScDocShell* pNewDocShell,
SCTAB nT,
const Color& aOTabBgColor,
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index ab96b2a..44fb871 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_CppunitTest_use_api,sd_uimpress,\
udkapi \
))
+$(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd))
+
$(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
avmedia \
basegfx \
@@ -56,7 +58,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
sal \
salhelper \
sb \
- sd \
sfx \
sot \
svl \
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 65aec09..700fa9c 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -216,7 +216,7 @@ public:
TYPEINFO();
- SD_DLLPUBLIC SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh);
+ SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh);
~SdDrawDocument();
virtual SdrModel* AllocModel() const;
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index 7f432b7..642d655 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -31,7 +31,6 @@
#include <sfx2/module.hxx>
#include <sfx2/sfxdefs.hxx>
-#include "sddllapi.h"
class SvFactory;
class SotFactory;
@@ -49,7 +48,7 @@ class SfxFilter;
|*
\************************************************************************/
-class SD_DLLPUBLIC SdDLL
+class SdDLL
{
protected:
static void RegisterFactorys();
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index 7f15783..94ebab3 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_swdoc_test, \
sw/qa/core/Test-BigPtrArray \
))
+$(eval $(call gb_CppunitTest_use_library_objects,sw_swdoc_test,sw))
+
$(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \
avmedia \
basegfx \
@@ -56,7 +58,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \
svt \
svx \
svxcore \
- sw \
swd \
test \
tk \
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index f2ed7f6..b110d68 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -229,7 +229,7 @@ public:
Filename
--------------------------------------------------------------------*/
-class SW_DLLPUBLIC SwFileNameFieldType : public SwFieldType
+class SwFileNameFieldType : public SwFieldType
{
SwDoc *pDoc;
public:
diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx
index 6f4bde8..154f670 100644
--- a/sw/inc/swdll.hxx
+++ b/sw/inc/swdll.hxx
@@ -30,7 +30,6 @@
#include <sfx2/sfxdefs.hxx>
#include <sfx2/module.hxx>
-#include "swdllapi.h"
namespace sw { class Filters; }
@@ -41,7 +40,7 @@ namespace sw { class Filters; }
*/
namespace SwGlobals
{
- SW_DLLPUBLIC void ensure();
+ void ensure();
sw::Filters & getFilters();
}
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index 1bec6c2..d1c6fe9 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -30,7 +30,6 @@
#include <i18npool/lang.h>
#include <modeltoviewhelper.hxx>
-#include "swdllapi.h"
class SwTxtNode;
@@ -40,7 +39,7 @@ class SwTxtNode;
* nacheinander zur Verfuegung stellt.
*************************************************************************/
-class SW_DLLPUBLIC SwScanner
+class SwScanner
{
rtl::OUString aWord;
const SwTxtNode& rNode;
commit eb526d8b258844b050e57251baa8034eb5d5787c
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Wed Apr 18 09:48:47 2012 +0200
change strange way of testing a bool
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index e83224d..bc2d355 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -257,7 +257,7 @@ void ScPreview::CalcPages()
nPages.push_back(0);
if ( i == static_cast<SCTAB>(nFirstAttr.size()))
nFirstAttr.push_back(0);
- if (!aOptions.GetAllSheets() && !maSelectedTabs.count(i) > 0)
+ if (!aOptions.GetAllSheets() && maSelectedTabs.count(i) == 0)
{
nPages[i] = 0;
nFirstAttr[i] = 0;
More information about the Libreoffice-commits
mailing list