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
e0480c81
Kaydet (Commit)
e0480c81
authored
May 23, 2014
tarafından
Eike Rathke
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
do not store invalid date acceptance patterns in configuration
Change-Id: I78cd8b304db2243fd105d4b13421b6ea0347e042
üst
3d79d4ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
optgdlg.cxx
cui/source/options/optgdlg.cxx
+5
-1
optgdlg.hxx
cui/source/options/optgdlg.hxx
+2
-0
No files found.
cui/source/options/optgdlg.cxx
Dosyayı görüntüle @
e0480c81
...
@@ -1298,7 +1298,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
...
@@ -1298,7 +1298,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// Configured date acceptance patterns, for example Y-M-D;M-D or empty for
// Configured date acceptance patterns, for example Y-M-D;M-D or empty for
// locale default.
// locale default.
if
(
m_pDatePatternsED
->
IsValueChangedFromSaved
())
if
(
m_
bDatePatternsValid
&&
m_
pDatePatternsED
->
IsValueChangedFromSaved
())
pLangConfig
->
aSysLocaleOptions
.
SetDatePatternsConfigString
(
m_pDatePatternsED
->
GetText
());
pLangConfig
->
aSysLocaleOptions
.
SetDatePatternsConfigString
(
m_pDatePatternsED
->
GetText
());
SfxObjectShell
*
pCurrentDocShell
=
SfxObjectShell
::
Current
();
SfxObjectShell
*
pCurrentDocShell
=
SfxObjectShell
::
Current
();
...
@@ -1463,6 +1463,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
...
@@ -1463,6 +1463,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
const
LocaleDataWrapper
&
rLocaleWrapper
(
Application
::
GetSettings
().
GetLocaleDataWrapper
()
);
const
LocaleDataWrapper
&
rLocaleWrapper
(
Application
::
GetSettings
().
GetLocaleDataWrapper
()
);
aDatePatternsString
=
lcl_getDatePatternsConfigString
(
rLocaleWrapper
);
aDatePatternsString
=
lcl_getDatePatternsConfigString
(
rLocaleWrapper
);
}
}
// Let's assume patterns are valid at this point.
m_bDatePatternsValid
=
true
;
m_pDatePatternsED
->
SetText
(
aDatePatternsString
);
m_pDatePatternsED
->
SetText
(
aDatePatternsString
);
bReadonly
=
pLangConfig
->
aSysLocaleOptions
.
IsReadOnly
(
SvtSysLocaleOptions
::
E_DATEPATTERNS
);
bReadonly
=
pLangConfig
->
aSysLocaleOptions
.
IsReadOnly
(
SvtSysLocaleOptions
::
E_DATEPATTERNS
);
m_pDatePatternsED
->
Enable
(
!
bReadonly
);
m_pDatePatternsED
->
Enable
(
!
bReadonly
);
...
@@ -1659,6 +1661,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
...
@@ -1659,6 +1661,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
// update the date acceptance patterns
// update the date acceptance patterns
OUString
aDatePatternsString
=
lcl_getDatePatternsConfigString
(
aLocaleWrapper
);
OUString
aDatePatternsString
=
lcl_getDatePatternsConfigString
(
aLocaleWrapper
);
m_bDatePatternsValid
=
true
;
m_pDatePatternsED
->
SetText
(
aDatePatternsString
);
m_pDatePatternsED
->
SetText
(
aDatePatternsString
);
return
0
;
return
0
;
...
@@ -1770,6 +1773,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
...
@@ -1770,6 +1773,7 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
pEd
->
SetControlForeground
(
::
Color
(
RGB_COLORDATA
(
0xf0
,
0
,
0
)));
pEd
->
SetControlForeground
(
::
Color
(
RGB_COLORDATA
(
0xf0
,
0
,
0
)));
#endif
#endif
}
}
m_bDatePatternsValid
=
bValid
;
return
0
;
return
0
;
}
}
...
...
cui/source/options/optgdlg.hxx
Dosyayı görüntüle @
e0480c81
...
@@ -157,6 +157,8 @@ class OfaLanguagesTabPage : public SfxTabPage
...
@@ -157,6 +157,8 @@ class OfaLanguagesTabPage : public SfxTabPage
OUString
m_sUserLocaleValue
;
OUString
m_sUserLocaleValue
;
OUString
m_sSystemDefaultString
;
OUString
m_sSystemDefaultString
;
bool
m_bDatePatternsValid
;
DECL_LINK
(
SupportHdl
,
CheckBox
*
)
;
DECL_LINK
(
SupportHdl
,
CheckBox
*
)
;
DECL_LINK
(
LocaleSettingHdl
,
SvxLanguageBox
*
)
;
DECL_LINK
(
LocaleSettingHdl
,
SvxLanguageBox
*
)
;
DECL_LINK
(
DatePatternsHdl
,
Edit
*
)
;
DECL_LINK
(
DatePatternsHdl
,
Edit
*
)
;
...
...
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