undoing r273933 which was accidently commited on master m51ooo/DEV300_m51

10 files changed, 6 insertions, 92 deletions

diff --git a/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu b/configmgr/qa/unit/data/org/openoffice/UI/GenericCommands.xcu
index d34db7424c..512b759478 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 @@
           <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Lowercase</value>
         </prop>
       </node>
-      <node oor:name=".uno:ChangeCaseToSentenceCase" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Sentence Case</value>
-        </prop>
-      </node>
       <node oor:name=".uno:ChangeCaseToHalfWidth" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="x-no-translate"></value><value xml:lang="en-US">H~alf-width</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index f3b6bede57..23caee9af1 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 @@
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ChangeCaseToSentenceCase" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Sentence case</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
-                </prop>
-            </node>
             <node oor:name=".uno:ChangeCaseToHalfWidth" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">H~alf-width</value>
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 9811df04dd..327bd45d53 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -1355,13 +1355,6 @@
                 };\
                 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" ; \
                     HelpID = SID_TRANSLITERATE_HALFWIDTH; \
diff --git a/svx/inc/svx/svxenum.hxx b/svx/inc/svx/svxenum.hxx
index 429f595766..d2f2530f27 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 a1e9349a5e..4bfad86fba 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 3172138d10..a69aae4cf9 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1483,31 +1483,6 @@ SfxVoidItem ChangeCaseToLower SID_TRANSLITERATE_LOWER
 ]
 
 //--------------------------------------------------------------------------
-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 4961b1c66a..9650864679 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 76515fc945..19ad1e0904 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 ed3225d58c..98c911c8a8 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 cabc6ffa21..32e8b9f617 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);