summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-07-23 11:01:59 +0000
committerKurt Zenker <kz@openoffice.org>2004-07-23 11:01:59 +0000
commit964a4b02711b5d982b07fd9c3c600454f0b32668 (patch)
treedee5cef14e61dd121bb602a09f1a7c959842c64d /basctl
parent256114635844471bd5dfa8dff0d0e43bfa7c398e (diff)
INTEGRATION: CWS tbe11 (1.27.154); FILE MERGED
2004/07/15 17:49:51 tbe 1.27.154.3: #i31315# Rework Basic IDE Macro Chooser and Macro Organizer 2004/07/09 15:53:13 tbe 1.27.154.2: #i31315# Rework Basic IDE Macro Chooser and Macro Organizer 2004/06/21 11:23:45 tbe 1.27.154.1: #99468# Basic IDE cannot handle libraries, which contain dialogs only
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/baside3.cxx22
1 files changed, 15 insertions, 7 deletions
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index e9203c8885ef..81a07956ac0b 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: baside3.cxx,v $
*
- * $Revision: 1.28 $
+ * $Revision: 1.29 $
*
- * last change: $Author: rt $ $Date: 2004-07-12 15:54:25 $
+ * last change: $Author: kz $ $Date: 2004-07-23 12:01:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -102,6 +102,7 @@
#include <basidesh.hxx>
#include <idetemp.hxx>
#include <helpid.hrc>
+#include <bastype2.hxx>
#ifndef _SVDVIEW_HXX
#include <svx/svdview.hxx>
@@ -132,10 +133,9 @@ using namespace ::com::sun::star::io;
TYPEINIT1( DialogWindow, IDEBaseWindow );
-DialogWindow::DialogWindow( Window* pParent, StarBASIC* pBasic,
- SfxObjectShell* pShell, String aLibName, String aName,
+DialogWindow::DialogWindow( Window* pParent, SfxObjectShell* pShell, String aLibName, String aName,
const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >& xDialogModel )
- :IDEBaseWindow( pParent, pBasic, pShell, aLibName, aName )
+ :IDEBaseWindow( pParent, pShell, aLibName, aName )
,pUndoMgr(NULL)
{
InitSettings( TRUE, TRUE, TRUE );
@@ -167,7 +167,7 @@ DialogWindow::DialogWindow( Window* pParent, StarBASIC* pBasic,
}
DialogWindow::DialogWindow( DialogWindow* pOrgWin ) :
- IDEBaseWindow( pOrgWin->GetParent(), pOrgWin->GetBasic(), pOrgWin->GetShell(), pOrgWin->GetLibName(), pOrgWin->GetName() )
+ IDEBaseWindow( pOrgWin->GetParent(), pOrgWin->GetShell(), pOrgWin->GetLibName(), pOrgWin->GetName() )
{
DBG_ERROR( "Dieser CTOR ist nicht erlaubt!" );
}
@@ -728,6 +728,14 @@ String DialogWindow::GetTitle()
return GetName();
}
+BasicEntryDescriptor DialogWindow::CreateEntryDescriptor()
+{
+ SfxObjectShell* pShell( GetShell() );
+ String aLibName( GetLibName() );
+ LibraryLocation eLocation = BasicIDE::GetLibraryLocation( pShell, aLibName );
+ return BasicEntryDescriptor( pShell, eLocation, aLibName, GetName(), OBJ_TYPE_DIALOG );
+}
+
void DialogWindow::SetReadOnly( BOOL b )
{
if ( pEditor )
@@ -793,7 +801,7 @@ void DialogWindow::StoreData()
void DialogWindow::Deactivating()
{
if ( IsModified() )
- BasicIDE::MarkDocShellModified( GetBasic() );
+ BasicIDE::MarkDocShellModified( GetShell() );
}
void DialogWindow::PrintData( Printer* pPrinter )