diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-06-25 05:24:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 21:01:19 +0000 |
| commit | 3b45f92ba6659836572d366aeda2b5bcedcae7f0 (patch) | |
| tree | 124d231f8c0cd5c1a866a7e9864549e99a5a87c2 /sd | |
| parent | Related: #i119985# date/time is displayed as different language (diff) | |
| download | core-3b45f92ba6659836572d366aeda2b5bcedcae7f0.tar.gz core-3b45f92ba6659836572d366aeda2b5bcedcae7f0.zip | |
Resolves: #i119985# date/time is displayed as different language
(cherry picked from commit 977a050343fc836fc3e7bd876afaee931c47252c)
Change-Id: I1f31f6731353b2d8b8fd684fc6ea29becfd4a814
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index e3efd3676396..3756d86754e3 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -638,8 +638,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo } } - // and set it, or just get it from the handout master page - GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0, PK_HANDOUT ) ); + // #i119985# and set it, or just get it from the notes master page + GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0, PK_NOTES ) ); } else { @@ -688,7 +688,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo if( aFieldInfo.pFieldItem ) { const SvxFieldData* pFieldData = aFieldInfo.pFieldItem->GetField(); - if( pFieldData && pFieldData->ISA( SvxDateTimeField ) ) + if( pFieldData && (pFieldData->ISA( SvxDateTimeField ) || pFieldData->ISA( SvxDateField )) ) { break; } |