officecfg/registry/data/org/openoffice/Office/Common.xcu | 7 ---
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 27 -------------
sc/qa/unit/subsequent_export_test3.cxx | 12 -----
sd/qa/unit/export-tests-ooxml1.cxx | 5 --
sd/qa/unit/export-tests.cxx | 12 -----
5 files changed, 63 deletions(-)
New commits:
commit 8bcf321d549799e530c81f22ff90096668442a96
Author: Gabor Kelemen <kelem...@ubuntu.com>
AuthorDate: Tue Apr 25 09:56:11 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue May 2 21:13:10 2023 +0200
[API CHANGE] Drop TotalCacheSize ObjectCacheSize ObjectReleaseTime config
keys
Obsoleted by 2018 commit c6cf2320d2a464594e759289c34796538d31f02b
Change-Id: Ifc83b8dae06ef84d2ae276c18a395185db330cc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150964
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 4694135efce7..a3b8bff164d0 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -494,13 +494,6 @@
</prop>
</node>
</node>
- <node oor:name="Cache">
- <node oor:name="GraphicManager">
- <prop oor:name="TotalCacheSize" oor:type="xs:int">
- <value install:module="32bit">200000000</value>
- </prop>
- </node>
- </node>
<node oor:name="Path">
<node oor:name="Current">
<prop oor:name="Temp" oor:type="xs:string">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 96f4af60a40b..072ab8ac5073 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1514,33 +1514,6 @@
<desc>Specifies a group of graphic manager cache options.</desc>
<label>Image Manager Cache</label>
</info>
- <prop oor:name="TotalCacheSize" oor:type="xs:int" oor:nillable="false">
- <info>
- <deprecated>Not used anymore</deprecated>
- <desc>Specifies the maximum cache size for all graphical display
- objects.</desc>
- <label>Total Image Cache Size</label>
- </info>
- <value>400000000</value>
- </prop>
- <prop oor:name="ObjectCacheSize" oor:type="xs:int"
oor:nillable="false">
- <info>
- <deprecated>Not used anymore</deprecated>
- <desc>Specifies the maximum cache size for a single graphic display
- object.</desc>
- <label>Image Object Cache Size</label>
- </info>
- <value>12600000</value>
- </prop>
- <prop oor:name="ObjectReleaseTime" oor:type="xs:int"
oor:nillable="false">
- <info>
- <deprecated>Not used anymore</deprecated>
- <desc>Specifies the time in seconds after which a cached object is
- freed from the cache.</desc>
- <label>Image Object Release Timeout</label>
- </info>
- <value>600</value>
- </prop>
<prop oor:name="GraphicSwappingEnabled" oor:type="xs:boolean"
oor:nillable="false">
<info>
<desc>Whether graphics will be swapped to disk when
`GraphicMemoryLimit`
diff --git a/sc/qa/unit/subsequent_export_test3.cxx
b/sc/qa/unit/subsequent_export_test3.cxx
index b1ce4c1a6125..ff8a27727a1b 100644
--- a/sc/qa/unit/subsequent_export_test3.cxx
+++ b/sc/qa/unit/subsequent_export_test3.cxx
@@ -1024,12 +1024,6 @@ CPPUNIT_TEST_FIXTURE(ScExportTest3,
testSwappedOutImageExport)
{
std::vector<OUString> aFilterNames{ "calc8", "MS Excel 97", "Calc Office
Open XML" };
- // Set cache size to a very small value to make sure one of the images is
swapped out
- std::shared_ptr<comphelper::ConfigurationChanges> xBatch(
- comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
xBatch);
- xBatch->commit();
-
for (size_t i = 0; i < aFilterNames.size(); ++i)
{
// Check whether the export code swaps in the image which was swapped
out before.
@@ -1150,12 +1144,6 @@ CPPUNIT_TEST_FIXTURE(ScExportTest3,
testImageWithSpecialID)
{
std::vector<OUString> aFilterNames{ "calc8", "MS Excel 97", "Calc Office
Open XML" };
- // Trigger swap out mechanism to test swapped state factor too.
- std::shared_ptr<comphelper::ConfigurationChanges> batch(
- comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
batch);
- batch->commit();
-
for (size_t i = 0; i < aFilterNames.size(); ++i)
{
createScDoc("ods/images_with_special_IDs.ods");
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index 9bbcab21cbaa..0c0815a548ec 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -779,11 +779,6 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testFdo79731)
CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTableCellFillProperties)
{
- std::shared_ptr<comphelper::ConfigurationChanges> batch(
- comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
batch);
- batch->commit();
-
// Load the original file
createSdImpressDoc("odp/Table_with_Cell_Fill.odp");
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 4be14483aad4..aee7e6724e32 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -428,12 +428,6 @@ CPPUNIT_TEST_FIXTURE(SdExportTest,
testSwappedOutImageExport)
{
// Problem was with the swapped out images, which were not swapped in
during export.
- // Set cache size to a very small value to make sure one of the images is
swapped out
- std::shared_ptr<comphelper::ConfigurationChanges> xBatch(
- comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
xBatch);
- xBatch->commit();
-
std::vector<OUString> vFormat{ "impress8", "Impress Office Open XML", "MS
PowerPoint 97" };
for (size_t i = 0; i < vFormat.size(); i++)
@@ -742,12 +736,6 @@ CPPUNIT_TEST_FIXTURE(SdExportTest, testImageWithSpecialID)
// Check how LO handles when the imported graphic's ID is different from
that one
// which is generated by LO.
- // Trigger swap out mechanism to test swapped state factor too.
- std::shared_ptr<comphelper::ConfigurationChanges> batch(
- comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
batch);
- batch->commit();
-
std::vector<OUString> vFormat{ "impress8", "Impress Office Open XML", "MS
PowerPoint 97" };
for (size_t i = 0; i < vFormat.size(); i++)
{
