Hi,

You will find attached 2 patches to complete the easy task "Remove bogus macro..".

When you will be OK, i'll be able to edit the wiki.

Thanks again for your friendly welcome on this maling-list !

Guillaume.

>From cd375808b626d022d6d650e541382d6ba7854e9e Mon Sep 17 00:00:00 2001
From: Guillaume Poussel <gpous...@gmail.com>
Date: Wed, 22 Dec 2010 18:37:18 +0100
Subject: [PATCH] Remove __READONLY_DATA

---
 tools/inc/tools/solar.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 8b72805..cc78aa5 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -87,8 +87,6 @@ typedef sal_uInt32			UINT32;	/* typedef unsigned int    UINT32; previously "unsi
 
 #define DELETEZ( p )	( delete p,p = 0 )
 
-#define __READONLY_DATA 		const
-
 #ifdef WNT
 #if defined (_MSC_VER) && ( _MSC_VER < 1200 )
 #define __LOADONCALLAPI _cdecl
-- 
1.7.1

>From d6119fae6b3a12cecf8c78cf11e27b2f3d6c7b45 Mon Sep 17 00:00:00 2001
From: Guillaume Poussel <g.pous...@wanadoo.fr>
Date: Wed, 22 Dec 2010 18:38:32 +0100
Subject: [PATCH] Removed __READONLY_DATA (replaced by const)

---
 .../objectpositioning/anchoredobjectposition.cxx   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 61028b5..9368e7f 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -1062,11 +1062,11 @@ bool SwAnchoredObjectPosition::_Minor( sal_Int16 _eRelOrient1,
 
     // draw aside order for left horizontal position
     //! one array entry for each value in text::RelOrientation
-    static USHORT __READONLY_DATA aLeft[ 10 ] =
+    static USHORT const aLeft[ 10 ] =
         { 5, 6, 0, 1, 8, 4, 7, 2, 3, 9 };
     // draw aside order for right horizontal position
     //! one array entry for each value in text::RelOrientation
-    static USHORT __READONLY_DATA aRight[ 10 ] =
+    static USHORT const aRight[ 10 ] =
         { 5, 6, 0, 8, 1, 7, 4, 2, 3, 9 };
 
     // decide depending on given order, which frame has to draw aside another frame
-- 
1.7.1

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Reply via email to