jl145: merge with DEV300_m69

12 files changed, 18 insertions, 13 deletions

diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
index 8fb05fdaa895..88dd1b9a592d 100644
--- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
+++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx
@@ -39,7 +39,7 @@
 #include <vcl/tabpage.hxx>
 #include <svtools/stdctrl.hxx>
 #include <svx/simptabl.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 
 namespace com {
 namespace sun {
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index dde41a4ac636..5882bdbafd4a 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -53,7 +53,7 @@
 #include <com/sun/star/ucb/Command.hpp>
 #include <tools/urlobj.hxx>
 #include <vcl/msgbox.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
 #include <com/sun/star/security/CertificateValidity.hpp>
 #include <com/sun/star/security/SerialNumberAdapter.hpp>
 #include <ucbhelper/contentbroker.hxx>
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index e8a484f38944..31005a64f091 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -88,6 +88,8 @@ namespace
     {
         sal_Int16 m_nODF;
     public:
+    virtual void Commit();
+    virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
         SaveODFItem();
         //See group ODF in Common.xcs
         bool isLessODF1_2()
@@ -96,6 +98,9 @@ namespace
         }
     };
 
+void SaveODFItem::Commit() {}
+void SaveODFItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+
     SaveODFItem::SaveODFItem(): utl::ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
         "Office.Common/Save"))), m_nODF(0)
     {
diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc
index 8d7e082cea6b..c0f9f4cd3dcb 100644
--- a/xmlsecurity/source/dialogs/helpids.hrc
+++ b/xmlsecurity/source/dialogs/helpids.hrc
@@ -33,7 +33,7 @@
 
 // include ---------------------------------------------------------------
 
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
 
 // Help-Ids --------------------------------------------------------------
 
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index f7fa2c08eca5..83e2ea82a303 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -44,7 +44,7 @@
 #include <com/sun/star/security/SerialNumberAdapter.hpp>
 #include <comphelper/sequence.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <svtools/pickerhelper.hxx>
+#include <svl/pickerhelper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 693d003b0d77..f1b47c3f0f0d 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -36,8 +36,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/solar.hrc>
-#include <svtools/syslocale.hxx>
+#include <svl/solar.hrc>
+#include <unotools/syslocale.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustrbuf.h>
 #include <vector>
diff --git a/xmlsecurity/source/dialogs/stbcontrl.cxx b/xmlsecurity/source/dialogs/stbcontrl.cxx
index c0f2db15eff7..bc5747ed3c88 100644
--- a/xmlsecurity/source/dialogs/stbcontrl.cxx
+++ b/xmlsecurity/source/dialogs/stbcontrl.cxx
@@ -41,14 +41,14 @@
 #endif
 #include <vcl/image.hxx>
 //#ifndef _SFXITEMPOOL_HXX
-//#include <svtools/itempool.hxx>
+//#include <svl/itempool.hxx>
 //#endif
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
 
 
 #include <xmlsecurity/stbcontrl.hxx>
diff --git a/xmlsecurity/tools/demo/makefile.mk b/xmlsecurity/tools/demo/makefile.mk
index 9789bd93ee97..41f80da9c8ad 100644
--- a/xmlsecurity/tools/demo/makefile.mk
+++ b/xmlsecurity/tools/demo/makefile.mk
@@ -125,7 +125,7 @@ APP5OBJS= $(OBJ)$/util.obj	$(OBJ)$/performance.obj
 # ---------- jflatfilter ----------
 #
 PACKAGE=	    com$/sun$/star$/xml$/security$/eval
-JARFILES=       sandbox.jar ridl.jar jurt.jar unoil.jar juh.jar
+JARFILES=       ridl.jar jurt.jar unoil.jar juh.jar
 JAVAFILES:=     $(shell @ls *.java)
 JAVACLASSFILES= $(CLASSDIR)$/$(PACKAGE)$/JavaFlatFilter.class
 JARCLASSDIRS=   $(PACKAGE)
diff --git a/xmlsecurity/tools/examples/uno_win.bat b/xmlsecurity/tools/examples/uno_win.bat
index 606ced6f5caf..6d1f74ada1f6 100644
--- a/xmlsecurity/tools/examples/uno_win.bat
+++ b/xmlsecurity/tools/examples/uno_win.bat
@@ -18,6 +18,6 @@ echo =============================================
 @echo on
 
 cp %WS_PATH%/xmlsecurity/tools/uno/current.gif ./.
-java -classpath %WS_PATH%/xmlsecurity/%OUTPUTDIR%/class;%SO_CLASSPATHPATH%/rt.jar;%SO_CLASSPATHPATH%/java_uno.jar;%SO_CLASSPATHPATH%/sandbox.jar;%SO_CLASSPATHPATH%/jurt.jar;%SO_CLASSPATHPATH%/unoil.jar;%SO_CLASSPATHPATH%/ridl.jar;%SO_CLASSPATHPATH%/juh.jar com.sun.star.xml.security.uno.TestTool %WS_PATH%/xmlsecurity/tools/cryptoken/jks/testToken.jks ""
+java -classpath %WS_PATH%/xmlsecurity/%OUTPUTDIR%/class;%SO_CLASSPATHPATH%/rt.jar;%SO_CLASSPATHPATH%/java_uno.jar;%SO_CLASSPATHPATH%/jurt.jar;%SO_CLASSPATHPATH%/unoil.jar;%SO_CLASSPATHPATH%/ridl.jar;%SO_CLASSPATHPATH%/juh.jar com.sun.star.xml.security.uno.TestTool %WS_PATH%/xmlsecurity/tools/cryptoken/jks/testToken.jks ""
 rm ./current.gif
 
diff --git a/xmlsecurity/tools/standalone/csfit/util/makefile.mk b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
index e25f42e7ce49..3ac85f910f8d 100644
--- a/xmlsecurity/tools/standalone/csfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/csfit/util/makefile.mk
@@ -107,7 +107,7 @@ REGISTERJARS=\
 #	xsec_jxsec.jar
 
 # jar-files, which regcomp needs so that it can use java
-REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar
+REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
 
 # CLASSPATH, which regcomp needs to be run
 # $(SOLARLIBDIR) needs to be included in case Java components are registered,
diff --git a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
index 399522e90bdf..3c1d17b7ecd1 100644
--- a/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
+++ b/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
@@ -107,7 +107,7 @@ REGISTERJARS=\
 #	xsec_jxsec.jar
 
 # jar-files, which regcomp needs so that it can use java
-REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar sandbox.jar jurt.jar juh.jar
+REGCOMP_JARS=unoil.jar java_uno.jar ridl.jar jurt.jar juh.jar
 
 # CLASSPATH, which regcomp needs to be run
 # $(SOLARLIBDIR) needs to be included in case Java components are registered,
diff --git a/xmlsecurity/tools/uno/makefile.mk b/xmlsecurity/tools/uno/makefile.mk
index 34c47ad2c166..3f3da61e57d6 100644
--- a/xmlsecurity/tools/uno/makefile.mk
+++ b/xmlsecurity/tools/uno/makefile.mk
@@ -41,7 +41,7 @@ USE_JAVAVER:=TRUE
 .INCLUDE :  settings.mk
 .INCLUDE :	$(PRJ)$/util$/target.pmk
 
-JARFILES = java_uno.jar sandbox.jar jurt.jar unoil.jar ridl.jar juh.jar
+JARFILES = java_uno.jar jurt.jar unoil.jar ridl.jar juh.jar
 JAVAFILES := $(shell @ls *.java)
 JAVACLASSFILES= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)