include correct sal/macros.h header to compile.
This commit is contained in:
@@ -28,6 +28,7 @@
|
|||||||
|
|
||||||
#include "precompiled_configmgr.hxx"
|
#include "precompiled_configmgr.hxx"
|
||||||
#include "sal/config.h"
|
#include "sal/config.h"
|
||||||
|
#include "sal/macros.h"
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
|
||||||
|
@@ -62,6 +62,7 @@
|
|||||||
#include <comphelper/componentcontext.hxx>
|
#include <comphelper/componentcontext.hxx>
|
||||||
#include <rtl/ustrbuf.hxx>
|
#include <rtl/ustrbuf.hxx>
|
||||||
#include <rtl/uri.hxx>
|
#include <rtl/uri.hxx>
|
||||||
|
#include <sal/macros.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
@@ -32,7 +32,8 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include "osl/time.h"
|
#include <sal/macros.h>
|
||||||
|
#include <osl/time.h>
|
||||||
#include <osl/diagnose.h>
|
#include <osl/diagnose.h>
|
||||||
|
|
||||||
#include "osl/doublecheckedlocking.h"
|
#include "osl/doublecheckedlocking.h"
|
||||||
|
@@ -66,6 +66,7 @@
|
|||||||
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
|
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
|
||||||
#include <com/sun/star/ucb/TransferInfo.hpp>
|
#include <com/sun/star/ucb/TransferInfo.hpp>
|
||||||
#include <com/sun/star/uno/Sequence.hxx>
|
#include <com/sun/star/uno/Sequence.hxx>
|
||||||
|
#include <sal/macros.h>
|
||||||
#include "hierarchycontent.hxx"
|
#include "hierarchycontent.hxx"
|
||||||
|
|
||||||
using namespace com::sun::star;
|
using namespace com::sun::star;
|
||||||
|
@@ -67,6 +67,7 @@
|
|||||||
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
|
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
|
||||||
#include <com/sun/star/ucb/TransferInfo.hpp>
|
#include <com/sun/star/ucb/TransferInfo.hpp>
|
||||||
#include <com/sun/star/uno/Sequence.hxx>
|
#include <com/sun/star/uno/Sequence.hxx>
|
||||||
|
#include <sal/macros.h>
|
||||||
#include "pkgcontent.hxx"
|
#include "pkgcontent.hxx"
|
||||||
|
|
||||||
using namespace com::sun::star;
|
using namespace com::sun::star;
|
||||||
|
@@ -64,16 +64,16 @@
|
|||||||
|
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#include "com/sun/star/beans/Property.hpp"
|
#include <com/sun/star/beans/Property.hpp>
|
||||||
#include "com/sun/star/beans/PropertyAttribute.hpp"
|
#include <com/sun/star/beans/PropertyAttribute.hpp>
|
||||||
#include "com/sun/star/beans/PropertyValue.hpp"
|
#include <com/sun/star/beans/PropertyValue.hpp>
|
||||||
#include "com/sun/star/embed/XStorage.hpp"
|
#include <com/sun/star/embed/XStorage.hpp>
|
||||||
#include "com/sun/star/frame/XModel.hpp"
|
#include <com/sun/star/frame/XModel.hpp>
|
||||||
#include "com/sun/star/ucb/CommandInfo.hpp"
|
#include <com/sun/star/ucb/CommandInfo.hpp>
|
||||||
#include "com/sun/star/ucb/OpenCommandArgument2.hpp"
|
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
|
||||||
#include "com/sun/star/ucb/TransferInfo.hpp"
|
#include <com/sun/star/ucb/TransferInfo.hpp>
|
||||||
|
#include <sal/macros.h>
|
||||||
#include "tdoc_content.hxx"
|
#include <tdoc_content.hxx>
|
||||||
|
|
||||||
namespace com { namespace sun { namespace star { namespace embed {
|
namespace com { namespace sun { namespace star { namespace embed {
|
||||||
class XStorage;
|
class XStorage;
|
||||||
@@ -89,7 +89,7 @@ using namespace tdoc_ucp;
|
|||||||
//=========================================================================
|
//=========================================================================
|
||||||
|
|
||||||
#define MAKEPROPSEQUENCE( a ) \
|
#define MAKEPROPSEQUENCE( a ) \
|
||||||
uno::Sequence< beans::Property >( a, SAL_N_ELEMTS( a ) )
|
uno::Sequence< beans::Property >( a, SAL_N_ELEMENTS( a ) )
|
||||||
|
|
||||||
#define MAKECMDSEQUENCE( a ) \
|
#define MAKECMDSEQUENCE( a ) \
|
||||||
uno::Sequence< ucb::CommandInfo >( a, SAL_N_ELEMENTS( a ) )
|
uno::Sequence< ucb::CommandInfo >( a, SAL_N_ELEMENTS( a ) )
|
||||||
|
Reference in New Issue
Block a user