[Libreoffice-commits] core.git: 2 commits - avmedia/source lotuswordpro/source sw/qa sw/source vcl/inc vcl/osx vcl/win
Thomas Arnhold
thomas at arnhold.org
Sun May 25 12:56:24 PDT 2014
avmedia/source/win/player.cxx | 9 ------
avmedia/source/win/player.hxx | 1
lotuswordpro/source/filter/lwp9reader.cxx | 6 ----
lotuswordpro/source/filter/lwp9reader.hxx | 1
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 4 +--
sw/source/filter/ww8/docxsdrexport.cxx | 6 ++--
vcl/inc/osx/saldata.hxx | 1
vcl/inc/win/saldata.hxx | 1
vcl/osx/salinst.cxx | 7 -----
vcl/win/source/app/salinst.cxx | 39 ------------------------------
vcl/win/source/gdi/winlayout.cxx | 1
vcl/win/source/window/salobj.cxx | 18 -------------
12 files changed, 5 insertions(+), 89 deletions(-)
New commits:
commit 762b160dcec4b9074e65d36b20e66b4817ba3a7c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun May 25 19:19:20 2014 +0200
WaE: warning C4146: unary minus operator applied to unsigned type,...
...result still unsigned at sw/source/filter/ww8/docxsdrexport.cxx(441)
Just use SAL_{MAX,MIN}_INT32 (change -2147483648 to (-2147483647-1)) which fixes this warning for MSVC.
Change-Id: Ia039906602d3b00193a364bddb81626afa928f2d
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 064e4fd..1d8d890 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3348,7 +3348,7 @@ DECLARE_OOXMLEXPORT_TEST(testAbsolutePositionOffsetValue,"fdo78432.docx")
if (!pXmlDoc)
return;
- sal_Int32 IntMax = 2147483647;
+ sal_Int32 IntMax = SAL_MAX_INT32;
xmlNodeSetPtr pXmlNodes[6];
pXmlNodes[0] = getXPathNode(pXmlDoc,"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionH[1]/wp:posOffset[1]");
@@ -3519,7 +3519,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78957, "fdo78957.docx")
if(!pXmlHeader)
return;
- const sal_Int64 IntMax = 2147483647;
+ const sal_Int64 IntMax = SAL_MAX_INT32;
sal_Int64 cx = 0, cy = 0;
cx = getXPath(pXmlHeader,"/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1]","cx").toInt64();
cy = getXPath(pXmlHeader,"/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1]","cy").toInt64();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index c8ffe94..064e652 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -437,8 +437,8 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
* climits header defines constants with the limits of integral types for the specific system and compiler implemetation used.
* Use of this might cause platform dependent problem like posOffset exceed the limit.
**/
- const sal_Int64 MAX_INTEGER_VALUE = 2147483647;
- const sal_Int64 MIN_INTEGER_VALUE = -2147483648;
+ const sal_Int64 MAX_INTEGER_VALUE = SAL_MAX_INT32;
+ const sal_Int64 MIN_INTEGER_VALUE = SAL_MIN_INT32;
if (alignH != NULL)
{
m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_align, FSEND);
@@ -535,7 +535,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
**/
sal_uInt64 cx = 0 ;
sal_uInt64 cy = 0 ;
- const sal_Int64 MAX_INTEGER_VALUE = 2147483647;
+ const sal_Int64 MAX_INTEGER_VALUE = SAL_MAX_INT32;
// the 'Size' type uses 'long' for width and height, so on
// platforms where 'long' is 32 bits they can obviously never be
commit 3c84ee9cce41c0d28a9ddbf1243ef571b4578448
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun May 25 17:03:42 2014 +0200
cppcheck: unusedFunction
Change-Id: I81f2a4be65bbc9359e51accccb746f1e8ea48c4f
diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx
index 2a0fdf0..aca353c 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 701a8fa..de0d393 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 e0ec331..a4ec3e5 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 f22cd8b..cb288c1 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 c07fe8a..413754b 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 6ab16db..ec4b39a 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 b779109..78755d1 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 d01806b..7a697ae 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 383e23f..fe51de2 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 3e41e65..4f42fa2 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();
More information about the Libreoffice-commits
mailing list