summaryrefslogtreecommitdiff
path: root/sw/inc/calbck.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc/calbck.hxx')
-rw-r--r--sw/inc/calbck.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 11a62033c5cc..0863b2da7f2f 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -30,6 +30,7 @@
#include <type_traits>
#include <vector>
#include <memory>
+#include <optional>
class SwModify;
class SwFormat;
@@ -76,7 +77,6 @@ namespace sw
struct ModifyChangedHint final: SfxHint
{
ModifyChangedHint(const SwModify* pNew) : m_pNew(pNew) {};
- virtual ~ModifyChangedHint() override;
const SwModify* m_pNew;
};
// Observer pattern using svl implementation
@@ -151,7 +151,7 @@ public:
// in case an SwModify object is destroyed that itself is registered in another SwModify,
// its SwClient objects can decide to get registered to the latter instead by calling this method
- std::unique_ptr<sw::ModifyChangedHint> CheckRegistration( const SfxPoolItem* pOldValue );
+ std::optional<sw::ModifyChangedHint> CheckRegistration( const SfxPoolItem* pOldValue );
// SwFormat wants to die different than the rest: It wants to reparent every client to its parent
// and then send a SwFormatChg hint.
void CheckRegistrationFormat(SwFormat& rOld);