diff options
author | Joachim Lingner <jl@openoffice.org> | 2010-01-12 15:55:12 +0100 |
---|---|---|
committer | Joachim Lingner <jl@openoffice.org> | 2010-01-12 15:55:12 +0100 |
commit | 76ea65d536125dd98a5f9b21eec6d9d8435bdfef (patch) | |
tree | c12e914caf800581493e89b8ade937de684e02ad /xmlsecurity/source | |
parent | cbb9a21b81b0753fac59d4e12963492a3c1bbcdc (diff) | |
parent | 8a5b59989048d67b567819ee2038d4bff54ca184 (diff) |
jl145: merge with DEV300_m69
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r-- | xmlsecurity/source/component/documentdigitalsignatures.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 5 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/helpids.hrc | 2 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/resourcemanager.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/stbcontrl.cxx | 4 |
6 files changed, 12 insertions, 7 deletions
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> |