undoapi: re-did the CWS'es changes in the new build system

10 files changed, 14 insertions, 16 deletions

diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 33d8959a474e..489204801b04 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -77,6 +77,8 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\
     framework/source/fwe/helper/imageproducer \
     framework/source/fwe/helper/propertysetcontainer \
     framework/source/fwe/helper/titlehelper \
+    framework/source/fwe/helper/documentundoguard \
+    framework/source/fwe/helper/undomanagerhelper \
     framework/source/fwe/helper/uiconfigelementwrapperbase \
     framework/source/fwe/helper/uielementwrapperbase \
     framework/source/fwe/interaction/preventduplicateinteraction \
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
index adefc3ccbd56..9db346cf1acf 100644
--- a/framework/Package_inc.mk
+++ b/framework/Package_inc.mk
@@ -34,6 +34,10 @@ $(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framew
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/framelistanalyzer.hxx,framework/framelistanalyzer.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/documentundoguard.hxx,framework/documentundoguard.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/undomanagerhelper.hxx,framework/undomanagerhelper.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imutex.hxx,framework/imutex.hxx))
+$(eval $(call gb_Package_add_file,framework_inc,inc/framework/iguard.hxx,framework/iguard.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx))
 $(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx))
diff --git a/framework/inc/helper/documentundoguard.hxx b/framework/inc/framework/documentundoguard.hxx
index d5856341e30e..d5856341e30e 100755
--- a/framework/inc/helper/documentundoguard.hxx
+++ b/framework/inc/framework/documentundoguard.hxx
diff --git a/framework/inc/helper/undomanagerhelper.hxx b/framework/inc/framework/undomanagerhelper.hxx
index e72f6fbdc173..e72f6fbdc173 100755
--- a/framework/inc/helper/undomanagerhelper.hxx
+++ b/framework/inc/framework/undomanagerhelper.hxx
diff --git a/framework/source/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 1227c5afbd93..91265cf45170 100755
--- a/framework/source/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_framework.hxx"
 
-#include <helper/documentundoguard.hxx>
+#include "framework/documentundoguard.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
diff --git a/framework/source/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index da2e9ceb6a73..a37451339234 100755
--- a/framework/source/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -26,7 +26,7 @@
 
 #include "precompiled_framework.hxx"
 
-#include "helper/undomanagerhelper.hxx"
+#include "framework/undomanagerhelper.hxx"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index ed941d5b9a9f..533451502ce1 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -137,7 +137,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/control/bindings \
     sfx2/source/control/ctrlitem \
     sfx2/source/control/dispatch \
-    sfx2/source/control/macrconf \
     sfx2/source/control/macro \
     sfx2/source/control/minfitem \
     sfx2/source/control/msg \
@@ -215,6 +214,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/doc/plugin \
     sfx2/source/doc/printhelper \
     sfx2/source/doc/querytemplate \
+    sfx2/source/doc/docundomanager \
     sfx2/source/doc/sfxbasemodel \
     sfx2/source/doc/sfxmodelfactory \
     sfx2/source/doc/syspath \
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 6ad8b0209c4e..85ce4143323c 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx))
 $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx))
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index 3a70da8a4e74..a37255f23b85 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -98,9 +98,9 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
 //________________________________________________________________________________________________________
-#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_31)
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_31
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 31
+#if ! defined(INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32)
+#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_32
+#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 32
 #include <comphelper/implbase_var.hxx>
 #endif
 
@@ -240,7 +240,7 @@ namespace sfx { namespace intern {
                  SfxListener
 */
 
-typedef ::comphelper::WeakImplHelper31  <   XCHILD
+typedef ::comphelper::WeakImplHelper32  <   XCHILD
                                         ,   XDOCUMENTINFOSUPPLIER
                                         ,   ::com::sun::star::document::XDocumentPropertiesSupplier
                                         ,   ::com::sun::star::rdf::XDocumentMetadataAccess
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 56d3917be93a..effb93864c92 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,10 +1,3 @@
-sf      sfx2    :    l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf      sfx2    :    l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt test NULL
 sf	sfx2									usr1	-	all	sf_mkout NULL
 sf	sfx2\prj								nmake	-	all	sf_prj NULL
-
-
-# fails on unxsoli4
-# sf      sfx2\qa\complex\standalonedocumentinfo  nmake   -       all     sf_qa_complex_standalonedocumentinfo sf_util NULL
-
-# sf      sfx2\qa\complex\framework               nmake   -       all     sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL
-# sf      sfx2\qa\complex\docinfo                 nmake   -       all     sf_qa_complex_docinfo sf_util NULL