diff options
author | Michael Callahan <callahan@xmission.com> | 2010-12-06 10:36:07 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-06 10:36:48 +0000 |
commit | b8f02010fe30cffe4dbc12cc9ecf4c52b9285b56 (patch) | |
tree | f12b13d02f6a608a5ed1ea0107deddaa4d584478 /sc/source/ui | |
parent | d88139d58bd35815545c5f43d204dde4759a8bf9 (diff) |
remove obsolete __FAR_DATA
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/asciiopt.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 54 | ||||
-rw-r--r-- | sc/source/ui/inc/docsh.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/scdetect.cxx | 52 | ||||
-rw-r--r-- | sc/source/ui/unoobj/servuno.cxx | 4 |
6 files changed, 60 insertions, 60 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 697f573cf630..0900871f3509 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -106,7 +106,7 @@ BOOL ScInputHandler::bAutoComplete = FALSE; // wird in KeyInput gesetzt // only characters that are allowed in formulas next to references // and the quotation mark (so string constants can be skipped) -static const sal_Char __FAR_DATA pMinDelimiters[] = " !\""; +static const sal_Char pMinDelimiters[] = " !\""; extern USHORT nEditAdjust; //! Member an ViewData diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index f101809552c9..73826a06c9d9 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -44,8 +44,8 @@ // ============================================================================ -static const sal_Char __FAR_DATA pStrFix[] = "FIX"; -static const sal_Char __FAR_DATA pStrMrg[] = "MRG"; +static const sal_Char pStrFix[] = "FIX"; +static const sal_Char pStrMrg[] = "MRG"; // ============================================================================ diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 954307bac5af..0617c68f340e 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -155,36 +155,36 @@ using ::std::vector; // Stream-Namen im Storage -const sal_Char __FAR_DATA ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument" -const sal_Char __FAR_DATA ScDocShell::pStyleName[] = "SfxStyleSheets"; +const sal_Char ScDocShell::pStarCalcDoc[] = STRING_SCSTREAM; // "StarCalcDocument" +const sal_Char ScDocShell::pStyleName[] = "SfxStyleSheets"; // Filter-Namen (wie in sclib.cxx) -static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0"; -//static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0"; -//static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0"; -//static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0"; -static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)"; -static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)"; -static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus"; -static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0"; -static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0"; -static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95"; -static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95"; -static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97"; -static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterDBase[] = "dBase"; -static const sal_Char __FAR_DATA pFilterDif[] = "DIF"; -static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK"; -static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)"; -static const sal_Char __FAR_DATA pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; -static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)"; +static const sal_Char pFilterSc50[] = "StarCalc 5.0"; +//static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template"; +static const sal_Char pFilterSc40[] = "StarCalc 4.0"; +//static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template"; +static const sal_Char pFilterSc30[] = "StarCalc 3.0"; +//static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template"; +static const sal_Char pFilterSc10[] = "StarCalc 1.0"; +static const sal_Char pFilterXML[] = "StarOffice XML (Calc)"; +static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)"; +static const sal_Char pFilterLotus[] = "Lotus"; +static const sal_Char pFilterQPro6[] = "Quattro Pro 6.0"; +static const sal_Char pFilterExcel4[] = "MS Excel 4.0"; +static const sal_Char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; +static const sal_Char pFilterExcel5[] = "MS Excel 5.0/95"; +static const sal_Char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; +static const sal_Char pFilterExcel95[] = "MS Excel 95"; +static const sal_Char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; +static const sal_Char pFilterExcel97[] = "MS Excel 97"; +static const sal_Char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; +static const sal_Char pFilterDBase[] = "dBase"; +static const sal_Char pFilterDif[] = "DIF"; +static const sal_Char pFilterSylk[] = "SYLK"; +static const sal_Char pFilterHtml[] = "HTML (StarCalc)"; +static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; +static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; //---------------------------------------------------------------------- diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 6a1fa0ff5098..ea29cc9871d9 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -90,8 +90,8 @@ typedef ::std::hash_map< ULONG, ULONG > ScChangeActionMergeMap; class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener { - static const sal_Char __FAR_DATA pStarCalcDoc[]; - static const sal_Char __FAR_DATA pStyleName[]; + static const sal_Char pStarCalcDoc[]; + static const sal_Char pStyleName[]; ScDocument aDocument; diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index d921c83b6ce3..fbf28b109257 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -97,32 +97,32 @@ ScFilterDetect::~ScFilterDetect() { } -static const sal_Char __FAR_DATA pFilterSc50[] = "StarCalc 5.0"; -static const sal_Char __FAR_DATA pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc40[] = "StarCalc 4.0"; -static const sal_Char __FAR_DATA pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc30[] = "StarCalc 3.0"; -static const sal_Char __FAR_DATA pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterSc10[] = "StarCalc 1.0"; -static const sal_Char __FAR_DATA pFilterXML[] = "StarOffice XML (Calc)"; -static const sal_Char __FAR_DATA pFilterAscii[] = "Text - txt - csv (StarCalc)"; -static const sal_Char __FAR_DATA pFilterLotus[] = "Lotus"; -static const sal_Char __FAR_DATA pFilterQPro6[] = "Quattro Pro 6.0"; -static const sal_Char __FAR_DATA pFilterExcel4[] = "MS Excel 4.0"; -static const sal_Char __FAR_DATA pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel5[] = "MS Excel 5.0/95"; -static const sal_Char __FAR_DATA pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel95[] = "MS Excel 95"; -static const sal_Char __FAR_DATA pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilterExcel97[] = "MS Excel 97"; -static const sal_Char __FAR_DATA pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; -static const sal_Char __FAR_DATA pFilter2003XML[] = "MS Excel 2003 XML"; -static const sal_Char __FAR_DATA pFilterDBase[] = "dBase"; -static const sal_Char __FAR_DATA pFilterDif[] = "DIF"; -static const sal_Char __FAR_DATA pFilterSylk[] = "SYLK"; -static const sal_Char __FAR_DATA pFilterHtml[] = "HTML (StarCalc)"; -static const sal_Char __FAR_DATA pFilterHtmlWeb[] = "calc_HTML_WebQuery"; -static const sal_Char __FAR_DATA pFilterRtf[] = "Rich Text Format (StarCalc)"; +static const sal_Char pFilterSc50[] = "StarCalc 5.0"; +static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template"; +static const sal_Char pFilterSc40[] = "StarCalc 4.0"; +static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template"; +static const sal_Char pFilterSc30[] = "StarCalc 3.0"; +static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template"; +static const sal_Char pFilterSc10[] = "StarCalc 1.0"; +static const sal_Char pFilterXML[] = "StarOffice XML (Calc)"; +static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)"; +static const sal_Char pFilterLotus[] = "Lotus"; +static const sal_Char pFilterQPro6[] = "Quattro Pro 6.0"; +static const sal_Char pFilterExcel4[] = "MS Excel 4.0"; +static const sal_Char pFilterEx4Temp[] = "MS Excel 4.0 Vorlage/Template"; +static const sal_Char pFilterExcel5[] = "MS Excel 5.0/95"; +static const sal_Char pFilterEx5Temp[] = "MS Excel 5.0/95 Vorlage/Template"; +static const sal_Char pFilterExcel95[] = "MS Excel 95"; +static const sal_Char pFilterEx95Temp[] = "MS Excel 95 Vorlage/Template"; +static const sal_Char pFilterExcel97[] = "MS Excel 97"; +static const sal_Char pFilterEx97Temp[] = "MS Excel 97 Vorlage/Template"; +static const sal_Char pFilter2003XML[] = "MS Excel 2003 XML"; +static const sal_Char pFilterDBase[] = "dBase"; +static const sal_Char pFilterDif[] = "DIF"; +static const sal_Char pFilterSylk[] = "SYLK"; +static const sal_Char pFilterHtml[] = "HTML (StarCalc)"; +static const sal_Char pFilterHtmlWeb[] = "calc_HTML_WebQuery"; +static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; static BOOL lcl_MayBeAscii( SvStream& rStream ) diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index b942c7dd9f11..c96e7e4b851e 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -247,7 +247,7 @@ struct ProvNamesId_Type sal_uInt16 nType; }; -static const ProvNamesId_Type __FAR_DATA aProvNamesId[] = +static const ProvNamesId_Type aProvNamesId[] = { { "com.sun.star.sheet.Spreadsheet", SC_SERVICE_SHEET }, { "com.sun.star.text.TextField.URL", SC_SERVICE_URLFIELD }, @@ -315,7 +315,7 @@ static const ProvNamesId_Type __FAR_DATA aProvNamesId[] = // in case some macro is still using them // -static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = +static const sal_Char* aOldNames[SC_SERVICE_COUNT] = { "", // SC_SERVICE_SHEET "stardiv.one.text.TextField.URL", // SC_SERVICE_URLFIELD |