diff options
| -rw-r--r-- | hwpfilter/source/hwpreader.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/inc/RptObject.hxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/framework/factories/BasicViewFactory.cxx | 20 | ||||
| -rw-r--r-- | svtools/source/dialogs/ServerDetailsControls.hxx | 4 |
4 files changed, 14 insertions, 16 deletions
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 2921ef5ff2f0..6d24faca1ced 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -4744,7 +4744,7 @@ public: virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& rDescriptor ) override; private: - Reference< XFilter > rFilter; + rtl::Reference< HwpReader > rFilter; Reference< XImporter > rImporter; }; diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 5920eb2bc8c2..b5c8c9b239fb 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -34,6 +34,8 @@ namespace rptui { + class OObjectListener; + typedef ::std::multimap< sal_Int16, OUString > IndexToNameMap; enum DlgEdHintKind { @@ -64,7 +66,7 @@ class UNLESS_MERGELIBS_MORE(REPORTDESIGN_DLLPUBLIC) SAL_LOPLUGIN_ANNOTATE("cross { protected: mutable rtl::Reference<OPropertyMediator> m_xMediator; - mutable css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener; + mutable rtl::Reference< OObjectListener > m_xPropertyChangeListener; mutable css::uno::Reference< css::report::XReportComponent> m_xReportComponent; css::uno::Reference< css::uno::XInterface > m_xKeepShapeAlive; OUString m_sComponentName; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 20cb7ed6df2f..c9f06e6593d6 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -57,7 +57,7 @@ namespace sd::framework { class BasicViewFactory::ViewDescriptor { public: - Reference<XResource> mxView; + rtl::Reference<ViewShellWrapper> mxView; std::shared_ptr<sd::ViewShell> mpViewShell; Reference<XResourceId> mxViewId; static bool CompareView (const std::shared_ptr<ViewDescriptor>& rpDescriptor, @@ -386,11 +386,10 @@ void BasicViewFactory::ReleaseView ( if (bIsCacheable) { - Reference<XRelocatableResource> xResource (rpDescriptor->mxView, UNO_QUERY); - if (xResource.is()) + if (rpDescriptor->mxView) { if (mxLocalPane.is()) - if (xResource->relocateToAnchor(mxLocalPane)) + if (rpDescriptor->mxView->relocateToAnchor(mxLocalPane)) mpViewCache->push_back(rpDescriptor); else bIsCacheable = false; @@ -410,9 +409,8 @@ void BasicViewFactory::ReleaseView ( mpBase->GetDocShell()->Disconnect(rpDescriptor->mpViewShell.get()); mpBase->GetViewShellManager()->DeactivateViewShell(rpDescriptor->mpViewShell.get()); - Reference<XComponent> xComponent (rpDescriptor->mxView, UNO_QUERY); - if (xComponent.is()) - xComponent->dispose(); + if (rpDescriptor->mxView) + rpDescriptor->mxView->dispose(); } } @@ -420,8 +418,7 @@ bool BasicViewFactory::IsCacheable (const std::shared_ptr<ViewDescriptor>& rpDes { bool bIsCacheable (false); - Reference<XRelocatableResource> xResource (rpDescriptor->mxView, UNO_QUERY); - if (xResource.is()) + if (rpDescriptor->mxView) { static ::std::vector<Reference<XResourceId> > s_aCacheableResources = [&]() { @@ -463,10 +460,9 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::GetViewFromC if (pDescriptor != nullptr) { bool bRelocationSuccessful (false); - Reference<XRelocatableResource> xResource (pDescriptor->mxView, UNO_QUERY); - if (xResource.is() && rxPane.is()) + if (pDescriptor->mxView && rxPane.is()) { - if (xResource->relocateToAnchor(rxPane)) + if (pDescriptor->mxView->relocateToAnchor(rxPane)) bRelocationSuccessful = true; } diff --git a/svtools/source/dialogs/ServerDetailsControls.hxx b/svtools/source/dialogs/ServerDetailsControls.hxx index 186125e555bb..ddca70807d77 100644 --- a/svtools/source/dialogs/ServerDetailsControls.hxx +++ b/svtools/source/dialogs/ServerDetailsControls.hxx @@ -12,7 +12,7 @@ #include <vector> #include <com/sun/star/uno/Reference.hxx> - +#include <ucbhelper/commandenvironment.hxx> #include <tools/link.hxx> #include <tools/urlobj.hxx> #include <vcl/weld.hxx> @@ -118,7 +118,7 @@ class CmisDetailsContainer final : public DetailsContainer private: OUString m_sUsername; OUString m_sPassword; - css::uno::Reference< css::ucb::XCommandEnvironment > m_xCmdEnv; + rtl::Reference< ucbhelper::CommandEnvironment > m_xCmdEnv; std::vector< OUString > m_aRepoIds; OUString m_sRepoId; OUString m_sBinding; |