[Libreoffice-commits] core.git: basegfx/source bin/find-can-be-private-symbols.classes.results bin/find-mergedlib-can-be-private.classes.results compilerplugins/clang include/basegfx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 2 18:23:41 UTC 2020
basegfx/source/tools/systemdependentdata.cxx | 38 -------------------
bin/find-can-be-private-symbols.classes.results | 1
bin/find-mergedlib-can-be-private.classes.results | 1
compilerplugins/clang/unusedfields.writeonly.results | 2 -
compilerplugins/clang/unusedmethods.results | 2 -
include/basegfx/utils/systemdependentdata.hxx | 26 -------------
6 files changed, 70 deletions(-)
New commits:
commit 782f4a674c0695a31591afa5cad656a7f8ca737a
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 2 08:55:22 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Sep 2 20:22:38 2020 +0200
drop unused MinimalSystemDependentDataManager
Change-Id: I6e5413bb79acac93abfb8398550c157e7b667a67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101942
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basegfx/source/tools/systemdependentdata.cxx b/basegfx/source/tools/systemdependentdata.cxx
index 8dbe8915664f..e333ce473437 100644
--- a/basegfx/source/tools/systemdependentdata.cxx
+++ b/basegfx/source/tools/systemdependentdata.cxx
@@ -21,44 +21,6 @@ namespace basegfx
}
} // namespace basegfx
-namespace basegfx
-{
- MinimalSystemDependentDataManager::MinimalSystemDependentDataManager()
- : SystemDependentDataManager(),
- maSystemDependentDataReferences()
- {
- }
-
- MinimalSystemDependentDataManager::~MinimalSystemDependentDataManager()
- {
- }
-
- void MinimalSystemDependentDataManager::startUsage(basegfx::SystemDependentData_SharedPtr& rData)
- {
- if(rData)
- {
- maSystemDependentDataReferences.insert(rData);
- }
- }
-
- void MinimalSystemDependentDataManager::endUsage(basegfx::SystemDependentData_SharedPtr& rData)
- {
- if(rData)
- {
- maSystemDependentDataReferences.erase(rData);
- }
- }
-
- void MinimalSystemDependentDataManager::touchUsage(basegfx::SystemDependentData_SharedPtr& /* rData */)
- {
- }
-
- void MinimalSystemDependentDataManager::flushAll()
- {
- maSystemDependentDataReferences.clear();
- }
-} // namespace basegfx
-
namespace basegfx
{
SystemDependentData::SystemDependentData(
diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results
index da988175b7a4..9cd21a2986ca 100644
--- a/bin/find-can-be-private-symbols.classes.results
+++ b/bin/find-can-be-private-symbols.classes.results
@@ -165,7 +165,6 @@ XMLConstantsPropertyHandler
XMLEnumPropertyHdl
XMLShapeStyleContext
basegfx::BColorModifier
-basegfx::MinimalSystemDependentDataManager
canvas
chart::PopupRequest
comphelper::RefCountedMutex
diff --git a/bin/find-mergedlib-can-be-private.classes.results b/bin/find-mergedlib-can-be-private.classes.results
index a9e425512aca..77df8bb4457e 100644
--- a/bin/find-mergedlib-can-be-private.classes.results
+++ b/bin/find-mergedlib-can-be-private.classes.results
@@ -230,7 +230,6 @@ basegfx::BColorModifier_gamma
basegfx::BColorModifier_gray
basegfx::BColorModifier_invert
basegfx::BColorModifier_replace
-basegfx::MinimalSystemDependentDataManager
basegfx::ODFGradientInfo
basegfx::RasterConverter3D
basegfx::SystemDependentDataHolder
diff --git a/compilerplugins/clang/unusedfields.writeonly.results b/compilerplugins/clang/unusedfields.writeonly.results
index 8c12ff96fbc6..45ba197af1c0 100644
--- a/compilerplugins/clang/unusedfields.writeonly.results
+++ b/compilerplugins/clang/unusedfields.writeonly.results
@@ -326,8 +326,6 @@ i18nutil/source/utility/paper.cxx:305
paperword string char *
include/basegfx/DrawCommands.hxx:81
gfx::LinearGradientInfo maMatrix basegfx::B2DHomMatrix
-include/basegfx/utils/systemdependentdata.hxx:59
- basegfx::MinimalSystemDependentDataManager maSystemDependentDataReferences std::set<SystemDependentData_SharedPtr>
include/basic/basmgr.hxx:56
BasicError nReason enum BasicErrorReason
include/basic/sbxvar.hxx:73
diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results
index 333fbb9eebb7..3b45782a7e5c 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -320,8 +320,6 @@ include/basegfx/tuple/b3ituple.hxx:164
_Bool basegfx::B3ITuple::operator!=(const class basegfx::B3ITuple &) const
include/basegfx/utils/b2dclipstate.hxx:72
_Bool basegfx::utils::B2DClipState::operator!=(const class basegfx::utils::B2DClipState &) const
-include/basegfx/utils/systemdependentdata.hxx:62
- basegfx::MinimalSystemDependentDataManager::MinimalSystemDependentDataManager()
include/basegfx/utils/unopolypolygon.hxx:88
const class basegfx::B2DPolyPolygon & basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const
include/basegfx/vector/b2ivector.hxx:73
diff --git a/include/basegfx/utils/systemdependentdata.hxx b/include/basegfx/utils/systemdependentdata.hxx
index 120e39a0e595..4486559df6fc 100644
--- a/include/basegfx/utils/systemdependentdata.hxx
+++ b/include/basegfx/utils/systemdependentdata.hxx
@@ -42,32 +42,6 @@ namespace basegfx
virtual void flushAll() = 0;
};
- class BASEGFX_DLLPUBLIC MinimalSystemDependentDataManager final : public SystemDependentDataManager
- {
- private:
- // example of a minimal SystemDependentDataManager. It *needs to hold*
- // a SystemDependentData_SharedPtr while SystemDependentDataHolder's will
- // use a SystemDependentData_WeakPtr. When the held SystemDependentData_SharedPtr
- // is deleted, the corresponding SystemDependentData_WeakPtr will get void.
- // To make this work, a minimal SystemDependentDataManager *has* to hold at
- // least that one SystemDependentData_SharedPtr.
- // That SystemDependentData_SharedPtr may be (e.g. Timer-based or resource-based)
- // be freed then. This minimal implementation does never free it, so all stay valid.
- // The instances may still be removed by endUsage calls, but there is no
- // caching/buffering mechanism involved here at all. It's an example, but
- // not used - better use an advanced derivation of SystemDependentDataManager
- std::set< SystemDependentData_SharedPtr > maSystemDependentDataReferences;
-
- public:
- MinimalSystemDependentDataManager();
- virtual ~MinimalSystemDependentDataManager() override;
-
- virtual void startUsage(basegfx::SystemDependentData_SharedPtr& rData) override;
- virtual void endUsage(basegfx::SystemDependentData_SharedPtr& rData) override;
- virtual void touchUsage(basegfx::SystemDependentData_SharedPtr& rData) override;
- virtual void flushAll() override;
- };
-
class BASEGFX_DLLPUBLIC SystemDependentData
{
private:
More information about the Libreoffice-commits
mailing list