Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
7531f838
Kaydet (Commit)
7531f838
authored
Nis 17, 2014
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
we don't even need an instance of SvtLanguageTable at SvxLanguageBox
Change-Id: I7ccefc73d7f6e5b7c41d6819ae13116af9d5b5ef
üst
2580b5dd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
langbox.hxx
include/svx/langbox.hxx
+0
-1
langbox.cxx
svx/source/dialog/langbox.cxx
+4
-6
No files found.
include/svx/langbox.hxx
Dosyayı görüntüle @
7531f838
...
@@ -57,7 +57,6 @@ private:
...
@@ -57,7 +57,6 @@ private:
Image
m_aCheckedImage
;
Image
m_aCheckedImage
;
OUString
m_aAllString
;
OUString
m_aAllString
;
com
::
sun
::
star
::
uno
::
Sequence
<
sal_Int16
>
*
m_pSpellUsedLang
;
com
::
sun
::
star
::
uno
::
Sequence
<
sal_Int16
>
*
m_pSpellUsedLang
;
SvtLanguageTable
*
m_pLangTable
;
sal_Int16
m_nLangList
;
sal_Int16
m_nLangList
;
bool
m_bHasLangNone
;
bool
m_bHasLangNone
;
bool
m_bLangNoneIsLangAll
;
bool
m_bLangNoneIsLangAll
;
...
...
svx/source/dialog/langbox.cxx
Dosyayı görüntüle @
7531f838
...
@@ -143,7 +143,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pPar
...
@@ -143,7 +143,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pPar
void
SvxLanguageBox
::
Init
()
void
SvxLanguageBox
::
Init
()
{
{
m_pLangTable
=
new
SvtLanguageTable
;
m_aNotCheckedImage
=
Image
(
SVX_RES
(
RID_SVXIMG_NOTCHECKED
)
);
m_aNotCheckedImage
=
Image
(
SVX_RES
(
RID_SVXIMG_NOTCHECKED
)
);
m_aCheckedImage
=
Image
(
SVX_RES
(
RID_SVXIMG_CHECKED
)
);
m_aCheckedImage
=
Image
(
SVX_RES
(
RID_SVXIMG_CHECKED
)
);
m_aAllString
=
SVX_RESSTR
(
RID_SVXSTR_LANGUAGE_ALL
);
m_aAllString
=
SVX_RESSTR
(
RID_SVXSTR_LANGUAGE_ALL
);
...
@@ -180,7 +179,6 @@ void SvxLanguageBox::Init()
...
@@ -180,7 +179,6 @@ void SvxLanguageBox::Init()
SvxLanguageBox
::~
SvxLanguageBox
()
SvxLanguageBox
::~
SvxLanguageBox
()
{
{
delete
m_pSpellUsedLang
;
delete
m_pSpellUsedLang
;
delete
m_pLangTable
;
}
}
...
@@ -340,7 +338,7 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_
...
@@ -340,7 +338,7 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_
return
nAt
;
return
nAt
;
}
}
OUString
aStrEntry
=
m_pLangTable
->
Get
String
(
nLang
);
OUString
aStrEntry
=
SvtLanguageTable
::
GetLanguage
String
(
nLang
);
if
(
LANGUAGE_NONE
==
nLang
&&
m_bHasLangNone
&&
m_bLangNoneIsLangAll
)
if
(
LANGUAGE_NONE
==
nLang
&&
m_bHasLangNone
&&
m_bLangNoneIsLangAll
)
aStrEntry
=
m_aAllString
;
aStrEntry
=
m_aAllString
;
...
@@ -349,11 +347,11 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_
...
@@ -349,11 +347,11 @@ sal_Int32 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_
{
{
nRealLang
=
MsLangId
::
resolveSystemLanguageByScriptType
(
nRealLang
,
nType
);
nRealLang
=
MsLangId
::
resolveSystemLanguageByScriptType
(
nRealLang
,
nType
);
aStrEntry
+=
" - "
;
aStrEntry
+=
" - "
;
aStrEntry
+=
m_pLangTable
->
Get
String
(
nRealLang
);
aStrEntry
+=
SvtLanguageTable
::
GetLanguage
String
(
nRealLang
);
}
else
if
(
nRealLang
==
LANGUAGE_USER_SYSTEM_CONFIG
)
{
}
else
if
(
nRealLang
==
LANGUAGE_USER_SYSTEM_CONFIG
)
{
nRealLang
=
MsLangId
::
getSystemLanguage
();
nRealLang
=
MsLangId
::
getSystemLanguage
();
aStrEntry
+=
" - "
;
aStrEntry
+=
" - "
;
aStrEntry
+=
m_pLangTable
->
Get
String
(
nRealLang
);
aStrEntry
+=
SvtLanguageTable
::
GetLanguage
String
(
nRealLang
);
}
}
aStrEntry
=
ApplyLreOrRleEmbedding
(
aStrEntry
);
aStrEntry
=
ApplyLreOrRleEmbedding
(
aStrEntry
);
...
@@ -411,7 +409,7 @@ sal_Int32 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
...
@@ -411,7 +409,7 @@ sal_Int32 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
return
nAt
;
return
nAt
;
}
}
OUString
aStrEntry
=
m_pLangTable
->
Get
String
(
nLang
);
OUString
aStrEntry
=
SvtLanguageTable
::
GetLanguage
String
(
nLang
);
if
(
LANGUAGE_NONE
==
nLang
&&
m_bHasLangNone
&&
m_bLangNoneIsLangAll
)
if
(
LANGUAGE_NONE
==
nLang
&&
m_bHasLangNone
&&
m_bLangNoneIsLangAll
)
aStrEntry
=
m_aAllString
;
aStrEntry
=
m_aAllString
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment