From 25c459e8b631e6e1ca8357e806560bf7b7d3b2d4 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Mon, 13 Jul 2009 12:48:12 +0000 Subject: undoing r273933 which was accidently commited on master m51 --- .../data/org/openoffice/UI/GenericCommands.xcu | 5 --- .../org/openoffice/Office/UI/GenericCommands.xcu | 8 ----- svx/inc/globlmn_tmpl.hrc | 7 ---- svx/inc/svx/svxenum.hxx | 1 - svx/inc/svx/svxids.hrc | 4 +-- svx/sdi/svx.sdi | 25 -------------- svx/sdi/svxitems.sdi | 1 - svx/source/cui/chardlg.src | 3 -- svx/source/items/svxfont.cxx | 40 +++------------------- svx/source/items/textitem.cxx | 2 -- 10 files changed, 5 insertions(+), 91 deletions(-) diff --git a/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu b/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu index af4fa2ed018f..f066fb0b96dc 100644 --- a/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu +++ b/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu @@ -2097,11 +2097,6 @@ ~Lowercase - - - ~Sentence Case - - H~alf-width diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index f3b6bede57f2..23caee9af12d 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -2122,14 +2122,6 @@ 1 - - - ~Sentence case - - - 1 - - H~alf-width diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 6b7a9f405872..d40ca4de1876 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -1354,13 +1354,6 @@ Text [ en-US ] = "~Lowercase";\ };\ MenuItem\ - {\ - Identifier = SID_TRANSLITERATE_SENTENCE_CASE; \ - Command = ".uno:ChangeCaseToSentenceCase" ; \ - HelpID = SID_TRANSLITERATE_SENTENCE_CASE; \ - Text [ en-US ] = "~Sentence case";\ - };\ - MenuItem\ {\ Identifier = SID_TRANSLITERATE_HALFWIDTH; \ Command = ".uno:ChangeCaseToHalfWidth" ; \ diff --git a/svx/inc/svx/svxenum.hxx b/svx/inc/svx/svxenum.hxx index b70ec600b59d..01a7d80d1351 100644 --- a/svx/inc/svx/svxenum.hxx +++ b/svx/inc/svx/svxenum.hxx @@ -39,7 +39,6 @@ enum SvxCaseMap SVX_CASEMAP_GEMEINE, SVX_CASEMAP_TITEL, SVX_CASEMAP_KAPITAELCHEN, - SVX_CASEMAP_SENTENCE, SVX_CASEMAP_END }; diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index c741f185a41b..d7c018bedaac 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -1347,11 +1347,9 @@ #define SID_CHAR_DLG_PREVIEW_STRING (SID_SVX_START+1090) #define SID_RECHECK_DOCUMENT (SID_SVX_START+1091) #define SID_ATTR_PARA_OUTLINE_LEVEL (SID_SVX_START+1092) -#define SID_TRANSLITERATE_SENTENCE_CASE (SID_SVX_START+1093) - // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id -#define SID_SVX_FIRSTFREE SID_TRANSLITERATE_SENTENCE_CASE + 1 +#define SID_SVX_FIRSTFREE SID_ATTR_PARA_OUTLINE_LEVEL + 1 // -------------------------------------------------------------------------- // Overflow check for slot IDs diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 3172138d1065..a69aae4cf9fd 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -1482,31 +1482,6 @@ SfxVoidItem ChangeCaseToLower SID_TRANSLITERATE_LOWER GroupId = GID_FORMAT; ] -//-------------------------------------------------------------------------- -SfxVoidItem ChangeCaseToSentenceCase SID_TRANSLITERATE_SENTENCE_CASE -() -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = TRUE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_FORMAT; -] - //-------------------------------------------------------------------------- SfxVoidItem ChangeCaseToUpper SID_TRANSLITERATE_UPPER () diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index 11f3b756f8ed..795f2aea1177 100644 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi @@ -170,7 +170,6 @@ enum SvxCaseMap SVX_CASEMAP_VERSALIEN, SVX_CASEMAP_GEMEINE, SVX_CASEMAP_TITEL, - SVX_CASEMAP_SENTENCE, SVX_CASEMAP_KAPITAELCHEN, SVX_CASEMAP_END }; diff --git a/svx/source/cui/chardlg.src b/svx/source/cui/chardlg.src index d8c8c662aa5a..19ad1e090435 100644 --- a/svx/source/cui/chardlg.src +++ b/svx/source/cui/chardlg.src @@ -402,9 +402,6 @@ TabPage RID_SVXPAGE_CHAR_EFFECTS < "Lowercase" ; Default ; > ; < "Title" ; Default ; > ; < "Small capitals" ; Default ; > ; -//#i1601: This specific change would be a file-format change -// and thus needs to be approved by OASIS before being activated -// < "Sentence" ; Default ; > ; }; }; FixedText FT_RELIEF diff --git a/svx/source/items/svxfont.cxx b/svx/source/items/svxfont.cxx index e4438d494b93..1ce7190393a7 100644 --- a/svx/source/items/svxfont.cxx +++ b/svx/source/items/svxfont.cxx @@ -176,49 +176,17 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const bBlank = TRUE; else { - String aTemp( aTxt.GetChar( i ) ); - if( bBlank ) + if( bBlank ) { + String aTemp( aTxt.GetChar( i ) ); aCharClass.toUpper( aTemp ); - bBlank = FALSE; - - } - else - { - aCharClass.toLower( aTemp ); + aTxt.Replace( i, 1, aTemp ); } - aTxt.Replace( i, 1, aTemp ); - + bBlank = FALSE; } } break; } - case SVX_CASEMAP_SENTENCE: - { - // SENTENCE CASE - BOOL bPoint = TRUE; - - for( USHORT i = 0; i < aTxt.Len(); ++i ) - { - sal_Unicode c = aTxt.GetChar(i); - if( sal_Unicode('.') == c || sal_Unicode('!') == c || sal_Unicode('?') == c ) - bPoint = TRUE; - else if( sal_Unicode(' ') == c || sal_Unicode('\t') == c ) - ; - else - { - if( bPoint ) - { - String aTemp( c ); - aCharClass.toUpper( aTemp ); - aTxt.Replace( i, 1, aTemp ); - } - bPoint = FALSE; - } - } - break; - } - default: { DBG_ASSERT(!this, "SvxFont::CaseMapTxt: unknown casemap"); diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx index b1aeb3608b9f..50c18cd14b17 100644 --- a/svx/source/items/textitem.cxx +++ b/svx/source/items/textitem.cxx @@ -2378,7 +2378,6 @@ sal_Bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const case SVX_CASEMAP_VERSALIEN : nRet = style::CaseMap::UPPERCASE; break; case SVX_CASEMAP_GEMEINE : nRet = style::CaseMap::LOWERCASE; break; case SVX_CASEMAP_TITEL : nRet = style::CaseMap::TITLE ; break; - case SVX_CASEMAP_SENTENCE : nRet = style::CaseMap::SENTENCE ; break; case SVX_CASEMAP_KAPITAELCHEN: nRet = style::CaseMap::SMALLCAPS; break; } rVal <<= (sal_Int16)(nRet); @@ -2399,7 +2398,6 @@ sal_Bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) case style::CaseMap::UPPERCASE: nVal = SVX_CASEMAP_VERSALIEN ; break; case style::CaseMap::LOWERCASE: nVal = SVX_CASEMAP_GEMEINE ; break; case style::CaseMap::TITLE : nVal = SVX_CASEMAP_TITEL ; break; - case style::CaseMap::SENTENCE : nVal = SVX_CASEMAP_SENTENCE ; break; case style::CaseMap::SMALLCAPS: nVal = SVX_CASEMAP_KAPITAELCHEN; break; } SetValue(nVal); -- cgit