summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/editeng/outliner.hxx7
-rw-r--r--include/editeng/overflowingtxt.hxx9
2 files changed, 8 insertions, 8 deletions
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index b28cdd39ac4b..23ff675707c1 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -21,6 +21,7 @@
#include <editeng/editdata.hxx>
#include <editeng/editstat.hxx>
+#include <editeng/overflowingtxt.hxx>
#include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx>
#include <svl/SfxBroadcaster.hxx>
@@ -68,8 +69,6 @@ class SvxNumberFormat;
class EditEngine;
class SvKeyValueIterator;
class SvxForbiddenCharactersTable;
-class OverflowingText;
-class NonOverflowingText;
class OutlinerViewShell;
enum class CharCompressType;
enum class TransliterationFlags;
@@ -734,8 +733,8 @@ public:
void SetParaRemovingHdl(const Link<ParagraphHdlParam,void>& rLink){aParaRemovingHdl=rLink;}
const Link<ParagraphHdlParam,void>& GetParaRemovingHdl() const { return aParaRemovingHdl; }
- std::unique_ptr<NonOverflowingText> GetNonOverflowingText() const;
- std::unique_ptr<OverflowingText> GetOverflowingText() const;
+ std::optional<NonOverflowingText> GetNonOverflowingText() const;
+ std::optional<OverflowingText> GetOverflowingText() const;
void ClearOverflowingParaNum();
bool IsPageOverflow();
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index 5edfdfa00ac6..3ec7a34354a9 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/uno/Reference.h>
#include <memory>
+#include <optional>
namespace com::sun::star {
namespace datatransfer { class XTransferable; }
@@ -87,8 +88,8 @@ public:
bool IsLastParaInterrupted() const;
private:
- const ESelection maContentSel;
- const bool mbLastParaInterrupted;
+ ESelection maContentSel;
+ bool mbLastParaInterrupted;
};
@@ -112,8 +113,8 @@ public:
bool IsLastParaInterrupted() const;
private:
- std::unique_ptr<NonOverflowingText> mpNonOverflowingTxt;
- std::unique_ptr<OverflowingText> mpOverflowingTxt;
+ std::optional<NonOverflowingText> mpNonOverflowingTxt;
+ std::optional<OverflowingText> mpOverflowingTxt;
bool mbIsDeepMerge;
};