[Libreoffice-commits] .: starmath/source sw/inc sw/source

[Norbert Thiebaud]

 starmath/source/cfgitem.cxx       |    2 +-
 starmath/source/parse.cxx         |    1 +
 sw/inc/doc.hxx                    |    1 +
 sw/source/core/doc/fmtcol.cxx     |    2 ++
 sw/source/core/unocore/unoidx.cxx |    6 +++---
 sw/source/filter/rtf/rtffld.cxx   |    1 +
 sw/source/filter/ww8/fields.cxx   |    2 +-
 sw/source/filter/ww8/ww8scan.cxx  |    1 +
 sw/source/ui/frmdlg/column.cxx    |    1 +
 9 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 12df8f23e74cc02697f7570e5ad0ae2933440f1a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Oct 9 21:10:37 2010 -0500

    missing include for SAL_N_ELEMENTS

diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 47527ed..ff80f82 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -30,7 +30,7 @@
 
 
 #include <vcl/svapp.hxx>
-
+#include <sal/macros.h>
 #include "cfgitem.hxx"
 
 #include "starmath.hrc"
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index cbe31aa..641704d 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -38,6 +38,7 @@
 #include <unotools/charclass.hxx>
 #include <editeng/unolingu.hxx>
 #include <unotools/syslocale.hxx>
+#include <sal/macros.h>
 #include "parse.hxx"
 #include "starmath.hrc"
 #include "smdll.hxx"
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index f2f1be3..ba52f45 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -61,6 +61,7 @@ class SwList;
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <vcl/timer.hxx>
+#include <sal/macros.h>
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <ndarr.hxx>
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index c1082da..ecc547d 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -27,6 +27,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
+#include <sal/macros.h>
 #include <hintids.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index affee81..977b051 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -2539,7 +2539,7 @@ static char const*const g_ServicesDocumentIndexes[] =
     "com.sun.star.text.DocumentIndexes",
 };
 static const size_t g_nServicesDocumentIndexes(
-    SAL_N_ELEMENT(g_ServicesDocumentIndexes));
+    SAL_N_ELEMENTS(g_ServicesDocumentIndexes));
 
 sal_Bool SAL_CALL
 SwXDocumentIndexes::supportsService(const OUString& rServiceName)
@@ -2771,7 +2771,7 @@ static char const*const g_ServicesIndexStyleAccess[] =
     "com.sun.star.text.DocumentIndexParagraphStyles",
 };
 static const size_t g_nServicesIndexStyleAccess(
-    SAL_N_ELEMENT(g_ServicesIndexStyleAccess));
+    SAL_N_ELEMENTS(g_ServicesIndexStyleAccess));
 
 sal_Bool SAL_CALL
 SwXDocumentIndex::StyleAccess_Impl::supportsService(
@@ -2924,7 +2924,7 @@ static char const*const g_ServicesIndexTokenAccess[] =
     "com.sun.star.text.DocumentIndexLevelFormat",
 };
 static const size_t g_nServicesIndexTokenAccess(
-    SAL_N_ELEMENT(g_ServicesIndexTokenAccess));
+    SAL_N_ELEMENTS(g_ServicesIndexTokenAccess));
 
 sal_Bool SAL_CALL
 SwXDocumentIndex::TokenAccess_Impl::supportsService(
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index a816578..dd23a85 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -32,6 +32,7 @@
 #include <ctype.h>
 #include <hintids.hxx>
 
+#include <sal/macros.h>
 #include <com/sun/star/i18n/ScriptType.hdl>
 #include <vcl/graph.hxx>
 #include <svl/urihelper.hxx>
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index b2e28fb..490ac37 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -31,7 +31,7 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
 #include "fields.hxx"
 #include <errhdl.hxx>   //ASSERT (use our own ww header later for asserts)
-
+#include <sal/macros.h>
 #include <stddef.h>
 
 namespace ww
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index f9acb2b..52d3fa4 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -36,6 +36,7 @@
 
 #include <string.h>         // memset()
 #include <rtl/tencinfo.h>
+#include <sal/macros.h>
 
 #ifdef DUMP
 
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index a832101..370b05f 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -45,6 +45,7 @@
 #include <sfx2/dispatch.hxx>
 #include <vcl/msgbox.hxx>
 #include <swmodule.hxx>
+#include <sal/macros.h>
 
 #include <helpid.h>
 #include "globals.hrc"