User: rt      
Date: 2008-01-30 08:49:18+0000
Modified:
   dba/dbaccess/source/ui/inc/WTypeSelect.hxx

Log:
 INTEGRATION: CWS dba24d (1.14.88); FILE MERGED
 2007/12/01 13:41:11 fs 1.14.88.2: RESYNC: (1.14-1.15); FILE MERGED
 2007/11/08 14:21:04 fs 1.14.88.1: #i81658# re-factoring of the Copy Table 
wizard

File Changes:

Directory: /dba/dbaccess/source/ui/inc/
=======================================

File [changed]: WTypeSelect.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/WTypeSelect.hxx?r1=1.15&r2=1.16
Delta lines:  +11 -20
---------------------
--- WTypeSelect.hxx     2007-11-21 16:02:37+0000        1.15
+++ WTypeSelect.hxx     2008-01-30 08:49:15+0000        1.16
@@ -35,27 +35,14 @@
 #ifndef DBAUI_WIZ_TYPESELECT_HXX
 #define DBAUI_WIZ_TYPESELECT_HXX
 
-#ifndef DBAUI_WIZ_TABBPAGE_HXX
-#include "WTabPage.hxx"
-#endif
-#ifndef _SV_LSTBOX_HXX
-#include <vcl/lstbox.hxx>
-#endif
-#ifndef _SV_FIELD_HXX
-#include <vcl/field.hxx>
-#endif
-#ifndef _SV_FIXED_HXX
-#include <vcl/fixed.hxx>
-#endif
-#ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX
 #include "FieldDescControl.hxx"
-#endif
-#ifndef DBAUI_TYPEINFO_HXX
 #include "TypeInfo.hxx"
-#endif
-#ifndef _SV_BUTTON_HXX
+#include "WTabPage.hxx"
+
 #include <vcl/button.hxx>
-#endif
+#include <vcl/field.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/lstbox.hxx>
 
 class SvStream;
 class SvParser;
@@ -107,6 +94,7 @@
                OWizTypeSelectList( Window* pParent, const ResId& rResId ) : 
MultiListBox(pParent,rResId) {};
                void                                    SetPKey(sal_Bool bPKey) 
{ m_bPKey = bPKey; }
        };
+
        // ========================================================
        // Wizard Page: OWizTypeSelect
        // Dient als Basis Klasse fuer unterschiedliche Kopiereigenschaften
@@ -146,12 +134,15 @@
                virtual sal_Bool                LeavePage();
                virtual String                  GetTitle() const;
 
-               OWizTypeSelect(Window* pParent,SvStream*        _pStream = 
NULL);
+               OWizTypeSelect(Window* pParent, SvStream* _pStream = NULL );
                virtual ~OWizTypeSelect();
 
                inline void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = 
_nRow - 1; }
                inline void setDuplicateName(sal_Bool _bDuplicateName) { 
m_bDuplicateName = _bDuplicateName; }
        };
+
+    // ========================================================
+    typedef OWizTypeSelect* (*TypeSelectionPageFactory)( Window*, SvStream& );
 }
 #endif // DBAUI_WIZ_TYPESELECT_HXX
 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to