[Libreoffice-commits] core.git: 2 commits - include/svl svl/source sw/source
Tor Lillqvist
tml at iki.fi
Mon Aug 12 12:59:57 PDT 2013
include/svl/inettype.hxx | 16 ---------------
svl/source/misc/inettype.cxx | 39 --------------------------------------
sw/source/filter/html/parcss1.cxx | 2 -
3 files changed, 1 insertion(+), 56 deletions(-)
New commits:
commit 95aaa3a727d930330f7b397f8baf30943e3eb9a6
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 12 22:36:54 2013 +0300
WaE: rewrite call of rtl::OUString::equalsIgnoreAsciiCaseAscii ... [loplugin]
Change-Id: I6875299a36a80e345dfeca5fcf3230b8deb49dd2
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index b294979..c498db9 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -255,7 +255,7 @@ CSS1Token CSS1Parser::GetNextToken()
aToken += sTmpBuffer.makeStringAndClear();
if( ( 'i'==aToken[0] || 'I'==aToken[0] ) &&
- aToken.equalsIgnoreAsciiCaseAscii( "important" ) )
+ aToken.equalsIgnoreAsciiCase( "important" ) )
{
// '!' 'important'
nRet = CSS1_IMPORTANT_SYM;
commit f371e16cfc1f7910ee045c92afbb9ca8f1213b1e
Author: Tor Lillqvist <tml at iki.fi>
Date: Mon Aug 12 15:54:47 2013 +0300
Start removing obviously unused and/or obsolete "inet types": SCHEDULE stuff
Change-Id: I8dc641a4f75e35020522daa8fcb1f8be2ee4fb4a
diff --git a/include/svl/inettype.hxx b/include/svl/inettype.hxx
index 48fca19..f155476 100644
--- a/include/svl/inettype.hxx
+++ b/include/svl/inettype.hxx
@@ -55,11 +55,6 @@
#define CONTENT_TYPE_STR_APP_MSPPOINT "application/x-mspowerpoint"
#define CONTENT_TYPE_STR_APP_MSWORD_TEMPL "application/x-msword-template"
#define CONTENT_TYPE_STR_APP_MSWORD "application/x-msword"
-#define CONTENT_TYPE_STR_APP_SCHEDULE_EVT "application/x-schedule-event"
-#define CONTENT_TYPE_STR_APP_SCHEDULE_FEVT "application/x-schedule-form-event"
-#define CONTENT_TYPE_STR_APP_SCHEDULE_FTASK "application/x-schedule-form-task"
-#define CONTENT_TYPE_STR_APP_SCHEDULE_TASK "application/x-schedule-task"
-#define CONTENT_TYPE_STR_APP_SCHEDULE_CMB "application/x-schedule"
#define CONTENT_TYPE_STR_APP_STARCALC "application/x-starcalc"
#define CONTENT_TYPE_STR_APP_STARCHART "application/x-starchart"
#define CONTENT_TYPE_STR_APP_STARDRAW "application/x-stardraw"
@@ -120,7 +115,6 @@
//============================================================================
/** Definitions for matching parts of URIs.
*/
-#define INETTYPE_URL_PROT_COMPONENT ".component"
#define INETTYPE_URL_PROT_DATA "data"
#define INETTYPE_URL_PROT_FILE "file"
#define INETTYPE_URL_PROT_HTTP "http"
@@ -139,16 +133,11 @@
#define INETTYPE_URL_SSUB_SIMAGE "simage"
#define INETTYPE_URL_SSUB_SIMPRESS "simpress"
#define INETTYPE_URL_SSUB_SMATH "smath"
-#define INETTYPE_URL_SSUB_SS "ss"
#define INETTYPE_URL_SSUB_SWRITER "swriter"
#define INETTYPE_URL_SSSUB_GLOB "GlobalDocument"
#define INETTYPE_URL_SSSUB_WEB "web"
-#define INETTYPE_URL_SCHED_CMB "cmbview"
-#define INETTYPE_URL_SCHED_FORM "formular"
-#define INETTYPE_URL_SCHED_TASK "type=task"
-
//============================================================================
enum INetContentType
{
@@ -206,11 +195,6 @@ enum INetContentType
CONTENT_TYPE_APP_VND_WRITER,
CONTENT_TYPE_APP_VND_WRITER_GLOBAL,
CONTENT_TYPE_APP_VND_WRITER_WEB,
- CONTENT_TYPE_APP_SCHEDULE,
- CONTENT_TYPE_APP_SCHEDULE_EVT,
- CONTENT_TYPE_APP_SCHEDULE_TASK,
- CONTENT_TYPE_APP_SCHEDULE_FORM_EVT,
- CONTENT_TYPE_APP_SCHEDULE_FORM_TASK,
CONTENT_TYPE_APP_FRAMESET,
CONTENT_TYPE_APP_MACRO,
CONTENT_TYPE_X_CNT_FSYSSPECIALFOLDER,
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index bc485fe..ba5fea9 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -173,16 +173,6 @@ MediaTypeEntry const aStaticTypeNameMap[CONTENT_TYPE_LAST + 1]
{ CONTENT_TYPE_STR_APP_MSWORD, CONTENT_TYPE_APP_MSWORD, "doc" },
{ CONTENT_TYPE_STR_APP_MSWORD_TEMPL, CONTENT_TYPE_APP_MSWORD_TEMPL,
"dot" },
- { CONTENT_TYPE_STR_APP_SCHEDULE_CMB, CONTENT_TYPE_APP_SCHEDULE,
- "tmp" },
- { CONTENT_TYPE_STR_APP_SCHEDULE_EVT, CONTENT_TYPE_APP_SCHEDULE_EVT,
- "tmp" },
- { CONTENT_TYPE_STR_APP_SCHEDULE_FEVT,
- CONTENT_TYPE_APP_SCHEDULE_FORM_EVT, "tmp" },
- { CONTENT_TYPE_STR_APP_SCHEDULE_FTASK,
- CONTENT_TYPE_APP_SCHEDULE_FORM_TASK, "tmp" },
- { CONTENT_TYPE_STR_APP_SCHEDULE_TASK, CONTENT_TYPE_APP_SCHEDULE_TASK,
- "tmp" },
{ CONTENT_TYPE_STR_APP_STARCALC, CONTENT_TYPE_APP_STARCALC, "sdc" },
{ CONTENT_TYPE_STR_APP_STARCHART, CONTENT_TYPE_APP_STARCHART, "sds" },
{ CONTENT_TYPE_STR_APP_STARDRAW, CONTENT_TYPE_APP_STARDRAW, "sda" },
@@ -302,12 +292,6 @@ sal_uInt16 const aStaticResourceIDMap[CONTENT_TYPE_LAST + 1]
STR_SVT_MIMETYPE_APP_STARWRITER, // CONTENT_TYPE_APP_VND_WRITER
STR_SVT_MIMETYPE_APP_STARW_GLOB, // CONTENT_TYPE_APP_VND_WRITER_GLOBAL
STR_SVT_MIMETYPE_APP_STARW_WEB, // CONTENT_TYPE_APP_VND_WRITER_WEB
- STR_SVT_MIMETYPE_SCHEDULE, // CONTENT_TYPE_APP_SCHEDULE
- STR_SVT_MIMETYPE_SCHEDULE_EVT, // CONTENT_TYPE_APP_SCHEDULE_EVT
- STR_SVT_MIMETYPE_SCHEDULE_TASK, // CONTENT_TYPE_APP_SCHEDULE_TASK
- STR_SVT_MIMETYPE_SCHEDULE_FEVT, // CONTENT_TYPE_APP_SCHEDULE_FORM_EVT
- STR_SVT_MIMETYPE_SCHEDULE_FTASK,
- // CONTENT_TYPE_APP_SCHEDULE_FORM_TASK
STR_SVT_MIMETYPE_FRAMESET, // CONTENT_TYPE_APP_FRAMESET
STR_SVT_MIMETYPE_MACRO, // CONTENT_TYPE_APP_MACRO
STR_SVT_MIMETYPE_CNT_SFSYSFOLDER,
@@ -807,29 +791,6 @@ INetContentType INetContentTypes::GetContentTypeFromURL(OUString const & rURL)
else if (aToken.equalsAscii(INETTYPE_URL_SUB_HELPID))
eTypeID = CONTENT_TYPE_APP_STARHELP;
}
- else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_COMPONENT))
- {
- aToken = rURL.getToken(1, ':'); // aToken now equals ss / *
- aToken = aToken.getToken(0, '/');
- if (aToken.equalsAscii(INETTYPE_URL_SSUB_SS))
- {
- if(rURL.indexOf(INETTYPE_URL_SCHED_CMB) < 0 && rURL.indexOf(INETTYPE_URL_SCHED_FORM) < 0)
- {
- eTypeID = CONTENT_TYPE_APP_SCHEDULE;
- }
- else
- {
- if( rURL.indexOf(INETTYPE_URL_SCHED_TASK) < 0)
- {
- eTypeID = CONTENT_TYPE_APP_SCHEDULE_EVT;
- }
- else
- {
- eTypeID = CONTENT_TYPE_APP_SCHEDULE_TASK;
- }
- }
- }
- }
else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_MAILTO))
eTypeID = CONTENT_TYPE_APP_VND_OUTTRAY;
else if (aToken.equalsIgnoreAsciiCase(INETTYPE_URL_PROT_MACRO))
More information about the Libreoffice-commits
mailing list