summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/gridctrl.hxx4
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx3
-rw-r--r--include/unotools/streamwrap.hxx4
-rw-r--r--svx/source/dialog/docrecovery.cxx10
-rw-r--r--svx/source/form/fmundo.cxx4
-rw-r--r--svx/source/inc/docrecovery.hxx4
-rw-r--r--svx/source/inc/fmundo.hxx3
-rw-r--r--svx/source/table/tablecontroller.cxx4
-rw-r--r--svx/source/xml/xmleohlp.cxx2
-rw-r--r--svx/source/xml/xmlgrhlp.cxx4
10 files changed, 19 insertions, 23 deletions
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 09c2a609a483..6bdee5cc6477 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -42,6 +42,7 @@ namespace weld { class Menu; }
class CursorWrapper;
class GridFieldValueListener;
+class RowSetEventListener;
bool CompareBookmark(const css::uno::Any& aLeft, const css::uno::Any& aRight);
@@ -257,8 +258,7 @@ private:
// For that reason we have to listen to some properties of our data source.
rtl::Reference<::comphelper::OPropertyChangeMultiplexer> m_pDataSourcePropMultiplexer;
FmXGridSourcePropListener* m_pDataSourcePropListener;
- css::uno::Reference< css::sdb::XRowsChangeListener>
- m_xRowSetListener; // get notification when rows were changed
+ rtl::Reference<RowSetEventListener> m_xRowSetListener; // get notification when rows were changed
std::map<sal_uInt16, GridFieldValueListener*> m_aFieldListeners;
// property listeners for field values
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index ecbd7642b478..2e90e2cbd540 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -39,6 +39,7 @@ class SvxBoxItem;
namespace sdr::table {
+class SvxTableControllerModifyListener;
class TableModel;
class SVXCORE_DLLPUBLIC SvxTableController final : public sdr::SelectionController
@@ -189,7 +190,7 @@ private:
std::optional<sdr::overlay::OverlayObjectList> mpSelectionOverlay;
SdrView& mrView;
unotools::WeakReference<SdrTableObj> mxTableObj;
- css::uno::Reference< css::util::XModifyListener > mxModifyListener;
+ rtl::Reference< SvxTableControllerModifyListener > mxModifyListener;
ImplSVEvent * mnUpdateEvent;
};
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index a21d9e070995..5eddbd6ffcff 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -99,10 +99,10 @@ public:
//= OOutputStreamWrapper
-class OOutputStreamWrapper : public cppu::WeakImplHelper<css::io::XOutputStream>
+class UNOTOOLS_DLLPUBLIC OOutputStreamWrapper : public cppu::WeakImplHelper<css::io::XOutputStream>
{
public:
- UNOTOOLS_DLLPUBLIC OOutputStreamWrapper(SvStream& _rStream);
+ OOutputStreamWrapper(SvStream& _rStream);
// css::io::XOutputStream
virtual void SAL_CALL writeBytes(const css::uno::Sequence< sal_Int8 >& aData) override final;
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 9227f5356d04..cd9e60de5e4a 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -625,9 +625,8 @@ SaveProgressDialog::SaveProgressDialog(weld::Window* pParent, RecoveryCore* pCor
SaveProgressDialog::~SaveProgressDialog()
{
- css::uno::Reference<css::lang::XComponent> xComp(m_xProgress, css::uno::UNO_QUERY);
- if (xComp)
- xComp->dispose();
+ if (m_xProgress)
+ m_xProgress->dispose();
}
short SaveProgressDialog::run()
@@ -732,9 +731,8 @@ RecoveryDialog::RecoveryDialog(weld::Window* pParent, RecoveryCore* pCore)
RecoveryDialog::~RecoveryDialog()
{
- css::uno::Reference<css::lang::XComponent> xComp(m_xProgress, css::uno::UNO_QUERY);
- if (xComp)
- xComp->dispose();
+ if (m_xProgress)
+ m_xProgress->dispose();
}
bool RecoveryDialog::allSuccessfullyRecovered()
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index b7bf173dba29..3f5f28884724 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -71,8 +71,6 @@ using namespace ::svxform;
using namespace ::dbtools;
-namespace {
-
class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener >
{
public:
@@ -142,6 +140,8 @@ private:
};
+namespace {
+
// some helper structs for caching property infos
struct PropertyInfo
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 7ac9549e1c11..559592ab9878 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -356,7 +356,7 @@ class SaveProgressDialog final : public weld::GenericDialogController
std::unique_ptr<weld::ProgressBar> m_xProgressBar;
// @short TODO
- css::uno::Reference< css::task::XStatusIndicator > m_xProgress;
+ rtl::Reference< PluginProgress > m_xProgress;
// interface
public:
/** @short create all child controls of this dialog.
@@ -395,7 +395,7 @@ class RecoveryDialog final : public weld::GenericDialogController
OUString m_aRecoveryOnlyFinishDescr;
RecoveryCore* m_pCore;
- css::uno::Reference< css::task::XStatusIndicator > m_xProgress;
+ rtl::Reference< PluginProgress > m_xProgress;
enum EInternalRecoveryState
{
E_RECOVERY_PREPARED, // dialog started... recovery prepared
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index f0e691fe67f4..c2e5bde29276 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -44,6 +44,7 @@ class FmFormModel;
class FmFormObj;
class SdrObject;
struct PropertySetInfo;
+class ScriptEventListenerWrapper;
class FmUndoPropertyAction final : public SdrUndoAction
{
@@ -193,7 +194,7 @@ private:
::osl::Mutex m_aMutex;
bool bReadOnly;
bool m_bDisposed;
- css::uno::Reference< css::script::XScriptListener > m_vbaListener;
+ rtl::Reference< ScriptEventListenerWrapper > m_vbaListener;
};
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 2cd2040dec6a..3e8f155eeac4 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -109,8 +109,6 @@ namespace o3tl
namespace sdr::table {
-namespace {
-
class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper< css::util::XModifyListener >
{
public:
@@ -126,8 +124,6 @@ public:
SvxTableController* mpController;
};
-}
-
// XModifyListener
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index d931e2a15105..e3164e4b838c 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -66,7 +66,7 @@ constexpr OUStringLiteral XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE = u"vnd.sun.star.Gr
class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream>
{
std::mutex maMutex;
- Reference < XOutputStream > xOut;
+ rtl::Reference < OOutputStreamWrapper > xOut;
TempFileFast aTempFile;
bool bStreamClosed : 1;
SvStream* pStream;
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index a2709bb8c943..f67f7c7c3703 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -91,7 +91,7 @@ private:
private:
utl::TempFileFast maTempFile;
- Reference<XInputStream> mxStreamWrapper;
+ rtl::Reference<::utl::OInputStreamWrapper> mxStreamWrapper;
public:
@@ -224,7 +224,7 @@ private:
std::optional<::utl::TempFileFast> moTmp;
SvStream* mpOStm;
- Reference< XOutputStream > mxStmWrapper;
+ rtl::Reference< ::utl::OOutputStreamWrapper > mxStmWrapper;
std::optional<GraphicObject> moGrfObj;
bool mbClosed;
generated by cgit (git 2.34.1) at 2025-02-05 22:41:54 +0000