[Libreoffice-commits] .: sd/source

[Michael Meeks]

 sd/source/ui/dlg/paragr.cxx     |    2 +-
 sd/source/ui/inc/unokywds.hxx   |    4 ++--
 sd/source/ui/unoidl/unopage.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7a7185c3a5ac336cd40a122cb2632ea6130592eb
Author: Michael Callahan <callahan at xmission.com>
Date:   Mon Dec 6 10:36:14 2010 +0000

    remove obsolete __FAR_DATA

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
old mode 100755
new mode 100644
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
old mode 100755
new mode 100644
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 0e20613..4704b1d 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -95,7 +95,7 @@ SfxTabPage* SdParagraphNumTabPage::Create(Window *pParent, const SfxItemSet & rA
 
 USHORT* SdParagraphNumTabPage::GetRanges()
 {
-    static USHORT __FAR_DATA aRange[] =
+    static USHORT aRange[] =
     {
         ATTR_PARANUMBERING_START, ATTR_PARANUMBERING_END,
         0
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 36e5c87..2c21d95 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -33,9 +33,9 @@
 #include <tools/solar.h>
 
 #ifndef SD_DEFINE_KEYWORDS
-#define SD_CONSTASCII_ACTION( n, s ) extern sal_Char __FAR_DATA n[sizeof(s)]
+#define SD_CONSTASCII_ACTION( n, s ) extern sal_Char n[sizeof(s)]
 #else
-#define SD_CONSTASCII_ACTION( n, s ) sal_Char __FAR_DATA n[sizeof(s)] = s
+#define SD_CONSTASCII_ACTION( n, s ) sal_Char n[sizeof(s)] = s
 #endif
 
 #define UNO_PREFIX "com.sun.star."
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 1f0398a..c1102ea 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -126,7 +126,7 @@ enum WID_PAGE
  #endif
 #endif
 
-static sal_Char __FAR_DATA sEmptyPageName[sizeof("page")] = "page";
+static sal_Char sEmptyPageName[sizeof("page")] = "page";
 
 /** this function stores the property maps for draw pages in impress and draw */
 const SvxItemPropertySet* ImplGetDrawPagePropertySet( sal_Bool bImpress, PageKind ePageKind )