diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-24 06:40:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-24 06:40:09 +0000 |
| commit | 98ca1402d809c345ee53a9150fb5479fcf82fcc8 (patch) | |
| tree | f19bd7fc9bc7f61e460b25c55ff6cb4d264841ec /svx/source/form/datanavi.cxx | |
| parent | a4a916774b5c2fd9f23c9ed4a8aa4396d3816b54 (diff) | |
INTEGRATION: CWS eformspp1 (1.5.26); FILE MERGED
2005/10/18 00:05:06 lo 1.5.26.3: RESYNC: (1.7-1.8); FILE MERGED
2005/07/22 13:30:00 lo 1.5.26.2: RESYNC: (1.5-1.7); FILE MERGED
2005/04/28 11:39:32 dvo 1.5.26.1: #i36202# #i36453# issue warnings when changing linked instances or deleting bindings/submissions
Diffstat (limited to 'svx/source/form/datanavi.cxx')
| -rw-r--r-- | svx/source/form/datanavi.cxx | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index fbe7b2e36fe5..ff1e2307a48a 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -4,9 +4,9 @@ * * $RCSfile: datanavi.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-08 22:48:59 $ + * last change: $Author: rt $ $Date: 2005-10-24 07:40:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -542,17 +542,12 @@ namespace svxform bool bIsElement = true; if ( DGTInstance == m_eGroup ) { -// #i36453# warning changing instance. Removed for -// upcoming 2.0 release because string change could not go through -// translation anymore. Please re-enable in the next version. -/* if ( m_sInstanceURL.Len() > 0 ) { LinkedInstanceWarningBox aMsgBox( this ); if ( aMsgBox.Execute() != RET_OK ) return bHandled; } -*/ DBG_ASSERT( pEntry, "XFormsPage::DoToolBoxAction(): no entry" ); ItemNode* pParentNode = static_cast< ItemNode* >( pEntry->GetUserData() ); @@ -710,17 +705,12 @@ namespace svxform ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() ); if ( DGTInstance == m_eGroup || DGTBinding == m_eGroup ) { -// #i36453# warning changing instance. Removed for -// upcoming 2.0 release because string change could not go through -// translation anymore. Please re-enable in the next version. -/* if ( DGTInstance == m_eGroup && m_sInstanceURL.Len() > 0 ) { LinkedInstanceWarningBox aMsgBox( this ); if ( aMsgBox.Execute() != RET_OK ) return bHandled; } -*/ AddDataItemDialog aDlg( this, pNode, m_xUIHelper ); DataItemType eType = DITElement; @@ -801,17 +791,12 @@ namespace svxform else if ( TBI_ITEM_REMOVE == _nToolBoxID ) { bHandled = true; -// #i36453# warning changing instance. Removed for -// upcoming 2.0 release because string change could not go through -// translation anymore. Please re-enable in the next version. -/* if ( DGTInstance == m_eGroup && m_sInstanceURL.Len() > 0 ) { LinkedInstanceWarningBox aMsgBox( this ); if ( aMsgBox.Execute() != RET_OK ) return bHandled; } -*/ bIsDocModified = RemoveEntry(); } @@ -1229,16 +1214,11 @@ namespace svxform { DBG_ERRORFILE( "XFormsPage::RemoveEntry(): exception caught" ); } -// #i36202 warning when deleting element/attribute. Removed for -// upcoming 2.0 release because string change could not go through -// translation anymore. Please re-enable in the next version. -/* QueryBox aQBox( this, SVX_RES( nResId ) ); String sMessText = aQBox.GetMessText(); sMessText.SearchAndReplace( sSearch, String( sName ) ); aQBox.SetMessText( sMessText ); if ( aQBox.Execute() == RET_YES ) -*/ { try { |