Kaydet (Commit) 3c115cd0 authored tarafından Andrzej Hunt's avatar Andrzej Hunt

Use SolarMutexGuard instead of pairs of Acquire/ReleaseSolarMutex

Change-Id: I7ff41dd932fd9860dff944b3bf8ff5bdc230ae5d
üst 5ee87e86
...@@ -466,11 +466,8 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart) ...@@ -466,11 +466,8 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart)
return; return;
} }
Application::AcquireSolarMutex(1); SolarMutexGuard aGuard;
{
pDoc->setPart( nPart ); pDoc->setPart( nPart );
}
Application::ReleaseSolarMutex();
} }
static char* doc_getPartName(LibreOfficeKitDocument* pThis, int nPart) static char* doc_getPartName(LibreOfficeKitDocument* pThis, int nPart)
...@@ -504,8 +501,8 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis, ...@@ -504,8 +501,8 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis,
return; return;
} }
Application::AcquireSolarMutex(1); SolarMutexGuard aGuard;
{
int nCurrentPart = pDoc->getPart(); int nCurrentPart = pDoc->getPart();
pDoc->setPartMode(ePartMode); pDoc->setPartMode(ePartMode);
...@@ -527,8 +524,6 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis, ...@@ -527,8 +524,6 @@ static void doc_setPartMode(LibreOfficeKitDocument* pThis,
{ {
pDoc->setPart( 0 ); pDoc->setPart( 0 );
} }
}
Application::ReleaseSolarMutex();
} }
void doc_paintTile (LibreOfficeKitDocument* pThis, void doc_paintTile (LibreOfficeKitDocument* pThis,
...@@ -550,8 +545,8 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, ...@@ -550,8 +545,8 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
return; return;
} }
Application::AcquireSolarMutex(1); SolarMutexGuard aGuard;
{
#if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS) #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
ImplSVData* pSVData = ImplGetSVData(); ImplSVData* pSVData = ImplGetSVData();
SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst); SvpSalInstance* pSalInstance = static_cast< SvpSalInstance* >(pSVData->mpDefInst);
...@@ -580,8 +575,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis, ...@@ -580,8 +575,6 @@ void doc_paintTile (LibreOfficeKitDocument* pThis,
(void) nTileWidth; (void) nTileWidth;
(void) nTileHeight; (void) nTileHeight;
#endif #endif
}
Application::ReleaseSolarMutex();
} }
static void doc_getDocumentSize(LibreOfficeKitDocument* pThis, static void doc_getDocumentSize(LibreOfficeKitDocument* pThis,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment