[Libreoffice-commits] .: sc/inc

[Kohei Yoshida]

 sc/inc/document.hxx |    2 +-
 sc/inc/scmatrix.hxx |    4 +---
 sc/inc/types.hxx    |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

New commits:
commit 2930911604103d6caf4d6861f2a70d1f8a7f0c5e
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Dec 21 16:40:04 2010 -0500

    Moved ScMatrixRef typedefs to its own file.
    
    This is to prevent including the whole scmatrix.hxx header in
    document.hxx.

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index cd536a1..5b0ced9 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -37,9 +37,9 @@
 #include "scdllapi.h"
 #include "rangelst.hxx"
 #include "table.hxx"
-#include "scmatrix.hxx"
 #include "brdcst.hxx"
 #include "tabopparams.hxx"
+#include "types.hxx"
 #include "formula/grammar.hxx"
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include "scdllapi.h"
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index df744df..0634774 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -30,6 +30,7 @@
 #define SC_MATRIX_HXX
 
 #include "global.hxx"
+#include "types.hxx"
 #include "formula/errorcodes.hxx"
 #include <tools/string.hxx>
 #include "scdllapi.h"
@@ -386,9 +387,6 @@ inline void intrusive_ptr_release(const ScMatrix* p)
     p->DecRef();
 }
 
-typedef ::boost::intrusive_ptr<ScMatrix> ScMatrixRef;
-typedef ::boost::intrusive_ptr<const ScMatrix> ScConstMatrixRef;
-
 #endif  // SC_MATRIX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
new file mode 100644
index 0000000..d9405c5
--- /dev/null
+++ b/sc/inc/types.hxx
@@ -0,0 +1,38 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Novell, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __SC_TYPES_HXX__
+#define __SC_TYPES_HXX__
+
+#include <boost/intrusive_ptr.hpp>
+
+class ScMatrix;
+
+typedef ::boost::intrusive_ptr<ScMatrix>        ScMatrixRef;
+typedef ::boost::intrusive_ptr<const ScMatrix>  ScConstMatrixRef;
+
+#endif