Kaydet (Commit) 6d2de44a authored tarafından Thomas Arnhold's avatar Thomas Arnhold

fix-includes.pl: comphelper

Change-Id: I0b4cd8320881b2b1f7984c86e58915217bcd0d5f
üst 878398ba
......@@ -14,42 +14,6 @@
also fixes all possible problems, so it's usually better to use it).
*/
#include "boost/shared_ptr.hpp"
#include "com/sun/star/beans/XPropertySet.hpp"
#include "com/sun/star/configuration/ReadOnlyAccess.hpp"
#include "com/sun/star/configuration/ReadWriteAccess.hpp"
#include "com/sun/star/configuration/XReadWriteAccess.hpp"
#include "com/sun/star/configuration/theDefaultProvider.hpp"
#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
#include "com/sun/star/container/XHierarchicalNameReplace.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/frame/XDispatchProvider.hpp"
#include "com/sun/star/frame/XSynchronousDispatch.hpp"
#include "com/sun/star/lang/Locale.hpp"
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/lang/XLocalizable.hpp"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/lang/XSingleComponentFactory.hpp"
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/DeploymentException.hpp"
#include "com/sun/star/uno/Exception.hpp"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/util/URLTransformer.hpp"
#include "com/sun/star/util/theMacroExpander.hpp"
#include "cppuhelper/implbase2.hxx"
#include "cppuhelper/typeprovider.hxx"
#include "i18nlangtag/languagetag.hxx"
#include "osl/diagnose.h"
#include "osl/file.hxx"
#include "rtl/instance.hxx"
#include "rtl/string.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.hxx"
#include "sal/config.h"
#include "typelib/typedescription.h"
#include <algorithm>
#include <boost/bind.hpp>
#include <boost/current_function.hpp>
......@@ -84,10 +48,15 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/theIntrospection.hpp>
#include <com/sun/star/configuration/ReadOnlyAccess.hpp>
#include <com/sun/star/configuration/ReadWriteAccess.hpp>
#include <com/sun/star/configuration/XReadWriteAccess.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/container/XEnumerableMap.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XHierarchicalNameReplace.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
......@@ -116,7 +85,9 @@
#include <com/sun/star/frame/DoubleInitializationException.hpp>
#include <com/sun/star/frame/UntitledNumbersConst.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
#include <com/sun/star/frame/XTitle.hpp>
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/CharType.hpp>
......@@ -143,9 +114,11 @@
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XLocalizable.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.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/logging/LogLevel.hpp>
......@@ -175,6 +148,9 @@
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/DeploymentException.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/XComponentContext.hpp>
......@@ -184,10 +160,12 @@
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XCloseBroadcaster.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <com/sun/star/util/theMacroExpander.hpp>
#include <com/sun/star/xml/crypto/DigestID.hpp>
#include <com/sun/star/xml/crypto/NSSInitializer.hpp>
#include <com/sun/star/xml/crypto/XDigestContext.hpp>
......@@ -215,12 +193,14 @@
#include <cstddef>
#include <deque>
#include <functional>
#include <i18nlangtag/languagetag.hxx>
#include <iterator>
#include <limits>
#include <map>
#include <memory.h>
#include <osl/conditn.hxx>
#include <osl/diagnose.h>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.h>
#include <osl/time.h>
......@@ -239,10 +219,10 @@
#include <set>
#include <stdarg.h>
#include <string.h>
#include <typelib/typedescription.h>
#include <typelib/typedescription.hxx>
#include <ucbhelper/content.hxx>
#include <unicode/uchar.h>
#include <uno/data.h>
#include <vector>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -25,8 +25,8 @@
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "rtl/string.hxx"
#include "rtl/ustring.hxx"
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
namespace {
......
......@@ -12,7 +12,7 @@
#include "cppunit/TestFixture.h"
#include "cppunit/extensions/HelperMacros.h"
#include "cppunit/plugin/TestPlugIn.h"
#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>
#include <cassert>
#include <vector>
......
......@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/XInterface.hpp"
#include "comphelper/weakbag.hxx"
#include "cppuhelper/weak.hxx"
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <comphelper/weakbag.hxx>
#include <cppuhelper/weak.hxx>
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/containermultiplexer.hxx"
#include "comphelper/uno3.hxx"
#include <comphelper/containermultiplexer.hxx>
#include <comphelper/uno3.hxx>
#include <osl/diagnose.h>
namespace comphelper
......
......@@ -20,10 +20,10 @@
#include "comphelper_module.hxx"
#include "comphelper_services.hxx"
#include "comphelper/anytostring.hxx"
#include "comphelper/anycompare.hxx"
#include "comphelper/componentbase.hxx"
#include "comphelper/extract.hxx"
#include <comphelper/anytostring.hxx>
#include <comphelper/anycompare.hxx>
#include <comphelper/componentbase.hxx>
#include <comphelper/extract.hxx>
#include <com/sun/star/container/XEnumerableMap.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
......
......@@ -20,7 +20,7 @@
#ifndef INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX
#define INCLUDED_COMPHELPER_SOURCE_INC_COMPHELPER_MODULE_HXX
#include "comphelper/componentmodule.hxx"
#include <comphelper/componentmodule.hxx>
namespace comphelper { namespace module
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/accessiblewrapper.hxx"
#include <comphelper/accessiblewrapper.hxx>
#include <com/sun/star/reflection/XProxyFactory.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/anycompare.hxx"
#include <comphelper/anycompare.hxx>
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Time.hpp>
......
......@@ -18,11 +18,11 @@
*/
#include "comphelper/anytostring.hxx"
#include "osl/diagnose.h"
#include "rtl/ustrbuf.hxx"
#include "typelib/typedescription.h"
#include "com/sun/star/lang/XServiceInfo.hpp"
#include <comphelper/anytostring.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <typelib/typedescription.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
using namespace ::com::sun::star;
......
......@@ -18,7 +18,7 @@
*/
#include "comphelper/componentbase.hxx"
#include <comphelper/componentbase.hxx>
#include <com/sun/star/lang/NotInitializedException.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
......
......@@ -7,29 +7,29 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "sal/config.h"
#include <sal/config.h>
#include <cassert>
#include "boost/shared_ptr.hpp"
#include "com/sun/star/configuration/ReadOnlyAccess.hpp"
#include "com/sun/star/configuration/ReadWriteAccess.hpp"
#include "com/sun/star/configuration/XReadWriteAccess.hpp"
#include "com/sun/star/configuration/theDefaultProvider.hpp"
#include "com/sun/star/container/XHierarchicalNameAccess.hpp"
#include "com/sun/star/container/XHierarchicalNameReplace.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/lang/Locale.hpp"
#include "com/sun/star/lang/XLocalizable.hpp"
#include "com/sun/star/uno/Any.hxx"
#include "com/sun/star/uno/Reference.hxx"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "comphelper/configuration.hxx"
#include "rtl/instance.hxx"
#include "rtl/ustrbuf.hxx"
#include "rtl/ustring.hxx"
#include "i18nlangtag/languagetag.hxx"
#include <boost/shared_ptr.hpp>
#include <com/sun/star/configuration/ReadOnlyAccess.hpp>
#include <com/sun/star/configuration/ReadWriteAccess.hpp>
#include <com/sun/star/configuration/XReadWriteAccess.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/container/XHierarchicalNameReplace.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XLocalizable.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/configuration.hxx>
#include <rtl/instance.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
#include <i18nlangtag/languagetag.hxx>
namespace {
......
......@@ -18,7 +18,7 @@
*/
#include "comphelper/docpasswordhelper.hxx"
#include <comphelper/docpasswordhelper.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
......
......@@ -18,7 +18,7 @@
*/
#include "comphelper/docpasswordrequest.hxx"
#include <comphelper/docpasswordrequest.hxx>
#include <com/sun/star/task/DocumentMSPasswordRequest2.hpp>
#include <com/sun/star/task/DocumentPasswordRequest2.hpp>
#include <com/sun/star/task/PasswordRequest.hpp>
......
......@@ -18,8 +18,8 @@
*/
#include "comphelper/documentinfo.hxx"
#include "comphelper/namedvaluecollection.hxx"
#include <comphelper/documentinfo.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/evtlistenerhlp.hxx"
#include <comphelper/evtlistenerhlp.hxx>
namespace comphelper
{
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/evtmethodhelper.hxx"
#include "cppuhelper/typeprovider.hxx"
#include <comphelper/evtmethodhelper.hxx>
#include <cppuhelper/typeprovider.hxx>
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Type;
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include <sal/config.h>
#include <cassert>
......
......@@ -18,9 +18,9 @@
*/
#include "comphelper/flagguard.hxx"
#include "osl/diagnose.h"
#include "com/sun/star/uno/Exception.hpp"
#include <comphelper/flagguard.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/uno/Exception.hpp>
namespace comphelper {
......
......@@ -18,13 +18,13 @@
*/
#include "comphelper/servicedecl.hxx"
#include "osl/diagnose.h"
#include "rtl/string.hxx"
#include "rtl/ustrbuf.hxx"
#include "cppuhelper/implbase2.hxx"
#include "comphelper/sequence.hxx"
#include "com/sun/star/lang/XSingleComponentFactory.hpp"
#include <comphelper/servicedecl.hxx>
#include <osl/diagnose.h>
#include <rtl/string.hxx>
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/implbase2.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <vector>
using namespace com::sun::star;
......
......@@ -18,7 +18,7 @@
*/
#include "comphelper/serviceinfohelper.hxx"
#include <comphelper/serviceinfohelper.hxx>
#include <stdarg.h>
// #####################################################################
......
......@@ -18,7 +18,7 @@
*/
#include "comphelper/sharedmutex.hxx"
#include <comphelper/sharedmutex.hxx>
namespace comphelper
......
......@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include <sal/config.h>
#include "comphelper/solarmutex.hxx"
#include <comphelper/solarmutex.hxx>
comphelper::SolarMutex::SolarMutex() {}
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include <sal/config.h>
#include <cstddef>
#include <string.h>
......
......@@ -18,14 +18,14 @@
*/
#include "com/sun/star/frame/XDispatchProvider.hpp"
#include "com/sun/star/frame/XSynchronousDispatch.hpp"
#include "com/sun/star/lang/XComponent.hpp"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/util/URLTransformer.hpp"
#include "comphelper/synchronousdispatch.hxx"
#include "comphelper/processfactory.hxx"
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <comphelper/synchronousdispatch.hxx>
#include <comphelper/processfactory.hxx>
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "sal/config.h"
#include <sal/config.h>
#include <cassert>
......
......@@ -18,7 +18,7 @@
*/
#include "comphelper/weak.hxx"
#include <comphelper/weak.hxx>
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
......
......@@ -29,9 +29,9 @@
*************************************************************************/
#include "osl/file.hxx"
#include "com/sun/star/beans/XPropertySet.hpp"
#include "com/sun/star/util/theMacroExpander.hpp"
#include <osl/file.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/util/theMacroExpander.hpp>
#include "officeinstallationdirectories.hxx"
......
......@@ -20,12 +20,12 @@
#ifndef INCLUDED_COMPHELPER_SOURCE_OFFICEINSTDIR_OFFICEINSTALLATIONDIRECTORIES_HXX
#define INCLUDED_COMPHELPER_SOURCE_OFFICEINSTDIR_OFFICEINSTALLATIONDIRECTORIES_HXX
#include "osl/mutex.hxx"
#include "cppuhelper/implbase2.hxx"
#include <osl/mutex.hxx>
#include <cppuhelper/implbase2.hxx>
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "com/sun/star/util/XOfficeInstallationDirectories.hpp"
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
namespace comphelper {
......
......@@ -21,8 +21,8 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "com/sun/star/beans/XPropertySet.hpp"
#include "com/sun/star/uno/DeploymentException.hpp"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/DeploymentException.hpp>
using namespace ::com::sun::star;
using namespace com::sun::star::uno;
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/propagg.hxx"
#include "comphelper/property.hxx"
#include <comphelper/propagg.hxx>
#include <comphelper/property.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/beans/PropertyAttribute.hpp>
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/propertybag.hxx"
#include <comphelper/propertybag.hxx>
#include <com/sun/star/beans/IllegalTypeException.hpp>
#include <com/sun/star/beans/PropertyExistException.hpp>
......
......@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/propertysetinfo.hxx"
#include "comphelper/propertysethelper.hxx"
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/propertysethelper.hxx>
#include <boost/scoped_array.hpp>
using namespace ::comphelper;
......
......@@ -18,7 +18,7 @@
*/
#include "comphelper/propertysetinfo.hxx"
#include <comphelper/propertysetinfo.hxx>
using namespace ::rtl;
using namespace ::comphelper;
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "comphelper/propertystatecontainer.hxx"
#include <comphelper/propertystatecontainer.hxx>
#include <rtl/ustrbuf.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment