[Libreoffice-commits] .: basctl/inc basctl/sdi basctl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Aug 29 13:48:49 PDT 2012
basctl/inc/iderdll.hxx | 28
basctl/sdi/baside.sdi | 4
basctl/source/accessibility/accessibledialogcontrolshape.cxx | 7
basctl/source/accessibility/accessibledialogwindow.cxx | 15
basctl/source/basicide/basdoc.cxx | 27
basctl/source/basicide/basdoc.hxx | 21
basctl/source/basicide/basicbox.cxx | 80 +-
basctl/source/basicide/basicbox.hxx | 28
basctl/source/basicide/basicmod.hxx | 22
basctl/source/basicide/basicrenderable.cxx | 23
basctl/source/basicide/basicrenderable.hxx | 27
basctl/source/basicide/baside2.cxx | 46 -
basctl/source/basicide/baside2.hrc | 6
basctl/source/basicide/baside2.hxx | 12
basctl/source/basicide/baside2b.cxx | 55 -
basctl/source/basicide/baside3.cxx | 206 ++----
basctl/source/basicide/basidectrlr.cxx | 35 -
basctl/source/basicide/basides1.cxx | 155 ++--
basctl/source/basicide/basides2.cxx | 47 -
basctl/source/basicide/basides3.cxx | 24
basctl/source/basicide/basidesh.cxx | 258 +++----
basctl/source/basicide/basobj2.cxx | 77 +-
basctl/source/basicide/basobj3.cxx | 136 ++--
basctl/source/basicide/bastype2.cxx | 359 +++++-----
basctl/source/basicide/bastype2.hxx | 160 ++--
basctl/source/basicide/bastype3.cxx | 107 +--
basctl/source/basicide/bastype3.hxx | 13
basctl/source/basicide/bastypes.cxx | 373 ++++-------
basctl/source/basicide/breakpoint.cxx | 6
basctl/source/basicide/breakpoint.hxx | 11
basctl/source/basicide/brkdlg.cxx | 29
basctl/source/basicide/brkdlg.hrc | 6
basctl/source/basicide/brkdlg.hxx | 15
basctl/source/basicide/iderdll.cxx | 185 ++---
basctl/source/basicide/iderdll2.hxx | 52 -
basctl/source/basicide/idetemp.hxx | 6
basctl/source/basicide/layout.cxx | 10
basctl/source/basicide/layout.hxx | 17
basctl/source/basicide/linenumberwindow.cxx | 11
basctl/source/basicide/linenumberwindow.hxx | 19
basctl/source/basicide/localizationmgr.cxx | 45 -
basctl/source/basicide/macrodlg.cxx | 115 +--
basctl/source/basicide/macrodlg.hrc | 6
basctl/source/basicide/macrodlg.hxx | 19
basctl/source/basicide/moduldl2.cxx | 160 ++--
basctl/source/basicide/moduldlg.cxx | 210 +++---
basctl/source/basicide/moduldlg.hrc | 6
basctl/source/basicide/moduldlg.hxx | 55 -
basctl/source/basicide/moptions.hrc | 6
basctl/source/basicide/objdlg.cxx | 8
basctl/source/basicide/objdlg.hxx | 6
basctl/source/basicide/register.cxx | 7
basctl/source/basicide/sbxitem.cxx | 81 --
basctl/source/basicide/scriptdocument.cxx | 143 ++--
basctl/source/basicide/tbxctl.cxx | 10
basctl/source/basicide/tbxctl.hxx | 10
basctl/source/basicide/unomodel.cxx | 9
basctl/source/basicide/unomodel.hxx | 11
basctl/source/dlged/dlged.cxx | 50 -
basctl/source/dlged/dlgedclip.cxx | 5
basctl/source/dlged/dlgedfac.cxx | 5
basctl/source/dlged/dlgedfunc.cxx | 8
basctl/source/dlged/dlgedlist.cxx | 5
basctl/source/dlged/dlgedmod.cxx | 4
basctl/source/dlged/dlgedobj.cxx | 6
basctl/source/dlged/dlgedpage.cxx | 6
basctl/source/dlged/dlgedview.cxx | 9
basctl/source/dlged/managelang.cxx | 12
basctl/source/dlged/managelang.hrc | 6
basctl/source/dlged/propbrw.cxx | 33
basctl/source/inc/accessibledialogcontrolshape.hxx | 24
basctl/source/inc/accessibledialogwindow.hxx | 23
basctl/source/inc/baside3.hxx | 22
basctl/source/inc/basidectrlr.hxx | 26
basctl/source/inc/basidesh.hxx | 116 +--
basctl/source/inc/basobj.hxx | 24
basctl/source/inc/bastypes.hxx | 178 ++---
basctl/source/inc/dlged.hxx | 70 +-
basctl/source/inc/dlgedclip.hxx | 11
basctl/source/inc/dlgeddef.hxx | 11
basctl/source/inc/dlgedfac.hxx | 12
basctl/source/inc/dlgedfunc.hxx | 11
basctl/source/inc/dlgedlist.hxx | 11
basctl/source/inc/dlgedmod.hxx | 12
basctl/source/inc/dlgedobj.hxx | 11
basctl/source/inc/dlgedpage.hxx | 11
basctl/source/inc/dlgedview.hxx | 11
basctl/source/inc/dlgresid.hrc | 6
basctl/source/inc/iderid.hxx | 11
basctl/source/inc/localizationmgr.hxx | 17
basctl/source/inc/managelang.hxx | 14
basctl/source/inc/propbrw.hxx | 19
basctl/source/inc/sbxitem.hxx | 45 -
basctl/source/inc/scriptdocument.hxx | 31
basctl/source/inc/svheader.hxx | 6
95 files changed, 2302 insertions(+), 2205 deletions(-)
New commits:
commit c20f15c1ebf648c3ed71de0ac4771029c9bb59bb
Author: Uray M. János <uray.janos at gmail.com>
Date: Sat Aug 25 12:43:27 2012 +0200
Basic IDE: namespace basctl
Now all names in basctl are in namespace 'basctl'.
There were lots of names that included the word 'Basic' or 'BasicIDE' in
it, e.g. BasicIDEData, BasicDocumentEntry, BasicTreeListBox,
BasicIDEModule, IDEBaseWindow etc. This information is now stored in the
namespace name, so the names could be shortened: basctl::DocumentEntry,
basctl::TreeListBox, basctl::Module, basctl::BaseWindow etc.
Some other minor changes:
* LibInfos, LibInfoItem, LibInfoKey ->
LibInfos, LibInfos::Item, LibInfos::Key
* The header guards are now uniformly BASCTL_FILENAME_HXX, instead of
e.g. _FILENAME_HXX, which is undefined behaviour because of the '_'.
* namespace BasicIDE, BasicIDEGlobals, basicide -> namespace basctl
* BASICIDE_TYPE_MODULE, ... -> basctl::TYPE_MODULE, ...
Change-Id: I2a9b493562d0d8a2510d569798fbe9e1161b7c9b
Reviewed-on: https://gerrit.libreoffice.org/501
Reviewed-by: Andras Timar <atimar at suse.com>
Tested-by: Andras Timar <atimar at suse.com>
diff --git a/basctl/inc/iderdll.hxx b/basctl/inc/iderdll.hxx
index 2c9f401..a0e2765 100644
--- a/basctl/inc/iderdll.hxx
+++ b/basctl/inc/iderdll.hxx
@@ -17,23 +17,25 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IDERDLL_HXX
-#define _IDERDLL_HXX
+#ifndef BASCTL_IDERDLL_HXX
+#define BASCTL_IDERDLL_HXX
-class BasicIDEShell;
-class BasicIDEData;
-
-namespace BasicIDEGlobals
+namespace basctl
{
- void ensure();
- void ShellCreated(BasicIDEShell* pShell);
- BasicIDEShell* GetShell();
- void ShellDestroyed(BasicIDEShell* pShell);
+class Shell;
+class ExtraData;
+
+void EnsureIde ();
+
+void ShellCreated (Shell* pShell);
+Shell* GetShell();
+void ShellDestroyed (Shell* pShell);
+
+ExtraData* GetExtraData();
- BasicIDEData* GetExtraData();
-}
+} // namespace basctl
-#endif //_IDERDLL_HXX
+#endif // BASCTL_IDERDLL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index d461892..5582c1d 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -23,7 +23,7 @@ interface BasicIDEView
{
}
-shell BasicIDEShell
+shell basctl_Shell
{
import BasicIDEView [Automation];
@@ -512,7 +512,7 @@ interface BasicIDEDocument
{
}
-shell BasicDocShell
+shell basctl_DocShell
{
import BasicIDEDocument [Automation];
}
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index ccfd4af..4b58550 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -33,6 +33,9 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
+namespace basctl
+{
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -45,7 +48,7 @@ using namespace ::comphelper;
// class AccessibleDialogControlShape
// -----------------------------------------------------------------------------
-AccessibleDialogControlShape::AccessibleDialogControlShape (basctl::DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj)
+AccessibleDialogControlShape::AccessibleDialogControlShape (DialogWindow* pDialogWindow, DlgEdObj* pDlgEdObj)
:AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() )
,m_pDialogWindow( pDialogWindow )
,m_pDlgEdObj( pDlgEdObj )
@@ -607,4 +610,6 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime
// -----------------------------------------------------------------------------
+} // namespace basctl
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index a36c5b2..c9b1971 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -36,6 +36,9 @@
#include <toolkit/helper/convert.hxx>
#include <vcl/svapp.hxx>
+namespace basctl
+{
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -538,26 +541,26 @@ void AccessibleDialogWindow::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
else if (DlgEdHint const* pDlgEdHint = dynamic_cast<DlgEdHint const*>(&rHint))
{
- switch ( pDlgEdHint->GetKind() )
+ switch (pDlgEdHint->GetKind())
{
- case DLGED_HINT_WINDOWSCROLLED:
+ case DlgEdHint::WINDOWSCROLLED:
{
UpdateChildren();
UpdateBounds();
}
break;
- case DLGED_HINT_LAYERCHANGED:
+ case DlgEdHint::LAYERCHANGED:
{
if (DlgEdObj* pDlgEdObj = pDlgEdHint->GetObject())
UpdateChild( ChildDescriptor( pDlgEdObj ) );
}
break;
- case DLGED_HINT_OBJORDERCHANGED:
+ case DlgEdHint::OBJORDERCHANGED:
{
SortChildren();
}
break;
- case DLGED_HINT_SELECTIONCHANGED:
+ case DlgEdHint::SELECTIONCHANGED:
{
UpdateFocused();
UpdateSelected();
@@ -1093,4 +1096,6 @@ void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) th
// -----------------------------------------------------------------------------
+} // namespace basctl
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 75f3c6e..67f358c 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -27,22 +27,25 @@
#include "unomodel.hxx"
#include <basdoc.hxx>
-#define BasicDocShell // This CANNOT come before basdoc apparently
+#define basctl_DocShell // This CANNOT come before basdoc apparently
#include <basslots.hxx>
#include <sfx2/sfxmodelfactory.hxx>
#include <svx/svxids.hrc>
-TYPEINIT1(BasicDocShell, SfxObjectShell);
-DBG_NAME(BasicDocShell);
+namespace basctl
+{
+
+TYPEINIT1(DocShell, SfxObjectShell);
+DBG_NAME(DocShell);
-SFX_IMPL_OBJECTFACTORY( BasicDocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, "sbasic" )
+SFX_IMPL_OBJECTFACTORY( DocShell, SvGlobalName(), SFXOBJECTSHELL_STD_NORMAL, "sbasic" )
-SFX_IMPL_INTERFACE( BasicDocShell, SfxObjectShell, IDEResId( 0 ) )
+SFX_IMPL_INTERFACE( basctl_DocShell, SfxObjectShell, IDEResId( 0 ) )
{
SFX_STATUSBAR_REGISTRATION( IDEResId( SID_BASICIDE_STATUSBAR ) );
}
-BasicDocShell::BasicDocShell()
+DocShell::DocShell()
:SfxObjectShell( SFXMODEL_DISABLE_EMBEDDED_SCRIPTS | SFXMODEL_DISABLE_DOCUMENT_RECOVERY )
{
pPrinter = 0;
@@ -50,12 +53,12 @@ BasicDocShell::BasicDocShell()
SetBaseModel( new SIDEModel(this) );
}
-BasicDocShell::~BasicDocShell()
+DocShell::~DocShell()
{
delete pPrinter;
}
-SfxPrinter* BasicDocShell::GetPrinter( bool bCreate )
+SfxPrinter* DocShell::GetPrinter( bool bCreate )
{
if ( !pPrinter && bCreate )
pPrinter = new SfxPrinter( new SfxItemSet( GetPool(), SID_PRINTER_NOTFOUND_WARN , SID_PRINTER_NOTFOUND_WARN ) );
@@ -63,7 +66,7 @@ SfxPrinter* BasicDocShell::GetPrinter( bool bCreate )
return pPrinter;
}
-void BasicDocShell::SetPrinter( SfxPrinter* pPr )
+void DocShell::SetPrinter( SfxPrinter* pPr )
{
if ( pPr != pPrinter )
{
@@ -72,13 +75,15 @@ void BasicDocShell::SetPrinter( SfxPrinter* pPr )
}
}
-void BasicDocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, String*, sal_Int32, sal_Bool bTemplate) const
+void DocShell::FillClass( SvGlobalName*, sal_uInt32*, String*, String*, String*, sal_Int32, sal_Bool bTemplate) const
{
(void)bTemplate;
DBG_ASSERT( !bTemplate, "No template for Basic" );
}
-void BasicDocShell::Draw( OutputDevice *, const JobSetup &, sal_uInt16 )
+void DocShell::Draw( OutputDevice *, const JobSetup &, sal_uInt16 )
{}
+} // namespace basctl
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 0c72add..8a302d7 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BASDOC_HXX
-#define _BASDOC_HXX
+#ifndef BASCTL_BASDOC_HXX
+#define BASCTL_BASDOC_HXX
#include <iderid.hxx>
#include <sfx2/docfac.hxx>
@@ -27,7 +27,10 @@
class SfxPrinter;
-class BasicDocShell: public SfxObjectShell
+namespace basctl
+{
+
+class DocShell: public SfxObjectShell
{
SfxPrinter* pPrinter;
@@ -48,13 +51,19 @@ public:
using SotObject::GetInterface;
SFX_DECL_OBJECTFACTORY();
SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_DOCSH )
- BasicDocShell();
- ~BasicDocShell();
+ DocShell();
+ ~DocShell();
SfxPrinter* GetPrinter( bool bCreate );
void SetPrinter( SfxPrinter* pPrinter );
};
-#endif // _BASDOC_HXX
+} // namespace basctl
+
+// This typedef helps baside.sdi,
+// because I don't know how to use nested names in it.
+typedef basctl::DocShell basctl_DocShell;
+
+#endif // BASCTL_BASDOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 34158fc..2cc65d1 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -37,6 +37,9 @@
#include <sfx2/dispatch.hxx>
#include <svtools/langtab.hxx>
+namespace basctl
+{
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
@@ -58,7 +61,7 @@ LibBoxControl::~LibBoxControl()
void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
- BasicLibBox* pBox = (BasicLibBox*) GetToolBox().GetItemWindow( GetId() );
+ LibBox* pBox = (LibBox*)GetToolBox().GetItemWindow(GetId());
DBG_ASSERT( pBox, "Box not found" );
if ( !pBox )
@@ -77,7 +80,7 @@ void LibBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPool
Window* LibBoxControl::CreateItemWindow( Window *pParent )
{
- return new BasicLibBox( pParent, m_xFrame );
+ return new LibBox( pParent, m_xFrame );
}
//=============================================================================
@@ -141,9 +144,9 @@ void DocListenerBox::onDocumentModeChanged( const ScriptDocument& /*_rDocument*/
}
//=============================================================================
-//= BasicLibBox
+//= basctl::LibBox
//=============================================================================
-BasicLibBox::BasicLibBox( Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) :
+LibBox::LibBox( Window* pParent, const uno::Reference< frame::XFrame >& rFrame ) :
DocListenerBox( pParent ),
m_xFrame( rFrame )
{
@@ -158,12 +161,12 @@ BasicLibBox::BasicLibBox( Window* pParent, const uno::Reference< frame::XFrame >
-BasicLibBox::~BasicLibBox()
+LibBox::~LibBox()
{
ClearBox();
}
-void BasicLibBox::Update( const SfxStringItem* pItem )
+void LibBox::Update( const SfxStringItem* pItem )
{
// if ( !pItem || !pItem->GetValue().Len() )
@@ -180,7 +183,7 @@ void BasicLibBox::Update( const SfxStringItem* pItem )
SelectEntry( aCurText );
}
-void BasicLibBox::ReleaseFocus()
+void LibBox::ReleaseFocus()
{
SfxViewShell* pCurSh = SfxViewShell::Current();
DBG_ASSERT( pCurSh, "Current ViewShell not found!" );
@@ -195,7 +198,7 @@ void BasicLibBox::ReleaseFocus()
}
}
-void BasicLibBox::FillBox()
+void LibBox::FillBox()
{
SetUpdateMode(false);
bIgnoreSelect = true;
@@ -207,7 +210,7 @@ void BasicLibBox::FillBox()
// create list box entries
sal_uInt16 nPos = InsertEntry( String( IDEResId( RID_STR_ALL ) ), LISTBOX_APPEND );
- SetEntryData( nPos, new BasicLibEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_UNKNOWN, String() ) );
+ SetEntryData( nPos, new LibEntry( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_UNKNOWN, String() ) );
InsertEntries( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_USER );
InsertEntries( ScriptDocument::getApplicationScriptDocument(), LIBRARY_LOCATION_SHARE );
@@ -231,7 +234,7 @@ void BasicLibBox::FillBox()
bIgnoreSelect = false;
}
-void BasicLibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation )
+void LibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation )
{
// get a sorted list of library names
Sequence< ::rtl::OUString > aLibNames = rDocument.getLibraryNames();
@@ -246,12 +249,12 @@ void BasicLibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocatio
String aName( rDocument.getTitle( eLocation ) );
String aEntryText( CreateMgrAndLibStr( aName, aLibName ) );
sal_uInt16 nPos = InsertEntry( aEntryText, LISTBOX_APPEND );
- SetEntryData( nPos, new BasicLibEntry( rDocument, eLocation, aLibName ) );
+ SetEntryData( nPos, new LibEntry( rDocument, eLocation, aLibName ) );
}
}
}
-long BasicLibBox::PreNotify( NotifyEvent& rNEvt )
+long LibBox::PreNotify( NotifyEvent& rNEvt )
{
long nDone = 0;
if( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -296,7 +299,7 @@ long BasicLibBox::PreNotify( NotifyEvent& rNEvt )
return nDone ? nDone : ListBox::PreNotify( rNEvt );
}
-void BasicLibBox::Select()
+void LibBox::Select()
{
if ( !IsTravelSelect() )
{
@@ -307,34 +310,30 @@ void BasicLibBox::Select()
}
}
-void BasicLibBox::NotifyIDE()
+void LibBox::NotifyIDE()
{
sal_uInt16 nSelPos = GetSelectEntryPos();
- BasicLibEntry* pEntry = static_cast<BasicLibEntry*>(GetEntryData( nSelPos ));
- if ( pEntry )
+ if (LibEntry* pEntry = static_cast<LibEntry*>(GetEntryData(nSelPos)))
{
ScriptDocument aDocument( pEntry->GetDocument() );
SfxUsrAnyItem aDocumentItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, uno::makeAny( aDocument.getDocumentOrNull() ) );
String aLibName = pEntry->GetLibName();
SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName );
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
- SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
- if ( pDispatcher )
- {
- pDispatcher->Execute( SID_BASICIDE_LIBSELECTED,
- SFX_CALLMODE_SYNCHRON, &aDocumentItem, &aLibNameItem, 0L );
- }
+ if (SfxDispatcher* pDispatcher = GetDispatcher())
+ pDispatcher->Execute(
+ SID_BASICIDE_LIBSELECTED,
+ SFX_CALLMODE_SYNCHRON, &aDocumentItem, &aLibNameItem, 0L
+ );
}
ReleaseFocus();
}
-void BasicLibBox::ClearBox()
+void LibBox::ClearBox()
{
sal_uInt16 nCount = GetEntryCount();
for ( sal_uInt16 i = 0; i < nCount; ++i )
{
- BasicLibEntry* pEntry = static_cast<BasicLibEntry*>(GetEntryData( i ));
+ LibEntry* pEntry = static_cast<LibEntry*>(GetEntryData( i ));
delete pEntry;
}
ListBox::Clear();
@@ -356,7 +355,7 @@ LanguageBoxControl::~LanguageBoxControl()
void LanguageBoxControl::StateChanged( sal_uInt16 nID, SfxItemState eState, const SfxPoolItem* pItem )
{
(void)nID;
- if (BasicLanguageBox* pBox = static_cast<BasicLanguageBox*>(GetToolBox().GetItemWindow(GetId())))
+ if (LanguageBox* pBox = static_cast<LanguageBox*>(GetToolBox().GetItemWindow(GetId())))
{
if (eState != SFX_ITEM_AVAILABLE)
pBox->Disable();
@@ -370,12 +369,12 @@ void LanguageBoxControl::StateChanged( sal_uInt16 nID, SfxItemState eState, cons
Window* LanguageBoxControl::CreateItemWindow( Window *pParent )
{
- return new BasicLanguageBox( pParent );
+ return new LanguageBox( pParent );
}
-// class BasicLanguageBox ------------------------------------------------
+// class basctl::LanguageBox -----------------------------------------------
-BasicLanguageBox::BasicLanguageBox( Window* pParent ) :
+LanguageBox::LanguageBox( Window* pParent ) :
DocListenerBox( pParent ),
@@ -390,19 +389,19 @@ BasicLanguageBox::BasicLanguageBox( Window* pParent ) :
FillBox();
}
-BasicLanguageBox::~BasicLanguageBox()
+LanguageBox::~LanguageBox()
{
ClearBox();
}
-void BasicLanguageBox::FillBox()
+void LanguageBox::FillBox()
{
SetUpdateMode(false);
m_bIgnoreSelect = true;
m_sCurrentText = GetSelectEntry();
ClearBox();
- boost::shared_ptr<LocalizationMgr> pCurMgr(BasicIDEGlobals::GetShell()->GetCurLocalizationMgr());
+ boost::shared_ptr<LocalizationMgr> pCurMgr(GetShell()->GetCurLocalizationMgr());
if ( pCurMgr->isLibraryLocalized() )
{
Enable();
@@ -448,7 +447,7 @@ void BasicLanguageBox::FillBox()
m_bIgnoreSelect = false;
}
-void BasicLanguageBox::ClearBox()
+void LanguageBox::ClearBox()
{
sal_uInt16 nCount = GetEntryCount();
for ( sal_uInt16 i = 0; i < nCount; ++i )
@@ -459,14 +458,14 @@ void BasicLanguageBox::ClearBox()
ListBox::Clear();
}
-void BasicLanguageBox::SetLanguage()
+void LanguageBox::SetLanguage()
{
LanguageEntry* pEntry = (LanguageEntry*)GetEntryData( GetSelectEntryPos() );
if ( pEntry )
- BasicIDEGlobals::GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale );
+ GetShell()->GetCurLocalizationMgr()->handleSetCurrentLocale( pEntry->m_aLocale );
}
-void BasicLanguageBox::Select()
+void LanguageBox::Select()
{
if ( !m_bIgnoreSelect )
SetLanguage();
@@ -474,7 +473,7 @@ void BasicLanguageBox::Select()
SelectEntry( m_sCurrentText ); // Select after Escape
}
-long BasicLanguageBox::PreNotify( NotifyEvent& rNEvt )
+long LanguageBox::PreNotify( NotifyEvent& rNEvt )
{
long nDone = 0;
if( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -507,7 +506,7 @@ long BasicLanguageBox::PreNotify( NotifyEvent& rNEvt )
return nDone ? nDone : ListBox::PreNotify( rNEvt );
}
-void BasicLanguageBox::Update( const SfxStringItem* pItem )
+void LanguageBox::Update( const SfxStringItem* pItem )
{
FillBox();
@@ -519,4 +518,7 @@ void BasicLanguageBox::Update( const SfxStringItem* pItem )
}
}
+
+} // namespace basctl
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index ce55433..a19ec43 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -16,9 +16,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//
-#ifndef _BASICBOX_HXX
-#define _BASICBOX_HXX
+
+#ifndef BASCTL_BASICBOX_HXX
+#define BASCTL_BASICBOX_HXX
#include "doceventnotifier.hxx"
#include <svl/stritem.hxx>
@@ -26,6 +26,8 @@
#include <sfx2/tbxctrl.hxx>
#include <vcl/lstbox.hxx>
+namespace basctl
+{
class LibBoxControl: public SfxToolBoxControl
{
@@ -44,7 +46,7 @@ public:
of open documents
*/
class DocListenerBox :public ListBox
- ,public ::basctl::DocumentEventListener
+ ,public DocumentEventListener
{
protected:
DocListenerBox( Window* pParent );
@@ -66,12 +68,12 @@ private:
virtual void onDocumentModeChanged( const ScriptDocument& _rDocument );
private:
- ::basctl::DocumentEventNotifier m_aNotifier;
+ DocumentEventNotifier m_aNotifier;
};
//
-class BasicLibBox : public DocListenerBox
+class LibBox : public DocListenerBox
{
private:
String aCurText;
@@ -93,9 +95,9 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt );
public:
- BasicLibBox( Window* pParent,
+ LibBox( Window* pParent,
const com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
- ~BasicLibBox();
+ ~LibBox();
using Window::Update;
void Update( const SfxStringItem* pItem );
@@ -113,7 +115,7 @@ public:
virtual Window* CreateItemWindow( Window *pParent );
};
-class BasicLanguageBox : public DocListenerBox
+class LanguageBox : public DocListenerBox
{
private:
String m_sNotLocalizedStr;
@@ -133,13 +135,15 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt );
public:
- BasicLanguageBox( Window* pParent );
- ~BasicLanguageBox();
+ LanguageBox( Window* pParent );
+ ~LanguageBox();
using Window::Update;
void Update( const SfxStringItem* pItem );
};
-#endif // _BASICBOX_HXX
+} // namespace basctl
+
+#endif // BASCTL_BASICBOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicmod.hxx b/basctl/source/basicide/basicmod.hxx
index 070829e..8cb6613 100644
--- a/basctl/source/basicide/basicmod.hxx
+++ b/basctl/source/basicide/basicmod.hxx
@@ -18,23 +18,27 @@
*/
-#ifndef BASICMOD_HXX
-#define BASICMOD_HXX
+#ifndef BASCTL_BASICMOD_HXX
+#define BASCTL_BASICMOD_HXX
#include <sfx2/module.hxx>
#include <tools/shl.hxx>
-class BasicIDEModule : public SfxModule
+namespace basctl
+{
+
+class Module : public SfxModule
{
public:
- BasicIDEModule( ResMgr *pMgr, SfxObjectFactory *pObjFact) :
- SfxModule( pMgr, false, pObjFact, NULL )
- {}
+ Module ( ResMgr *pMgr, SfxObjectFactory *pObjFact) :
+ SfxModule( pMgr, false, pObjFact, NULL )
+ { }
+public:
+ static Module*& Get () { return *reinterpret_cast<Module**>(GetAppData(SHL_IDE)); }
};
+} // namespace basctl
-#define BASIC_MOD() ( *(BasicIDEModule**) GetAppData(SHL_IDE) )
-
-#endif
+#endif // BASCTL_BASICMOD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index 9d58d71..8aafe05 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -27,11 +27,13 @@
#include "tools/multisel.hxx"
#include "tools/resary.hxx"
+namespace basctl
+{
+
using namespace com::sun::star;
using namespace com::sun::star::uno;
-using namespace basicide;
-BasicRenderable::BasicRenderable( IDEBaseWindow* pWin )
+Renderable::Renderable (BaseWindow* pWin)
: cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >( maMutex )
, mpWindow( pWin )
{
@@ -75,11 +77,11 @@ BasicRenderable::BasicRenderable( IDEBaseWindow* pWin )
);
}
-BasicRenderable::~BasicRenderable()
+Renderable::~Renderable()
{
}
-Printer* BasicRenderable::getPrinter()
+Printer* Renderable::getPrinter()
{
Printer* pPrinter = NULL;
Any aValue( getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RenderDevice" ) ) ) );
@@ -94,7 +96,7 @@ Printer* BasicRenderable::getPrinter()
return pPrinter;
}
-sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
+sal_Int32 SAL_CALL Renderable::getRendererCount (
const Any&, const Sequence<beans::PropertyValue >& i_xOptions
) throw (lang::IllegalArgumentException, RuntimeException)
{
@@ -103,8 +105,7 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
sal_Int32 nCount = 0;
if( mpWindow )
{
- Printer* pPrinter = getPrinter();
- if( pPrinter )
+ if (Printer* pPrinter = getPrinter())
{
nCount = mpWindow->countPages( pPrinter );
sal_Int64 nContent = getIntValue( "PrintContent", -1 );
@@ -127,7 +128,7 @@ sal_Int32 SAL_CALL BasicRenderable::getRendererCount (
return nCount;
}
-Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer (
+Sequence<beans::PropertyValue> SAL_CALL Renderable::getRenderer (
sal_Int32, const Any&, const Sequence<beans::PropertyValue>& i_xOptions
) throw (lang::IllegalArgumentException, RuntimeException)
{
@@ -154,7 +155,7 @@ Sequence<beans::PropertyValue> SAL_CALL BasicRenderable::getRenderer (
return aVals;
}
-void SAL_CALL BasicRenderable::render (
+void SAL_CALL Renderable::render (
sal_Int32 nRenderer, const Any&,
const Sequence<beans::PropertyValue>& i_xOptions
) throw (lang::IllegalArgumentException, RuntimeException)
@@ -163,8 +164,7 @@ void SAL_CALL BasicRenderable::render (
if( mpWindow )
{
- Printer* pPrinter = getPrinter();
- if( pPrinter )
+ if (Printer* pPrinter = getPrinter())
{
sal_Int64 nContent = getIntValue( "PrintContent", -1 );
if( nContent == 1 )
@@ -192,5 +192,6 @@ void SAL_CALL BasicRenderable::render (
}
}
+} // namespace basctl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx
index b9bc999..b53c927 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -16,29 +16,30 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BASICRENDERABLE_HXX
-#define _BASICRENDERABLE_HXX
+#ifndef BASCTL_BASICRENDERABLE_HXX
+#define BASCTL_BASICRENDERABLE_HXX
#include "com/sun/star/view/XRenderable.hpp"
#include "cppuhelper/compbase1.hxx"
#include "vcl/print.hxx"
-class IDEBaseWindow;
-
-namespace basicide
+namespace basctl
{
-class BasicRenderable :
- public cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >,
- public vcl::PrinterOptionsHelper
+
+class BaseWindow;
+
+class Renderable :
+ public cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >,
+ public vcl::PrinterOptionsHelper
{
- IDEBaseWindow* mpWindow;
+ BaseWindow* mpWindow;
osl::Mutex maMutex;
Printer* getPrinter();
public:
- BasicRenderable( IDEBaseWindow* pWin );
- virtual ~BasicRenderable();
+ Renderable (BaseWindow*);
+ virtual ~Renderable();
// XRenderable
virtual sal_Int32 SAL_CALL getRendererCount (
@@ -60,8 +61,8 @@ public:
};
-} // namespace
+} // namespace basctl
-#endif
+#endif // BASCTL_BASICRENDERABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 2475ef6..d0726d4 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -77,7 +77,7 @@ using namespace comphelper;
DBG_NAME( ModulWindow )
-TYPEINIT1( ModulWindow , IDEBaseWindow );
+TYPEINIT1( ModulWindow , BaseWindow );
namespace
{
@@ -185,7 +185,7 @@ ModulWindow::ModulWindow (
ScriptDocument const& rDocument,
rtl::OUString aLibName, rtl::OUString aName, rtl::OUString& aModule
) :
- IDEBaseWindow(pParent, rDocument, aLibName, aName),
+ BaseWindow(pParent, rDocument, aLibName, aName),
rLayout(*pParent),
nValid(VALIDWINDOW),
aXEditorWindow(this),
@@ -280,8 +280,7 @@ void ModulWindow::CheckCompileBasic()
{
bool bDone = false;
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- pIDEShell->GetViewFrame()->GetWindow().EnterWait();
+ GetShell()->GetViewFrame()->GetWindow().EnterWait();
if( bModified )
{
@@ -300,7 +299,7 @@ void ModulWindow::CheckCompileBasic()
GetBreakPoints().SetBreakPointsInBasic( xModule );
}
- pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
+ GetShell()->GetViewFrame()->GetWindow().LeaveWait();
aStatus.bError = !bDone;
aStatus.bIsRunning = false;
@@ -355,13 +354,13 @@ bool ModulWindow::BasicExecute()
if ( !pMethod )
{
// If not in a method then prompt the user
- return ( !BasicIDE::ChooseMacro( uno::Reference< frame::XModel >(), false, rtl::OUString() ).isEmpty() );
+ return ( !ChooseMacro( uno::Reference< frame::XModel >(), false, rtl::OUString() ).isEmpty() );
}
if ( pMethod )
{
pMethod->SetDebugFlags( aStatus.nBasicFlags );
BasicDLL::SetDebugMode( true );
- BasicIDE::RunMethod( pMethod );
+ RunMethod( pMethod );
BasicDLL::SetDebugMode( false );
// if cancelled during Interactive=false
BasicDLL::EnableBreak( true );
@@ -536,13 +535,8 @@ bool ModulWindow::SaveBasicSource()
return bDone;
}
-} // namespace basctl
-
bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName );
-namespace basctl
-{
-
bool ModulWindow::ImportDialog()
{
const ScriptDocument& rDocument = GetDocument();
@@ -746,7 +740,7 @@ long ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
AddStatus( BASWIN_INRESCHEDULE );
- BasicIDE::InvalidateDebuggerSlots();
+ InvalidateDebuggerSlots();
while( aStatus.bIsRunning )
Application::Yield();
@@ -872,7 +866,7 @@ void ModulWindow::UpdateData()
setTextEngineText( GetEditEngine(), xModule->GetSource32() );
GetEditView()->SetSelection( aSel );
GetEditEngine()->SetModified( false );
- BasicIDE::MarkDocumentModified( GetDocument() );
+ MarkDocumentModified( GetDocument() );
}
}
}
@@ -1046,7 +1040,7 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
if ( !IsReadOnly() )
{
GetEditView()->Cut();
- if (SfxBindings* pBindings = BasicIDE::GetBindingsPtr())
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DOC_MODIFIED );
}
}
@@ -1061,7 +1055,7 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
if ( !IsReadOnly() )
{
GetEditView()->Paste();
- if (SfxBindings* pBindings = BasicIDE::GetBindingsPtr())
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DOC_MODIFIED );
}
}
@@ -1082,7 +1076,7 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
{
if (QueryDelModule(m_aName, this))
if (m_aDocument.removeModule(m_aLibName, m_aName))
- BasicIDE::MarkDocumentModified(m_aDocument);
+ MarkDocumentModified(m_aDocument);
}
break;
case FID_SEARCH_OFF:
@@ -1108,11 +1102,11 @@ void ModulWindow::ExecuteGlobal (SfxRequest& rReq)
{
case SID_SIGNATURE:
{
- basctl::DocumentSignature aSignature(m_aDocument);
+ DocumentSignature aSignature(m_aDocument);
if (aSignature.supportsSignatures())
{
aSignature.signScriptingContent();
- if (SfxBindings* pBindings = BasicIDE::GetBindingsPtr())
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate(SID_SIGNATURE);
}
}
@@ -1216,7 +1210,7 @@ bool ModulWindow::IsModified()
void ModulWindow::GoOnTop()
{
- BasicIDEGlobals::GetShell()->GetViewFrame()->ToTop();
+ GetShell()->GetViewFrame()->ToTop();
}
::rtl::OUString ModulWindow::GetSbModuleName()
@@ -1366,7 +1360,7 @@ void ModulWindow::BasicStopped()
GetBreakPointWindow().SetMarkerPos( MARKER_NOMARKER );
}
-BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
+EntryDescriptor ModulWindow::CreateEntryDescriptor()
{
ScriptDocument aDocument( GetDocument() );
String aLibName( GetLibName() );
@@ -1403,7 +1397,7 @@ BasicEntryDescriptor ModulWindow::CreateEntryDescriptor()
break;
}
}
- return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aModName, OBJ_TYPE_MODULE );
+ return EntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, aModName, OBJ_TYPE_MODULE );
}
void ModulWindow::SetReadOnly (bool b)
@@ -1450,9 +1444,9 @@ char const* ModulWindow::GetHid () const
{
return HID_BASICIDE_MODULWINDOW;
}
-BasicIDEType ModulWindow::GetType () const
+ItemType ModulWindow::GetType () const
{
- return BASICIDE_TYPE_MODULE;
+ return TYPE_MODULE;
}
bool ModulWindow::HasActiveEditor () const
@@ -1475,7 +1469,7 @@ void ModulWindow::UpdateModule ()
OSL_VERIFY(m_aDocument.updateModule(m_aLibName, m_aName, aModule));
GetEditEngine()->SetModified(false);
- BasicIDE::MarkDocumentModified(m_aDocument);
+ MarkDocumentModified(m_aDocument);
}
@@ -1512,7 +1506,7 @@ void ModulWindowLayout::DataChanged (DataChangedEvent const& rDCEvt)
}
-void ModulWindowLayout::Activating (IDEBaseWindow& rChild)
+void ModulWindowLayout::Activating (BaseWindow& rChild)
{
assert(dynamic_cast<ModulWindow*>(&rChild));
pChild = &static_cast<ModulWindow&>(rChild);
diff --git a/basctl/source/basicide/baside2.hrc b/basctl/source/basicide/baside2.hrc
index 52942fb..7c87e33 100644
--- a/basctl/source/basicide/baside2.hrc
+++ b/basctl/source/basicide/baside2.hrc
@@ -15,8 +15,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _BASIDE2_HRC
-#define _BASIDE2_HRC
+#ifndef BASCTL_BASIDE2_HRC
+#define BASCTL_BASIDE2_HRC
#include <basidesh.hrc>
@@ -38,4 +38,4 @@
#define IMGID_STEPMARKER ( SID_BASICIDE_IMAGESTART + 22 )
#define IMGID_ERRORMARKER ( SID_BASICIDE_IMAGESTART + 23 )
-#endif // _BASIDE2_HRC
+#endif // BASCTL_BASIDE2_HRC
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 0ad755c..297ebd6 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -229,7 +229,7 @@ public:
-class WatchWindow : public BasicDockingWindow
+class WatchWindow : public DockingWindow
{
private:
String aWatchStr;
@@ -260,7 +260,7 @@ public:
};
-class StackWindow : public BasicDockingWindow
+class StackWindow : public DockingWindow
{
private:
SvTreeListBox aTreeListBox;
@@ -304,7 +304,7 @@ public:
};
-class ModulWindow: public IDEBaseWindow
+class ModulWindow: public BaseWindow
{
private:
ModulWindowLayout& rLayout;
@@ -348,7 +348,7 @@ public:
// print page
virtual void printPage( sal_Int32 nPage, Printer* pPrinter );
virtual ::rtl::OUString GetTitle();
- virtual BasicEntryDescriptor CreateEntryDescriptor();
+ virtual EntryDescriptor CreateEntryDescriptor();
virtual bool AllowUndo();
virtual void SetReadOnly (bool bReadOnly);
virtual bool IsReadOnly();
@@ -418,7 +418,7 @@ public:
virtual void OnNewDocument ();
virtual char const* GetHid () const;
- virtual BasicIDEType GetType () const;
+ virtual ItemType GetType () const;
virtual bool HasActiveEditor () const;
void UpdateModule ();
@@ -430,7 +430,7 @@ public:
ModulWindowLayout (Window* pParent, ObjectCatalog&);
public:
// Layout:
- virtual void Activating (IDEBaseWindow&);
+ virtual void Activating (BaseWindow&);
virtual void Deactivating ();
virtual void GetState (SfxItemSet&, unsigned nWhich);
virtual void UpdateDebug (bool bBasicStopped);
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index a784d4d..41e31c7 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -109,7 +109,10 @@ void setTextEngineText( ExtTextEngine* pEngine, const ::rtl::OUString aStr )
pEngine->Read( aMemStream );
}
-void lcl_DrawIDEWindowFrame( BasicDockingWindow* pWin )
+namespace
+{
+
+void lcl_DrawIDEWindowFrame( DockingWindow* pWin )
{
if ( pWin->IsFloatingMode() )
return;
@@ -157,6 +160,8 @@ void lcl_SeparateNameAndIndex( const String& rVName, String& rVar, String& rInde
}
}
+} // namespace
+
//
// EditorWindow
@@ -397,8 +402,7 @@ void EditorWindow::MouseButtonUp( const MouseEvent &rEvt )
if ( pEditView )
{
pEditView->MouseButtonUp( rEvt );
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_BASICIDE_STAT_POS );
}
}
@@ -407,9 +411,7 @@ void EditorWindow::MouseButtonDown( const MouseEvent &rEvt )
{
GrabFocus();
if ( pEditView )
- {
pEditView->MouseButtonDown( rEvt );
- }
}
void EditorWindow::Command( const CommandEvent& rCEvt )
@@ -436,7 +438,7 @@ bool EditorWindow::ImpCanModify()
if ( QueryBox( 0, WB_OK_CANCEL, String( IDEResId( RID_STR_WILLSTOPPRG ) ) ).Execute() == RET_OK )
{
rModulWindow.GetBasicStatus().bIsRunning = false;
- BasicIDE::StopBasic();
+ StopBasic();
}
else
bCanModify = false;
@@ -491,8 +493,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
}
else
{
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
{
pBindings->Invalidate( SID_BASICIDE_STAT_POS );
if ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_CURSOR )
@@ -539,8 +540,6 @@ bool EditorWindow::SetSourceInBasic()
return bChanged;
}
-} // namespace basctl
-
// Returns the position of the last character of any of the following
// EOL char combinations: CR, CR/LF, LF, return -1 if no EOL is found
sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex )
@@ -559,10 +558,6 @@ sal_Int32 searchEOL( const ::rtl::OUString& rStr, sal_Int32 fromIndex )
return iRetPos;
}
-
-namespace basctl
-{
-
void EditorWindow::CreateEditEngine()
{
if ( pEditEngine )
@@ -596,7 +591,11 @@ void EditorWindow::CreateEditEngine()
// nLines*4: SetText+Formatting+DoHighlight+Formatting
// it could be cut down on one formatting but you would wait even longer
// for the text then if the source code is long...
- pProgress = new ProgressInfo( BasicIDEGlobals::GetShell()->GetViewFrame()->GetObjectShell(), String( IDEResId( RID_STR_GENERATESOURCE ) ), nLines*4 );
+ pProgress = new ProgressInfo(
+ GetShell()->GetViewFrame()->GetObjectShell(),
+ String(IDEResId(RID_STR_GENERATESOURCE)),
+ nLines*4
+ );
setTextEngineText( pEditEngine, aOUSource );
pEditView->SetStartDocPos( Point( 0, 0 ) );
@@ -626,8 +625,7 @@ void EditorWindow::CreateEditEngine()
InitScrollBars();
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_BASICIDE_STAT_POS );
DBG_ASSERT( rModulWindow.GetBreakPointWindow().GetCurYOffset() == 0, "CreateEditEngine: Brechpunkte verschoben?" );
@@ -931,7 +929,11 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted )
void EditorWindow::CreateProgress( const String& rText, sal_uLong nRange )
{
DBG_ASSERT( !pProgress, "ProgressInfo existiert schon" );
- pProgress = new ProgressInfo( BasicIDEGlobals::GetShell()->GetViewFrame()->GetObjectShell(), rText, nRange );
+ pProgress = new ProgressInfo(
+ GetShell()->GetViewFrame()->GetObjectShell(),
+ rText,
+ nRange
+ );
}
void EditorWindow::DestroyProgress()
@@ -1179,7 +1181,7 @@ namespace
}
WatchWindow::WatchWindow (Layout* pParent) :
- BasicDockingWindow(pParent),
+ DockingWindow(pParent),
aWatchStr( IDEResId( RID_STR_REMOVEWATCH ) ),
aXEdit( this, IDEResId( RID_EDT_WATCHEDIT ) ),
aRemoveWatchButton( this, IDEResId( RID_IMGBTN_REMOVEWATCH ) ),
@@ -1430,16 +1432,9 @@ bool WatchWindow::RemoveSelectedWatch()
IMPL_LINK_INLINE_START( WatchWindow, ButtonHdl, ImageButton *, pButton )
{
- if ( pButton == &aRemoveWatchButton )
- {
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
- SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
- if( pDispatcher )
- {
- pDispatcher->Execute( SID_BASICIDE_REMOVEWATCH );
- }
- }
+ if (pButton == &aRemoveWatchButton)
+ if (SfxDispatcher* pDispatcher = GetDispatcher())
+ pDispatcher->Execute(SID_BASICIDE_REMOVEWATCH);
return 0;
}
IMPL_LINK_INLINE_END( WatchWindow, ButtonHdl, ImageButton *, pButton )
@@ -1528,7 +1523,7 @@ void WatchWindow::UpdateWatches( bool bBasicStopped )
//
StackWindow::StackWindow (Layout* pParent) :
- BasicDockingWindow(pParent),
+ DockingWindow(pParent),
aTreeListBox( this, WB_BORDER | WB_3DLOOK | WB_HSCROLL | WB_TABSTOP ),
aStackStr( IDEResId( RID_STR_STACK ) )
{
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 951b5be..6bfe6e4 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -54,6 +54,9 @@
#include <vcl/msgbox.hxx>
#include <xmlscript/xmldlg_imexp.hxx>
+namespace basctl
+{
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
@@ -61,9 +64,6 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::resource;
using namespace ::com::sun::star::ui::dialogs;
-namespace basctl
-{
-
#if defined(UNX)
#define FILTERMASK_ALL "*"
#else
@@ -72,7 +72,7 @@ namespace basctl
DBG_NAME( DialogWindow )
-TYPEINIT1( DialogWindow, IDEBaseWindow );
+TYPEINIT1( DialogWindow, BaseWindow );
DialogWindow::DialogWindow (
DialogWindowLayout* pParent,
@@ -80,7 +80,7 @@ DialogWindow::DialogWindow (
rtl::OUString aLibName, rtl::OUString aName,
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel
) :
- IDEBaseWindow(pParent, rDocument, aLibName, aName),
+ BaseWindow(pParent, rDocument, aLibName, aName),
rLayout(*pParent),
pUndoMgr(0)
{
@@ -144,8 +144,7 @@ void DialogWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
pEditor->MouseButtonDown( rMEvt );
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
}
@@ -154,14 +153,13 @@ void DialogWindow::MouseButtonDown( const MouseEvent& rMEvt )
void DialogWindow::MouseButtonUp( const MouseEvent& rMEvt )
{
pEditor->MouseButtonUp( rMEvt );
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if( (pEditor->GetMode() == DLGED_INSERT) && !pEditor->IsCreateOK() )
+ if( (pEditor->GetMode() == DlgEditor::INSERT) && !pEditor->IsCreateOK() )
{
- pEditor->SetMode( DLGED_SELECT );
- if ( pBindings )
+ pEditor->SetMode( DlgEditor::SELECT );
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_CHOOSE_CONTROLS );
}
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
{
pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
pBindings->Invalidate( SID_DOC_MODIFIED );
@@ -182,19 +180,14 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt )
{
if( rKEvt.GetKeyCode() == KEY_BACKSPACE )
{
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
- SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
- if( pDispatcher )
- {
+ if (SfxDispatcher* pDispatcher = GetDispatcher())
pDispatcher->Execute( SID_BACKSPACE );
- }
}
else
{
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if( pBindings && rKEvt.GetKeyCode() == KEY_TAB )
- pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
+ if (rKEvt.GetKeyCode() == KEY_TAB)
+ if (SfxBindings* pBindings = GetBindingsPtr())
+ pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
if( !pEditor->KeyInput( rKEvt ) )
{
@@ -214,10 +207,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
}
else if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU )
{
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
- SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL;
- if ( pDispatcher )
+ if (SfxDispatcher* pDispatcher = GetDispatcher())
{
SdrView* pView = GetView();
if( !rCEvt.IsMouseEvent() && pView->AreObjectsMarked() )
@@ -235,7 +225,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
}
}
else
- IDEBaseWindow::Command( rCEvt );
+ BaseWindow::Command( rCEvt );
}
@@ -321,8 +311,8 @@ void DialogWindow::GetState( SfxItemSet& rSet )
case SID_DIALOG_TESTMODE:
{
// is the IDE still active?
- bool const bBool = BasicIDEGlobals::GetShell()->GetFrame() &&
- pEditor->GetMode() == DLGED_TEST;
+ bool const bBool = GetShell()->GetFrame() &&
+ pEditor->GetMode() == DlgEditor::TEST;
rSet.Put(SfxBoolItem(SID_DIALOG_TESTMODE, bBool));
}
break;
@@ -336,7 +326,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
else
{
SfxAllEnumItem aItem( SID_CHOOSE_CONTROLS );
- if ( GetEditor()->GetMode() == DLGED_SELECT )
+ if ( GetEditor()->GetMode() == DlgEditor::SELECT )
aItem.SetValue( SVX_SNAP_SELECT );
else
{
@@ -384,8 +374,8 @@ void DialogWindow::GetState( SfxItemSet& rSet )
case SID_SHOW_PROPERTYBROWSER:
{
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
+ Shell* pShell = GetShell();
+ SfxViewFrame* pViewFrame = pShell ? pShell->GetViewFrame() : NULL;
if ( pViewFrame && !pViewFrame->HasChildWindow( SID_SHOW_PROPERTYBROWSER ) && !pEditor->GetView()->AreObjectsMarked() )
rSet.DisableItem( nWh );
@@ -426,8 +416,7 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
if ( !IsReadOnly() )
{
GetEditor()->Cut();
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DOC_MODIFIED );
}
break;
@@ -435,8 +424,7 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
if ( !IsReadOnly() )
{
GetEditor()->Delete();
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DOC_MODIFIED );
}
break;
@@ -447,37 +435,36 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
if ( !IsReadOnly() )
{
GetEditor()->Paste();
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DOC_MODIFIED );
}
break;
case SID_INSERT_FORM_RADIO:
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMRADIO );
break;
case SID_INSERT_FORM_CHECK:
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMCHECK );
break;
case SID_INSERT_FORM_LIST:
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMLIST );
break;
case SID_INSERT_FORM_COMBO:
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMCOMBO );
break;
case SID_INSERT_FORM_SPIN:
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMSPIN );
break;
case SID_INSERT_FORM_VSCROLL:
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMVSCROLL );
break;
case SID_INSERT_FORM_HSCROLL:
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMHSCROLL );
break;
case SID_CHOOSE_CONTROLS:
@@ -490,170 +477,168 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
{
case SVX_SNAP_PUSHBUTTON:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_PUSHBUTTON );
}
break;
case SVX_SNAP_RADIOBUTTON:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_RADIOBUTTON );
}
break;
case SVX_SNAP_CHECKBOX:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_CHECKBOX);
}
break;
case SVX_SNAP_LISTBOX:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_LISTBOX );
}
break;
case SVX_SNAP_COMBOBOX:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_COMBOBOX );
}
break;
case SVX_SNAP_GROUPBOX:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_GROUPBOX );
}
break;
case SVX_SNAP_EDIT:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_EDIT );
}
break;
case SVX_SNAP_FIXEDTEXT:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FIXEDTEXT );
}
break;
case SVX_SNAP_IMAGECONTROL:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_IMAGECONTROL );
}
break;
case SVX_SNAP_PROGRESSBAR:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_PROGRESSBAR );
}
break;
case SVX_SNAP_HSCROLLBAR:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_HSCROLLBAR );
}
break;
case SVX_SNAP_VSCROLLBAR:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_VSCROLLBAR );
}
break;
case SVX_SNAP_HFIXEDLINE:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_HFIXEDLINE );
}
break;
case SVX_SNAP_VFIXEDLINE:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_VFIXEDLINE );
}
break;
case SVX_SNAP_DATEFIELD:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_DATEFIELD );
}
break;
case SVX_SNAP_TIMEFIELD:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_TIMEFIELD );
}
break;
case SVX_SNAP_NUMERICFIELD:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_NUMERICFIELD );
}
break;
case SVX_SNAP_CURRENCYFIELD:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_CURRENCYFIELD );
}
break;
case SVX_SNAP_FORMATTEDFIELD:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FORMATTEDFIELD );
}
break;
case SVX_SNAP_PATTERNFIELD:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_PATTERNFIELD );
}
break;
case SVX_SNAP_FILECONTROL:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_FILECONTROL );
}
break;
case SVX_SNAP_SPINBUTTON:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_SPINBUTTON );
}
break;
case SVX_SNAP_TREECONTROL:
{
- GetEditor()->SetMode( DLGED_INSERT );
+ GetEditor()->SetMode( DlgEditor::INSERT );
GetEditor()->SetInsertObj( OBJ_DLG_TREECONTROL );
}
break;
case SVX_SNAP_SELECT:
{
- GetEditor()->SetMode( DLGED_SELECT );
+ GetEditor()->SetMode( DlgEditor::SELECT );
}
break;
}
if ( rReq.GetModifier() & KEY_MOD1 )
{
- if ( GetEditor()->GetMode() == DLGED_INSERT )
+ if ( GetEditor()->GetMode() == DlgEditor::INSERT )
GetEditor()->CreateDefaultObject();
}
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DOC_MODIFIED );
}
break;
case SID_DIALOG_TESTMODE:
{
- DlgEdMode eOldMode = GetEditor()->GetMode();
- GetEditor()->SetMode( DLGED_TEST );
+ DlgEditor::Mode eOldMode = GetEditor()->GetMode();
+ GetEditor()->SetMode( DlgEditor::TEST );
GetEditor()->SetMode( eOldMode );
rReq.Done();
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DIALOG_TESTMODE );
return;
}
@@ -668,10 +653,10 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
case SID_BASICIDE_DELETECURRENT:
if (QueryDelDialog(m_aName, this))
{
- if (BasicIDE::RemoveDialog(m_aDocument, m_aLibName, m_aName))
+ if (RemoveDialog(m_aDocument, m_aLibName, m_aName))
{
- BasicIDE::MarkDocumentModified(m_aDocument);
- BasicIDEGlobals::GetShell()->RemoveWindow(this, true);
+ MarkDocumentModified(m_aDocument);
+ GetShell()->RemoveWindow(this, true);
}
}
break;
@@ -687,11 +672,10 @@ Reference< container::XNameContainer > DialogWindow::GetDialog() const
bool DialogWindow::RenameDialog( const ::rtl::OUString& rNewName )
{
- if ( !BasicIDE::RenameDialog( this, GetDocument(), GetLibName(), GetName(), rNewName ) )
+ if ( !basctl::RenameDialog( this, GetDocument(), GetLibName(), GetName(), rNewName ) )
return false;
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_DOC_MODIFIED );
return true;
@@ -699,20 +683,20 @@ bool DialogWindow::RenameDialog( const ::rtl::OUString& rNewName )
void DialogWindow::DisableBrowser()
{
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
- SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow(SID_SHOW_PROPERTYBROWSER) : NULL;
+ Shell* pShell = GetShell();
+ SfxViewFrame* pViewFrame = pShell ? pShell->GetViewFrame() : 0;
+ SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow(SID_SHOW_PROPERTYBROWSER) : 0;
if( pChildWin )
((PropBrw*)(pChildWin->GetWindow()))->Update( NULL );
}
void DialogWindow::UpdateBrowser()
{
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL;
- SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow(SID_SHOW_PROPERTYBROWSER) : NULL;
+ Shell* pShell = GetShell();
+ SfxViewFrame* pViewFrame = pShell ? pShell->GetViewFrame() : 0;
+ SfxChildWindow* pChildWin = pViewFrame ? pViewFrame->GetChildWindow(SID_SHOW_PROPERTYBROWSER) : 0;
if( pChildWin )
- ((PropBrw*)(pChildWin->GetWindow()))->Update( pIDEShell );
+ ((PropBrw*)(pChildWin->GetWindow()))->Update( pShell );
}
static ::rtl::OUString aResourceResolverPropName( RTL_CONSTASCII_USTRINGPARAM( "ResourceResolver" ));
@@ -893,9 +877,6 @@ bool DialogWindow::SaveDialog()
return bDone;
}
-} // namespace basctl
-
-
extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft,
const ::com::sun::star::lang::Locale& rLocaleRight );
@@ -1098,10 +1079,10 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
}
}
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
- if( pIDEShell == NULL )
+ Shell* pShell = GetShell();
+ if (!pShell)
{
- OSL_ASSERT( pIDEShell != NULL );
+ OSL_ASSERT(pShell);
return bDone;
}
@@ -1163,7 +1144,7 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
bool bCopyResourcesForDialog = true;
if( bAddDialogLanguagesToLib )
{
- boost::shared_ptr<LocalizationMgr> pCurMgr = pIDEShell->GetCurLocalizationMgr();
+ boost::shared_ptr<LocalizationMgr> pCurMgr = pShell->GetCurLocalizationMgr();
lang::Locale aFirstLocale;
aFirstLocale = aOnlyInImportLanguages[0];
@@ -1225,12 +1206,12 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
if( eNameClashMode == CLASH_OVERWRITE_DIALOG )
{
- if ( BasicIDE::RemoveDialog( rDocument, aLibName, aNewDlgName ) )
+ if (basctl::RemoveDialog( rDocument, aLibName, aNewDlgName ) )
{
- IDEBaseWindow* pDlgWin = pIDEShell->FindDlgWin( rDocument, aLibName, aNewDlgName, false, true );
+ BaseWindow* pDlgWin = pShell->FindDlgWin( rDocument, aLibName, aNewDlgName, false, true );
if( pDlgWin != NULL )
- pIDEShell->RemoveWindow( pDlgWin, true );
- BasicIDE::MarkDocumentModified( rDocument );
+ pShell->RemoveWindow( pDlgWin, true );
+ MarkDocumentModified( rDocument );
}
else
{
@@ -1271,8 +1252,8 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
bool bSuccess = rDocument.insertDialog( aLibName, aNewDlgName, xISP );
if( bSuccess )
{
- basctl::DialogWindow* pNewDlgWin = pIDEShell->CreateDlgWin( rDocument, aLibName, aNewDlgName );
- pIDEShell->SetCurWindow( pNewDlgWin, true );
+ DialogWindow* pNewDlgWin = pShell->CreateDlgWin( rDocument, aLibName, aNewDlgName );
+ pShell->SetCurWindow( pNewDlgWin, true );
}
bDone = true;
@@ -1285,9 +1266,6 @@ bool implImportDialog( Window* pWin, const ::rtl::OUString& rCurPath, const Scri
}
-namespace basctl
-{
-
bool DialogWindow::ImportDialog()
{
DBG_CHKTHIS( DialogWindow, 0 );
@@ -1327,24 +1305,24 @@ bool DialogWindow::IsModified()
return GetName();
}
-BasicEntryDescriptor DialogWindow::CreateEntryDescriptor()
+EntryDescriptor DialogWindow::CreateEntryDescriptor()
{
ScriptDocument aDocument( GetDocument() );
::rtl::OUString aLibName( GetLibName() );
::rtl::OUString aLibSubName;
LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
- return BasicEntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG );
+ return EntryDescriptor( aDocument, eLocation, aLibName, aLibSubName, GetName(), OBJ_TYPE_DIALOG );
}
void DialogWindow::SetReadOnly (bool bReadOnly)
{
if (pEditor)
- pEditor->SetMode(bReadOnly ? DLGED_READONLY : DLGED_SELECT);
+ pEditor->SetMode(bReadOnly ? DlgEditor::READONLY : DlgEditor::SELECT);
}
bool DialogWindow::IsReadOnly ()
{
- return pEditor && pEditor->GetMode() == DLGED_READONLY;
+ return pEditor && pEditor->GetMode() == DlgEditor::READONLY;
}
bool DialogWindow::IsPasteAllowed()
@@ -1379,7 +1357,7 @@ void DialogWindow::StoreData()
{
DBG_UNHANDLED_EXCEPTION();
}
- BasicIDE::MarkDocumentModified( GetDocument() );
+ MarkDocumentModified( GetDocument() );
pEditor->ClearModifyFlag();
}
}
@@ -1394,7 +1372,7 @@ void DialogWindow::Deactivating()
{
Hide();
if ( IsModified() )
- BasicIDE::MarkDocumentModified( GetDocument() );
+ MarkDocumentModified( GetDocument() );
DisableBrowser();
}
@@ -1416,7 +1394,7 @@ void DialogWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
else
- IDEBaseWindow::DataChanged( rDCEvt );
+ BaseWindow::DataChanged( rDCEvt );
}
void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground)
@@ -1448,9 +1426,9 @@ char const* DialogWindow::GetHid () const
{
return HID_BASICIDE_DIALOGWINDOW;
}
-BasicIDEType DialogWindow::GetType () const
+ItemType DialogWindow::GetType () const
{
- return BASICIDE_TYPE_DIALOG;
+ return TYPE_DIALOG;
}
@@ -1465,7 +1443,7 @@ DialogWindowLayout::DialogWindowLayout (Window* pParent, ObjectCatalog& rObjectC
rObjectCatalog(rObjectCatalog_)
{ }
-void DialogWindowLayout::Activating (IDEBaseWindow& rChild)
+void DialogWindowLayout::Activating (BaseWindow& rChild)
{
assert(dynamic_cast<DialogWindow*>(&rChild));
pChild = &static_cast<DialogWindow&>(rChild);
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index 05d511e..262afb1 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -17,16 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "basidectrlr.hxx"
+
+#include "basidesh.hxx"
-#include <basidectrlr.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <vcl/syswin.hxx>
-#include <basidesh.hxx>
-
+namespace basctl
+{
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -39,7 +41,7 @@ using namespace com::sun::star::beans;
//----------------------------------------------------------------------------
-BasicIDEController::BasicIDEController( BasicIDEShell* pViewShell )
+Controller::Controller (Shell* pViewShell)
:OPropertyContainer( m_aBHelper )
,SfxBaseController( pViewShell )
,m_nIconId( ICON_MACROLIBRARY )
@@ -49,14 +51,13 @@ BasicIDEController::BasicIDEController( BasicIDEShell* pViewShell )
//----------------------------------------------------------------------------
-BasicIDEController::~BasicIDEController()
-{
-}
+Controller::~Controller()
+{ }
// XInterface
//----------------------------------------------------------------------------
-Any SAL_CALL BasicIDEController::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException)
{
Any aReturn = SfxBaseController::queryInterface( rType );
if ( !aReturn.hasValue() )
@@ -67,14 +68,14 @@ Any SAL_CALL BasicIDEController::queryInterface( const Type & rType ) throw(Runt
//----------------------------------------------------------------------------
-void SAL_CALL BasicIDEController::acquire() throw()
+void SAL_CALL Controller::acquire() throw()
{
SfxBaseController::acquire();
}
//----------------------------------------------------------------------------
-void SAL_CALL BasicIDEController::release() throw()
+void SAL_CALL Controller::release() throw()
{
SfxBaseController::release();
}
@@ -83,19 +84,19 @@ void SAL_CALL BasicIDEController::release() throw()
// XTypeProvider ( ::SfxBaseController )
//----------------------------------------------------------------------------
-Sequence< Type > SAL_CALL BasicIDEController::getTypes() throw(RuntimeException)
+Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException)
{
Sequence< Type > aTypes = ::comphelper::concatSequences(
SfxBaseController::getTypes(),
OPropertyContainer::getTypes()
- );
+ );
return aTypes;
}
//----------------------------------------------------------------------------
-Sequence< sal_Int8 > SAL_CALL BasicIDEController::getImplementationId() throw(RuntimeException)
+Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException)
{
static ::cppu::OImplementationId * pId = 0;
if ( !pId )
@@ -113,7 +114,7 @@ Sequence< sal_Int8 > SAL_CALL BasicIDEController::getImplementationId() throw(Ru
// XPropertySet
//----------------------------------------------------------------------------
-Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySetInfo() throw(RuntimeException)
+Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException)
{
Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
return xInfo;
@@ -122,7 +123,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySet
// OPropertySetHelper
//----------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper& BasicIDEController::getInfoHelper()
+::cppu::IPropertyArrayHelper& Controller::getInfoHelper()
{
return *getArrayHelper();
}
@@ -130,7 +131,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySet
// OPropertyArrayUsageHelper
//----------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper* BasicIDEController::createArrayHelper( ) const
+::cppu::IPropertyArrayHelper* Controller::createArrayHelper( ) const
{
Sequence< Property > aProps;
describeProperties( aProps );
@@ -139,4 +140,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySet
//----------------------------------------------------------------------------
+} // namespace basctl
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 233e01c..e36eaf3 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -52,16 +52,14 @@
#include <vcl/xtextedt.hxx>
#include <vcl/msgbox.hxx>
+namespace basctl
+{
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
-using basctl::ModulWindow;
-using basctl::ModulWindowLayout;
-using basctl::DialogWindow;
-using basctl::DialogWindowLayout;
-
-void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
+void Shell::ExecuteCurrent( SfxRequest& rReq )
{
if ( !pCurWin )
return;
@@ -92,24 +90,24 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
DBG_ASSERT(dynamic_cast<SvxSearchItem const*>(&rItem), "no searchitem!");
SvxSearchItem const& rSearchItem = static_cast<SvxSearchItem const&>(rItem);
// memorize item because of the adjustments...
- BasicIDEGlobals::GetExtraData()->SetSearchItem(rSearchItem);
+ GetExtraData()->SetSearchItem(rSearchItem);
sal_Int32 nFound = 0;
bool bCanceled = false;
if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL)
{
sal_uInt16 nActModWindows = 0;
- for (WindowTableIt it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it)
+ for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
- IDEBaseWindow* pWin = it->second;
+ BaseWindow* pWin = it->second;
if (pWin->HasActiveEditor())
nActModWindows++;
}
if ( nActModWindows <= 1 || ( !rSearchItem.GetSelection() && QueryBox( pCurWin, WB_YES_NO|WB_DEF_YES, String(IDEResId(RID_STR_SEARCHALLMODULES)) ).Execute() == RET_YES ) )
{
- for (WindowTableIt it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it)
+ for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
- IDEBaseWindow* pWin = it->second;
+ BaseWindow* pWin = it->second;
nFound += pWin->StartSearchAndReplace(rSearchItem);
}
}
@@ -128,12 +126,12 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
// search other modules...
bool bChangeCurWindow = false;
WindowTableIt it;
- for (it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it)
+ for (it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
if (it->second == pCurWin)
break;
- if (it != aIDEWindowTable.end())
+ if (it != aWindowTable.end())
++it;
- IDEBaseWindow* pWin = it != aIDEWindowTable.end() ? it->second : 0;
+ BaseWindow* pWin = it != aWindowTable.end() ? it->second : 0;
bool bSearchedFromStart = false;
while ( !nFound && !bCanceled && ( pWin || !bSearchedFromStart ) )
@@ -146,8 +144,8 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
QueryBox aQuery(pParent, WB_YES_NO|WB_DEF_YES, IDE_RESSTR(RID_STR_SEARCHFROMSTART));
if ( aQuery.Execute() == RET_YES )
{
- it = aIDEWindowTable.begin();
- if ( it != aIDEWindowTable.end() )
+ it = aWindowTable.begin();
+ if ( it != aWindowTable.end() )
pWin = it->second;
bSearchedFromStart = true;
}
@@ -171,9 +169,9 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
}
if ( pWin && ( pWin != pCurWin ) )
{
- if ( it != aIDEWindowTable.end() )
+ if ( it != aWindowTable.end() )
++it;
- pWin = it != aIDEWindowTable.end() ? it->second : 0;
+ pWin = it != aWindowTable.end() ? it->second : 0;
}
else
pWin = 0;
@@ -201,7 +199,7 @@ void BasicIDEShell::ExecuteCurrent( SfxRequest& rReq )
}
// no matter who's at the top, influence on the shell:
-void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
+void Shell::ExecuteGlobal( SfxRequest& rReq )
{
sal_uInt16 nSlot = rReq.GetSlot();
switch ( nSlot )
@@ -211,7 +209,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
// maybe do not simply stop if on breakpoint!
if (ModulWindow* pMCurWin = dynamic_cast<ModulWindow*>(pCurWin))
pMCurWin->BasicStop();
- BasicIDE::StopBasic();
+ StopBasic();
}
break;
@@ -252,8 +250,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
aDocument.saveDocument( xStatusIndicator );
}
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
{
pBindings->Invalidate( SID_DOC_MODIFIED );
pBindings->Invalidate( SID_SAVEDOC );
@@ -267,15 +264,15 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
if ( rReq.GetArgs() )
{
const SfxUInt16Item &rTabId = (const SfxUInt16Item&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_TABID );
- BasicIDE::Organize( rTabId.GetValue() );
+ Organize( rTabId.GetValue() );
}
else
- BasicIDE::Organize( 0 );
+ Organize( 0 );
}
break;
case SID_BASICIDE_CHOOSEMACRO:
{
- BasicIDE::ChooseMacro( NULL, false, ::rtl::OUString() );
+ ChooseMacro( NULL, false, ::rtl::OUString() );
}
break;
case SID_BASICIDE_CREATEMACRO:
@@ -302,7 +299,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
// get Basic
pBasic = pBasMgr->GetLib( aLibName );
}
- DBG_ASSERT( pBasic, "Kein Basic!" );
+ DBG_ASSERT( pBasic, "No Basic!" );
SetCurLib( aDocument, aLibName );
@@ -324,7 +321,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
}
DBG_ASSERT( pModule, "Kein Modul!" );
if ( !pModule->GetMethods()->Find( rInfo.GetMethod(), SbxCLASS_METHOD ) )
- BasicIDE::CreateMacro( pModule, rInfo.GetMethod() );
+ CreateMacro( pModule, rInfo.GetMethod() );
}
SfxViewFrame* pViewFrame = GetViewFrame();
if ( pViewFrame )
@@ -342,7 +339,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
if (pLayout)
pLayout->ArrangeWindows();
// refresh the button state
- if (SfxBindings* pBindings = BasicIDE::GetBindingsPtr())
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate(SID_BASICIDE_OBJCAT);
break;
@@ -351,9 +348,9 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
const SfxUInt16Item &rTabId = (const SfxUInt16Item&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_TABID );
const SfxStringItem &rModName = (const SfxStringItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_MODULENAME );
- if ( aIDEWindowTable.find( rTabId.GetValue() ) != aIDEWindowTable.end() )
+ if ( aWindowTable.find( rTabId.GetValue() ) != aWindowTable.end() )
{
- IDEBaseWindow* pWin = aIDEWindowTable[ rTabId.GetValue() ];
+ BaseWindow* pWin = aWindowTable[ rTabId.GetValue() ];
::rtl::OUString aNewName( rModName.GetValue() );
::rtl::OUString aOldName( pWin->GetName() );
if ( aNewName != aOldName )
@@ -364,7 +361,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
rtl::OUString aLibName = pModWin->GetLibName();
ScriptDocument aDocument( pWin->GetDocument() );
- if ( BasicIDE::RenameModule( pModWin, aDocument, aLibName, aOldName, aNewName ) )
+ if (RenameModule(pModWin, aDocument, aLibName, aOldName, aNewName))
{
bRenameOk = true;
// Because we listen for container events for script
@@ -380,12 +377,12 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
}
if ( bRenameOk )
{
- BasicIDE::MarkDocumentModified( pWin->GetDocument() );
+ MarkDocumentModified( pWin->GetDocument() );
}
else
{
// set old name in TabWriter
- sal_uInt16 nId = GetIDEWindowId( pWin );
+ sal_uInt16 nId = GetWindowId( pWin );
DBG_ASSERT( nId, "No entry in Tabbar!" );
if ( nId )
pTabBar->SetPageText( nId, aOldName );
@@ -418,9 +415,9 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
case SID_BASICIDE_STOREALLMODULESOURCES:
case SID_BASICIDE_UPDATEALLMODULESOURCES:
{
- for (WindowTableIt it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it)
+ for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
- IDEBaseWindow* pWin = it->second;
+ BaseWindow* pWin = it->second;
if (!pWin->IsSuspended() && dynamic_cast<ModulWindow*>(pWin))
{
if ( rReq.GetSlot() == SID_BASICIDE_STOREALLMODULESOURCES )
@@ -468,8 +465,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
else
{
// adjust old value...
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate(SID_BASICIDE_LIBSELECTOR, true, false);
}
}
@@ -483,8 +479,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
m_aCurDocument = ScriptDocument::getApplicationScriptDocument();
m_aCurLibName = String();
// no UpdateWindows!
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
- if ( pBindings )
+ if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_BASICIDE_LIBSELECTOR );
}
}
@@ -521,9 +516,9 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
::rtl::OUString aName( rSbxItem.GetName() );
if ( m_aCurLibName.isEmpty() || ( aDocument == m_aCurDocument && aLibName == m_aCurLibName ) )
{
- if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
+ if ( rSbxItem.GetType() == TYPE_MODULE )
FindBasWin( aDocument, aLibName, aName, true );
- else if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
+ else if ( rSbxItem.GetType() == TYPE_DIALOG )
FindDlgWin( aDocument, aLibName, aName, true );
}
}
@@ -533,7 +528,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
DBG_ASSERT( rReq.GetArgs(), "arguments expected" );
const SbxItem& rSbxItem = (const SbxItem&)rReq.GetArgs()->Get(SID_BASICIDE_ARG_SBX );
ScriptDocument aDocument( rSbxItem.GetDocument() );
- IDEBaseWindow* pWin = FindWindow( aDocument, rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), true );
+ BaseWindow* pWin = FindWindow( aDocument, rSbxItem.GetLibName(), rSbxItem.GetName(), rSbxItem.GetType(), true );
if ( pWin )
RemoveWindow( pWin, true );
}
@@ -546,19 +541,19 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
::rtl::OUString aLibName( rSbxItem.GetLibName() );
::rtl::OUString aName( rSbxItem.GetName() );
SetCurLib( aDocument, aLibName );
- IDEBaseWindow* pWin = 0;
- if ( rSbxItem.GetType() == BASICIDE_TYPE_DIALOG )
+ BaseWindow* pWin = 0;
+ if ( rSbxItem.GetType() == TYPE_DIALOG )
{
pWin = FindDlgWin( aDocument, aLibName, aName, true );
}
- else if ( rSbxItem.GetType() == BASICIDE_TYPE_MODULE )
+ else if ( rSbxItem.GetType() == TYPE_MODULE )
{
pWin = FindBasWin( aDocument, aLibName, aName, true );
}
- else if ( rSbxItem.GetType() == BASICIDE_TYPE_METHOD )
+ else if ( rSbxItem.GetType() == TYPE_METHOD )
{
pWin = FindBasWin( aDocument, aLibName, aName, true );
- ((ModulWindow*)pWin)->EditMacro( rSbxItem.GetMethodName() );
+ static_cast<ModulWindow*>(pWin)->EditMacro( rSbxItem.GetMethodName() );
}
DBG_ASSERT( pWin, "Fenster wurde nicht erzeugt!" );
SetCurWindow( pWin, true );
@@ -612,7 +607,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
if ( pTypeItem )
aType = pTypeItem->GetValue();
- IDEBaseWindow* pWin = 0;
+ BaseWindow* pWin = 0;
if ( aType == aModType )
pWin = FindBasWin( *pDocument, aLibName, aName, false );
else if ( aType == aDlgType )
@@ -705,7 +700,7 @@ void BasicIDEShell::ExecuteGlobal( SfxRequest& rReq )
}
}
-void BasicIDEShell::GetState(SfxItemSet &rSet)
+void Shell::GetState(SfxItemSet &rSet)
{
SfxWhichIter aIter(rSet);
for ( sal_uInt16 nWh = aIter.FirstWhich(); 0 != nWh; nWh = aIter.NextWhich() )
@@ -750,7 +745,7 @@ void BasicIDEShell::GetState(SfxItemSet &rSet)
sal_uInt16 nState = 0;
if ( pCurWin )
{
- ::basctl::DocumentSignature aSignature( pCurWin->GetDocument() );
+ DocumentSignature aSignature( pCurWin->GetDocument() );
nState = aSignature.getScriptingSignatureState();
}
rSet.Put( SfxUInt16Item( SID_SIGNATURE, nState ) );
@@ -861,7 +856,7 @@ void BasicIDEShell::GetState(SfxItemSet &rSet)
case SID_SEARCH_ITEM:
{
::rtl::OUString aSelected = GetSelectionText(true);
- SvxSearchItem& rItem = BasicIDEGlobals::GetExtraData()->GetSearchItem();
+ SvxSearchItem& rItem = GetExtraData()->GetSearchItem();
rItem.SetSearchString( aSelected );
rSet.Put( rItem );
}
@@ -984,7 +979,7 @@ void BasicIDEShell::GetState(SfxItemSet &rSet)
pCurWin->GetState( rSet );
}
-sal_Bool BasicIDEShell::HasUIFeature( sal_uInt32 nFeature )
+sal_Bool Shell::HasUIFeature( sal_uInt32 nFeature )
{
bool bResult = false;
@@ -998,7 +993,7 @@ sal_Bool BasicIDEShell::HasUIFeature( sal_uInt32 nFeature )
return bResult;
}
-void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, bool bUpdateTabBar, bool bRememberAsCurrent )
+void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRememberAsCurrent )
{
if ( pNewWin != pCurWin )
{
@@ -1007,7 +1002,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, bool bUpdateTabBar, bo
pLayout->Deactivating();
if (pCurWin)
{
- if (pCurWin->GetType() == BASICIDE_TYPE_MODULE)
+ if (pCurWin->GetType() == TYPE_MODULE)
pLayout = pModulLayout.get();
else
pLayout = pDialogLayout.get();
@@ -1019,7 +1014,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, bool bUpdateTabBar, bo
if (GetViewFrame()->GetWindow().IsVisible()) // SFX will do it later otherwise
pCurWin->Show();
pCurWin->Init();
- if ( !BasicIDEGlobals::GetExtraData()->ShellInCriticalSection() )
+ if (!GetExtraData()->ShellInCriticalSection())
{
Window* pFrameWindow = &GetViewFrame()->GetWindow();
Window* pFocusWindow = Application::GetFocusWindow();
@@ -1033,7 +1028,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, bool bUpdateTabBar, bo
pLayout = 0;
if ( bUpdateTabBar )
{
- sal_uLong nKey = GetIDEWindowId( pCurWin );
+ sal_uLong nKey = GetWindowId( pCurWin );
if ( pCurWin && ( pTabBar->GetPagePos( (sal_uInt16)nKey ) == TAB_PAGE_NOTFOUND ) )
pTabBar->InsertPage( (sal_uInt16)nKey, pCurWin->GetTitle() ); // has just been faded in
pTabBar->SetCurPageId( (sal_uInt16)nKey );
@@ -1067,7 +1062,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, bool bUpdateTabBar, bo
}
}
-void BasicIDEShell::ManageToolbars()
+void Shell::ManageToolbars()
{
static ::rtl::OUString aLayoutManagerName( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ));
static ::rtl::OUString aMacroBarResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/macrobar" ));
@@ -1110,27 +1105,27 @@ void BasicIDEShell::ManageToolbars()
}
}
-IDEBaseWindow* BasicIDEShell::FindApplicationWindow()
+BaseWindow* Shell::FindApplicationWindow()
{
return FindWindow( ScriptDocument::getApplicationScriptDocument() );
}
-IDEBaseWindow* BasicIDEShell::FindWindow(
+BaseWindow* Shell::FindWindow(
ScriptDocument const& rDocument,
rtl::OUString const& rLibName, rtl::OUString const& rName,
- BasicIDEType eType, bool bFindSuspended
+ ItemType eType, bool bFindSuspended
)
{
- for (WindowTableIt it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it)
+ for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
- IDEBaseWindow* const pWin = it->second;
+ BaseWindow* const pWin = it->second;
if (pWin->Is(rDocument, rLibName, rName, eType, bFindSuspended))
return pWin;
}
return 0;
}
-long BasicIDEShell::CallBasicErrorHdl( StarBASIC* pBasic )
+long Shell::CallBasicErrorHdl( StarBASIC* pBasic )
{
long nRet = 0;
ModulWindow* pModWin = ShowActiveModuleWindow( pBasic );
@@ -1139,7 +1134,7 @@ long BasicIDEShell::CallBasicErrorHdl( StarBASIC* pBasic )
return nRet;
}
-long BasicIDEShell::CallBasicBreakHdl( StarBASIC* pBasic )
+long Shell::CallBasicBreakHdl( StarBASIC* pBasic )
{
long nRet = 0;
ModulWindow* pModWin = ShowActiveModuleWindow( pBasic );
@@ -1148,7 +1143,7 @@ long BasicIDEShell::CallBasicBreakHdl( StarBASIC* pBasic )
bool bAppWindowDisabled, bDispatcherLocked;
sal_uInt16 nWaitCount;
SfxUInt16Item *pSWActionCount, *pSWLockViewCount;
- BasicIDE::BasicStopped( &bAppWindowDisabled, &bDispatcherLocked,
+ BasicStopped( &bAppWindowDisabled, &bDispatcherLocked,
&nWaitCount, &pSWActionCount, &pSWLockViewCount );
nRet = pModWin->BasicBreakHdl( pBasic );
@@ -1160,16 +1155,16 @@ long BasicIDEShell::CallBasicBreakHdl( StarBASIC* pBasic )
if ( nWaitCount )
{
- BasicIDEShell* pIDEShell = BasicIDEGlobals::GetShell();
+ Shell* pShell = GetShell();
for ( sal_uInt16 n = 0; n < nWaitCount; n++ )
- pIDEShell->GetViewFrame()->GetWindow().EnterWait();
+ pShell->GetViewFrame()->GetWindow().EnterWait();
}
}
}
return nRet;
}
-ModulWindow* BasicIDEShell::ShowActiveModuleWindow( StarBASIC* pBasic )
+ModulWindow* Shell::ShowActiveModuleWindow( StarBASIC* pBasic )
{
SetCurLib( ScriptDocument::getApplicationScriptDocument(), ::rtl::OUString(), false );
@@ -1184,8 +1179,7 @@ ModulWindow* BasicIDEShell::ShowActiveModuleWindow( StarBASIC* pBasic )
SbxObject* pParent = pActiveModule->GetParent();
if (StarBASIC* pLib = dynamic_cast<StarBASIC*>(pParent))
{
- BasicManager* pBasMgr = BasicIDE::FindBasicManager( pLib );
- if ( pBasMgr )
+ if (BasicManager* pBasMgr = FindBasicManager(pLib))
{
ScriptDocument aDocument( ScriptDocument::getDocumentForBasicManager( pBasMgr ) );
::rtl::OUString aLibName = pLib->GetName();
@@ -1196,16 +1190,15 @@ ModulWindow* BasicIDEShell::ShowActiveModuleWindow( StarBASIC* pBasic )
}
}
else
- DBG_ASSERT(false, "Kein BASIC!");
- BasicManager* pBasicMgr = BasicIDE::FindBasicManager( pBasic );
- if ( pBasicMgr )
+ DBG_ASSERT(false, "No BASIC!");
+ if (BasicManager* pBasicMgr = FindBasicManager(pBasic))
StartListening( *pBasicMgr, true /* log on only once */ );
return pWin;
}
return 0;
}
-void BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
+void Shell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
{
// not if iconified because the whole text would be displaced then at restore
if ( GetViewFrame()->GetWindow().GetOutputSizePixel().Height() == 0 )
@@ -1240,7 +1233,7 @@ void BasicIDEShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
pLayout->SetPosSizePixel(rPos, dynamic_cast<DialogWindow*>(pCurWin) ? aSz : aOutSz);
}
-Reference< XModel > BasicIDEShell::GetCurrentDocument() const
+Reference< XModel > Shell::GetCurrentDocument() const
{
Reference< XModel > xDocument;
if ( pCurWin && pCurWin->GetDocument().isDocument() )
@@ -1248,7 +1241,7 @@ Reference< XModel > BasicIDEShell::GetCurrentDocument() const
return xDocument;
}
-void BasicIDEShell::Activate( sal_Bool bMDI )
+void Shell::Activate( sal_Bool bMDI )
{
SfxViewShell::Activate( bMDI );
@@ -1259,7 +1252,7 @@ void BasicIDEShell::Activate( sal_Bool bMDI )
}
}
-void BasicIDEShell::Deactivate( sal_Bool bMDI )
+void Shell::Deactivate( sal_Bool bMDI )
{
// bMDI == true means that another MDI has been activated; in case of a
// deactivate due to a MessageBox bMDI is false
@@ -1269,14 +1262,14 @@ void BasicIDEShell::Deactivate( sal_Bool bMDI )
{
pXDlgWin->DisableBrowser();
if( pXDlgWin->IsModified() )
- BasicIDE::MarkDocumentModified( pXDlgWin->GetDocument() );
+ MarkDocumentModified( pXDlgWin->GetDocument() );
}
// test CanClose to also test during deactivating the BasicIDE whether
// the sourcecode is too large in one of the modules...
- for (WindowTableIt it = aIDEWindowTable.begin(); it != aIDEWindowTable.end(); ++it)
+ for (WindowTableIt it = aWindowTable.begin(); it != aWindowTable.end(); ++it)
{
- IDEBaseWindow* pWin = it->second;
+ BaseWindow* pWin = it->second;
if ( /* !pWin->IsSuspended() && */ !pWin->CanClose() )
{
if ( !m_aCurLibName.isEmpty() && ( pWin->IsDocument( m_aCurDocument ) || pWin->GetLibName() != m_aCurLibName ) )
@@ -1288,4 +1281,6 @@ void BasicIDEShell::Deactivate( sal_Bool bMDI )
}
}
+} // namespace basctl
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 6a1a5b4..16e73fe 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -41,19 +41,19 @@
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+namespace basctl
+{
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
namespace css = ::com::sun::star;
-using basctl::ModulWindow;
-using basctl::ModulWindowLayout;
-
-Reference< view::XRenderable > BasicIDEShell::GetRenderable()
+Reference< view::XRenderable > Shell::GetRenderable()
{
- return Reference< view::XRenderable >( new basicide::BasicRenderable( pCurWin ) );
+ return Reference<view::XRenderable>( new Renderable(pCurWin) );
}
-sal_Bool BasicIDEShell::HasSelection( sal_Bool /* bText */ ) const
+sal_Bool Shell::HasSelection( sal_Bool /* bText */ ) const
{
if (ModulWindow* pMCurWin = dynamic_cast<ModulWindow*>(pCurWin))
{
@@ -64,7 +64,7 @@ sal_Bool BasicIDEShell::HasSelection( sal_Bool /* bText */ ) const
return false;
}
-String BasicIDEShell::GetSelectionText( sal_Bool bWholeWord )
+String Shell::GetSelectionText( sal_Bool bWholeWord )
{
String aText;
if (ModulWindow* pMCurWin = dynamic_cast<ModulWindow*>(pCurWin))
@@ -86,27 +86,27 @@ String BasicIDEShell::GetSelectionText( sal_Bool bWholeWord )
return aText;
}
-SfxPrinter* BasicIDEShell::GetPrinter( sal_Bool bCreate )
+SfxPrinter* Shell::GetPrinter( sal_Bool bCreate )
{
if ( pCurWin )
{
- BasicDocShell* pDocShell = (BasicDocShell*)GetViewFrame()->GetObjectShell();
+ DocShell* pDocShell = (DocShell*)GetViewFrame()->GetObjectShell();
DBG_ASSERT( pDocShell, "DocShell ?!" );
return pDocShell->GetPrinter( bCreate );
}
return 0;
}
-sal_uInt16 BasicIDEShell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool )
+sal_uInt16 Shell::SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags, bool )
{
(void)nDiffFlags;
- BasicDocShell* pDocShell = (BasicDocShell*)GetViewFrame()->GetObjectShell();
+ DocShell* pDocShell = (DocShell*)GetViewFrame()->GetObjectShell();
DBG_ASSERT( pDocShell, "DocShell ?!" );
pDocShell->SetPrinter( pNewPrinter );
return 0;
}
-void BasicIDEShell::SetMDITitle()
+void Shell::SetMDITitle()
{
::rtl::OUStringBuffer aTitleBuf;
if ( !m_aCurLibName.isEmpty() )
@@ -119,7 +119,7 @@ void BasicIDEShell::SetMDITitle()
else
aTitleBuf.append(IDE_RESSTR(RID_STR_ALL));
- ::basctl::DocumentSignature aCurSignature( m_aCurDocument );
+ DocumentSignature aCurSignature( m_aCurDocument );
if ( aCurSignature.getScriptingSignatureState() == SIGNATURESTATE_SIGNATURES_OK )
{
aTitleBuf.append(' ');
@@ -145,7 +145,7 @@ void BasicIDEShell::SetMDITitle()
}
}
-ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
+ModulWindow* Shell::CreateBasWin( const ScriptDocument& rDocument, const ::rtl::OUString& rLibName, const ::rtl::OUString& rModName )
{
bCreatingWindow = true;
@@ -193,7 +193,7 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
else
{
pWin->SetStatus( pWin->GetStatus() & ~BASWIN_SUSPENDED );
- nKey = GetIDEWindowId( pWin );
+ nKey = GetWindowId( pWin );
DBG_ASSERT( nKey, "CreateBasWin: Kein Key- Fenster nicht gefunden!" );
}
if( nKey && xLib.is() && rDocument.isInVBAMode() )
@@ -222,41 +222,40 @@ ModulWindow* BasicIDEShell::CreateBasWin( const ScriptDocument& rDocument, const
return pWin;
}
-ModulWindow* BasicIDEShell::FindBasWin (
+ModulWindow* Shell::FindBasWin (
ScriptDocument const& rDocument,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list