summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/source/win/player.cxx9
-rw-r--r--avmedia/source/win/player.hxx1
-rw-r--r--lotuswordpro/source/filter/lwp9reader.cxx6
-rw-r--r--lotuswordpro/source/filter/lwp9reader.hxx1
-rw-r--r--vcl/inc/osx/saldata.hxx1
-rw-r--r--vcl/inc/win/saldata.hxx1
-rw-r--r--vcl/osx/salinst.cxx7
-rw-r--r--vcl/win/source/app/salinst.cxx39
-rw-r--r--vcl/win/source/gdi/winlayout.cxx1
-rw-r--r--vcl/win/source/window/salobj.cxx18
10 files changed, 0 insertions, 84 deletions
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 2a0fdf068521..aca353c4d130 100644
--- a/avmedia/source/win/player.cxx
+++ b/avmedia/source/win/player.cxx
@@ -206,15 +206,6 @@ void Player::setNotifyWnd( int nNotifyWnd )
mpME->SetNotifyWindow( (OAHWND) nNotifyWnd, WM_GRAPHNOTIFY, reinterpret_cast< LONG_PTR>( this ) );
}
-void Player::setDDrawParams( IDirectDraw* pDDraw, IDirectDrawSurface* pDDrawSurface )
-{
- if( mpEV && pDDraw && pDDrawSurface )
- {
- mpEV->SetDDrawObject( pDDraw );
- mpEV->SetDDrawSurface( pDDrawSurface );
- }
-}
-
long Player::processEvent()
{
long nCode;
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 701a8facabf3..de0d3938dc26 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -60,7 +60,6 @@ public:
bool create( const OUString& rURL );
void setNotifyWnd( int nNotifyWnd );
- void setDDrawParams( IDirectDraw* pDDraw, IDirectDrawSurface* pDDrawSurface );
long processEvent();
const IVideoWindow* getVideoWindow() const;
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index e0ec3319c1f4..a4ec3e540654 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -99,12 +99,6 @@ void Lwp9Reader::Read()
}
/**
- * @descr Read the OLE objects.
- */
-void Lwp9Reader::ReadOleObjects()
-{
-}
-/**
* @descr Read the LWP7 object.
*/
void Lwp9Reader::ReadFileHeader()
diff --git a/lotuswordpro/source/filter/lwp9reader.hxx b/lotuswordpro/source/filter/lwp9reader.hxx
index f22cd8b4d9b8..cb288c16acdf 100644
--- a/lotuswordpro/source/filter/lwp9reader.hxx
+++ b/lotuswordpro/source/filter/lwp9reader.hxx
@@ -83,7 +83,6 @@ class Lwp9Reader
void ParseDocument();
void WriteDocHeader();
void WriteDocEnd();
- void ReadOleObjects();
public:
void Read();
};
diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx
index c07fe8a46840..413754b92839 100644
--- a/vcl/inc/osx/saldata.hxx
+++ b/vcl/inc/osx/saldata.hxx
@@ -112,7 +112,6 @@ inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; }
bool ImplSalYieldMutexTryToAcquire();
-void ImplSalYieldMutexAcquire();
void ImplSalYieldMutexRelease();
#endif // INCLUDED_VCL_INC_OSX_SALDATA_HXX
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 6ab16db296c2..ec4b39a7761d 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -173,7 +173,6 @@ void ImplFreeSalGDI();
void ImplSalYieldMutexAcquireWithWait();
bool ImplSalYieldMutexTryToAcquire();
-void ImplSalYieldMutexAcquire();
void ImplSalYieldMutexRelease();
sal_uLong ImplSalReleaseYieldMutex();
void ImplSalAcquireYieldMutex( sal_uLong nCount );
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index b779109bc5f5..78755d1f1597 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -300,13 +300,6 @@ bool ImplSalYieldMutexTryToAcquire()
return FALSE;
}
-void ImplSalYieldMutexAcquire()
-{
- AquaSalInstance* pInst = (AquaSalInstance*) GetSalData()->mpFirstInstance;
- if ( pInst )
- pInst->mpSalYieldMutex->acquire();
-}
-
void ImplSalYieldMutexRelease()
{
AquaSalInstance* pInst = (AquaSalInstance*) GetSalData()->mpFirstInstance;
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d01806bece70..7a697ae093dd 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -99,7 +99,6 @@ void SalAbort( const OUString& rErrorText, bool )
}
}
-LRESULT CALLBACK SalComWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam );
LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam );
class SalYieldMutex : public comphelper::SolarMutex
@@ -250,13 +249,6 @@ bool ImplSalYieldMutexTryToAcquire()
return FALSE;
}
-void ImplSalYieldMutexAcquire()
-{
- WinSalInstance* pInst = GetSalData()->mpFirstInstance;
- if ( pInst )
- pInst->mpSalYieldMutex->acquire();
-}
-
void ImplSalYieldMutexRelease()
{
WinSalInstance* pInst = GetSalData()->mpFirstInstance;
@@ -751,37 +743,6 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
return nRet;
}
-LRESULT CALLBACK SalComWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
-{
- int bDef = TRUE;
- LRESULT nRet = 0;
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- jmp_buf jmpbuf;
- __SEHandler han;
- if (__builtin_setjmp(jmpbuf) == 0)
- {
- han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER);
-#else
- __try
- {
-#endif
- nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef );
- }
-#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
- han.Reset();
-#else
- __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation()))
- {
- }
-#endif
- if ( bDef )
- {
- if ( !ImplHandleGlobalMsg( hWnd, nMsg, wParam, lParam, nRet ) )
- nRet = DefWindowProcA( hWnd, nMsg, wParam, lParam );
- }
- return nRet;
-}
-
LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
int bDef = TRUE;
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 383e23fb9e27..fe51de257884 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -116,7 +116,6 @@ public:
WinLayout( HDC, const ImplWinFontData&, ImplWinFontEntry& );
virtual void InitFont() const;
void SetFontScale( float f ) { mfFontScale = f; }
- float GetFontScale() const { return mfFontScale; }
HFONT DisableFontScaling( void) const;
SCRIPT_CACHE& GetScriptCache() const
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 3e41e6523160..4f42fa2308a9 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -364,15 +364,6 @@ LRESULT CALLBACK SalSysObjWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM
return nRet;
}
-LRESULT CALLBACK SalSysObjWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
-{
- int bDef = TRUE;
- LRESULT nRet = SalSysObjWndProc( hWnd, nMsg, wParam, lParam, bDef );
- if ( bDef )
- nRet = DefWindowProcW( hWnd, nMsg, wParam, lParam );
- return nRet;
-}
-
LRESULT CALLBACK SalSysObjChildWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef )
{
LRESULT nRet = 0;
@@ -444,15 +435,6 @@ LRESULT CALLBACK SalSysObjChildWndProcA( HWND hWnd, UINT nMsg, WPARAM wParam, LP
return nRet;
}
-LRESULT CALLBACK SalSysObjChildWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
-{
- int bDef = TRUE;
- LRESULT nRet = SalSysObjChildWndProc( hWnd, nMsg, wParam, lParam, bDef );
- if ( bDef )
- nRet = DefWindowProcW( hWnd, nMsg, wParam, lParam );
- return nRet;
-}
-
SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent )
{
SalData* pSalData = GetSalData();