basctl/source/dlged/managelang.cxx | 14 ++++++--------
basctl/source/inc/managelang.hxx | 12 ++++++------
2 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit 98fd966d0c2c46b51b84da26cdb4bc5ac81e0372
Author: August Sodora <aug...@gmail.com>
Date: Wed Nov 30 22:03:58 2011 -0500
Remove unnecessary includes
diff --git a/basctl/source/dlged/managelang.cxx
b/basctl/source/dlged/managelang.cxx
index feeabbd..d41ed42 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -26,24 +26,23 @@
*
************************************************************************/
-
#include "basidesh.hxx"
#include "basobj.hxx"
-#include "dlgresid.hrc"
#include "iderdll.hxx"
#include "iderid.hxx"
#include "localizationmgr.hxx"
#include "managelang.hxx"
-#include "managelang.hrc"
+#include "dlgresid.hrc"
#include "helpid.hrc"
+#include "managelang.hrc"
-#include <com/sun/star/i18n/XBreakIterator.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <comphelper/string.hxx>
#include <editeng/unolingu.hxx>
#include <sfx2/bindings.hxx>
#include <svtools/langtab.hxx>
+#include <svx/langbox.hxx>
#include <vcl/unohelp.hxx>
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 6d81efd..f9f9dba 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -29,13 +29,13 @@
#ifndef _BASCTL_MANAGELANG_HXX
#define _BASCTL_MANAGELANG_HXX
-#include <svx/langbox.hxx>
#include <svx/checklbx.hxx>
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
class LocalizationMgr;
+class SvxLanguageBox;
struct LanguageEntry
{
commit b291c3a1f2d0595096d671c8f6d2812caa993f83
Author: August Sodora <aug...@gmail.com>
Date: Wed Nov 30 21:56:20 2011 -0500
String->OUString
diff --git a/basctl/source/dlged/managelang.cxx
b/basctl/source/dlged/managelang.cxx
index a83c62c..feeabbd 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -100,10 +100,9 @@ ManageLanguageDialog::ManageLanguageDialog( Window*
pParent, LocalizationMgr* _p
m_aHelpBtn ( this, IDEResId( PB_HELP ) ),
m_aCloseBtn ( this, IDEResId( PB_CLOSE ) ),
m_pLocalizationMgr ( _pLMgr ),
- m_sDefLangStr ( IDEResId( STR_DEF_LANG ) ),
- m_sDeleteStr ( IDEResId( STR_DELETE ) ),
- m_sCreateLangStr ( IDEResId( STR_CREATE_LANG ) )
-
+ m_sDefLangStr (ResId::toString(IDEResId(STR_DEF_LANG))),
+ m_sDeleteStr (ResId::toString(IDEResId(STR_DELETE))),
+ m_sCreateLangStr (ResId::toString(IDEResId(STR_CREATE_LANG)))
{
FreeResource();
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index d31188f..6d81efd 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -39,11 +39,11 @@ class LocalizationMgr;
struct LanguageEntry
{
- String m_sLanguage;
+ ::rtl::OUString m_sLanguage;
::com::sun::star::lang::Locale m_aLocale;
bool m_bIsDefault;
- LanguageEntry( const String& _rLanguage,
+ LanguageEntry( const ::rtl::OUString& _rLanguage,
const ::com::sun::star::lang::Locale& _rLocale,
bool _bIsDefault ) :
m_sLanguage( _rLanguage ),
@@ -70,9 +70,9 @@ private:
LocalizationMgr* m_pLocalizationMgr;
- String m_sDefLangStr;
- String m_sDeleteStr;
- String m_sCreateLangStr;
+ ::rtl::OUString m_sDefLangStr;
+ ::rtl::OUString m_sDeleteStr;
+ ::rtl::OUString m_sCreateLangStr;
void Init();
void CalcInfoSize();
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
