[ooo-build-commit] Branch 'ooo/master' - 2 commits - basctl/source extensions/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Aug 6 17:25:11 PDT 2009
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 -
extensions/source/update/check/updatecheckjob.cxx | 64 ++++++++++++++++++++--
11 files changed, 60 insertions(+), 185 deletions(-)
New commits:
commit 8a78b456c85410ad418979b0351030cb2e8561a2
Author: Release Engineers <releng at openoffice.org>
Date: Thu Aug 6 11:03:20 2009 +0000
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 at 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
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 325a982..097d4df 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 377c5ec..67a3297 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 50ecd9d..5017eb2 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 9210c89..c3bf36d 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 5bce4e8..1e099d2 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<nCount; i++ )
- {
- if ( IsChecked( i ) )
- nCheckCount++;
- }
-
- return nCheckCount;
-}
-
-//----------------------------------------------------------------------------
-
void BasicCheckBox::CheckEntryPos( ULONG nPos, BOOL bCheck )
{
if ( nPos < GetEntryCount() )
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index c98e035..e4a575e 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -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;
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 663992f..d060c90 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -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()
{
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 74eec87..fc69ec8 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 33048a7..f3bd547 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 b0b4311..71be086 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 );
commit f9a13656941f2cd9cc7413a9ab0bdcbbef568521
Author: Release Engineers <releng at openoffice.org>
Date: Thu Aug 6 09:32:55 2009 +0000
CWS-TOOLING: integrate CWS extmgr01
2009-07-28 15:37:52 +0200 dv r274410 : #i103856# Create dialog before using it
2009-07-27 15:24:42 +0200 dv r274368 : #i103831# Made selectEntry virtual so the correct function will be used from the listbox with buttons
2009-07-27 14:17:08 +0200 dv r274366 : #i103831# Made selectEntry virtual so the correct function will be used from the listbox with buttons
2009-07-07 08:23:17 +0200 dv r273765 : #i102666# Extension check on startup after office update -> fixed repaint problem
2009-07-06 11:28:28 +0200 dv r273729 : #i102666# Extension check on startup after office update -> fixed Mac OS X issues
2009-07-02 15:01:35 +0200 dv r273654 : #i102666# Extension check on startup after office update -> set last checked to never when aborting
2009-07-01 12:18:52 +0200 dv r273564 : Removed unused variable
2009-07-01 07:25:01 +0200 dv r273542 : #i102666# Extension check on startup after office update -> better layout
2009-06-30 14:56:16 +0200 dv r273506 : #i102666# Extension check on startup after office update -> mark incompatible extensions in extension manager
2009-06-30 12:43:55 +0200 dv r273502 : CWS-TOOLING: rebase CWS extmgr01 to trunk at 273468 (milestone: DEV300:m51)
2009-06-29 13:26:54 +0200 dv r273469 : Now with newline at the end
2009-06-29 11:54:07 +0200 dv r273462 : #i102666# Extension check on startup after office update -> exit button of dialog disables extensions, too
2009-06-26 16:26:02 +0200 dv r273428 : #i102666# Extension check on startup after office update -> better progress handling
2009-06-26 14:50:34 +0200 dv r273417 : fixed crash when shutting down while initial waiting
2009-06-26 14:46:40 +0200 dv r273416 : #i102666# Extension check on startup after office update
2009-06-24 07:30:57 +0200 dv r273306 : #i102666# Extension check on startup after update
2009-06-11 12:03:10 +0200 dv r272863 : #i102666# Extension check on startup after update
2009-06-11 11:59:29 +0200 dv r272862 : #i102666# Extension check on startup after update
2009-06-09 15:50:05 +0200 dv r272773 : CWS-TOOLING: rebase CWS extmgr01 to trunk at 272291 (milestone: DEV300:m49)
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index b244b8b..e106b7a 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -36,12 +36,15 @@
#include "updatehdl.hxx"
#include "updateprotocol.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implementationentry.hxx>
+#include "com/sun/star/frame/XDesktop.hpp"
+#include "com/sun/star/frame/XTerminateListener.hpp"
#include <com/sun/star/task/XJob.hpp>
namespace beans = com::sun::star::beans ;
+namespace frame = com::sun::star::frame ;
namespace lang = com::sun::star::lang ;
namespace task = com::sun::star::task ;
namespace uno = com::sun::star::uno ;
@@ -61,6 +64,7 @@ public:
virtual void SAL_CALL onTerminated();
void showDialog();
+ void setTerminating() { m_bTerminating = true; }
protected:
~InitUpdateCheckJobThread();
@@ -69,11 +73,12 @@ private:
osl::Condition m_aCondition;
uno::Reference<uno::XComponentContext> m_xContext;
uno::Sequence<beans::NamedValue> m_xParameters;
- bool m_bShowDialog;
+ bool m_bShowDialog;
+ bool m_bTerminating;
};
class UpdateCheckJob :
- public ::cppu::WeakImplHelper2< task::XJob, lang::XServiceInfo >
+ public ::cppu::WeakImplHelper3< task::XJob, lang::XServiceInfo, frame::XTerminateListener >
{
virtual ~UpdateCheckJob();
@@ -100,8 +105,19 @@ public:
virtual uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames()
throw (uno::RuntimeException);
+ // XEventListener
+ virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt )
+ throw (::com::sun::star::uno::RuntimeException);
+
+ // XTerminateListener
+ virtual void SAL_CALL queryTermination( lang::EventObject const & evt )
+ throw ( frame::TerminationVetoException, uno::RuntimeException );
+ virtual void SAL_CALL notifyTermination( lang::EventObject const & evt )
+ throw ( uno::RuntimeException );
+
private:
uno::Reference<uno::XComponentContext> m_xContext;
+ uno::Reference< frame::XDesktop > m_xDesktop;
InitUpdateCheckJobThread *m_pInitThread;
void handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp );
@@ -115,7 +131,8 @@ InitUpdateCheckJobThread::InitUpdateCheckJobThread(
const uno::Sequence< beans::NamedValue > &xParameters ) :
m_xContext( xContext ),
m_xParameters( xParameters ),
- m_bShowDialog( false )
+ m_bShowDialog( false ),
+ m_bTerminating( false )
{
create();
}
@@ -132,6 +149,9 @@ void SAL_CALL InitUpdateCheckJobThread::run()
m_aCondition.wait( &tv );
+ if ( m_bTerminating )
+ return;
+
rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
aController->initialize( m_xParameters, m_xContext );
@@ -156,10 +176,13 @@ void InitUpdateCheckJobThread::showDialog()
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
-UpdateCheckJob::UpdateCheckJob(const uno::Reference<uno::XComponentContext>& xContext) :
+UpdateCheckJob::UpdateCheckJob( const uno::Reference<uno::XComponentContext>& xContext ) :
m_xContext(xContext),
m_pInitThread( NULL )
{
+ m_xDesktop.set( xContext->getServiceManager()->createInstanceWithContext( UNISTRING("com.sun.star.frame.Desktop"), xContext ), uno::UNO_QUERY );
+ if ( m_xDesktop.is() )
+ m_xDesktop->addTerminateListener( this );
}
//------------------------------------------------------------------------------
@@ -301,6 +324,37 @@ UpdateCheckJob::supportsService( rtl::OUString const & serviceName ) throw (uno:
return sal_False;
}
+//------------------------------------------------------------------------------
+// XEventListener
+void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt )
+ throw ( uno::RuntimeException )
+{
+ bool shutDown = ( rEvt.Source == m_xDesktop );
+
+ if ( shutDown && m_xDesktop.is() )
+ {
+ m_xDesktop->removeTerminateListener( this );
+ m_xDesktop.clear();
+ }
+}
+
+//------------------------------------------------------------------------------
+// XTerminateListener
+void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & )
+ throw ( frame::TerminationVetoException, uno::RuntimeException )
+{
+}
+
+//------------------------------------------------------------------------------
+void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & rEvt )
+ throw ( uno::RuntimeException )
+{
+ if ( m_pInitThread )
+ m_pInitThread->setTerminating();
+
+ disposing( rEvt );
+}
+
} // anonymous namespace
//------------------------------------------------------------------------------
More information about the ooo-build-commit
mailing list