CWS-TOOLING: integrate CWS killnonpro

17 files changed, 29 insertions, 27 deletions

diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 4dbafe373117..595b358a789a 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -194,6 +194,7 @@ class HandlerCFGAccess : public ::utl::ConfigItem
 
         void setCache(HandlerCache* pCache) {m_pCache = pCache;};
         virtual void Notify(const css::uno::Sequence< rtl::OUString >& lPropertyNames);
+        virtual void Commit();
 };
 
 } // namespace framework
diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx
index 595f45bfc79a..a62ec3e47890 100644
--- a/framework/inc/dispatch/basedispatcher.hxx
+++ b/framework/inc/dispatch/basedispatcher.hxx
@@ -70,7 +70,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.h>
 /*DRAFT
-#include <svtools/historyoptions.hxx>
+#include <unotools/historyoptions.hxx>
 */
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc
index 6f35d20c2d22..57fb2e94b07a 100644
--- a/framework/inc/framework.hrc
+++ b/framework/inc/framework.hrc
@@ -31,7 +31,7 @@
 #ifndef _FRAMEWORK_HRC
 #define _FRAMEWORK_HRC
 
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 
 #define RID_FWK_START               260
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 435b87a4f248..1bd908b266c6 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/frame/XFrame.hpp>

 

 #include <i18npool/lang.h>

-#include <svtools/languageoptions.hxx>

+#include <svl/languageoptions.hxx>

 

 namespace framework

 {

diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 22ef1a481ab7..55d356c80806 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -53,7 +53,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #include <cppuhelper/weak.hxx>
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index aa893cd40a57..255229d8e2eb 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -93,7 +93,7 @@
 //_________________________________________________________________________________________________________________
 
 #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
 #endif
 
 #ifndef _CPPUHELPER_WEAK_HXX_
diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc
index 49921efcee37..6195a6372452 100644
--- a/framework/inc/helpid.hrc
+++ b/framework/inc/helpid.hrc
@@ -32,7 +32,7 @@
 
 // include ------------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids -----------------------------------------------------------------
 
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx
index eaffedbc0e5c..fd211dd81ee9 100644
--- a/framework/inc/pch/precompiled_framework.hxx
+++ b/framework/inc/pch/precompiled_framework.hxx
@@ -380,32 +380,32 @@
 #include "sot/storage.hxx"
 
 #include "svtools/acceleratorexecute.hxx"
-#include "svtools/cmdoptions.hxx"
+#include "unotools/cmdoptions.hxx"
 #include "svtools/colorcfg.hxx"
 #include "svtools/ctrltool.hxx"
-#include "svtools/dynamicmenuoptions.hxx"
+#include "unotools/dynamicmenuoptions.hxx"
 #include "svtools/filter.hxx"
 #include "svtools/framestatuslistener.hxx"
 #include "svtools/helpopt.hxx"
-#include "svtools/historyoptions.hxx"
-#include "svtools/imageitm.hxx"
+#include "unotools/historyoptions.hxx"
+#include "svl/imageitm.hxx"
 #include "svtools/imgdef.hxx"
-#include "svtools/inettype.hxx"
-#include "svtools/internaloptions.hxx"
-#include "svtools/lstner.hxx"
+#include "svl/inettype.hxx"
+#include "unotools/internaloptions.hxx"
+#include "svl/lstner.hxx"
 #include "svtools/menuoptions.hxx"
 #include "svtools/miscopt.hxx"
-#include "svtools/moduleoptions.hxx"
-#include "svtools/pathoptions.hxx"
+#include "unotools/moduleoptions.hxx"
+#include "unotools/pathoptions.hxx"
 #include "svtools/sfxecode.hxx"
-#include "svtools/smplhint.hxx"
-#include "svtools/solar.hrc"
+#include "svl/smplhint.hxx"
+#include "svl/solar.hrc"
 #include "svtools/statusbarcontroller.hxx"
-#include "svtools/svarray.hxx"
+#include "svl/svarray.hxx"
 #include "svtools/svmedit.hxx"
 #include "svtools/toolboxcontroller.hxx"
 #include "svtools/transfer.hxx"
-#include "svtools/urihelper.hxx"
+#include "svl/urihelper.hxx"
 #include "svtools/xtextedt.hxx"
 
 #include "toolkit/awt/vclxmenu.hxx"
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 92c575c7b5b5..c1e1e59dc02f 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -80,7 +80,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 32e83aed1974..022bda1786bc 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -87,7 +87,7 @@
 //_________________________________________________________________________________________________________________
 //  other includes
 //_________________________________________________________________________________________________________________
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/string.hxx>
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index 86e3f6c7fc57..4f5b9f0c65fa 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.hxx
@@ -42,7 +42,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/scrbar.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 
 namespace framework {
 
diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx
index 46a90015a56e..af81b51d04ac 100644
--- a/framework/inc/services/pluginframe.hxx
+++ b/framework/inc/services/pluginframe.hxx
@@ -57,7 +57,7 @@
 #ifndef _VCL_ATOM_HXX
 #include <vcl/threadex.hxx>
 #endif
-#include <svtools/cmdoptions.hxx>
+#include <unotools/cmdoptions.hxx>
 
 
 //_________________________________________________________________________________________________________________
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index a95e913695b0..215def2ea08c 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -139,6 +139,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
         /** is called from the ConfigManager before application ends or from the
             PropertyChangeListener if the sub tree broadcasts changes. */
         virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
+        virtual void    Commit();
 
     private:
         // Wrapper methods for low-level functions
diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx
index ca446a7e1386..69e6f85c6f90 100644
--- a/framework/inc/xml/eventsconfiguration.hxx
+++ b/framework/inc/xml/eventsconfiguration.hxx
@@ -31,7 +31,7 @@
 #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index 452d2c045da4..d0961892b96b 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -31,7 +31,7 @@
 #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <tools/color.hxx>
diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx
index 9bcfa9564a33..8619ae423622 100644
--- a/framework/inc/xml/statusbarconfiguration.hxx
+++ b/framework/inc/xml/statusbarconfiguration.hxx
@@ -1,7 +1,7 @@
 #ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <tools/string.hxx>
 #include <tools/stream.hxx>
 #include <vcl/status.hxx>
diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx
index c3f827bc95a1..924c601ac689 100644
--- a/framework/inc/xml/toolboxconfiguration.hxx
+++ b/framework/inc/xml/toolboxconfiguration.hxx
@@ -1,7 +1,7 @@
 #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_
 
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
 #include <vcl/bitmap.hxx>
 #include <tools/string.hxx>
 #include <com/sun/star/io/XInputStream.hpp>