diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-06-19 12:15:21 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-06-19 14:46:56 +0200 |
| commit | c5e1c4105f744ad9730cf74c9b36c2b23bbc0979 (patch) | |
| tree | 65d2ec98ee4dda680fc3a4a90ca230d8808ef792 /framework | |
| parent | 1115a60e6d825c049680e7f2caf318e36d481b12 (diff) | |
Rename nFlags to nSearchFlags
Change-Id: Ib03046acf3d34fc307a3765d7d0b1b7d9448b507
Reviewed-on: https://gerrit.libreoffice.org/56088
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index b527d0259e77..6ae60ebeadc5 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -143,7 +143,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const const css::uno::Reference< css::uno::XComponentContext >& xContext , const OUString& sURL , const OUString& sTarget, - sal_Int32 nFlags , + sal_Int32 nSearchFlags , const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) { css::uno::Reference< css::lang::XComponent > xComponent; @@ -163,7 +163,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const lArgs, css::uno::Reference< css::frame::XFrame >(xLoader, css::uno::UNO_QUERY), sTarget, - nFlags, + nSearchFlags, loadEnvFeatures); aEnv.startLoading(); aEnv.waitWhileLoading(); // wait for ever! @@ -1035,8 +1035,8 @@ bool LoadEnv::impl_loadContent() } else { - sal_Int32 nFlags = m_nSearchFlags & ~css::frame::FrameSearchFlag::CREATE; - m_xTargetFrame = m_xBaseFrame->findFrame(sTarget, nFlags); + sal_Int32 nSearchFlags = m_nSearchFlags & ~css::frame::FrameSearchFlag::CREATE; + m_xTargetFrame = m_xBaseFrame->findFrame(sTarget, nSearchFlags); if (! m_xTargetFrame.is()) { if (! impl_furtherDocsAllowed()) |