INTEGRATION: CWS pbhelp02 (1.70.10); FILE MERGED

2004/08/02 11:05:04 pb 1.70.10.2: RESYNC: (1.70-1.71); FILE MERGED
2004/07/23 07:46:04 dfoster 1.70.10.1: #i31901#
Object should be created on the heap to prevent crash on destruction

1 files changed, 23 insertions, 23 deletions

diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 33447a9a2..1f1b43d62 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -2,9 +2,9 @@
  *
  *	$RCSfile: formcontroller.cxx,v $
  *
- *	$Revision: 1.74 $
+ *	$Revision: 1.75 $
  *
- *	last change: $Author: hr $ $Date: 2004-08-05 10:13:24 $
+ *	last change: $Author: obo $ $Date: 2004-08-11 14:00:05 $
  *
  *	The Contents of this file are made available subject to the terms of
  *	either of the following licenses
@@ -117,13 +117,13 @@
 #ifndef _COM_SUN_STAR_UI_DIALOGS_EXTENDEDFILEPICKERELEMENTIDS_HPP_
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERCONTROLACCESS_HPP_ 
+#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERCONTROLACCESS_HPP_
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #endif
 #ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER_HPP_ 
+#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER_HPP_
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
 #endif
 #ifndef _COM_SUN_STAR_AWT_XTOPWINDOW_HPP_
@@ -245,7 +245,7 @@
 #ifndef _EXTENSIONS_PROPCTRLR_PROPERTYEDITOR_HXX_
 #include "propertyeditor.hxx"
 #endif
-#ifndef _SV_WAITOBJ_HXX 
+#ifndef _SV_WAITOBJ_HXX
 #include <vcl/waitobj.hxx>
 #endif
 #ifndef _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_
@@ -258,7 +258,7 @@
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
 #include <toolkit/unohlp.hxx>
 #endif
-#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSERFACTORY_HPP_ 
+#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSERFACTORY_HPP_
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
 #endif
 #ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
@@ -384,13 +384,13 @@ namespace pcr
 
 //
 // XNameReplace impl for transition to new SvxMacroAssignDlg
-class EventsNameReplace_Impl: 
+class EventsNameReplace_Impl:
         public ::cppu::WeakImplHelper1 < ::com::sun::star::container::XNameReplace >
 {
     public:
         EventsNameReplace_Impl( );
         ~EventsNameReplace_Impl( );
-        
+
         void AddEvent( ::rtl::OUString sEventName, ::rtl::OUString sMacroURL );
 
         //XNameReplace
@@ -516,9 +516,9 @@ class EventsNameReplace_Impl:
                 case TypeClass_BOOLEAN:
                 {
                     String aEntries;
-                    if (  _nPropId == PROPERTY_ID_SHOW_POSITION 
-                       || _nPropId == PROPERTY_ID_SHOW_NAVIGATION 
-                       || _nPropId == PROPERTY_ID_SHOW_RECORDACTIONS 
+                    if (  _nPropId == PROPERTY_ID_SHOW_POSITION
+                       || _nPropId == PROPERTY_ID_SHOW_NAVIGATION
+                       || _nPropId == PROPERTY_ID_SHOW_RECORDACTIONS
                        || _nPropId == PROPERTY_ID_SHOW_FILTERSORT
                        )
                        aEntries = String( ModuleRes( RID_STR_SHOW_HIDE ) );
@@ -772,9 +772,9 @@ class EventsNameReplace_Impl:
                 case TypeClass_BOOLEAN:
                 {
                     String sBooleanValues;
-                    if (  _nPropId == PROPERTY_ID_SHOW_POSITION 
-                       || _nPropId == PROPERTY_ID_SHOW_NAVIGATION 
-                       || _nPropId == PROPERTY_ID_SHOW_RECORDACTIONS 
+                    if (  _nPropId == PROPERTY_ID_SHOW_POSITION
+                       || _nPropId == PROPERTY_ID_SHOW_NAVIGATION
+                       || _nPropId == PROPERTY_ID_SHOW_RECORDACTIONS
                        || _nPropId == PROPERTY_ID_SHOW_FILTERSORT
                        )
                        sBooleanValues = String( ModuleRes( RID_STR_SHOW_HIDE ) );
@@ -980,7 +980,7 @@ class EventsNameReplace_Impl:
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); //CHINA001
         DBG_ASSERT(pFact, "CreateFactory fail!");
         ::CreateTabPage fnCreatePage  = pFact->GetTabPageCreatorFunc(RID_SVXPAGE_NUMBERFORMAT);
-        DBG_ASSERT(fnCreatePage, "Dialogdiet error!");//CHINA001 
+        DBG_ASSERT(fnCreatePage, "Dialogdiet error!");//CHINA001
         SfxTabPage*	pPage = (*fnCreatePage)( pDlg, aCoreSet );
         // end by CHINA001
         const SfxPoolItem& rInfoItem = pPage->GetItemSet().Get(SID_ATTR_NUMBERFORMAT_INFO);
@@ -1631,7 +1631,7 @@ class EventsNameReplace_Impl:
             {
                 return;
             }
-            
+
             /*SvxMacroItem aMacroItem;
 
             aMacroItem.SetMacroTable(aTable);
@@ -1712,7 +1712,7 @@ class EventsNameReplace_Impl:
                                 //SvxMacro* pMacro = aTab.Get( nIndex++ );
                                 Sequence< css::beans::PropertyValue > props;
                                 ::rtl::OUString macroURL;
-                                if( xNameReplace->getByName( *pMethods ) >>= props )
+                                if( sal_True == ( xNameReplace->getByName( *pMethods ) >>= props ) )
                                 {
                                     sal_Int32 nCount = props.getLength();
                                     for( sal_Int32 index = 0; index < nCount ; ++index )
@@ -2056,7 +2056,7 @@ class EventsNameReplace_Impl:
                    )
                    continue;
                 if ( nPropId == PROPERTY_ID_DATASOURCE )
-                {					
+                {
                     if ( m_xPropValueAccess.is() && ::dbtools::getActiveConnectionFromParent(m_xPropValueAccess).is() )
                         continue;
                 }
@@ -2508,9 +2508,9 @@ class EventsNameReplace_Impl:
                 if (eType == TypeClass_BOOLEAN )
                 {
                     String aEntries;
-                    if (  nPropId == PROPERTY_ID_SHOW_POSITION 
-                       || nPropId == PROPERTY_ID_SHOW_NAVIGATION 
-                       || nPropId == PROPERTY_ID_SHOW_RECORDACTIONS 
+                    if (  nPropId == PROPERTY_ID_SHOW_POSITION
+                       || nPropId == PROPERTY_ID_SHOW_NAVIGATION
+                       || nPropId == PROPERTY_ID_SHOW_RECORDACTIONS
                        || nPropId == PROPERTY_ID_SHOW_FILTERSORT
                        )
                        aEntries = String( ModuleRes( RID_STR_SHOW_HIDE ) );
@@ -2842,7 +2842,7 @@ class EventsNameReplace_Impl:
 
             //////////////////////////////////////////////////////////////////////
             // Bei Datenquelle auch Cursor-/ListSource fuellen
-            case PROPERTY_ID_DATASOURCE: 
+            case PROPERTY_ID_DATASOURCE:
             {
                 String aUserVal=aVal;
 
@@ -2857,7 +2857,7 @@ class EventsNameReplace_Impl:
 
                 static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
                 const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
-                OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!"); 
+                OSL_ENSURE(pFilter,"Filter: StarOffice XML (Base) could not be found!");
                 if ( pFilter )
                 {
                     aFileDlg.AddFilter(pFilter->GetFilterName(),pFilter->GetDefaultExtension());