User: hr Date: 2007-08-02 14:36:20+0000 Modified: dba/reportdesign/source/ui/dlg/DateTime.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/16 07:30:42 lla 1.2.2.2: #i78500# insert time control only 2007/07/11 10:19:09 oj 1.2.2.1: #i78504# use own numberformatter File Changes: Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: DateTime.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/DateTime.cxx?r1=1.2&r2=1.3 Delta lines: +10 -7 -------------------- --- DateTime.cxx 2007-07-09 11:56:29+0000 1.2 +++ DateTime.cxx 2007-08-02 14:36:18+0000 1.3 @@ -178,13 +178,16 @@ try { sal_Int32 nLength = 0; - uno::Sequence<beans::PropertyValue> aValues( 4 ); + uno::Sequence<beans::PropertyValue> aValues( 5 ); aValues[nLength].Name = PROPERTY_SECTION; aValues[nLength++].Value <<= m_xHoldAlive; - aValues[nLength].Name = PROPERTY_STATE; + aValues[nLength].Name = PROPERTY_TIME_STATE; aValues[nLength++].Value <<= m_aTime.IsChecked(); + aValues[nLength].Name = PROPERTY_DATE_STATE; + aValues[nLength++].Value <<= m_aDate.IsChecked(); + aValues[nLength].Name = PROPERTY_FORMATKEYDATE; aValues[nLength++].Value <<= getFormatKey(getFormatIndex(sal_True)); @@ -204,7 +207,7 @@ ::rtl::OUString ODateTimeDialog::getFormatString(::sal_Int16 _nNumberFormatIndex) { DBG_CHKTHIS( rpt_ODateTimeDialog,NULL); - uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getNumberFormatter(); + uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter(); uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats(); uno::Reference< util::XNumberFormatTypes> xNumType(xFormats,uno::UNO_QUERY); sal_Int32 nFormatKey = xNumType->getFormatIndex(_nNumberFormatIndex,m_nLocale); @@ -272,7 +275,7 @@ // ----------------------------------------------------------------------------- sal_Int32 ODateTimeDialog::getFormatKey(::sal_Int16 _nNumberFormatIndex) { - uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getNumberFormatter(); + uno::Reference< util::XNumberFormatter> xNumberFormatter = m_pController->getReportNumberFormatter(); uno::Reference< util::XNumberFormats> xFormats = xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats(); uno::Reference< util::XNumberFormatTypes> xNumType(xFormats,uno::UNO_QUERY); return xNumType->getFormatIndex(_nNumberFormatIndex,m_nLocale); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
