ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

UnoApiTest: merge save and saveWithParams into one

Browse Source 
it allows to simplify the code a bit since the
TestFilter is passed as the first parameter.

In preparation for a follow-up commit

Change-Id: I316c88e1583dc7d9b04876883b971bdfa54e8967
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198588
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2026-02-03 16:49:32 +01:00
parent 7e0c4230e8
commit d2c12c44fe
10 changed files with 75 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/source/unoapi_test.cxx
+8 -14
View File
@@ -150,11 +150,15 @@ uno::Any UnoApiTest::executeMacro(const OUString& rScriptURL,
return aRet;
}
void UnoApiTest::save(TestFilter eFilter, const char* pPassword)
void UnoApiTest::save(TestFilter eFilter, const uno::Sequence<beans::PropertyValue>& rParams,
const char* pPassword)
{
OUString aFilter(TestFilterNames.at(eFilter));
comphelper::SequenceAsHashMap aMediaDescriptor;
aMediaDescriptor[u"FilterName"_ustr] <<= aFilter;
if (rParams.hasElements())
aMediaDescriptor.update(rParams);
if (!maFilterOptions.isEmpty())
aMediaDescriptor[u"FilterOptions"_ustr] <<= maFilterOptions;
@@ -179,26 +183,16 @@ void UnoApiTest::save(TestFilter eFilter, const char* pPassword)
skipValidation();
}
saveWithParams(aMediaDescriptor.getAsConstPropertyValueList());
}
void UnoApiTest::saveWithParams(const uno::Sequence<beans::PropertyValue>& rParams)
{
css::uno::Reference<frame::XStorable> xStorable(mxComponent, css::uno::UNO_QUERY_THROW);
xStorable->storeToURL(maTempFile.GetURL(), rParams);
xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
if (!mbSkipValidation)
{
::comphelper::SequenceAsHashMap aParamsHash(rParams);
OUString aFilterName;
aParamsHash.getValue(u"FilterName"_ustr) >>= aFilterName;
validate(maTempFile.GetFileName(), aFilterName);
}
validate(maTempFile.GetFileName(), aFilter);
}
void UnoApiTest::saveAndReload(TestFilter eFilter, const char* pPassword)
{
save(eFilter, pPassword);
save(eFilter, /*rParams*/ {}, pPassword);
loadFromURL(maTempFile.GetURL(), pPassword);
}