summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-07-07 12:43:22 +0200
committerOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-07-07 12:43:22 +0200
commitf550379188d5f14e87e5452e79fa64d0c9cf0cd3 (patch)
tree0667e95119555bfb240b5a4221862bd86cdf9f5f /reportdesign
parentd98c5119b4f4211167c919e7bf0bc32875dafbf5 (diff)
dba33g: #i112620# modified state is not set correctly at sdrmodel
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx1
-rw-r--r--reportdesign/source/ui/report/FormattedFieldBeautifier.cxx7
2 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index bcc90b54b8b6..2cf848dc0c84 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1299,6 +1299,7 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
::comphelper::MediaDescriptor aDescriptor( _aArguments );
fillArgs(aDescriptor);
+ m_pImpl->m_pReportModel->SetModified(sal_False);
return sal_True;
}
// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index e44325dec05f..fdfdad6cb55f 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -88,11 +88,10 @@ namespace rptui
void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< uno::XInterface >& _rxComponent )
{
::rtl::OUString sDataField;
- uno::Reference< report::XReportComponent > xComponent( _rxComponent, uno::UNO_QUERY );
try
{
- uno::Reference< report::XReportControlModel > xControlModel( xComponent, uno::UNO_QUERY );
+ uno::Reference< report::XFormattedField > xControlModel( _rxComponent, uno::UNO_QUERY );
if ( xControlModel.is() )
{
sDataField = xControlModel->getDataField();
@@ -119,8 +118,8 @@ namespace rptui
}
}
- if ( xComponent.is() )
- setPlaceholderText( getVclWindowPeer( xComponent ), sDataField );
+ if ( xControlModel.is() )
+ setPlaceholderText( getVclWindowPeer( xControlModel.get() ), sDataField );
}
catch (uno::Exception)
{