diff options
| -rw-r--r-- | sc/inc/chgtrack.hxx | 7 | ||||
| -rw-r--r-- | sc/source/core/tool/chgtrack.cxx | 23 |
2 files changed, 10 insertions, 20 deletions
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index c4c22a992452..2b283ed6a7d0 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -32,11 +32,7 @@ #include "global.hxx" #include "bigrange.hxx" #include "scdllapi.h" - -#ifdef SC_CHGTRACK_CXX -// core/inc #include "refupdat.hxx" -#endif class ScBaseCell; class ScDocument; @@ -949,7 +945,6 @@ class ScChangeTrack : public utl::ConfigurationListener ScChangeTrack( const ScChangeTrack& ); ScChangeTrack& operator=( const ScChangeTrack& ); -#ifdef SC_CHGTRACK_CXX static SCROW InitContentRowsPerSlot(); // true if one is MM_FORMULA and the other is @@ -1022,8 +1017,6 @@ class ScChangeTrack : public utl::ConfigurationListener // bRecursion == called from reject with table bool Reject( ScChangeAction*, ScChangeActionMap*, bool bRecursion ); -#endif // SC_CHGTRACK_CXX - void ClearMsgQueue(); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index d35fd7d559a6..29b0017b860f 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -17,16 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/shl.hxx> // SHL_CALC -#include <tools/rtti.hxx> -#include <svl/zforlist.hxx> -#include <svl/itemset.hxx> -#include <svl/isethint.hxx> -#include <svl/itempool.hxx> -#include <sfx2/app.hxx> -#include <unotools/useroptions.hxx> -#include <sfx2/sfxsids.hrc> - +#include "chgtrack.hxx" #include "cell.hxx" #include "document.hxx" #include "dociter.hxx" @@ -38,11 +29,17 @@ #include "patattr.hxx" #include "hints.hxx" #include "markdata.hxx" - #include "globstr.hrc" -#define SC_CHGTRACK_CXX -#include "chgtrack.hxx" +#include <tools/shl.hxx> // SHL_CALC +#include <tools/rtti.hxx> +#include <svl/zforlist.hxx> +#include <svl/itemset.hxx> +#include <svl/isethint.hxx> +#include <svl/itempool.hxx> +#include <sfx2/app.hxx> +#include <unotools/useroptions.hxx> +#include <sfx2/sfxsids.hrc> IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry ) |