summaryrefslogtreecommitdiff
path: root/sw/source/core/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/inc')
-rw-r--r--sw/source/core/inc/MarkManager.hxx2
-rw-r--r--sw/source/core/inc/unobookmark.hxx48
2 files changed, 44 insertions, 6 deletions
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 8266198a521d..a25e414f8aa2 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -85,6 +85,8 @@ namespace sw::mark {
virtual const_iterator_t findFirstBookmarkStartsAfter(const SwPosition& rPos) const override;
// Fieldmarks
+ virtual const_iterator_t getFieldmarksBegin() const override;
+ virtual const_iterator_t getFieldmarksEnd() const override;
virtual ::sw::mark::IFieldmark* getFieldmarkAt(const SwPosition& rPos) const override;
virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& rPos) const override;
virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& rPos) const override;
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index f277748b5d7e..8ebbc373008f 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -25,6 +25,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XTextField.hpp>
#include <com/sun/star/text/XFormField.hpp>
#include <cppuhelper/implbase.hxx>
@@ -70,6 +71,8 @@ protected:
IDocumentMarkAccess* GetIDocumentMarkAccess();
+ SwDoc * GetDoc();
+
void registerInMark( SwXBookmark& rXMark, ::sw::mark::IMark* const pMarkBase );
virtual ~SwXBookmark() override;
@@ -177,13 +180,20 @@ class SwXFieldmarkParameters
};
typedef cppu::ImplInheritanceHelper< SwXBookmark,
- css::text::XFormField > SwXFieldmark_Base;
+ css::text::XFormField,
+ css::text::XTextField
+ > SwXFieldmark_Base;
class SwXFieldmark final
: public SwXFieldmark_Base
{
::sw::mark::ICheckboxFieldmark* getCheckboxFieldmark();
- bool m_bReplacementObject;
+ bool const m_bReplacementObject;
+
+ css::uno::Reference<css::text::XTextRange>
+ GetCommand(::sw::mark::IFieldmark const& rMark);
+ css::uno::Reference<css::text::XTextRange>
+ GetResult(::sw::mark::IFieldmark const& rMark);
SwXFieldmark(bool isReplacementObject, SwDoc* pDoc);
@@ -194,15 +204,41 @@ public:
virtual void attachToRange(
const css::uno::Reference<css::text::XTextRange > & xTextRange) override;
- virtual OUString SAL_CALL getFieldType() override;
- virtual void SAL_CALL setFieldType(const OUString& description ) override;
- virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getParameters( ) override;
+
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL
+ getSupportedServiceNames() override;
+
+ // XPropertySet
+ virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL
+ getPropertySetInfo() override;
virtual void SAL_CALL setPropertyValue(
const OUString& rPropertyName,
const css::uno::Any& rValue) override;
-
virtual css::uno::Any SAL_CALL getPropertyValue(
const OUString& rPropertyName) override;
+
+ // XComponent
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener(
+ const css::uno::Reference<css::lang::XEventListener> & xListener) override;
+ virtual void SAL_CALL removeEventListener(
+ const css::uno::Reference<css::lang::XEventListener> & xListener) override;
+
+ // XTextContent
+ virtual void SAL_CALL attach(
+ const css::uno::Reference<css::text::XTextRange> & xTextRange) override;
+ virtual css::uno::Reference<css::text::XTextRange> SAL_CALL getAnchor() override;
+
+ // XTextField
+ virtual OUString SAL_CALL getPresentation(sal_Bool bShowCommand) override;
+
+ // XFormField
+ virtual OUString SAL_CALL getFieldType() override;
+ virtual void SAL_CALL setFieldType(const OUString& description) override;
+ virtual css::uno::Reference<css::container::XNameContainer> SAL_CALL getParameters() override;
+
};
#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX