Kaydet (Commit) e1d6946a authored tarafından Oliver Bolte's avatar Oliver Bolte

INTEGRATION: CWS fr8fix2 (1.4.38); FILE MERGED

2005/04/26 11:45:34 hbrinkm 1.4.38.2: RESYNC: (1.4-1.5); FILE MERGED
2005/04/13 13:21:06 dvo 1.4.38.1: #i47248# only delete temporary bindings, if they were created by the
         DataNavigator
üst 48fac2d0
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: datanavi.cxx,v $ * $RCSfile: datanavi.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: obo $ $Date: 2005-04-29 09:07:44 $ * last change: $Author: obo $ $Date: 2005-05-03 14:48:03 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -3483,8 +3483,8 @@ namespace svxform ...@@ -3483,8 +3483,8 @@ namespace svxform
AddSubmissionDialog::~AddSubmissionDialog() AddSubmissionDialog::~AddSubmissionDialog()
{ {
// #i38991# if we have added a binding, we need to remove it as well. // #i38991# if we have added a binding, we need to remove it as well.
if( m_xTempBinding.is() && m_xUIHelper.is() ) if( m_xCreatedBinding.is() && m_xUIHelper.is() )
m_xUIHelper->removeBindingIfUseless( m_xTempBinding ); m_xUIHelper->removeBindingIfUseless( m_xCreatedBinding );
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
...@@ -3615,11 +3615,12 @@ namespace svxform ...@@ -3615,11 +3615,12 @@ namespace svxform
if( !m_xTempBinding.is() ) if( !m_xTempBinding.is() )
{ {
Reference<css::xforms::XModel> xModel( m_xUIHelper, UNO_QUERY_THROW ); Reference<css::xforms::XModel> xModel( m_xUIHelper, UNO_QUERY_THROW );
m_xTempBinding = m_xUIHelper->getBindingForNode( m_xCreatedBinding = m_xUIHelper->getBindingForNode(
Reference<css::xml::dom::XNode>( Reference<css::xml::dom::XNode>(
xModel->getDefaultInstance()->getDocumentElement(), xModel->getDefaultInstance()->getDocumentElement(),
UNO_QUERY_THROW ), UNO_QUERY_THROW ),
sal_True ); sal_True );
m_xTempBinding = m_xCreatedBinding;
} }
// replace box // replace box
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment