diff options
| -rw-r--r-- | sc/Library_sc.mk | 1 | ||||
| -rw-r--r-- | sc/Library_scfilt.mk | 1 | ||||
| -rw-r--r-- | sc/source/filter/starcalc/collect.cxx (renamed from sc/source/core/tool/collect.cxx) | 0 | ||||
| -rw-r--r-- | sc/source/filter/starcalc/collect.hxx (renamed from sc/inc/collect.hxx) | 6 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index fbd6a17e926e..cf4bb6bd48b8 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -166,7 +166,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/chartpos \ sc/source/core/tool/chgtrack \ sc/source/core/tool/chgviset \ - sc/source/core/tool/collect \ sc/source/core/tool/compiler \ sc/source/core/tool/consoli \ sc/source/core/tool/dbdata \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 1e5652743a85..97fb999e87af 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -154,6 +154,7 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\ sc/source/filter/rtf/rtfexp \ sc/source/filter/rtf/rtfimp \ sc/source/filter/rtf/rtfparse \ + sc/source/filter/starcalc/collect \ sc/source/filter/starcalc/scflt \ sc/source/filter/starcalc/scfobj \ sc/source/filter/xcl97/XclExpChangeTrack \ diff --git a/sc/source/core/tool/collect.cxx b/sc/source/filter/starcalc/collect.cxx index 090ebfad1a2e..090ebfad1a2e 100644 --- a/sc/source/core/tool/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx diff --git a/sc/inc/collect.hxx b/sc/source/filter/starcalc/collect.hxx index 608b22a17c04..6444efd4ad14 100644 --- a/sc/inc/collect.hxx +++ b/sc/source/filter/starcalc/collect.hxx @@ -29,9 +29,9 @@ #ifndef SC_COLLECT_HXX #define SC_COLLECT_HXX -#include "scdllapi.h" +#include "sal/types.h" -class SC_DLLPUBLIC ScDataObject +class ScDataObject { public: ScDataObject() {} @@ -39,7 +39,7 @@ public: virtual ScDataObject* Clone() const = 0; }; -class SC_DLLPUBLIC ScCollection : public ScDataObject +class ScCollection : public ScDataObject { protected: sal_uInt16 nCount; |