[Libreoffice-commits] core.git: fpicker/Library_fps.mk fpicker/source

[Stephan Bergmann]

 fpicker/Library_fps.mk                                 |    1 
 fpicker/source/win32/filepicker/SolarMutex.cxx         |   40 -----------------
 fpicker/source/win32/filepicker/SolarMutex.hxx         |   27 -----------
 fpicker/source/win32/filepicker/asynceventnotifier.cxx |    2 
 4 files changed, 70 deletions(-)

New commits:
commit e35e95560d714a84da4c3a07f50de1de339ab727
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Oct 13 22:02:19 2016 +0200

    ReleaseSolarMutexOnMainThreadContext is unused
    
    ...ever since its introduction in 29da2639353762a64673d6ae5b32a36045caa7d3
    "CWS-TOOLING: integrate CWS filepicker01"
    
    Change-Id: I2bd989e7e950bf58a8f26708f79eeed223c4fb4a
    Reviewed-on: https://gerrit.libreoffice.org/29799
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 90eb8da..c57b411 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_Library_add_exception_objects,fps,\
 	fpicker/source/win32/filepicker/helppopupwindow \
 	fpicker/source/win32/filepicker/previewadapter \
 	fpicker/source/win32/filepicker/previewbase \
-	fpicker/source/win32/filepicker/SolarMutex \
 	fpicker/source/win32/filepicker/VistaFilePicker \
 	fpicker/source/win32/filepicker/VistaFilePickerEventHandler \
 	fpicker/source/win32/filepicker/VistaFilePickerImpl \
diff --git a/fpicker/source/win32/filepicker/SolarMutex.cxx b/fpicker/source/win32/filepicker/SolarMutex.cxx
deleted file mode 100644
index 3b8fdbb..0000000
--- a/fpicker/source/win32/filepicker/SolarMutex.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <vcl/svapp.hxx>
-#include <comphelper/solarmutex.hxx>
-#include <osl/thread.hxx>
-
-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId)
-{
-    int nAcquireCount = 0;
-    oslThreadIdentifier nMainThreadId = Application::GetMainThreadIdentifier();
-
-    if ( nMainThreadId == nThreadId )
-    {
-        comphelper::SolarMutex& rMutex = Application::GetSolarMutex();
-        if ( rMutex.tryToAcquire() )
-            nAcquireCount = Application::ReleaseSolarMutex() - 1;
-    }
-
-    return nAcquireCount;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/SolarMutex.hxx b/fpicker/source/win32/filepicker/SolarMutex.hxx
deleted file mode 100644
index 3233083..0000000
--- a/fpicker/source/win32/filepicker/SolarMutex.hxx
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SOLARMUTEX_HXX
-#define INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SOLARMUTEX_HXX
-
-int ReleaseSolarMutexOnMainThreadContext(unsigned nThreadId);
-
-#endif // INCLUDED_FPICKER_SOURCE_WIN32_FILEPICKER_SOLARMUTEX_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 08b61f8..854a6b8 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -25,8 +25,6 @@
 
 #include <process.h>
 #include <memory>
-#include "SolarMutex.hxx"
-
 
 using namespace com::sun::star;
 using ::com::sun::star::ui::dialogs::XFilePickerListener;