undoing r273933 which was accidently commited on master m51ooo/DEV300_m51

9 files changed, 7 insertions, 55 deletions

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index d6962d1b65..57a3c1e701 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -201,7 +201,6 @@ public:
 
     // change text to Upper/Lower/Hiragana/Katagana/...
     void TransliterateText( sal_uInt32 nType );
-    void TransliterateText( const String& rModuleName );
 
     // count words in current selection
     void CountWords( SwDocStat& rStat ) const;
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 0604777ffe..b09e5f74b1 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1495,12 +1495,6 @@ interface BaseText
         StateMethod = NoState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
-    SID_TRANSLITERATE_SENTENCE_CASE
-    [
-        ExecMethod = ExecTransliteration;
-        StateMethod = NoState ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
     SID_TRANSLITERATE_HALFWIDTH
     [
         ExecMethod = ExecTransliteration;
diff --git a/sw/sdi/annotsh.sdi b/sw/sdi/annotsh.sdi
index 5ba49134fa..eb842e6ab0 100755
--- a/sw/sdi/annotsh.sdi
+++ b/sw/sdi/annotsh.sdi
@@ -194,13 +194,6 @@ interface Annotation : _Annotation
         StateMethod = NoState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
-
-    SID_TRANSLITERATE_SENTENCE_CASE
-    [
-        ExecMethod = ExecTransliteration;
-        StateMethod = NoState ;
-        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
-    ]
     
     SID_TRANSLITERATE_HALFWIDTH
     [
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 11efef9fca..0a033d9ed3 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -1179,31 +1179,6 @@ void SwEditShell::TransliterateText( sal_uInt32 nType )
     EndAllAction();
 }
 
-void SwEditShell::TransliterateText( const String& rModuleName )
-{
-    utl::TransliterationWrapper aTrans(::comphelper::getProcessServiceFactory(), 0 );
-    aTrans.loadModuleByImplName( rModuleName, LANGUAGE_SYSTEM );
-    StartAllAction();
-    SET_CURR_SHELL( this );
-
-    SwPaM* pCrsr = GetCrsr();
-    if( pCrsr->GetNext() != pCrsr )
-    {
-        GetDoc()->StartUndo(UNDO_EMPTY, NULL);
-        FOREACHPAM_START( this )
-
-        if( PCURCRSR->HasMark() )
-            GetDoc()->TransliterateText( *PCURCRSR, aTrans );
-
-        FOREACHPAM_END()
-        GetDoc()->EndUndo(UNDO_EMPTY, NULL);
-    }
-    else
-        GetDoc()->TransliterateText( *pCrsr, aTrans );
-
-    EndAllAction();
-}
-
 void SwEditShell::CountWords( SwDocStat& rStat ) const
 {
     FOREACHPAM_START( this )
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index e22dfeb02c..3f004af143 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -328,7 +328,6 @@ sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
                 case  SVX_CASEMAP_GEMEINE     : nRet = 6;break;
                 case  SVX_CASEMAP_KAPITAELCHEN: nRet = 7;break;
                 case  SVX_CASEMAP_TITEL       : nRet = 8;break;
-                case  SVX_CASEMAP_SENTENCE    : nRet = 10;break;
             }
         }
         break;
@@ -387,7 +386,6 @@ void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, sal_Bool bDelet
         case 6: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_GEMEINE      ; break;
         case 7: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_KAPITAELCHEN ; break;
         case 8: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_TITEL        ; break;
-        case 10:rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = SVX_CASEMAP_SENTENCE     ; break;
         case 9: rAttr.nItemId = SID_ATTR_BRUSH;	break;
     }
 }
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 24d9d39db6..124471389c 100755
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -34,7 +34,6 @@
 
 #include <tools/shl.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -1293,9 +1292,6 @@ void SwAnnotationShell::ExecTransliteration(SfxRequest &rReq)
             case SID_TRANSLITERATE_LOWER:
                 nMode = TransliterationModules_UPPERCASE_LOWERCASE;
                 break;
-            case SID_TRANSLITERATE_SENTENCE_CASE:
-                nMode = TransliterationModulesExtra::SENTENCE_CASE;
-                break;
             case SID_TRANSLITERATE_HALFWIDTH:
                 nMode = TransliterationModules_FULLWIDTH_HALFWIDTH;
                 break;
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index baab2e0696..7ba01b121f 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -55,7 +55,6 @@
 #include <svx/svdoutl.hxx>
 #include <unoobj.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -740,15 +739,14 @@ void SwDrawTextShell::ExecTransliteration( SfxRequest & rReq )
         case SID_TRANSLITERATE_LOWER:
             nMode = TransliterationModules_UPPERCASE_LOWERCASE;
             break;
-        case SID_TRANSLITERATE_SENTENCE_CASE:
-            nMode = TransliterationModulesExtra::SENTENCE_CASE;
-            break;
+
         case SID_TRANSLITERATE_HALFWIDTH:
             nMode = TransliterationModules_FULLWIDTH_HALFWIDTH;
             break;
         case SID_TRANSLITERATE_FULLWIDTH:
             nMode = TransliterationModules_HALFWIDTH_FULLWIDTH;
             break;
+
         case SID_TRANSLITERATE_HIRAGANA:
             nMode = TransliterationModules_KATAKANA_HIRAGANA;
             break;
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx
index b8bf1a15ca..046beba2ca 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/ui/shells/textsh.cxx
@@ -71,8 +71,9 @@
 #include <svx/htmlmode.hxx>
 #include <svx/pfiledlg.hxx>
 #include <svx/htmlcfg.hxx>
-#include <com/sun/star/i18n/TransliterationModules.hpp>
-#include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
+#ifndef _COM_SUN_STAR_I18N_TRANSLITERATIONMODULES_HDL_
+#include <com/sun/star/i18n/TransliterationModules.hdl>
+#endif
 
 #include <sot/clsids.hxx>
 #include <svx/acorrcfg.hxx>
@@ -1050,15 +1051,14 @@ void SwTextShell::ExecTransliteration( SfxRequest & rReq )
         case SID_TRANSLITERATE_LOWER:
             nMode = TransliterationModules_UPPERCASE_LOWERCASE;
             break;
-        case SID_TRANSLITERATE_SENTENCE_CASE:
-            nMode = TransliterationModulesExtra::SENTENCE_CASE;
-            break;
+
         case SID_TRANSLITERATE_HALFWIDTH:
             nMode = TransliterationModules_FULLWIDTH_HALFWIDTH;
             break;
         case SID_TRANSLITERATE_FULLWIDTH:
             nMode = TransliterationModules_HALFWIDTH_FULLWIDTH;
             break;
+
         case SID_TRANSLITERATE_HIRAGANA:
             nMode = TransliterationModules_KATAKANA_HIRAGANA;
             break;
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index d0f838e4c6..7c44f84982 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -221,7 +221,6 @@
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:ChangeCaseToUpper"/>
                     <menu:menuitem menu:id=".uno:ChangeCaseToLower"/>
-                    <menu:menuitem menu:id=".uno:ChangeCaseToSentenceCase"/>
                     <menu:menuitem menu:id=".uno:ChangeCaseToHalfWidth"/>
                     <menu:menuitem menu:id=".uno:ChangeCaseToFullWidth"/>
                     <menu:menuitem menu:id=".uno:ChangeCaseToHiragana"/>