diff options
author | Michael Callahan <callahan@xmission.com> | 2010-12-06 10:36:22 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-06 10:36:22 +0000 |
commit | b76b4d9b64f09dd4941c48b245eaffcf6bfd056d (patch) | |
tree | d9c29fe576ff6f1d3e4b1a3fd8743f79308d1e33 /sw/source/ui | |
parent | 28b420533905e506f3f2a6a6afd8671f301c9001 (diff) |
remove obsolete __FAR_DATA
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/app/applab.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/numpara.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/chrdlg/swuiccoll.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/optpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/viewopt.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dbui/dbmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/dialog/ascfldlg.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 50 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/tabsh.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cntex.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/shells/textsh1.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/uiview/view2.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/glbltree.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/uiitems.cxx | 2 |
22 files changed, 55 insertions, 55 deletions
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx index dfc364e1dcaa..2cd0a59975fb 100644 --- a/sw/source/ui/app/applab.cxx +++ b/sw/source/ui/app/applab.cxx @@ -93,7 +93,7 @@ using ::rtl::OUString; // is in appenv.cxx extern String InsertLabEnvText( SwWrtShell& , SwFldMgr& , const String& ); -const char __FAR_DATA MASTER_LABEL[] = "MasterLabel"; +const char MASTER_LABEL[] = "MasterLabel"; const SwFrmFmt *lcl_InsertBCText( SwWrtShell& rSh, const SwLabItem& rItem, SwFrmFmt &rFmt, diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index f187758e3ea6..407a68f21142 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -83,7 +83,7 @@ using namespace ::com::sun::star::lang; // Globals ****************************************************************** -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { RES_PARATR_DROP, RES_PARATR_DROP, 0 }; diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 36f9ef1b8351..b0e02e85651e 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -53,7 +53,7 @@ // Globals ****************************************************************** -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT, 0 }; diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index b41974d1fcf0..408c9df6379e 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -58,7 +58,7 @@ #include "swuiccoll.hxx" -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { FN_COND_COLL, FN_COND_COLL, 0 }; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 5374a86e397b..9e2852c8012f 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1528,7 +1528,7 @@ struct CharAttr }; // Editieren entspricht Einfuegen-Attributen -static CharAttr __FAR_DATA aRedlineAttr[] = +static CharAttr aRedlineAttr[] = { { SID_ATTR_CHAR_CASEMAP, SVX_CASEMAP_NOT_MAPPED }, { SID_ATTR_CHAR_WEIGHT, WEIGHT_BOLD }, diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index f17c746de016..d5ab4e8916b1 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -85,7 +85,7 @@ USHORT SwViewOption::nPixelTwips = 0; //ein Pixel auf dem Bildschirm #define MIN_TABWIDTH 120 #define MIN_TABHEIGHT 200 -static const char __FAR_DATA aPostItStr[] = " "; +static const char aPostItStr[] = " "; BOOL SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const { diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 19481fed576b..99c56fa670a4 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -774,7 +774,7 @@ String lcl_FindUniqueName(SwWrtShell* pTargetShell, const String& rStartingPageD void lcl_CopyDynamicDefaults( const SwDoc& rSource, SwDoc& rTarget ) { - USHORT __FAR_DATA aRangeOfDefaults[] = { + USHORT aRangeOfDefaults[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_END-1, RES_PARATR_BEGIN, RES_PARATR_END-1, diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 39cd4e867e53..406c2daedb50 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -59,8 +59,8 @@ using namespace ::com::sun::star; const sal_Unicode cDialogExtraDataClose = '}'; -const char __FAR_DATA sDialogImpExtraData[] = "EncImpDlg:{"; -const char __FAR_DATA sDialogExpExtraData[] = "EncExpDlg:{"; +const char sDialogImpExtraData[] = "EncImpDlg:{"; +const char sDialogExpExtraData[] = "EncExpDlg:{"; const USHORT nDialogExtraDataLen = 11; // 12345678901 SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 916339a62fc0..1a95fe21be28 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -144,7 +144,7 @@ enum /*-------------------------------------------------------------------- Beschreibung: Formate in der richtigen Reihenfolge --------------------------------------------------------------------*/ -static const USHORT __FAR_DATA aSetFmt[] = +static const USHORT aSetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -152,14 +152,14 @@ static const USHORT __FAR_DATA aSetFmt[] = 0 }; -static const USHORT __FAR_DATA aGetFmt[] = +static const USHORT aGetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_GETVAR_??? // uebereinstimmen 0 }; -static const USHORT __FAR_DATA aUsrFmt[] = +static const USHORT aUsrFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -167,7 +167,7 @@ static const USHORT __FAR_DATA aUsrFmt[] = nsSwExtendedSubType::SUB_CMD }; -static const USHORT __FAR_DATA aDBFmt[] = +static const USHORT aDBFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_DBFLD_??? // uebereinstimmen @@ -195,7 +195,7 @@ struct SwFldPack /*-------------------------------------------------------------------- Beschreibung: Strings und Formate --------------------------------------------------------------------*/ -static const SwFldPack __FAR_DATA aSwFlds[] = +static const SwFldPack aSwFlds[] = { // Document { TYP_EXTUSERFLD, FLD_EU_BEGIN, FLD_EU_END, 0, 0 }, diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 587d5895f9c5..b0f2cf037a22 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -78,7 +78,7 @@ SV_IMPL_PTRARR( SwColumns, SwColumnPtr ) /*-------------------------------------------------------------------- Beschreibung: Statische Daten --------------------------------------------------------------------*/ -static const USHORT __FAR_DATA nLines[] = { +static const USHORT nLines[] = { DEF_LINE_WIDTH_0, DEF_LINE_WIDTH_1, DEF_LINE_WIDTH_2, @@ -390,7 +390,7 @@ USHORT GetMaxWidth( SwColMgr* pColMgr, USHORT nCols ) return nMax; } -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { RES_COL, RES_COL, 0 }; diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index a9fd394c5d77..6e4f2d50ed32 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -57,7 +57,7 @@ using namespace ::com::sun::star; //using namespace text; -static USHORT __FAR_DATA aFrmMgrRange[] = { +static USHORT aFrmMgrRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER, FN_SET_FRM_NAME, FN_SET_FRM_NAME, diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 5980e054bbd5..e86660a79479 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -139,7 +139,7 @@ struct StringIdPair_Impl #define LB_VERT_LINE 0x00400000L // vertical text line -static RelationMap __FAR_DATA aRelationMap[] = +static RelationMap aRelationMap[] = { {SwFPos::FRAME, SwFPos::FRAME, LB_FRAME, text::RelOrientation::FRAME}, {SwFPos::PRTAREA, SwFPos::PRTAREA, LB_PRTAREA, text::RelOrientation::PRINT_AREA}, @@ -165,7 +165,7 @@ static RelationMap __FAR_DATA aRelationMap[] = {SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, text::RelOrientation::TEXT_LINE} }; -static RelationMap __FAR_DATA aAsCharRelationMap[] = +static RelationMap aAsCharRelationMap[] = { {SwFPos::REL_BASE, SwFPos::REL_BASE, LB_REL_BASE, text::RelOrientation::FRAME}, {SwFPos::REL_CHAR, SwFPos::REL_CHAR, LB_REL_CHAR, text::RelOrientation::FRAME}, @@ -178,7 +178,7 @@ static RelationMap __FAR_DATA aAsCharRelationMap[] = #define HORI_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_PG_LEFT| \ LB_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHPageMap[] = +static FrmMap aHPageMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_PAGE_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_PAGE_REL}, @@ -186,14 +186,14 @@ static FrmMap __FAR_DATA aHPageMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_PAGE_REL} }; -static FrmMap __FAR_DATA aHPageHtmlMap[] = +static FrmMap aHPageHtmlMap[] = { {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_REL_PG_FRAME} }; #define VERT_PAGE_REL (LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVPageMap[] = +static FrmMap aVPageMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_PAGE_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_PAGE_REL}, @@ -201,7 +201,7 @@ static FrmMap __FAR_DATA aVPageMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_PAGE_REL} }; -static FrmMap __FAR_DATA aVPageHtmlMap[] = +static FrmMap aVPageHtmlMap[] = { {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB_REL_PG_FRAME} }; @@ -212,7 +212,7 @@ static FrmMap __FAR_DATA aVPageHtmlMap[] = #define HORI_FRAME_REL (LB_FLY_REL_PG_FRAME|LB_FLY_REL_PG_PRTAREA| \ LB_FLY_REL_PG_LEFT|LB_FLY_REL_PG_RIGHT) -static FrmMap __FAR_DATA aHFrameMap[] = +static FrmMap aHFrameMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_FRAME_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_FRAME_REL}, @@ -220,7 +220,7 @@ static FrmMap __FAR_DATA aHFrameMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, HORI_FRAME_REL} }; -static FrmMap __FAR_DATA aHFlyHtmlMap[] = +static FrmMap aHFlyHtmlMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, LB_FLY_REL_PG_FRAME}, {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, text::HoriOrientation::NONE, LB_FLY_REL_PG_FRAME} @@ -229,7 +229,7 @@ static FrmMap __FAR_DATA aHFlyHtmlMap[] = // own vertical alignment map for to frame anchored objects #define VERT_FRAME_REL (LB_FLY_VERT_FRAME|LB_FLY_VERT_PRTAREA) -static FrmMap __FAR_DATA aVFrameMap[] = +static FrmMap aVFrameMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_FRAME_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_FRAME_REL}, @@ -237,7 +237,7 @@ static FrmMap __FAR_DATA aVFrameMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_FRAME_REL} }; -static FrmMap __FAR_DATA aVFlyHtmlMap[] = +static FrmMap aVFlyHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_FLY_VERT_FRAME}, {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, LB_FLY_VERT_FRAME} @@ -250,7 +250,7 @@ static FrmMap __FAR_DATA aVFlyHtmlMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT) -static FrmMap __FAR_DATA aHParaMap[] = +static FrmMap aHParaMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_PARA_REL}, @@ -260,13 +260,13 @@ static FrmMap __FAR_DATA aHParaMap[] = #define HTML_HORI_PARA_REL (LB_FRAME|LB_PRTAREA) -static FrmMap __FAR_DATA aHParaHtmlMap[] = +static FrmMap aHParaHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_PARA_REL} }; -static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = +static FrmMap aHParaHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HTML_HORI_PARA_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_PARA_REL} @@ -276,7 +276,7 @@ static FrmMap __FAR_DATA aHParaHtmlAbsMap[] = #define VERT_PARA_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVParaMap[] = +static FrmMap aVParaMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, VERT_PARA_REL}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, VERT_PARA_REL}, @@ -284,7 +284,7 @@ static FrmMap __FAR_DATA aVParaMap[] = {SwFPos::FROMTOP, SwFPos::FROMTOP, text::VertOrientation::NONE, VERT_PARA_REL} }; -static FrmMap __FAR_DATA aVParaHtmlMap[] = +static FrmMap aVParaHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_VERT_PRTAREA} }; @@ -296,7 +296,7 @@ static FrmMap __FAR_DATA aVParaHtmlMap[] = LB_REL_PG_FRAME|LB_REL_PG_PRTAREA|LB_REL_FRM_LEFT| \ LB_REL_FRM_RIGHT|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharMap[] = +static FrmMap aHCharMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, HORI_CHAR_REL}, @@ -306,13 +306,13 @@ static FrmMap __FAR_DATA aHCharMap[] = #define HTML_HORI_CHAR_REL (LB_FRAME|LB_PRTAREA|LB_REL_CHAR) -static FrmMap __FAR_DATA aHCharHtmlMap[] = +static FrmMap aHCharHtmlMap[] = { {SwFPos::LEFT, SwFPos::LEFT, text::HoriOrientation::LEFT, HTML_HORI_CHAR_REL}, {SwFPos::RIGHT, SwFPos::RIGHT, text::HoriOrientation::RIGHT, HTML_HORI_CHAR_REL} }; -static FrmMap __FAR_DATA aHCharHtmlAbsMap[] = +static FrmMap aHCharHtmlAbsMap[] = { {SwFPos::LEFT, SwFPos::MIR_LEFT, text::HoriOrientation::LEFT, LB_PRTAREA|LB_REL_CHAR}, {SwFPos::RIGHT, SwFPos::MIR_RIGHT, text::HoriOrientation::RIGHT, LB_PRTAREA}, @@ -323,7 +323,7 @@ static FrmMap __FAR_DATA aHCharHtmlAbsMap[] = #define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) -static FrmMap __FAR_DATA aVCharMap[] = +static FrmMap aVCharMap[] = { // introduce mappings for new vertical alignment at top of line <LB_VERT_LINE> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> @@ -342,12 +342,12 @@ static FrmMap __FAR_DATA aVCharMap[] = {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER, LB_VERT_LINE} }; -static FrmMap __FAR_DATA aVCharHtmlMap[] = +static FrmMap aVCharHtmlMap[] = { {SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} }; -static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = +static FrmMap aVCharHtmlAbsMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_CHAR}, {SwFPos::BELOW, SwFPos::BELOW, text::VertOrientation::CHAR_BOTTOM, LB_REL_CHAR} @@ -356,7 +356,7 @@ static FrmMap __FAR_DATA aVCharHtmlAbsMap[] = /*-------------------------------------------------------------------- Beschreibung: Als Zeichen verankert --------------------------------------------------------------------*/ -static FrmMap __FAR_DATA aVAsCharMap[] = +static FrmMap aVAsCharMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_BASE}, {SwFPos::BOTTOM, SwFPos::BOTTOM, text::VertOrientation::BOTTOM, LB_REL_BASE}, @@ -373,7 +373,7 @@ static FrmMap __FAR_DATA aVAsCharMap[] = {SwFPos::FROMBOTTOM, SwFPos::FROMBOTTOM, text::VertOrientation::NONE, LB_REL_BASE} }; -static FrmMap __FAR_DATA aVAsCharHtmlMap[] = +static FrmMap aVAsCharHtmlMap[] = { {SwFPos::TOP, SwFPos::TOP, text::VertOrientation::TOP, LB_REL_BASE}, {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::CENTER, LB_REL_BASE}, @@ -385,14 +385,14 @@ static FrmMap __FAR_DATA aVAsCharHtmlMap[] = {SwFPos::CENTER_VERT, SwFPos::CENTER_VERT, text::VertOrientation::LINE_CENTER, LB_REL_ROW} }; -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { RES_FRM_SIZE, RES_FRM_SIZE, RES_VERT_ORIENT, RES_ANCHOR, RES_COL, RES_COL, RES_FOLLOW_TEXT_FLOW, RES_FOLLOW_TEXT_FLOW, 0 }; -static USHORT __FAR_DATA aAddPgRg[] = { +static USHORT aAddPgRg[] = { RES_PROTECT, RES_PROTECT, RES_PRINT, RES_PRINT, FN_SET_FRM_NAME, FN_SET_FRM_NAME, diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 60cdc1a43ed3..a9eed6bbc4ee 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -61,7 +61,7 @@ using namespace ::com::sun::star; -static USHORT __FAR_DATA aWrapPageRg[] = { +static USHORT aWrapPageRg[] = { RES_LR_SPACE, RES_UL_SPACE, RES_PROTECT, RES_SURROUND, RES_PRINT, RES_PRINT, diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/ui/inc/tabsh.hxx index 544cab3b66e4..79d913146094 100644 --- a/sw/source/ui/inc/tabsh.hxx +++ b/sw/source/ui/inc/tabsh.hxx @@ -36,7 +36,7 @@ class SwWrtShell; SW_DLLPUBLIC void ItemSetToTableParam( const SfxItemSet& rSet, SwWrtShell &rSh ); -extern const USHORT __FAR_DATA aUITableAttrRange[]; +extern const USHORT aUITableAttrRange[]; SW_DLLPUBLIC const USHORT* SwuiGetUITableAttrRange(); class SwTableShell: public SwBaseShell diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx index 9c232d4c128e..2d840af79699 100644 --- a/sw/source/ui/index/cntex.cxx +++ b/sw/source/ui/index/cntex.cxx @@ -190,7 +190,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample( if(!pExampleFrame || !pExampleFrame->IsInitialized()) return; - const char* __FAR_DATA IndexServiceNames[] = + const char* IndexServiceNames[] = { "com.sun.star.text.DocumentIndex", "com.sun.star.text.UserIndex", diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 83029d360fc6..ed07c6ecdc5c 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -62,7 +62,7 @@ /*-----------------------------------------------------#--------------- Beschreibung: vordefinierte Linien in Point --------------------------------------------------------------------*/ -static const USHORT __FAR_DATA nLines[] = { +static const USHORT nLines[] = { 0, 50, 100, @@ -73,7 +73,7 @@ static const USHORT __FAR_DATA nLines[] = { static const USHORT nLineCount = SAL_N_ELEMENTS(nLines); -static USHORT __FAR_DATA aPageRg[] = { +static USHORT aPageRg[] = { FN_PARAM_FTN_INFO, FN_PARAM_FTN_INFO, 0 }; diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 6e69cd11099d..3a20c177f915 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -395,7 +395,7 @@ void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 n USHORT* SwTextGridPage::GetRanges() { - static USHORT __FAR_DATA aPageRg[] = { + static USHORT aPageRg[] = { RES_TEXTGRID, RES_TEXTGRID, 0}; return aPageRg; diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 35dd6981b7b9..ea13faa11080 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -120,7 +120,7 @@ SFX_IMPL_INTERFACE(SwTableShell, SwBaseShell, SW_RES(STR_SHELLNAME_TABLE)) TYPEINIT1(SwTableShell,SwBaseShell) -const USHORT __FAR_DATA aUITableAttrRange[] = +const USHORT aUITableAttrRange[] = { FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_NAME, FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE, diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index fe1c11facd02..15fb6cdedb06 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -494,7 +494,7 @@ void SwTextShell::Execute(SfxRequest &rReq) // remove the languages from that) SvUShortsSort aAttribs; - USHORT __FAR_DATA aResetableSetRange[] = { + USHORT aResetableSetRange[] = { RES_FRMATR_BEGIN, RES_FRMATR_END-1, RES_CHRATR_BEGIN, RES_CHRATR_LANGUAGE - 1, RES_CHRATR_LANGUAGE + 1, RES_CHRATR_CJK_LANGUAGE - 1, @@ -506,7 +506,7 @@ void SwTextShell::Execute(SfxRequest &rReq) RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1, 0 }; - USHORT __FAR_DATA *pUShorts = aResetableSetRange; + USHORT *pUShorts = aResetableSetRange; while (*pUShorts) { USHORT nL = pUShorts[1] - pUShorts[0] + 1; diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx index a735c6d14c7c..447405a634b8 100644 --- a/sw/source/ui/uiview/view2.cxx +++ b/sw/source/ui/uiview/view2.cxx @@ -143,8 +143,8 @@ #include <svx/ofaitem.hxx> #include <unomid.h> -const char __FAR_DATA sStatusDelim[] = " : "; -const char __FAR_DATA sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei +const char sStatusDelim[] = " : "; +const char sStatusComma[] = " , ";//#outlinelevel, define a Variable for "," add by zhaojianwei using ::rtl::OUString; using namespace sfx2; diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 47fc8848461e..9a461ada9f94 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -109,7 +109,7 @@ using ::rtl::OUString; #define GLBL_TABPOS_SUB 5 const SfxObjectShell* SwGlobalTree::pShowShell = 0; -static const USHORT __FAR_DATA aHelpForMenu[] = +static const USHORT aHelpForMenu[] = { 0, // HID_GLBLTREE_UPDATE, //CTX_UPDATE diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx index 65018fa90856..f7b691dd7b61 100644 --- a/sw/source/ui/utlui/uiitems.cxx +++ b/sw/source/ui/utlui/uiitems.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; // Breitenangaben der Fussnotenlinien, mit TabPage abstimmen -static const USHORT __FAR_DATA nFtnLines[] = { +static const USHORT nFtnLines[] = { 0, 10, 50, |