sc/inc/dbdata.hxx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit cfaccff5aa7be7e240e51c6661ee09812b1aa113
Author: David Tardon <dtar...@redhat.com>
Date: Thu Apr 16 09:52:26 2015 +0200
fix windows build, part 4
error C2487: member of dll interface class may not be declared with dll
interface
Change-Id: I467670d483112ddbe8e608a7884a9c4e168e470d
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index c66d7e0..b239275 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -76,7 +76,7 @@ public:
bool operator() (const ScDBData& left, const ScDBData& right) const;
};
- SC_DLLPUBLIC ScDBData(const OUString& rName,
+ ScDBData(const OUString& rName,
SCTAB nTab,
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bool bByR = true, bool bHasH = true);
@@ -91,7 +91,7 @@ public:
const OUString& GetName() const { return aName; }
const OUString& GetUpperName() const { return aUpper; }
void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2,
SCROW& rRow2) const;
- SC_DLLPUBLIC void GetArea(ScRange& rRange) const;
+ void GetArea(ScRange& rRange) const;
void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2);
bool IsByRow() const { return bByRow; }
@@ -115,10 +115,10 @@ public:
void GetSortParam(ScSortParam& rSortParam) const;
void SetSortParam(const ScSortParam& rSortParam);
- SC_DLLPUBLIC void GetQueryParam(ScQueryParam& rQueryParam) const;
- SC_DLLPUBLIC void SetQueryParam(const ScQueryParam& rQueryParam);
- SC_DLLPUBLIC bool GetAdvancedQuerySource(ScRange& rSource) const;
- SC_DLLPUBLIC void SetAdvancedQuerySource(const ScRange* pSource);
+ void GetQueryParam(ScQueryParam& rQueryParam) const;
+ void SetQueryParam(const ScQueryParam& rQueryParam);
+ bool GetAdvancedQuerySource(ScRange& rSource) const;
+ void SetAdvancedQuerySource(const ScRange* pSource);
void GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const;
void SetSubTotalParam(const ScSubTotalParam& rSubTotalParam);
@@ -130,7 +130,7 @@ public:
bool IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2) const;
bool HasImportParam() const;
- SC_DLLPUBLIC bool HasQueryParam() const;
+ bool HasQueryParam() const;
bool HasSortParam() const;
bool HasSubTotalParam() const;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
