From f06fca80cdf28e70839916e38bd08f7575b79a3e Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Thu, 14 Oct 2010 22:10:14 +0100
Subject: include correct sal/macros.h header to compile.

---
 configmgr/source/xmlreader.cxx                    |  1 +
 ucb/source/ucp/ext/ucpext_content.cxx             |  1 +
 ucb/source/ucp/gvfs/gvfs_content.cxx              |  3 ++-
 ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx |  1 +
 ucb/source/ucp/package/pkgcontentcaps.cxx         |  1 +
 ucb/source/ucp/tdoc/tdoc_contentcaps.cxx          | 22 +++++++++++-----------
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/configmgr/source/xmlreader.cxx b/configmgr/source/xmlreader.cxx
index 4865c87cf81a..49963ca3188a 100644
--- a/configmgr/source/xmlreader.cxx
+++ b/configmgr/source/xmlreader.cxx
@@ -28,6 +28,7 @@
 
 #include "precompiled_configmgr.hxx"
 #include "sal/config.h"
+#include "sal/macros.h"
 
 #include <cstddef>
 
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index f1e2b0347634..fba64800ca51 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -62,6 +62,7 @@
 #include <comphelper/componentcontext.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/uri.hxx>
+#include <sal/macros.h>
 
 #include <algorithm>
 
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index a9f94f0768e0..1cfbf45be180 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -32,7 +32,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "osl/time.h"
+#include <sal/macros.h>
+#include <osl/time.h>
 #include <osl/diagnose.h>
 
 #include "osl/doublecheckedlocking.h"
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index aae23c0adf18..fc9f1c676eeb 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -66,6 +66,7 @@
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <sal/macros.h>
 #include "hierarchycontent.hxx"
 
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx
index 84eabe6f5b37..b15cf057fbf2 100644
--- a/ucb/source/ucp/package/pkgcontentcaps.cxx
+++ b/ucb/source/ucp/package/pkgcontentcaps.cxx
@@ -67,6 +67,7 @@
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <sal/macros.h>
 #include "pkgcontent.hxx"
 
 using namespace com::sun::star;
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index bd8ed490fb8d..9dba9f166565 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -64,16 +64,16 @@
 
  *************************************************************************/
 
-#include "com/sun/star/beans/Property.hpp"
-#include "com/sun/star/beans/PropertyAttribute.hpp"
-#include "com/sun/star/beans/PropertyValue.hpp"
-#include "com/sun/star/embed/XStorage.hpp"
-#include "com/sun/star/frame/XModel.hpp"
-#include "com/sun/star/ucb/CommandInfo.hpp"
-#include "com/sun/star/ucb/OpenCommandArgument2.hpp"
-#include "com/sun/star/ucb/TransferInfo.hpp"
-
-#include "tdoc_content.hxx"
+#include <com/sun/star/beans/Property.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/ucb/CommandInfo.hpp>
+#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
+#include <com/sun/star/ucb/TransferInfo.hpp>
+#include <sal/macros.h>
+#include <tdoc_content.hxx>
 
 namespace com { namespace sun { namespace star { namespace embed {
     class XStorage;
@@ -89,7 +89,7 @@ using namespace tdoc_ucp;
 //=========================================================================
 
 #define MAKEPROPSEQUENCE( a ) \
-    uno::Sequence< beans::Property >( a, SAL_N_ELEMTS( a ) )
+    uno::Sequence< beans::Property >( a, SAL_N_ELEMENTS( a ) )
 
 #define MAKECMDSEQUENCE( a ) \
     uno::Sequence< ucb::CommandInfo >( a, SAL_N_ELEMENTS( a ) )
-- 
cgit