[Libreoffice-commits] .: 3 commits - basctl/source svtools/inc svtools/source vcl/inc vcl/source
August Sodora
augsod at kemper.freedesktop.org
Thu Dec 8 10:54:45 PST 2011
basctl/source/basicide/breakpoint.cxx | 5 --
basctl/source/basicide/breakpoint.hxx | 1
svtools/inc/svtools/filedlg.hxx | 6 --
svtools/source/dialogs/filedlg.cxx | 35 --------------
vcl/inc/vcl/svapp.hxx | 5 --
vcl/source/app/svapp.cxx | 83 ----------------------------------
6 files changed, 135 deletions(-)
New commits:
commit 0c1a331599bdafbfe0c1a64875ea5a247d149da6
Author: August Sodora <augsod at gmail.com>
Date: Thu Dec 8 13:53:20 2011 -0500
Remove unused code
diff --git a/svtools/inc/svtools/filedlg.hxx b/svtools/inc/svtools/filedlg.hxx
index 0390c3b..64b2255 100644
--- a/svtools/inc/svtools/filedlg.hxx
+++ b/svtools/inc/svtools/filedlg.hxx
@@ -78,7 +78,6 @@ private:
Link aFilterHdlLink; // Link zum FilterSelect-Handler
public:
- FileDialog( Window* pParent, WinBits nWinStyle );
~FileDialog();
virtual void FileSelect();
@@ -86,11 +85,6 @@ public:
void SetDefaultExt( const UniString& rExt ) { aDfltExt = rExt; }
const UniString& GetDefaultExt() const { return aDfltExt; }
- void AddFilter( const UniString& rFilter, const UniString& rType );
- void SetCurFilter( const UniString& rFilter );
- UniString GetCurFilter() const;
- sal_uInt16 GetFilterCount() const;
- UniString GetFilterName( sal_uInt16 nPos ) const;
UniString GetFilterType( sal_uInt16 nPos ) const;
void SetFileSelectHdl( const Link& rLink ) { aFileHdlLink = rLink; }
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index f26f072..77a071c 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.cxx
@@ -72,35 +72,10 @@ long PathDialog::OK()
return sal_True;
}
-
-FileDialog::FileDialog( Window* _pParent, WinBits nStyle ) :
- PathDialog( _pParent, WB_STDMODAL | nStyle )
-{
- // Dadurch dass hier bei VCL nicht der CTOR mit ResType verwendet wird,
- // wurde im PathDialog-CTOR leider ein ImpPathDialog angelegt...
- // So zwar scheisse, aber der Dialog ist eh' nur ein Hack:
- pImpFileDlg->CreateDialog( this, nStyle, WINDOW_FILEDIALOG, sal_False );
-}
-
FileDialog::~FileDialog()
{
}
-void FileDialog::AddFilter( const UniString& rFilter, const UniString& rMask )
-{
- ((ImpFileDialog*)pImpFileDlg->GetDialog())->AddFilter( rFilter, rMask );
-}
-
-void FileDialog::SetCurFilter( const UniString& rFilter )
-{
- ((ImpFileDialog*)pImpFileDlg->GetDialog())->SetCurFilter( rFilter );
-}
-
-UniString FileDialog::GetCurFilter() const
-{
- return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetCurFilter();
-}
-
void FileDialog::FileSelect()
{
aFileHdlLink.Call( this );
@@ -111,16 +86,6 @@ void FileDialog::FilterSelect()
aFilterHdlLink.Call( this );
}
-sal_uInt16 FileDialog::GetFilterCount() const
-{
- return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterCount();
-}
-
-UniString FileDialog::GetFilterName( sal_uInt16 nPos ) const
-{
- return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterName( nPos );
-}
-
UniString FileDialog::GetFilterType( sal_uInt16 nPos ) const
{
return ((ImpFileDialog*)pImpFileDlg->GetDialog())->GetFilterType( nPos );
commit 954c3b2d9afd451006deef59143f97d4ee0391fe
Author: August Sodora <augsod at gmail.com>
Date: Thu Dec 8 13:27:22 2011 -0500
Remove unused code
diff --git a/basctl/source/basicide/breakpoint.cxx b/basctl/source/basicide/breakpoint.cxx
index 6bbfdf9..1d28fec 100644
--- a/basctl/source/basicide/breakpoint.cxx
+++ b/basctl/source/basicide/breakpoint.cxx
@@ -169,11 +169,6 @@ const BreakPoint* BreakPointList::at(size_t i) const
return i < maBreakPoints.size() ? maBreakPoints[ i ] : NULL;
}
-void BreakPointList::push_back(BreakPoint* item)
-{
- maBreakPoints.push_back( item );
-}
-
void BreakPointList::clear()
{
maBreakPoints.clear();
diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx
index a989144..8d6ca9f 100644
--- a/basctl/source/basicide/breakpoint.hxx
+++ b/basctl/source/basicide/breakpoint.hxx
@@ -70,7 +70,6 @@ public:
size_t size() const;
BreakPoint* at(size_t i);
const BreakPoint* at(size_t i) const;
- void push_back(BreakPoint* item);
void clear();
BreakPoint* remove(BreakPoint* ptr);
};
commit 7cf6d38eb6c89f174b71f74cb06d5e54c9fa12d0
Author: August Sodora <augsod at gmail.com>
Date: Thu Dec 8 13:24:58 2011 -0500
Remove unused code
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index cfd46ed..a994ff9 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -206,7 +206,6 @@ public:
static sal_Bool IsInMain();
static sal_Bool IsInExecute();
static sal_Bool IsInModalMode();
- static sal_uInt16 GetModalModeCount();
static sal_uInt16 GetDispatchLevel();
static sal_Bool AnyInput( sal_uInt16 nType = VCL_INPUT_ANY );
@@ -245,7 +244,6 @@ public:
static sal_uLong PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent );
static sal_uLong PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent );
static void RemoveMouseAndKeyEvents( Window *pWin );
- static sal_Bool IsProcessedMouseOrKeyEvent( sal_uLong nEventId );
static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL );
static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL );
@@ -302,10 +300,7 @@ public:
static sal_Bool InsertAccel( Accelerator* pAccel );
static void RemoveAccel( Accelerator* pAccel );
- static sal_Bool CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 );
- static sal_uLong AddEventHook( VCLEventHookProc pProc, void* pData = NULL );
- static void RemoveEventHook( sal_uLong nId );
static long CallEventHooks( NotifyEvent& rEvt );
static void SetHelp( Help* pHelp = NULL );
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 1f08f18..bc1e7cc 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -26,9 +26,6 @@
*
************************************************************************/
-
-//#include "svsys.h"
-
#include "comphelper/processfactory.hxx"
#include "osl/module.h"
@@ -561,13 +558,6 @@ sal_Bool Application::IsInModalMode()
// -----------------------------------------------------------------------
-sal_uInt16 Application::GetModalModeCount()
-{
- return ImplGetSVData()->maAppData.mnModalMode;
-}
-
-// -----------------------------------------------------------------------
-
sal_uInt16 Application::GetDispatchLevel()
{
return ImplGetSVData()->maAppData.mnDispatchLevel;
@@ -1014,24 +1004,6 @@ void Application::RemoveMouseAndKeyEvents( Window* pWin )
// -----------------------------------------------------------------------
-sal_Bool Application::IsProcessedMouseOrKeyEvent( sal_uLong nEventId )
-{
- const SolarMutexGuard aGuard;
-
- // find event
- ::std::list< ImplPostEventPair >::iterator aIter( aPostedEventList.begin() );
-
- while( aIter != aPostedEventList.end() )
- {
- if( (*aIter).second->mnEventId == nEventId )
- return sal_False;
-
- else
- ++aIter;
- }
- return sal_True;
-}
-
sal_uLong Application::PostUserEvent( const Link& rLink, void* pCaller )
{
sal_uLong nEventId;
@@ -1390,21 +1362,6 @@ void Application::RemoveAccel( Accelerator* pAccel )
// -----------------------------------------------------------------------
-sal_Bool Application::CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat )
-{
- ImplSVData* pSVData = ImplGetSVData();
-
- if ( pSVData->maAppData.mpAccelMgr )
- {
- if ( pSVData->maAppData.mpAccelMgr->IsAccelKey( rKeyCode, nRepeat ) )
- return sal_True;
- }
-
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
void Application::SetHelp( Help* pHelp )
{
ImplGetSVData()->maAppData.mpHelp = pHelp;
@@ -1703,46 +1660,6 @@ void ImplFreeEventHookData()
// -----------------------------------------------------------------------
-sal_uIntPtr Application::AddEventHook( VCLEventHookProc pProc, void* pData )
-{
- ImplSVData* pSVData = ImplGetSVData();
- ImplEventHook* pEventHookData = new ImplEventHook;
- pEventHookData->mpUserData = pData;
- pEventHookData->mpProc = pProc;
- pEventHookData->mpNext = pSVData->maAppData.mpFirstEventHook;
- pSVData->maAppData.mpFirstEventHook = pEventHookData;
- return (sal_uIntPtr)pEventHookData;
-}
-
-// -----------------------------------------------------------------------
-
-void Application::RemoveEventHook( sal_uIntPtr nId )
-{
- ImplSVData* pSVData = ImplGetSVData();
- ImplEventHook* pFindEventHookData = (ImplEventHook*)nId;
- ImplEventHook* pPrevEventHookData = NULL;
- ImplEventHook* pEventHookData = pSVData->maAppData.mpFirstEventHook;
- while ( pEventHookData )
- {
- if ( pEventHookData == pFindEventHookData )
- {
- if ( pPrevEventHookData )
- pPrevEventHookData->mpNext = pFindEventHookData->mpNext;
- else
- pSVData->maAppData.mpFirstEventHook = pFindEventHookData->mpNext;
- delete pFindEventHookData;
- break;
- }
-
- pPrevEventHookData = pEventHookData;
- pEventHookData = pEventHookData->mpNext;
- }
-
- DBG_ASSERT( pEventHookData, "Application::RemoveEventHook() - EventHook is not added" );
-}
-
-// -----------------------------------------------------------------------
-
long Application::CallEventHooks( NotifyEvent& rEvt )
{
ImplSVData* pSVData = ImplGetSVData();
More information about the Libreoffice-commits
mailing list