i18n API moved from com.sun.star.lang to com.sun.star.i18n

6 files changed, 49 insertions, 48 deletions

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 5a9f678b4821..455397a47cae 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbggui.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mt $ $Date: 2000-10-23 15:17:16 $
+ *  last change: $Author: er $ $Date: 2000-10-29 17:19:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,8 +116,8 @@
 #include <dbggui.hxx>
 #endif
 
-#ifndef _COM_SUN_STAR_LANG_XCHARACTERCLASSIFICATION_HPP_
-#include <com/sun/star/lang/XCharacterClassification.hpp>
+#ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
+#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #endif
 
 #include <unohelp.hxx>
@@ -1445,7 +1445,7 @@ void DbgDialogTest( Window* pWindow )
                 if ( nAccelPos != STRING_NOTFOUND )
                 {
                     const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLocale();
-                    uno::Reference < lang::XCharacterClassification > xCharClass = vcl::unohelper::CreateCharacterClassification();
+                    uno::Reference < i18n::XCharacterClassification > xCharClass = vcl::unohelper::CreateCharacterClassification();
                     XubString aUpperText = xCharClass->toUpper( aText, 0, aText.Len(), rLocale );
                     cAccel = aUpperText.GetChar( nAccelPos+1 );
                     if ( pChild->IsVisible() )
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 769b5feb58e4..4d611a4ae6d1 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unohelp.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cp $ $Date: 2000-10-27 11:30:27 $
+ *  last change: $Author: er $ $Date: 2000-10-29 17:19:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,8 +87,8 @@
 #include <com/sun/star/text/XBreakIterator.hpp>
 #endif
 
-#ifndef _COM_SUN_STAR_LANG_XCHARACTERCLASSIFICATION_HPP_
-#include <com/sun/star/lang/XCharacterClassification.hpp>
+#ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
+#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #endif
 
 #ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_
@@ -97,6 +97,7 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 using namespace ::rtl;
@@ -246,29 +247,29 @@ uno::Reference < text::XBreakIterator > vcl::unohelper::CreateBreakIterator()
     return xB;
 }
 
-uno::Reference < lang::XCharacterClassification > vcl::unohelper::CreateCharacterClassification()
+uno::Reference < i18n::XCharacterClassification > vcl::unohelper::CreateCharacterClassification()
 {
-    uno::Reference < lang::XCharacterClassification > xB;
+    uno::Reference < i18n::XCharacterClassification > xB;
     uno::Reference< lang::XMultiServiceFactory > xMSF = ::utl::getProcessServiceFactory();
     if ( xMSF.is() )
     {
-        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.lang.CharacterClassification" ) );
+        uno::Reference < uno::XInterface > xI = xMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.i18n.CharacterClassification" ) );
         if ( xI.is() )
         {
-            uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< lang::XCharacterClassification >*)0) );
+            uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XCharacterClassification >*)0) );
             x >>= xB;
         }
     }
     if( !xB.is() )
     {
         uno::Reference< lang::XSingleServiceFactory > xSSF = ImplLoadLibComponentFactory(
-            OUString( RTL_CONSTASCII_USTRINGPARAM( LIBNAME( int ) ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.lang.CharacterClassification" ) ),
+            OUString( RTL_CONSTASCII_USTRINGPARAM( LIBNAME( int ) ) ), OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.CharacterClassification" ) ),
             Reference< XMultiServiceFactory >(), Reference< XRegistryKey >() );
 
         uno::Reference < uno::XInterface > xI = xSSF->createInstance();
         if ( xI.is() )
         {
-            uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< lang::XCharacterClassification >*)0) );
+            uno::Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XCharacterClassification >*)0) );
             x >>= xB;
         }
     }
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 5a598c72e3cb..91a630fd061f 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: field2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:05:36 $
+ *  last change: $Author: er $ $Date: 2000-10-29 17:20:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,12 +95,12 @@
 
 #include <com/sun/star/lang/Locale.hpp>
 
-#ifndef _COM_SUN_STAR_LANG_XCHARACTERCLASSIFICATION_HPP_
-#include <com/sun/star/lang/XCharacterClassification.hpp>
+#ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
+#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #endif
 
-#ifndef _COM_SUN_STAR_LANG_KCHARACTERTYPE_HPP_
-#include <com/sun/star/lang/KCharacterType.hpp>
+#ifndef _COM_SUN_STAR_I18N_KCHARACTERTYPE_HPP_
+#include <com/sun/star/i18n/KCharacterType.hpp>
 #endif
 
 #pragma hdrstop
@@ -122,18 +122,18 @@ using namespace ::com::sun::star;
 
 
 const sal_Int32 nCharClassAlphaType =
-    ::com::sun::star::lang::KCharacterType::UPPER |
-    ::com::sun::star::lang::KCharacterType::LOWER |
-    ::com::sun::star::lang::KCharacterType::TITLE_CASE;
+    ::com::sun::star::i18n::KCharacterType::UPPER |
+    ::com::sun::star::i18n::KCharacterType::LOWER |
+    ::com::sun::star::i18n::KCharacterType::TITLE_CASE;
 
 const sal_Int32 nCharClassAlphaTypeMask =
     nCharClassAlphaType |
-    ::com::sun::star::lang::KCharacterType::PRINTABLE |
-    ::com::sun::star::lang::KCharacterType::BASE_FORM;
+    ::com::sun::star::i18n::KCharacterType::PRINTABLE |
+    ::com::sun::star::i18n::KCharacterType::BASE_FORM;
 
 inline sal_Bool isAlphaType( sal_Int32 nType )
 {
-    return ((nType & nCharClassAlphaType) != 0) && (nType & ~(nCharClassAlphaTypeMask) == 0);
+    return ((nType & nCharClassAlphaType) != 0) && ((nType & ~(nCharClassAlphaTypeMask)) == 0);
 }
 
 lang::Locale CreateLocale( const International& rInt )
@@ -147,9 +147,9 @@ lang::Locale CreateLocale( const International& rInt )
     return aLocale;
 }
 
-uno::Reference< lang::XCharacterClassification > ImplGetCharClass()
+uno::Reference< i18n::XCharacterClassification > ImplGetCharClass()
 {
-    static uno::Reference< lang::XCharacterClassification > xCharClass;
+    static uno::Reference< i18n::XCharacterClassification > xCharClass;
     if ( !xCharClass.is() )
         xCharClass = vcl::unohelper::CreateCharacterClassification();
 
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index a8c45e6d7f3b..780f2cf15416 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgctrl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:05:40 $
+ *  last change: $Author: er $ $Date: 2000-10-29 17:21:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,8 +86,8 @@
 
 #include <unohelp.hxx>
 
-#ifndef _COM_SUN_STAR_LANG_XCHARACTERCLASSIFICATION_HPP_
-#include <com/sun/star/lang/XCharacterClassification.hpp>
+#ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
+#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #endif
 
 using namespace ::com::sun::star;
@@ -328,7 +328,7 @@ static Window* ImplFindAccelWindow( Window* pParent, USHORT& rIndex, xub_Unicode
     Window* pWindow;
 
     // MT: Where can we keep the CharClass?!
-    static uno::Reference< lang::XCharacterClassification > xCharClass;
+    static uno::Reference< i18n::XCharacterClassification > xCharClass;
     if ( !xCharClass.is() )
         xCharClass = vcl::unohelper::CreateCharacterClassification();
 
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index eaf3c680c85d..1cd9c46d48f6 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: menu.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mt $ $Date: 2000-10-11 16:01:47 $
+ *  last change: $Author: er $ $Date: 2000-10-29 17:21:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,8 +133,8 @@
 #include <com/sun/star/uno/Reference.h>
 #endif
 
-#ifndef _COM_SUN_STAR_LANG_XCHARACTERCLASSIFICATION_HPP_
-#include <com/sun/star/lang/XCharacterClassification.hpp>
+#ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
+#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #endif
 
 #include <unohelp.hxx>
@@ -192,7 +192,7 @@ struct MenuItemData
 
 class MenuItemList : public List
 {
-    uno::Reference< lang::XCharacterClassification > xCharClass;
+    uno::Reference< i18n::XCharacterClassification > xCharClass;
 public:
                     MenuItemList() : List( 16, 4 ) {}
                     ~MenuItemList();
@@ -211,7 +211,7 @@ public:
                         { return (MenuItemData*)List::GetObject( nPos ); }
 
     MenuItemData*   SearchItem( xub_Unicode cSelectChar, USHORT& rPos ) const;
-    uno::Reference< lang::XCharacterClassification > GetCharClass() const;
+    uno::Reference< i18n::XCharacterClassification > GetCharClass() const;
 };
 
 
@@ -305,7 +305,7 @@ MenuItemData* MenuItemList::SearchItem( xub_Unicode cSelectChar, USHORT& rPos )
     return 0;
 }
 
-uno::Reference< lang::XCharacterClassification > MenuItemList::GetCharClass() const
+uno::Reference< i18n::XCharacterClassification > MenuItemList::GetCharClass() const
 {
     if ( !xCharClass.is() )
         ((MenuItemList*)this)->xCharClass = vcl::unohelper::CreateCharacterClassification();
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index ea1b7b0cea29..23379c1e7f58 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: mnemonic.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:05:40 $
+ *  last change: $Author: er $ $Date: 2000-10-29 17:21:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,8 +68,8 @@
 
 #include <unohelp.hxx>
 
-#ifndef _COM_SUN_STAR_LANG_XCHARACTERCLASSIFICATION_HPP_
-#include <com/sun/star/lang/XCharacterClassification.hpp>
+#ifndef _COM_SUN_STAR_I18N_XCHARACTERCLASSIFICATION_HPP_
+#include <com/sun/star/i18n/XCharacterClassification.hpp>
 #endif
 
 using namespace ::com::sun::star;
@@ -128,7 +128,7 @@ sal_Unicode ImplMnemonicGenerator::ImplFindMnemonic( const XubString& rKey )
 void ImplMnemonicGenerator::RegisterMnemonic( const XubString& rKey )
 {
     const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLocale();
-    uno::Reference < lang::XCharacterClassification > xCharClass = GetCharClass();
+    uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
 
     XubString aKey = xCharClass->toUpper( rKey, 0, rKey.Len(), rLocale );
 
@@ -170,7 +170,7 @@ BOOL ImplMnemonicGenerator::CreateMnemonic( XubString& rKey )
         return FALSE;
 
     const ::com::sun::star::lang::Locale& rLocale = Application::GetSettings().GetLocale();
-    uno::Reference < lang::XCharacterClassification > xCharClass = GetCharClass();
+    uno::Reference < i18n::XCharacterClassification > xCharClass = GetCharClass();
 
     XubString aKey = xCharClass->toUpper( rKey, 0, rKey.Len(), rLocale );
 
@@ -250,7 +250,7 @@ BOOL ImplMnemonicGenerator::CreateMnemonic( XubString& rKey )
     return bChanged;
 }
 
-uno::Reference< lang::XCharacterClassification > ImplMnemonicGenerator::GetCharClass()
+uno::Reference< i18n::XCharacterClassification > ImplMnemonicGenerator::GetCharClass()
 {
     if ( !xCharClass.is() )
         xCharClass = vcl::unohelper::CreateCharacterClassification();