diff options
| author | Henry Castro <hcastro@collabora.com> | 2023-10-09 07:34:02 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2023-10-31 21:09:19 +0100 |
| commit | f2ae8b934aaac7c444e8493ed5e8189c6ce63328 (patch) | |
| tree | 936021425c09fdc505e6d0331f7eee8cf872296e /include/oox/ppt | |
| parent | 046e9545956d8ad1d69345d6b4a4c0a33714d179 (diff) | |
tdf#155512: oox: ppt: fix import master slides, follow up
Import all master slides.
Signed-off-by: Henry Castro <hcastro@collabora.com>
Change-Id: Ieac68bacf15c75e4c23ec692aadcb16033cdd092
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157701
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158716
Tested-by: Jenkins
Diffstat (limited to 'include/oox/ppt')
| -rw-r--r-- | include/oox/ppt/presentationfragmenthandler.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index 29204b282bdb..20fc521ae8c5 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -52,10 +52,10 @@ private: void importSlide( const ::oox::core::FragmentHandlerRef& rSlideFragmentHandler, const oox::ppt::SlidePersistPtr& rPersist ); void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes); - oox::ppt::SlidePersistPtr importMasterSlide(const ::com::sun::star::uno::Reference<::com::sun::star::frame::XModel>& xModel, - ::oox::ppt::PowerPointImport& rFilter, - std::u16string_view rLayoutFragmentPath, - std::u16string_view rMasterFragmentPath); + void importMasterSlides(); + void importMasterSlide(const ::com::sun::star::uno::Reference<::com::sun::star::frame::XModel>& xModel, + ::oox::ppt::PowerPointImport& rFilter, + const OUString& rMasterFragmentPath); void saveThemeToGrabBag(const oox::drawingml::ThemePtr& pThemePtr, sal_Int32 nThemeIdx); void importCustomSlideShow(std::vector<CustomShow>& rCustomShowList); static void importSlideNames(::oox::core::XmlFilterBase& rFilter, const std::vector<SlidePersistPtr>& rSlidePersist); |