[Libreoffice-commits] core.git: vcl/android vcl/headless vcl/inc vcl/ios vcl/osx vcl/source vcl/unx vcl/win
vcl/android/androidinst.cxx |2 +-
vcl/headless/headlessinst.cxx |2 +-
vcl/headless/svpinst.cxx |2 +-
vcl/inc/osx/salinst.h |2 +-
vcl/inc/salinst.hxx |2 +-
vcl/inc/unx/geninst.h |2 +-
vcl/inc/win/salinst.h |2 +-
vcl/ios/iosinst.cxx |2 +-
vcl/osx/salinst.cxx |4 ++--
vcl/source/app/svapp.cxx |2 +-
vcl/unx/generic/app/geninst.cxx |4 ++--
vcl/unx/generic/plugadapt/salplug.cxx |2 +-
vcl/win/app/salinst.cxx |4 ++--
vcl/win/gdi/salprn.cxx|2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 4cfcf965b5c95b1ba7dd454e9dda954e8315b8a9
Author: Noel Grandin
Date: Mon Oct 30 16:27:01 2017 +0200
ReleaseYieldMutex is always called with true
so drop param and rename to ReleaseYieldMutexAll
Change-Id: Ic4fcee24d46405659e54363c87f21d88696b0ce1
Reviewed-on: https://gerrit.libreoffice.org/44057
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 3c181ace2ff6..7bf18338a3fe 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -197,7 +197,7 @@ SalInstance *CreateSalInstance()
void DestroySalInstance( SalInstance *pInst )
{
-pInst->ReleaseYieldMutex( true );
+pInst->ReleaseYieldMutexAll();
delete pInst;
}
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 79f2f268ed2e..299c5f7d607d 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -98,7 +98,7 @@ SalInstance *CreateSalInstance()
void DestroySalInstance( SalInstance *pInst )
{
-pInst->ReleaseYieldMutex( true );
+pInst->ReleaseYieldMutexAll();
delete pInst;
}
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 50eeb9cc207c..e20592b51b67 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -312,7 +312,7 @@ void SvpSalInstance::DoReleaseYield( int nTimeoutMS )
aPoll.revents = 0;
// release yield mutex
-sal_uInt32 nAcquireCount = ReleaseYieldMutex( true );
+sal_uInt32 nAcquireCount = ReleaseYieldMutexAll();
(void)poll( &aPoll, 1, nTimeoutMS );
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index f70bbcac1ca5..95dd4db26c24 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -109,7 +109,7 @@ public:
virtual SalSystem* CreateSalSystem() override;
virtual SalBitmap* CreateSalBitmap() override;
virtual comphelper::SolarMutex* GetYieldMutex() override;
-virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false )
override;
+virtual sal_uInt32 ReleaseYieldMutexAll() override;
virtual voidAcquireYieldMutex( sal_uInt32 nCount = 1 )
override;
virtual boolDoYield(bool bWait, bool bHandleAllCurrentEvents)
override;
virtual boolAnyInput( VclInputFlags nType ) override;
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 8418a1ed8126..f33d9d4d912a 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -122,7 +122,7 @@ public:
// YieldMutex
virtual comphelper::SolarMutex*
GetYieldMutex() = 0;
-virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false ) = 0;
+virtual sal_uInt32 ReleaseYieldMutexAll() = 0;
virtual voidAcquireYieldMutex( sal_uInt32 nCount = 1 ) = 0;
// return true, if yield mutex is owned by this thread, else false
virtual boolIsMainThread() const = 0;
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index 516ca7c37956..af97a2d9ba83 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -53,7 +53,7 @@ public:
// Yield mutex
virtual comphelper::SolarMutex* GetYieldMutex() override;
-virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false )
override;
+virtual sal_uInt32 ReleaseYieldMutexAll() override;
virtual void AcquireYieldMutex( sal_uInt32 nCount = 1 )
override;
// Printing
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index d95f08b49e91..9f5dbdf955b1 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -66,7 +66,7 @@ public:
virtual SalSystem* CreateSalSystem() override;
virtual SalBitmap* CreateSalBitmap() override;
virtual comphelper::SolarMutex* GetYieldMutex() override;
-virtual sal_uInt32 ReleaseYieldMutex( bool bUnlockAll = false )
override;
+virtual sal_uInt32 ReleaseYieldMutexAll() override;
virtual voidAcquireYieldMutex( sal_uInt32 nCount = 1 )
override;
virtual boolIsMainThread() const override;
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cx
[Libreoffice-commits] core.git: vcl/android vcl/headless vcl/inc vcl/ios vcl/osx vcl/source vcl/unx vcl/win
vcl/android/androidinst.cxx |6 -
vcl/headless/svpframe.cxx| 10 +-
vcl/headless/svpinst.cxx |4
vcl/inc/android/androidinst.hxx |4
vcl/inc/headless/svpframe.hxx|4
vcl/inc/headless/svpinst.hxx |4
vcl/inc/ios/iosinst.hxx |4
vcl/inc/osx/salframe.h |4
vcl/inc/osx/salinst.h|4
vcl/inc/salframe.hxx | 61 +++--
vcl/inc/salinst.hxx |5 -
vcl/inc/unx/gtk/gtkframe.hxx | 26 ++---
vcl/inc/unx/gtk/gtkinst.hxx |4
vcl/inc/unx/salframe.h | 20 ++--
vcl/inc/unx/salinst.h|4
vcl/inc/win/salframe.h |2
vcl/inc/win/salinst.h|6 -
vcl/ios/iosinst.cxx |4
vcl/osx/salframe.cxx | 22 ++--
vcl/osx/salframeview.mm | 22 ++--
vcl/osx/salinst.cxx |4
vcl/osx/vclnsapp.mm |2
vcl/source/window/window.cxx | 32 +++
vcl/unx/generic/app/salinst.cxx |4
vcl/unx/generic/app/wmadaptor.cxx| 12 +-
vcl/unx/generic/window/salframe.cxx | 158 +--
vcl/unx/gtk/app/gtkinst.cxx |4
vcl/unx/gtk/window/gtksalframe.cxx | 86 +--
vcl/unx/kde/salnativewidgets-kde.cxx |2
vcl/unx/kde4/KDESalFrame.cxx |2
vcl/win/source/app/salinst.cxx | 10 +-
vcl/win/source/window/salframe.cxx | 52 +--
32 files changed, 298 insertions(+), 290 deletions(-)
New commits:
commit 0e30af6fdc496ee1b935d68e979aa63729cef878
Author: Noel Grandin
Date: Fri Oct 2 11:37:49 2015 +0200
convert SAL_FRAME_STYLE to scoped enum
Change-Id: Ic3f7fddcea36c18ffe43c4c633d415f596a58cbc
Reviewed-on: https://gerrit.libreoffice.org/19094
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index ce46fee..787beba 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -118,7 +118,7 @@ class AndroidSalFrame : public SvpSalFrame
public:
AndroidSalFrame( AndroidSalInstance *pInstance,
SalFrame *pParent,
- sal_uLong nSalFrameStyle,
+ SalFrameStyleFlags nSalFrameStyle,
SystemParentData *pSysParent )
: SvpSalFrame( pInstance, pParent, nSalFrameStyle,
true, basebmp::Format::ThirtyTwoBitTcMaskRGBA,
@@ -177,12 +177,12 @@ public:
}
};
-SalFrame *AndroidSalInstance::CreateChildFrame( SystemParentData* pParent,
sal_uLong nStyle )
+SalFrame *AndroidSalInstance::CreateChildFrame( SystemParentData* pParent,
SalFrameStyleFlags nStyle )
{
return new AndroidSalFrame( this, NULL, nStyle, pParent );
}
-SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nStyle
)
+SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent,
SalFrameStyleFlags nStyle )
{
return new AndroidSalFrame( this, pParent, nStyle, NULL );
}
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 4d4a225..408e05d 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -69,7 +69,7 @@ void SvpSalFrame::enableDamageTracker( bool bOn )
SvpSalFrame::SvpSalFrame( SvpSalInstance* pInstance,
SalFrame* pParent,
- sal_uLong nSalFrameStyle,
+ SalFrameStyleFlags nSalFrameStyle,
bool bTopDown,
basebmp::Format nScanlineFormat,
SystemParentData* ) :
@@ -137,9 +137,9 @@ SvpSalFrame::~SvpSalFrame()
SvpSalFrame* pFrame =
const_cast(static_cast(*it));
if( pFrame->m_bVisible&&
pFrame->m_pParent == NULL &&
-(pFrame->m_nStyle & (SAL_FRAME_STYLE_MOVEABLE |
- SAL_FRAME_STYLE_SIZEABLE |
- SAL_FRAME_STYLE_CLOSEABLE) ) != 0
+(pFrame->m_nStyle & (SalFrameStyleFlags::MOVEABLE |
+ SalFrameStyleFlags::SIZEABLE |
+ SalFrameStyleFlags::CLOSEABLE) )
)
{
pFrame->GetFocus();
@@ -155,7 +155,7 @@ void SvpSalFrame::GetFocus()
if( s_pFocusFrame == this )
return;
-if( (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION |
SAL_FRAME_STYLE_FLOAT)) == 0 )
+if( (m_nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION |
SalFrameStyleFlags::FLOAT)) == SalFrameStyleFlags::NONE )
{
if( s_pFocusFrame )
s_pFocusFrame->LoseFocus();
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index bcecfac.
