strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS ab72

Browse source 
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
This commit is contained in:
Release Engineers 2009-08-06 11:03:20 +00:00
parent 12e1a0d94c
commit f4ba26d756
10 changed files with 1 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basctl/source/basicide/basidesh.src
View file

@ -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
{

25
basctl/source/basicide/basobj2.cxx
View file

@ -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();

18
basctl/source/basicide/bastype3.hxx
View file

@ -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

57
basctl/source/basicide/bastypes.cxx
View file

@ -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 )

31
basctl/source/basicide/moduldl2.cxx
View file

@ -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<nCount; i++ )
{
if ( IsChecked( i ) )
nCheckCount++;
}
return nCheckCount;
}
//----------------------------------------------------------------------------
void BasicCheckBox::CheckEntryPos( ULONG nPos, BOOL bCheck )
{
if ( nPos < GetEntryCount() )

4
basctl/source/basicide/moduldlg.hxx
View file

@ -131,12 +131,8 @@ public:
~BasicCheckBox();
SvLBoxEntry* DoInsertEntry( const String& rStr, ULONG nPos = LISTBOX_APPEND );
void RemoveEntry( ULONG nPos );
SvLBoxEntry* FindEntry( const String& rName );
ULONG GetSelectEntryPos() const;
ULONG GetCheckedEntryCount() const;
void CheckEntryPos( ULONG nPos, BOOL bCheck = TRUE );
BOOL IsChecked( ULONG nPos ) const;

27
basctl/source/dlged/dlgedobj.cxx
View file

@ -88,16 +88,6 @@ DlgEdObj::DlgEdObj()
//----------------------------------------------------------------------------
DlgEdObj::DlgEdObj(const ::rtl::OUString& rModelName)
:SdrUnoObj(rModelName, sal_False)
,bIsListening(sal_False)
,pDlgEdForm( NULL )
{
DBG_CTOR(DlgEdObj, NULL);
}
//----------------------------------------------------------------------------
DlgEdObj::DlgEdObj(const ::rtl::OUString& rModelName,
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& 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()
{

1
basctl/source/inc/basobj.hxx
View file

@ -54,7 +54,6 @@ struct BasicIDE_Impl;
namespace BasicIDE
{
SfxMacro* CreateMacro();
void Organize( INT16 tabId );

12
basctl/source/inc/bastypes.hxx
View file

@ -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();

4
basctl/source/inc/dlgedobj.hxx
View file

@ -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 );