diff options
Diffstat (limited to 'io/source/stm/odata.cxx')
-rw-r--r-- | io/source/stm/odata.cxx | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index 3e40e25da82e..3e8c1b502b9b 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -1,36 +1,30 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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 - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ - - -// streams #include <boost/unordered_map.hpp> #include <vector> +#include <string.h> + +#include <cppuhelper/weak.hxx> +#include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase4.hxx> #include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/io/XObjectOutputStream.hpp> @@ -42,14 +36,6 @@ #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/weak.hxx> // OWeakObject -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> - -#include <string.h> - - using namespace ::cppu; using namespace ::osl; using namespace ::std; @@ -961,8 +947,10 @@ typedef boost::unordered_map * * *--------------------------------------------*/ -class OObjectOutputStream: public ImplInheritanceHelper2< - ODataOutputStream, XObjectOutputStream, XMarkableStream > +class OObjectOutputStream: + public ImplInheritanceHelper2< + ODataOutputStream, /* parent */ + XObjectOutputStream, XMarkableStream > { public: OObjectOutputStream() @@ -1235,8 +1223,10 @@ Sequence< OUString > OObjectOutputStream::getSupportedServiceNames(void) throw ( return OObjectOutputStream_getSupportedServiceNames(); } -class OObjectInputStream: public ImplInheritanceHelper2< - ODataInputStream, XObjectInputStream, XMarkableStream > +class OObjectInputStream: + public ImplInheritanceHelper2< + ODataInputStream, /* parent */ + XObjectInputStream, XMarkableStream > { public: OObjectInputStream( const Reference < XComponentContext > &r) |