diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-08 12:18:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-05-09 09:11:48 +0200 |
| commit | 440c23ee678442fc64aa9fcca13b137738e10a04 (patch) | |
| tree | 85fb3c1cd71cb57e668ad82e67f4e07b278ba0bd /svx/qa | |
| parent | 8bafae3656f7a0a6b74bb0985403a96f9a3f61be (diff) | |
merge GalleryStorageLocations with GalleryBinaryStorageLocations
Change-Id: Icf9a942047f212132d7b543cd1b1a857f8f95223
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151551
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/qa')
| -rw-r--r-- | svx/qa/unit/gallery/test_gallery.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/svx/qa/unit/gallery/test_gallery.cxx b/svx/qa/unit/gallery/test_gallery.cxx index cf868bd219fd..ac6a1b6ee875 100644 --- a/svx/qa/unit/gallery/test_gallery.cxx +++ b/svx/qa/unit/gallery/test_gallery.cxx @@ -17,7 +17,7 @@ #include <svx/galtheme.hxx> #include <gallerystoragelocations.hxx> #include <galobj.hxx> -#include <gallerybinarystoragelocations.hxx> +#include <gallerystoragelocations.hxx> #include <cppunit/TestAssert.h> #include <cppunit/extensions/HelperMacros.h> @@ -256,8 +256,7 @@ void GalleryObjTest::TestGalleryThemeEntry() myThemeName); // Check URLs - GalleryBinaryStorageLocations& aGalleryBinaryStorageLocations - = dynamic_cast<GalleryBinaryStorageLocations&>(mpThemeEntry->getGalleryStorageLocations()); + GalleryStorageLocations& rGalleryStorageLocations = mpThemeEntry->getGalleryStorageLocations(); INetURLObject aURL(aGalleryURL); aURL.Append(myThemeName); INetURLObject aThemeURL(aURL), aSdvURL(aURL), aSdgURL(aURL), aStrURL(aURL); @@ -266,19 +265,19 @@ void GalleryObjTest::TestGalleryThemeEntry() aSdgURL.setExtension(u"sdg"); aStrURL.setExtension(u"str"); CPPUNIT_ASSERT_EQUAL_MESSAGE("Theme URL doesn't match", - aGalleryBinaryStorageLocations.GetThmURL().GetMainURL( + rGalleryStorageLocations.GetThmURL().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous), aThemeURL.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)); CPPUNIT_ASSERT_EQUAL_MESSAGE("Sdv URL doesn't match", - aGalleryBinaryStorageLocations.GetSdvURL().GetMainURL( + rGalleryStorageLocations.GetSdvURL().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous), aSdvURL.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)); CPPUNIT_ASSERT_EQUAL_MESSAGE("Sdg URL doesn't match", - aGalleryBinaryStorageLocations.GetSdgURL().GetMainURL( + rGalleryStorageLocations.GetSdgURL().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous), aSdgURL.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)); CPPUNIT_ASSERT_EQUAL_MESSAGE("Str URL doesn't match", - aGalleryBinaryStorageLocations.GetStrURL().GetMainURL( + rGalleryStorageLocations.GetStrURL().GetMainURL( INetURLObject::DecodeMechanism::Unambiguous), aStrURL.GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)); } |