[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - cppcanvas/source vcl/aqua
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Mar 13 17:57:39 PDT 2011
cppcanvas/source/uno/exports.dxp | 1 -
cppcanvas/source/uno/exports.map | 1 -
vcl/aqua/source/app/salinst.cxx | 5 ++---
vcl/aqua/source/window/salframeview.mm | 2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit a2f1005a6e8d6dad55c3065c37ef6a7ed50c2a54
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 19:52:18 2011 -0500
no more vos3
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 3ea1bd2..6cde3d1 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -573,12 +573,11 @@ bool AquaSalInstance::CheckYieldMutex()
bool bRet = true;
SalYieldMutex* pYieldMutex = mpSalYieldMutex;
- if ( pYieldMutex->GetThreadId() !=
- vos::OThread::getCurrentIdentifier() )
+ if ( pYieldMutex->GetThreadId() != osl::Thread::getCurrentIdentifier())
{
bRet = false;
}
-
+
return bRet;
}
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 90e69a0..a728109 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -169,7 +169,7 @@ static AquaSalFrame* getMouseContainerFrame()
{
if( GetSalData() && GetSalData()->mpFirstInstance )
{
- vos::IMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
+ osl::SolarMutex* pMutex = GetSalData()->mpFirstInstance->GetYieldMutex();
if( pMutex )
{
pMutex->acquire();
commit 285dd1654f003f1015d5af420e1349102f111d1e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 19:52:04 2011 -0500
no more writeInfo
diff --git a/cppcanvas/source/uno/exports.dxp b/cppcanvas/source/uno/exports.dxp
index 9630d7e..f0e1c69 100644
--- a/cppcanvas/source/uno/exports.dxp
+++ b/cppcanvas/source/uno/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/cppcanvas/source/uno/exports.map b/cppcanvas/source/uno/exports.map
index 31a8b65..a488d5d 100644
--- a/cppcanvas/source/uno/exports.map
+++ b/cppcanvas/source/uno/exports.map
@@ -2,7 +2,6 @@ UDK_3_0_0 {
global:
_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
component_getImplementationEnvironment;
- component_writeInfo;
component_getFactory;
local:
*;
More information about the Libreoffice-commits
mailing list