From f4ba26d7568062c21a569e987a9b3b93849c64ed Mon Sep 17 00:00:00 2001 From: Release Engineers Date: Thu, 6 Aug 2009 11:03:20 +0000 Subject: [PATCH] CWS-TOOLING: integrate CWS ab72 2009-08-03 14:57:25 +0200 jsk r274581 : #i103969 - fixed f_windowfunctions.bas 2009-08-03 13:29:21 +0200 jsk r274577 : #i103969 - minor stability improvements and a rewrite to use GUI function to install extension (CLI version fails for some unknown reason) 2009-07-16 10:43:48 +0200 ab r274033 : #i82918# Added support to pass context explicitely to service ctors 2009-07-08 16:24:05 +0200 ab r273839 : CWS-TOOLING: rebase CWS ab72 to trunk@273468 (milestone: DEV300:m51) 2009-07-02 13:09:22 +0200 ab r273641 : #i89740# Fixed resource typos 2009-07-02 12:21:49 +0200 ab r273635 : #i99461# Applied patch 2009-06-23 15:56:08 +0200 ab r273284 : #i100578# applied patch 2009-06-23 11:52:45 +0200 ab r273271 : #i100600# applied patch 2009-06-22 14:35:15 +0200 ab r273231 : #i101603# applied patch 2009-06-22 13:24:22 +0200 ab r273227 : #i100540# applied patch to remove unused code 2009-06-10 13:33:20 +0200 ab r272806 : #i82918# New style service ctor support --- basctl/source/basicide/basidesh.src | 2 +- basctl/source/basicide/basobj2.cxx | 25 ------------- basctl/source/basicide/bastype3.hxx | 18 --------- basctl/source/basicide/bastypes.cxx | 57 ----------------------------- basctl/source/basicide/moduldl2.cxx | 31 ---------------- basctl/source/basicide/moduldlg.hxx | 4 -- basctl/source/dlged/dlgedobj.cxx | 27 -------------- basctl/source/inc/basobj.hxx | 1 - basctl/source/inc/bastypes.hxx | 12 ------ basctl/source/inc/dlgedobj.hxx | 4 -- 10 files changed, 1 insertion(+), 180 deletions(-) diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 5d5f4b6fe9fb..130dda34d9e4 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -195,7 +195,7 @@ String RID_STR_APPENDLIBS String RID_STR_QUERYDELMACRO { /* ### ACHTUNG: Neuer Text in Resource? Möchten Sie das Makro XX löschen ? : M÷chten Sie das Makro XX l÷schen ? */ - Text [ en-US ] = "Do you want to delete the macro XX ?" ; + Text [ en-US ] = "Do you want to delete the macro XX?" ; }; String RID_STR_QUERYDELDIALOG { diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 4d0ccca05581..e4abb3fad92e 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -80,31 +80,6 @@ namespace BasicIDE { //---------------------------------------------------------------------------- -SfxMacro* CreateMacro() -{ - DBG_ERROR( "BasicIDE::CreateMacro() - war eigentlich nur fuer Macro-Recording!" ); - IDE_DLL()->GetExtraData()->ChoosingMacro() = TRUE; - SFX_APP()->EnterBasicCall(); - Window* pParent = Application::GetDefDialogParent(); - SfxMacro* pMacro = 0; - MacroChooser* pChooser = new MacroChooser( pParent, TRUE ); - Window* pOldModalDialogParent = Application::GetDefDialogParent(); - Application::SetDefDialogParent( pChooser ); - //pChooser->SetMode( MACROCHOOSER_RECORDING ); - short nRetValue = pChooser->Execute(); - (void)nRetValue; - - Application::SetDefDialogParent( pOldModalDialogParent ); - delete pChooser; - - SFX_APP()->LeaveBasicCall(); - IDE_DLL()->GetExtraData()->ChoosingMacro() = FALSE; - - return pMacro; -} - -//---------------------------------------------------------------------------- - void Organize( INT16 tabId ) { BasicIDEDLL::Init(); diff --git a/basctl/source/basicide/bastype3.hxx b/basctl/source/basicide/bastype3.hxx index 35607b43f307..02dbb9cd95dd 100644 --- a/basctl/source/basicide/bastype3.hxx +++ b/basctl/source/basicide/bastype3.hxx @@ -62,24 +62,6 @@ public: Accelerator& GetAccelerator() { return aAcc; } }; -class ExtendedMultiLineEdit : public MultiLineEdit -{ -private: - Accelerator aAcc; - Link aAccHdl; - -protected: - DECL_LINK( EditAccHdl, Accelerator * ); - DECL_LINK( ImplGetFocusHdl, Control* ); - DECL_LINK( ImplLoseFocusHdl, Control* ); - -public: - ExtendedMultiLineEdit( Window* pParent, IDEResId nRes ); - - void SetAccHdl( const Link& rLink ) { aAccHdl = rLink; } - Accelerator& GetAccelerator() { return aAcc; } -}; - #endif //NO_SPECIALEDIT #endif // _BASTYPE3_HXX diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index c00037cf8cab..3b64b11b9abc 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -484,24 +484,6 @@ void __EXPORT BasicDockingWindow::StartDocking() - -BasicToolBox::BasicToolBox( Window* pParent, IDEResId nRes ) : - ToolBox( pParent, nRes ) -{ -} - - - -void __EXPORT BasicToolBox::MouseButtonDown( const MouseEvent &rEvt ) -{ - ToolBox::MouseButtonDown( rEvt ); - if ( !GetCurItemId() ) - ((BasicDockingWindow*)GetParent())->MouseButtonDown( rEvt ); -} - - - - ExtendedEdit::ExtendedEdit( Window* pParent, IDEResId nRes ) : Edit( pParent, nRes ) { @@ -534,34 +516,6 @@ IMPL_LINK_INLINE_END( ExtendedEdit, EditAccHdl, Accelerator *, pAcc ) -ExtendedMultiLineEdit::ExtendedMultiLineEdit( Window* pParent, IDEResId nRes ) : - MultiLineEdit( pParent, nRes ) -{ - aAcc.SetSelectHdl( LINK( this, ExtendedMultiLineEdit, EditAccHdl ) ); - Control::SetGetFocusHdl( LINK( this, ExtendedMultiLineEdit, ImplGetFocusHdl ) ); - Control::SetLoseFocusHdl( LINK( this, ExtendedMultiLineEdit, ImplLoseFocusHdl ) ); -} - -IMPL_LINK( ExtendedMultiLineEdit, ImplGetFocusHdl, Control*, EMPTYARG ) -{ - Application::InsertAccel( &aAcc ); - return 0; -} - - -IMPL_LINK( ExtendedMultiLineEdit, ImplLoseFocusHdl, Control*, EMPTYARG ) -{ - Application::RemoveAccel( &aAcc ); - return 0; -} - -IMPL_LINK_INLINE_START( ExtendedMultiLineEdit, EditAccHdl, Accelerator *, pAcc ) -{ - aAccHdl.Call( pAcc ); - return 0; -} -IMPL_LINK_INLINE_END( ExtendedMultiLineEdit, EditAccHdl, Accelerator *, pAcc ) - struct TabBarDDInfo { ULONG npTabBar; @@ -803,11 +757,6 @@ ULONG CalcLineCount( SvStream& rStream ) return nCRs; } -LibInfoKey::LibInfoKey() - :m_aDocument( ScriptDocument::getApplicationScriptDocument() ) -{ -} - LibInfoKey::LibInfoKey( const ScriptDocument& rDocument, const String& rLibName ) :m_aDocument( rDocument ) ,m_aLibName( rLibName ) @@ -839,12 +788,6 @@ bool LibInfoKey::operator==( const LibInfoKey& rKey ) const return bRet; } -LibInfoItem::LibInfoItem() - :m_aDocument( ScriptDocument::getApplicationScriptDocument() ) - ,m_nCurrentType( 0 ) -{ -} - LibInfoItem::LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, USHORT nCurrentType ) :m_aDocument( rDocument ) ,m_aLibName( rLibName ) diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index abf25722eab2..f0143cc8517b 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -232,14 +232,6 @@ SvLBoxEntry* BasicCheckBox::DoInsertEntry( const String& rStr, ULONG nPos ) //---------------------------------------------------------------------------- -void BasicCheckBox::RemoveEntry( ULONG nPos ) -{ - if ( nPos < GetEntryCount() ) - SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) ); -} - -//---------------------------------------------------------------------------- - SvLBoxEntry* BasicCheckBox::FindEntry( const String& rName ) { ULONG nCount = GetEntryCount(); @@ -255,29 +247,6 @@ SvLBoxEntry* BasicCheckBox::FindEntry( const String& rName ) //---------------------------------------------------------------------------- -ULONG BasicCheckBox::GetSelectEntryPos() const -{ - return GetModel()->GetAbsPos( FirstSelected() ); -} - -//---------------------------------------------------------------------------- - -ULONG BasicCheckBox::GetCheckedEntryCount() const -{ - ULONG nCheckCount = 0; - ULONG nCount = GetEntryCount(); - - for (ULONG i=0; i& rxSFac) :SdrUnoObj(rModelName, rxSFac, sal_False) @@ -1382,23 +1372,6 @@ DBG_NAME(DlgEdForm); //---------------------------------------------------------------------------- -DlgEdForm::DlgEdForm(const ::rtl::OUString& rModelName) - :DlgEdObj(rModelName) -{ - DBG_CTOR(DlgEdForm, NULL); -} - -//---------------------------------------------------------------------------- - -DlgEdForm::DlgEdForm(const ::rtl::OUString& rModelName, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac) - :DlgEdObj(rModelName, rxSFac) -{ - DBG_CTOR(DlgEdForm, NULL); -} - -//---------------------------------------------------------------------------- - DlgEdForm::DlgEdForm() :DlgEdObj() { diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index a243d64af39a..c917de5a6dee 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -54,7 +54,6 @@ struct BasicIDE_Impl; namespace BasicIDE { - SfxMacro* CreateMacro(); void Organize( INT16 tabId ); diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index ba1ac9c57068..0c542ac405ad 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -98,8 +98,6 @@ struct BreakPoint class BasicDockingWindow : public DockingWindow { - friend class BasicToolBox; - Rectangle aFloatingPosAndSize; protected: @@ -113,14 +111,6 @@ public: BasicDockingWindow( Window* pParent ); }; -class BasicToolBox : public ToolBox -{ -public: - BasicToolBox( Window* pParent, IDEResId nRes ); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); -}; - DECLARE_LIST( BreakPL, BreakPoint* ) class BreakPointList : public BreakPL { @@ -264,7 +254,6 @@ private: String m_aLibName; public: - LibInfoKey(); LibInfoKey( const ScriptDocument& rDocument, const String& rLibName ); ~LibInfoKey(); @@ -287,7 +276,6 @@ private: USHORT m_nCurrentType; public: - LibInfoItem(); LibInfoItem( const ScriptDocument& rDocument, const String& rLibName, const String& rCurrentName, USHORT nCurrentType ); ~LibInfoItem(); diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 8d0f46b089f0..e352ad738da4 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -66,7 +66,6 @@ private: protected: DlgEdObj(); - DlgEdObj(const ::rtl::OUString& rModelName); DlgEdObj(const ::rtl::OUString& rModelName, const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac); @@ -160,9 +159,6 @@ private: protected: - DlgEdForm(const ::rtl::OUString& rModelName); - DlgEdForm(const ::rtl::OUString& rModelName, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac); DlgEdForm(); virtual void NbcMove( const Size& rSize );