diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:05:35 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-02-11 16:05:35 -0600 |
| commit | 95565916b0f9bc46521bead9ae148f73e6beda61 (patch) | |
| tree | c0f4155d24e6f18c33ab23d92b34a5ec64bfc16c /xmloff/source/draw/sdxmlexp_impl.hxx | |
| parent | f327d71f9cc07c3a4e384d73d6023792a5151e7a (diff) | |
merge trivial non-conflicting changes to avmedia
Diffstat (limited to 'xmloff/source/draw/sdxmlexp_impl.hxx')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp_impl.hxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx index e80bb005c2..bc7bba544e 100644 --- a/xmloff/source/draw/sdxmlexp_impl.hxx +++ b/xmloff/source/draw/sdxmlexp_impl.hxx @@ -1,10 +1,11 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * 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 + * Copyright 2000, 2010 Oracle and/or its affiliates. * * This file is part of OpenOffice.org. * @@ -30,13 +31,14 @@ #include <xmloff/xmlexp.hxx> - #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <comphelper/stl_types.hxx> +#include <vector> + ////////////////////////////////////////////////////////////////////////////// class SvXMLUnitConverter; @@ -48,16 +50,18 @@ class OUStringsSort_Impl; class Rectangle; class ImpPresPageDrawStylePropMapper; -class ImpXMLEXPPageMasterList; class ImpXMLEXPPageMasterInfo; class ImpXMLDrawPageInfoList; -class ImpXMLAutoLayoutInfoList; +class ImpXMLAutoLayoutInfo; class SvXMLAutoStylePoolP; class XMLSdPropHdlFactory; class ImpXMLShapeStyleInfo; class XMLShapeExportPropertyMapper; class XMLPageExportPropertyMapper; +typedef ::std::vector< ImpXMLEXPPageMasterInfo* > ImpXMLEXPPageMasterList; +typedef ::std::vector< ImpXMLAutoLayoutInfo* > ImpXMLAutoLayoutInfoList; + ////////////////////////////////////////////////////////////////////////////// enum XmlPlaceholder @@ -192,7 +196,7 @@ protected: public: // #110680# - SdXMLExport( + SdXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, sal_Bool bIsDraw, sal_uInt16 nExportFlags = EXPORT_ALL ); virtual ~SdXMLExport(); @@ -226,3 +230,4 @@ public: #endif // _SDXMLEXP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |