/************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License version 3 * only, as published by the Free Software Foundation. * * OpenOffice.org is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License version 3 for more details * (a copy is included in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU Lesser General Public License * version 3 along with OpenOffice.org. If not, see * * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _LAYOUT_PLUGIN_HXX #define _LAYOUT_PLUGIN_HXX #include #include namespace svx { class DialControl; } class PluginDialog : public ModalDialog { private: FixedImage aHeaderImage; FixedText aHeaderText; FixedLine aHeaderLine; Plugin aPlugin; svx::DialControl& aDialControl; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; public: PluginDialog( Window* pParent ); ~PluginDialog(); }; #include #endif /* _LAYOUT_PLUGIN_HXX */ n value='distro/cib/libreoffice-5-4'>distro/cib/libreoffice-5-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/external/boost/include/boost/scoped_ptr.hpp
AgeCommit message (Collapse)Author
2017-08-16Silence further warnings in external/boost/include wrappersStephan Bergmann
...as required by clang-cl: > [build CXX] avmedia/source/framework/modeltools.cxx > In file included from C:/lo64/core/avmedia/source/framework/modeltools.cxx:29: > In file included from C:/lo64/core/external/boost/include\boost/exception/diagnostic_information.hpp:23: > In file included from C:/lo64/core/workdir/UnpackedTarball/boost\boost/exception/diagnostic_information.hpp:17: > C:/lo64/core/workdir/UnpackedTarball/boost\boost/exception/info.hpp(103,13): error: 'boost::exception_detail::error_info_container_impl' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor] > ~error_info_container_impl() throw() > ^ > C:/lo64/core/workdir/UnpackedTarball/boost\boost/exception/info.hpp(172,21): error: delete called on non-final 'boost::exception_detail::error_info_container_impl' that has virtual functions but non-virtual destructor [-Werror,-Wdelete-non-virtual-dtor] > delete this; > ^ > 2 errors generated. Change-Id: I026f7e72d027becb68ac9118616ed6d8f2ecbf80 Reviewed-on: https://gerrit.libreoffice.org/41225 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-05-02Adapt bin/gen-boost-headers to Clang 5Stephan Bergmann
...since <http://llvm.org/viewvc/llvm-project?view=revision&revision=301647> "Use the -Wunknown-warning-option group for the 'unknown warning group' diagnostic in #pragma diagnostic". * external/boost/include/boost/{locale.hpp,locale/gnu_gettext.hpp} would have been removed by 'make cmd cmd=bin/gen-boost-headers' as they are still unused from c25eee44966703cb27d632bccb39b20978341ffd "build boost::locale library", but there's reportedly a patch in Gerrit to actually use them, so I fixed them manually for now. * The deviating comment style is to keep lines no wider than 80 characters. Change-Id: I64603ae8d8a82781eda46f12c9dd5c68dcf395b9
2016-05-30boost: warning-patch-ectomyMichael Stahl
Upstream maintainers, with few exceptions, generally don't care about warnings in boost headers, hence we re-base our warning fix patches on every upgrade, which is a pointless exercise in frustration. Most of the patches are for GCC/Clang warnings, where we could use -isystem to suppress the warnings (with corresponding hacks in the build system, because -isystem also disables dependency generation) - but clang-cl does not support -isystem. So generate a bunch of wrapper headers into external/boost/include, that disable all known warnings and use #include_next to get the real boost header. This allows us to get rid of most of the existing patches. There is however a bug in GCC that preprocessor warnings like -Wundef cannot be disabled with a #pragma, so those patches cannot be removed. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431 Change-Id: I2992bf4a463015f1140489df867bd80757f84541 Reviewed-on: https://gerrit.libreoffice.org/25563 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>