[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Feb 14 13:33:54 UTC 2019
xmlsecurity/inc/certificateviewer.hxx | 8
xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 172 -------------
xmlsecurity/source/component/documentdigitalsignatures.cxx | 3
xmlsecurity/source/dialogs/certificatechooser.cxx | 1
xmlsecurity/source/dialogs/certificateviewer.cxx | 1
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 1
xmlsecurity/source/dialogs/macrosecurity.cxx | 6
7 files changed, 12 insertions(+), 180 deletions(-)
New commits:
commit 6c1588fd22baa0f315e38ecd22591cf13b4b9384
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 13 21:33:05 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 14 14:33:25 2019 +0100
drop unneeded vcl includes, update pch
Change-Id: Idd2c4a812a9415c816427f8566d9e7159b4dd2a6
Reviewed-on: https://gerrit.libreoffice.org/67806
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx
index a117ad39cbb8..1db10c125271 100644
--- a/xmlsecurity/inc/certificateviewer.hxx
+++ b/xmlsecurity/inc/certificateviewer.hxx
@@ -20,13 +20,7 @@
#ifndef INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX
#define INCLUDED_XMLSECURITY_INC_CERTIFICATEVIEWER_HXX
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/tabdlg.hxx>
-#include <vcl/tabctrl.hxx>
-#include <vcl/tabpage.hxx>
-#include <svtools/simptabl.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/weld.hxx>
namespace com {
namespace sun {
diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
index c23d8bb5eae9..66b40256ab26 100644
--- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
+++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2017-09-20 22:55:53 using:
+ Generated on 2019-02-13 21:32:09 using:
./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -22,61 +22,39 @@
#include <algorithm>
#include <cassert>
-#include <config_global.h>
#include <config_typesizes.h>
-#include <config_vcl.h>
#include <cstddef>
-#include <cstdlib>
#include <cstring>
#include <deque>
-#include <exception>
#include <float.h>
#include <functional>
#include <iomanip>
#include <limits.h>
#include <limits>
#include <list>
-#include <map>
#include <math.h>
#include <memory>
#include <new>
#include <ostream>
#include <set>
-#include <sstream>
-#include <stack>
#include <stddef.h>
-#include <stdlib.h>
#include <string.h>
-#include <string>
#include <type_traits>
-#include <typeinfo>
#include <utility>
#include <vector>
#include <xmlsecuritydllapi.h>
-#include <boost/optional/optional.hpp>
+#include <xsecxmlsecdllapi.h>
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
#include <osl/endian.h>
-#include <osl/file.h>
#include <osl/file.hxx>
#include <osl/getglobalmutex.hxx>
#include <osl/interlck.h>
-#include <osl/module.h>
-#include <osl/module.hxx>
#include <osl/mutex.h>
#include <osl/mutex.hxx>
-#include <osl/pipe.h>
-#include <osl/process.h>
-#include <osl/security.h>
-#include <osl/socket.h>
#include <osl/thread.h>
-#include <osl/thread.hxx>
#include <osl/time.h>
#include <rtl/alloc.h>
-#include <rtl/byteseq.h>
-#include <rtl/character.hxx>
-#include <rtl/cipher.h>
-#include <rtl/digest.h>
#include <rtl/instance.hxx>
#include <rtl/locale.h>
#include <rtl/math.h>
@@ -87,7 +65,6 @@
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/stringutils.hxx>
-#include <rtl/tencinfo.h>
#include <rtl/textcvt.h>
#include <rtl/textenc.h>
#include <rtl/unload.h>
@@ -98,66 +75,26 @@
#include <rtl/ustring.hxx>
#include <rtl/uuid.h>
#include <sal/config.h>
-#include <sal/detail/log.h>
#include <sal/log.hxx>
#include <sal/macros.h>
#include <sal/mathconf.h>
#include <sal/saldllapi.h>
#include <sal/types.h>
#include <sal/typesizes.h>
-#include <vcl/EnumContext.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
-#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/builder.hxx>
-#include <vcl/button.hxx>
-#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/commandevent.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/cursor.hxx>
-#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
-#include <vcl/dndhelp.hxx>
-#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
-#include <vcl/event.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/gfxlink.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/hatch.hxx>
-#include <vcl/idle.hxx>
-#include <vcl/image.hxx>
-#include <vcl/inputctx.hxx>
-#include <vcl/inputtypes.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
-#include <vcl/lineinfo.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/metaactiontypes.hxx>
-#include <vcl/mnemonicengine.hxx>
-#include <vcl/notebookbar.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/outdevmap.hxx>
-#include <vcl/outdevstate.hxx>
-#include <vcl/ptrstyle.hxx>
-#include <vcl/quickselectionengine.hxx>
#include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/seleng.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/syswin.hxx>
#include <vcl/task.hxx>
#include <vcl/timer.hxx>
#include <vcl/uitest/factory.hxx>
@@ -165,13 +102,9 @@
#include <vcl/vclevent.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
-#include <vcl/vectorgraphicdata.hxx>
-#include <vcl/wall.hxx>
-#include <vcl/window.hxx>
-#include <vcl/wmfexternal.hxx>
+#include <vcl/weld.hxx>
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/point/b2ipoint.hxx>
@@ -182,62 +115,21 @@
#include <basegfx/tuple/b2dtuple.hxx>
#include <basegfx/tuple/b2ituple.hxx>
#include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <basegfx/vector/b2ivector.hxx>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/awt/SystemPointer.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include <com/sun/star/datatransfer/XTransferable2.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
-#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/StorageFormats.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
-#include <com/sun/star/i18n/Calendar2.hpp>
-#include <com/sun/star/i18n/DirectionProperty.hpp>
-#include <com/sun/star/i18n/KCharacterType.hpp>
-#include <com/sun/star/i18n/KParseTokens.hpp>
-#include <com/sun/star/i18n/KParseType.hpp>
-#include <com/sun/star/i18n/LocaleItem.hpp>
-#include <com/sun/star/i18n/ParseResult.hpp>
-#include <com/sun/star/i18n/UnicodeScript.hpp>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <com/sun/star/i18n/XCollator.hpp>
-#include <com/sun/star/i18n/XLocaleData4.hpp>
-#include <com/sun/star/i18n/reservedWords.hpp>
#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/ui/XContextChangeEventListener.hpp>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Exception.hpp>
@@ -249,35 +141,22 @@
#include <com/sun/star/uno/Type.h>
#include <com/sun/star/uno/Type.hxx>
#include <com/sun/star/uno/TypeClass.hdl>
-#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/XWeak.hpp>
#include <com/sun/star/uno/genfunc.h>
#include <com/sun/star/uno/genfunc.hxx>
-#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/xml/crypto/DigestID.hpp>
#include <com/sun/star/xml/crypto/SecurityOperationStatus.hpp>
-#include <com/sun/star/xml/crypto/XSEInitializer.hpp>
-#include <com/sun/star/xml/crypto/XUriBinding.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
#include <com/sun/star/xml/crypto/XXMLSignature.hpp>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.hpp>
-#include <com/sun/star/xml/crypto/sax/XKeyCollector.hpp>
-#include <com/sun/star/xml/crypto/sax/XMissionTaker.hpp>
#include <com/sun/star/xml/crypto/sax/XReferenceResolvedBroadcaster.hpp>
-#include <com/sun/star/xml/crypto/sax/XReferenceResolvedListener.hpp>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/wrapper/XXMLElementWrapper.hpp>
#include <comphelper/comphelperdllapi.h>
-#include <comphelper/fileformat.h>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/servicehelper.hxx>
#include <cppu/cppudllapi.h>
#include <cppu/unotype.hxx>
#include <cppuhelper/cppuhelperdllapi.h>
@@ -287,67 +166,28 @@
#include <cppuhelper/implbase_ex_post.hxx>
#include <cppuhelper/implbase_ex_pre.hxx>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <i18nlangtag/i18nlangtagdllapi.h>
#include <i18nlangtag/lang.h>
-#include <i18nlangtag/languagetag.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
-#include <resourcemanager.hxx>
-#include <sax/saxdllapi.h>
-#include <sot/exchange.hxx>
-#include <sot/formats.hxx>
-#include <sot/sotdllapi.h>
#include <svl/sigstruct.hxx>
-#include <svtools/svtdllapi.h>
#include <tools/color.hxx>
-#include <tools/contnr.hxx>
-#include <tools/date.hxx>
-#include <tools/datetime.hxx>
-#include <tools/debug.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/gen.hxx>
-#include <tools/globname.hxx>
-#include <tools/lineend.hxx>
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
-#include <tools/poly.hxx>
-#include <tools/ref.hxx>
#include <tools/solar.h>
-#include <tools/stream.hxx>
#include <tools/time.hxx>
#include <tools/toolsdllapi.h>
-#include <tools/wintypes.hxx>
#include <typelib/typeclass.h>
#include <typelib/typedescription.h>
#include <typelib/uik.h>
#include <uno/any2.h>
#include <uno/data.h>
#include <uno/sequence2.h>
-#include <unotools/accessiblestatesethelper.hxx>
-#include <unotools/calendarwrapper.hxx>
-#include <unotools/charclass.hxx>
-#include <unotools/collatorwrapper.hxx>
-#include <unotools/fontdefs.hxx>
-#include <unotools/intlwrapper.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <unotools/options.hxx>
-#include <unotools/readwritemutexguard.hxx>
-#include <unotools/resmgr.hxx>
-#include <unotools/syslocale.hxx>
+#include <unotools/datetime.hxx>
#include <unotools/unotoolsdllapi.h>
-#include <vcl/AccessibleBrowseBoxObjType.hxx>
-#include <vcl/accessibletableprovider.hxx>
-#include <vcl/headbar.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/transfer.hxx>
-#include <vcl/treelist.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/treelistentries.hxx>
-#include <vcl/viewdataentry.hxx>
#include <xsecctl.hxx>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 78f1b9e52960..8e1044f414af 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -32,6 +32,7 @@
#include <com/sun/star/embed/StorageFormats.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -55,6 +56,8 @@
#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
+#include <map>
+
using namespace css;
using namespace css::uno;
using namespace css::lang;
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 67bc31cf3dd0..4f04f0dcea23 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/security/NoPasswordException.hpp>
#include <com/sun/star/security/CertificateCharacters.hpp>
-#include <vcl/treelistentry.hxx>
#include <unotools/datetime.hxx>
#include <unotools/useroptions.hxx>
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 7bc6b03ff28d..9f880ce7709d 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -31,7 +31,6 @@
#include <strings.hrc>
#include <resourcemanager.hxx>
#include <comphelper/xmlsechelper.hxx>
-#include <svtools/controldims.hxx>
#include <tools/datetime.hxx>
#include <bitmaps.hlst>
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 00e96005d816..4cde7de2e3e3 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -48,7 +48,6 @@
#include <tools/date.hxx>
#include <tools/time.hxx>
#include <unotools/datetime.hxx>
-#include <vcl/treelistentry.hxx>
#include <bitmaps.hlst>
#include <strings.hrc>
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index e77a5815c045..0e01b505a644 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -25,9 +25,6 @@
#include <osl/file.hxx>
#include <sal/log.hxx>
-#include <vcl/help.hxx>
-#include <vcl/layout.hxx>
-
#include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp>
#include <comphelper/sequence.hxx>
@@ -40,7 +37,8 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <tools/urlobj.hxx>
#include <unotools/datetime.hxx>
-#include <vcl/treelistentry.hxx>
+
+#include <vcl/svapp.hxx>
#include <strings.hrc>
More information about the Libreoffice-commits
mailing list