Tag: cws_src680_hsqlcsv
User: fs      
Date: 2008-01-17 02:50:10+0000
Modified:
   dba/dbaccess/source/ui/inc/databaseobjectview.hxx

Log:
 RESYNC: (1.2-1.5); FILE MERGED

File Changes:

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

File [changed]: databaseobjectview.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/databaseobjectview.hxx?r1=1.1.2.2&r2=1.1.2.3
Delta lines:  +26 -8
--------------------
--- databaseobjectview.hxx      2006-09-18 13:52:19+0000        1.1.2.2
+++ databaseobjectview.hxx      2008-01-17 02:50:07+0000        1.1.2.3
@@ -90,6 +90,8 @@
        private:
                ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >
                                            m_xORB;
+               ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >
+                                           m_xParentFrame;
                ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XComponentLoader >
                                            m_xFrameLoader;
         ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >
@@ -137,6 +139,7 @@
                DatabaseObjectView(
             const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
             const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication,
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& _rxParentFrame,
             const ::rtl::OUString& _rComponentURL
         );
                virtual ~DatabaseObjectView(){}
@@ -188,7 +191,7 @@
        class QueryDesigner : public DatabaseObjectView
        {
        protected:
-               sal_Bool        m_bCreateView;
+        sal_Int32   m_nCommandType;
                sal_Bool        m_bPreferSQLView;
 
        protected:
@@ -202,7 +205,8 @@
                QueryDesigner(
             const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
             const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication,
-                       sal_Bool _bCreateView,
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& _rxParentFrame,
+                       bool _bCreateView,
                        sal_Bool _bPreferSQLView
         );
        };
@@ -228,7 +232,8 @@
        public:
                TableDesigner(
             const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
-            const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication,
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& _rxParentFrame
         );
 
     private:
@@ -263,6 +268,7 @@
                ResultSetBrowser(
             const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
             const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication,
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& _rxParentFrame,
                        sal_Bool _bTable
         );
 
@@ -275,10 +281,22 @@
        public:
                RelationDesigner(
             const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
-            const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication,
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& _rxParentFrame
+        );
+       };
+       //======================================================================
+       //= ReportDesigner
+       //======================================================================
+       class ReportDesigner : public DatabaseObjectView
+       {
+       public:
+               ReportDesigner(
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::sdb::application::XDatabaseDocumentUI >& _rxApplication,
+            const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XFrame >& _rxParentFrame
         );
        };
-
 // .........................................................................
 }      // namespace dbaui
 // .........................................................................




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

Reply via email to