Tag: cws_src680_reportdesign01 User: oj Date: 2007-10-11 07:46:11+0000 Modified: dba/reportdesign/source/core/api/ReportEngineJFree.cxx
Log: #i77604# reset filter and order File Changes: Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportEngineJFree.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportEngineJFree.cxx?r1=1.4.20.1&r2=1.4.20.2 Delta lines: +7 -7 ------------------- --- ReportEngineJFree.cxx 2007-10-09 09:26:47+0000 1.4.20.1 +++ ReportEngineJFree.cxx 2007-10-11 07:46:08+0000 1.4.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: ReportEngineJFree.cxx,v $ * - * $Revision: 1.4.20.1 $ + * $Revision: 1.4.20.2 $ * - * last change: $Author: lla $ $Date: 2007/10/09 09:26:47 $ + * last change: $Author: oj $ $Date: 2007/10/11 07:46:08 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -243,7 +243,7 @@ uno::Reference< beans::XPropertySet> xStorageProp(xTemp,uno::UNO_QUERY); if ( xStorageProp.is() ) { - static const ::rtl::OUString sPropName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")); + static const ::rtl::OUString sPropName(RTL_CONSTASCII_USTRINGPARAM("MediaType")); xStorageProp->setPropertyValue( sPropName, uno::makeAny(m_xReport->getMimeType())); } m_xReport->storeToStorage(xTemp,aEmpty); // store to temp file because it may contain information which aren't in the database yet. @@ -263,7 +263,7 @@ //! TODO: has to be changed into a temp storage later on const static String s_sExt = String::CreateFromAscii(".rpt"); String sName = m_xReport->getName(); - ::utl::TempFile aFile(sName,&s_sExt); + ::utl::TempFile aFile(sName,sal_False,&s_sExt); uno::Reference< embed::XStorage > xOut = OStorageHelper::GetStorageFromURL(aFile.GetURL(),embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE,uno::Reference< lang::XMultiServiceFactory >(m_xContext->getServiceManager(),uno::UNO_QUERY)); utl::DisposableComponent aOut(xOut); xStorageProp.set(xOut,uno::UNO_QUERY); @@ -321,10 +321,10 @@ } } } - xRowSetProp->setPropertyValue(PROPERTY_ORDER,uno::makeAny(sOrder)); } - if ( m_xReport->getFilter().getLength() ) - xRowSetProp->setPropertyValue(PROPERTY_APPLYFILTER,uno::makeAny(sal_True)); + // we have to set the order everytime, at least we clear the old one. + xRowSetProp->setPropertyValue(PROPERTY_ORDER,uno::makeAny(sOrder)); + xRowSetProp->setPropertyValue(PROPERTY_APPLYFILTER,uno::makeAny(m_xReport->getFilter().getLength() != 0)); uno::Reference<sdb::XCompletedExecution> xExecute( m_xRowSet, uno::UNO_QUERY ); if ( xExecute.is() ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
