incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wangz...@apache.org
Subject svn commit: r1353399 - /incubator/ooo/trunk/main/sd/source/ui/dlg/headerfooterdlg.cxx
Date Mon, 25 Jun 2012 06:24:31 GMT
Author: wangzcdl
Date: Mon Jun 25 06:24:31 2012
New Revision: 1353399

URL: http://svn.apache.org/viewvc?rev=1353399&view=rev
Log:
for #119985#

Modified:
    incubator/ooo/trunk/main/sd/source/ui/dlg/headerfooterdlg.cxx

Modified: incubator/ooo/trunk/main/sd/source/ui/dlg/headerfooterdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/dlg/headerfooterdlg.cxx?rev=1353399&r1=1353398&r2=1353399&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/dlg/headerfooterdlg.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/dlg/headerfooterdlg.cxx Mon Jun 25 06:24:31 2012
@@ -729,7 +729,8 @@ void HeaderFooterTabPage::GetOrSetDateTi
 		}
 
 		// 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::GetOrSetDateTi
 					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;
 						}



Mime
View raw message