diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-12-18 15:01:38 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-12-23 08:21:14 +0100 |
| commit | 0322a41224a7264bbe03a068647ab093bcc88f90 (patch) | |
| tree | f3727c86193227546c9e5e5a393395f3da769522 /sw/source/uibase/app/docsh2.cxx | |
| parent | f3e0595fcba689b07f6419c2fb540731a3aadecf (diff) | |
XStyleLoader::loadStylesFromURL Allow loading from stream
Change-Id: Iab0c301096118203466dd91c724c25f1283a0488
Reviewed-on: https://gerrit.libreoffice.org/85392
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/source/uibase/app/docsh2.cxx')
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 0f6c54e82e26..df49f29b5761 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1565,8 +1565,7 @@ void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcVie m_xDoc->getIDocumentState().ResetModified(); } -ErrCode SwDocShell::LoadStylesFromFile( const OUString& rURL, - SwgReaderOption const & rOpt, bool bUnoCall ) +ErrCode SwDocShell::LoadStylesFromFile(const OUString& rURL, SwgReaderOption& rOpt, bool bUnoCall) { ErrCode nErr = ERRCODE_NONE; @@ -1575,6 +1574,8 @@ ErrCode SwDocShell::LoadStylesFromFile( const OUString& rURL, // search for filter in WebDocShell, too SfxMedium aMed( rURL, StreamMode::STD_READ ); + if (rURL == "private:stream") + aMed.setStreamToLoadFrom(rOpt.GetInputStream(), true); std::shared_ptr<const SfxFilter> pFlt; aMatcher.DetectFilter( aMed, pFlt ); if(!pFlt) |