1 files changed, 21 insertions, 30 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index fb40c5edb2cc..ea7fb3a5f1cd 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -1,30 +1,21 @@
 /* -*- 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 .
+ */
 
 #ifndef SC_DPOBJECT_HXX
 #define SC_DPOBJECT_HXX
@@ -70,7 +61,7 @@ class ScDPOutput;
 struct ScPivotParam;
 struct ScImportSourceDesc;
 class ScSheetSourceDesc;
-struct PivotField;
+struct ScPivotField;
 class ScDPTableData;
 class ScDPDimensionSaveData;
 
@@ -154,7 +145,7 @@ public:
     void                SetHeaderLayout(bool bUseGrid);
     bool                GetHeaderLayout() const;
 
-    void                SetSheetDesc(const ScSheetSourceDesc& rDesc);
+    void                SetSheetDesc(const ScSheetSourceDesc& rDesc, bool bFromRefUpdate = false);
     void                SetImportDesc(const ScImportSourceDesc& rDesc);
     void                SetServiceData(const ScDPServiceDesc& rDesc);
 
@@ -256,13 +247,13 @@ public:
 
     static void ConvertOrientation(
         ScDPSaveData& rSaveData,
-        const ::std::vector<PivotField>& rFields, sal_uInt16 nOrient,
+        const ScPivotFieldVector& rFields, sal_uInt16 nOrient,
         const com::sun::star::uno::Reference<
             com::sun::star::sheet::XDimensionsSupplier>& xSource,
-        const ScDPLabelDataVec& rLabels,
-        std::vector<PivotField>* pRefColFields = NULL,
-        std::vector<PivotField>* pRefRowFields = NULL,
-        std::vector<PivotField>* pRefPageFields = NULL );
+        const ScDPLabelDataVector& rLabels,
+        const ScPivotFieldVector* pRefColFields = NULL,
+        const ScPivotFieldVector* pRefRowFields = NULL,
+        const ScPivotFieldVector* pRefPageFields = NULL );
 
     static bool         IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags );