User: hr      
Date: 2007-08-02 14:29:41+0000
Modified:
   dba/reportdesign/source/core/api/FormattedField.cxx

Log:
 INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED
 2007/07/11 10:31:00 oj 1.2.2.1: #i78377# reportdefinition now is a 
numberformatssupplier as ell

File Changes:

Directory: /dba/reportdesign/source/core/api/
=============================================

File [changed]: FormattedField.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/FormattedField.cxx?r1=1.2&r2=1.3
Delta lines:  +12 -8
--------------------
--- FormattedField.cxx  2007-07-09 11:56:14+0000        1.2
+++ FormattedField.cxx  2007-08-02 14:29:38+0000        1.3
@@ -295,9 +295,13 @@
        ::osl::MutexGuard aGuard(m_aMutex);
        if ( !m_xFormatsSupplier.is() )
        {
+        uno::Reference< report::XSection> xSection = getSection();
+        if ( xSection.is() )
+            
m_xFormatsSupplier.set(xSection->getReportDefinition(),uno::UNO_QUERY);
+        if ( !m_xFormatsSupplier.is() )
+           {
                uno::Reference< beans::XPropertySet> 
xProp(::dbtools::findDataSource(getParent()),uno::UNO_QUERY);
                if ( xProp.is() )
-               {
                        
m_xFormatsSupplier.set(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatsSupplier"))),uno::UNO_QUERY);
                }
        }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to