Resolves: #i119985# date/time is displayed as different language

(cherry picked from commit 977a0503) Change-Id: I1f31f6731353b2d8b8fd684fc6ea29becfd4a814

Resolves: #i119985# date/time is displayed as different language
(cherry picked from commit 977a0503) Change-Id: I1f31f6731353b2d8b8fd684fc6ea29becfd4a814
3b45f92b · Zhe Wang · Caolán McNamara · 8a5ad76b · 3b45f92b
Kaydet (Commit) 3b45f92b authored Haz 25, 2012 tarafından Zhe Wang Kaydeden (comit) Caolán McNamara Şub 23, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

headerfooterdlg.cxx sd/source/ui/dlg/headerfooterdlg.cxx +3 -3

No files found.
--- 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;
                        }