diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-06-25 05:24:31 +0000 |
|---|---|---|
| committer | Zhe Wang <wangzcdl@apache.org> | 2012-06-25 05:24:31 +0000 |
| commit | 977a050343fc836fc3e7bd876afaee931c47252c (patch) | |
| tree | 19e9f11b0d4f24342a4240bfd16c864b50644ddf /sd | |
| parent | 2a3c87a5ea5e3308a138e461dffae19483c0184c (diff) | |
for #119985#
Notes
Notes:
merged as: 3b45f92ba6659836572d366aeda2b5bcedcae7f0
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 5e5e5f809409..79de97d740fe 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -729,7 +729,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 ) ); +// bug119985 2012.06.14 + GetOrSetDateTimeLanguage( rLanguage, bSet, mpDoc->GetMasterSdPage( 0, PK_NOTES ) ); } else { @@ -778,7 +779,8 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo if( aFieldInfo.pFieldItem ) { const SvxFieldData* pFieldData = aFieldInfo.pFieldItem->GetField(); - if( pFieldData && pFieldData->ISA( SvxDateTimeField ) ) +// bug119985 2012.06.14 + if( pFieldData && (pFieldData->ISA( SvxDateTimeField ) || pFieldData->ISA( SvxDateField )) ) { break; } |