diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-15 10:04:51 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-02-19 09:09:06 +0100 |
commit | 3ba92b5f1eaf7d4447a0943ea260db515ca799dc (patch) | |
tree | c9d872596ba8c5d57f6a30761d5ce1052972735a /sw/inc | |
parent | 5f0021cdd0b84fccaecf23a014622f0aca86430c (diff) |
hide more symbols
using the bin/find-can-be-private-symbols.py script
to find classes with large numbers of exported symbols
that can hidden.
before
exported = 58104
imported = 30810
unused_exports = 35433
after
exported = 55094
imported = 31073
unused_exports = 32423
Change-Id: Idd0a70ee3740afd5ca1a86771e0e2ff8090d102d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163456
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/bparr.hxx | 4 | ||||
-rw-r--r-- | sw/inc/crsrsh.hxx | 174 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 202 | ||||
-rw-r--r-- | sw/inc/editsh.hxx | 260 | ||||
-rw-r--r-- | sw/inc/fesh.hxx | 158 | ||||
-rw-r--r-- | sw/inc/unocoll.hxx | 4 |
6 files changed, 401 insertions, 401 deletions
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx index e59cb2c0b6bd..9f3e17f8d140 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -61,7 +61,7 @@ struct BlockInfo final mvData; ///< data block }; -class SW_DLLPUBLIC BigPtrArray +class BigPtrArray { protected: std::unique_ptr<BlockInfo*[]> @@ -91,7 +91,7 @@ public: void Move( sal_Int32 from, sal_Int32 to ); void Replace( sal_Int32 pos, BigPtrEntry* p); - BigPtrEntry* operator[]( sal_Int32 ) const; + SW_DLLPUBLIC BigPtrEntry* operator[]( sal_Int32 ) const; }; inline sal_Int32 BigPtrEntry::GetPos() const diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index ecf253281205..6859f9083bb8 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -144,7 +144,7 @@ bool GetRanges(std::vector<std::shared_ptr<SwUnoCursor>> & rRanges, } // namespace sw -class SW_DLLPUBLIC SwCursorShell +class SwCursorShell : public SwViewShell , public sw::BroadcastingModify , public ::sw::IShellCursorSupplier @@ -166,7 +166,7 @@ public: READONLY = (1 << 3) ///< make visible in spite of Readonly }; - void UpdateCursor( + SW_DLLPUBLIC void UpdateCursor( sal_uInt16 eFlags = SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE, bool bIdleEnd = false ); @@ -245,9 +245,9 @@ private: SwFrame* m_oldColFrame; - SAL_DLLPRIVATE void MoveCursorToNum(); + void MoveCursorToNum(); - SAL_DLLPRIVATE void ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing ); + void ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing ); /** Mark a certain list level of a certain list @@ -258,33 +258,33 @@ private: An empty sListId denotes that no level of a list is marked. */ - SAL_DLLPRIVATE void MarkListLevel( const OUString& sListId, + void MarkListLevel( const OUString& sListId, const int nLevel ); // private method(s) accessed from public inline method(s) must be exported. - bool LeftRight( bool, sal_uInt16, SwCursorSkipMode, bool ); - SAL_DLLPRIVATE bool UpDown( bool, sal_uInt16 ); - SAL_DLLPRIVATE bool LRMargin( bool, bool bAPI = false ); - SAL_DLLPRIVATE bool IsAtLRMargin( bool, bool bAPI = false ) const; + SW_DLLPUBLIC bool LeftRight( bool, sal_uInt16, SwCursorSkipMode, bool ); + bool UpDown( bool, sal_uInt16 ); + bool LRMargin( bool, bool bAPI = false ); + bool IsAtLRMargin( bool, bool bAPI = false ) const; - SAL_DLLPRIVATE bool isInHiddenFrame(SwShellCursor* pShellCursor); + bool isInHiddenFrame(SwShellCursor* pShellCursor); - SAL_DLLPRIVATE bool GoStartWordImpl(); - SAL_DLLPRIVATE bool GoEndWordImpl(); - SAL_DLLPRIVATE bool GoNextWordImpl(); - SAL_DLLPRIVATE bool GoPrevWordImpl(); - SAL_DLLPRIVATE bool GoNextSentenceImpl(); - SAL_DLLPRIVATE bool GoEndSentenceImpl(); - SAL_DLLPRIVATE bool GoStartSentenceImpl(); + bool GoStartWordImpl(); + bool GoEndWordImpl(); + bool GoNextWordImpl(); + bool GoPrevWordImpl(); + bool GoNextSentenceImpl(); + bool GoEndSentenceImpl(); + bool GoStartSentenceImpl(); typedef bool (SwCursor::*FNCursor)(); typedef bool (SwCursorShell::*FNCursorShell)(); - SAL_DLLPRIVATE bool CallCursorFN( FNCursor ); - SAL_DLLPRIVATE bool CallCursorShellFN( FNCursorShell ); + bool CallCursorFN( FNCursor ); + bool CallCursorShellFN( FNCursorShell ); - SAL_DLLPRIVATE const SwRangeRedline* GotoRedline_( SwRedlineTable::size_type nArrPos, bool bSelect ); + const SwRangeRedline* GotoRedline_( SwRedlineTable::size_type nArrPos, bool bSelect ); - SAL_DLLPRIVATE void sendLOKCursorUpdates(); + void sendLOKCursorUpdates(); protected: inline SwMoveFnCollection const & MakeFindRange( SwDocPositions, SwDocPositions, SwPaM* ) const; @@ -295,7 +295,7 @@ protected: */ int CompareCursorStackMkCurrPt() const; - bool SelTableRowOrCol( bool bRow, bool bRowSimple = false ); + SW_DLLPUBLIC bool SelTableRowOrCol( bool bRow, bool bRowSimple = false ); bool SetInFrontOfLabel( bool bNew ); @@ -303,7 +303,7 @@ protected: /** Updates the marked list level according to the cursor. */ - SAL_DLLPRIVATE void UpdateMarkedListLevel(); + void UpdateMarkedListLevel(); protected: virtual void SwClientNotify(const SwModify&, const SfxHint&) override; @@ -316,11 +316,11 @@ public: // create new cursor and append the old one virtual SwCursor & CreateNewShellCursor() override; - virtual SwCursor & GetCurrentShellCursor() override; + SW_DLLPUBLIC virtual SwCursor & GetCurrentShellCursor() override; - SwPaM * CreateCursor(); + SW_DLLPUBLIC SwPaM * CreateCursor(); ///< delete the current cursor and make the following into the current - void DestroyCursor(); + SW_DLLPUBLIC void DestroyCursor(); ///< transform TableCursor to normal cursor, nullify Tablemode void TableCursorToCursor(); ///< enter block mode, change normal cursor into block cursor @@ -338,7 +338,7 @@ public: /// If document body starts with a table or starts/ends with hidden paragraph. StartsWith StartsWith_(); - SwCursor* GetCursor( bool bMakeTableCursor = true ) const; + SW_DLLPUBLIC SwCursor* GetCursor( bool bMakeTableCursor = true ) const; // return only the current cursor SwShellCursor* GetCursor_() { return m_pCurrentCursor; } const SwShellCursor* GetCursor_() const { return m_pCurrentCursor; } @@ -354,9 +354,9 @@ public: inline SwPaM* GetStackCursor() const; // start parenthesing, hide SV-Cursor and selected areas - void StartAction(); + SW_DLLPUBLIC void StartAction(); // end parenthesing, show SV-Cursor and selected areas - void EndAction( const bool bIdleEnd = false ); + SW_DLLPUBLIC void EndAction( const bool bIdleEnd = false ); // basic cursor travelling tools::Long GetUpDownX() const { return m_nUpDownX; } @@ -369,17 +369,17 @@ public: bool Down( sal_uInt16 nCnt = 1 ) { return UpDown( false, nCnt ); } bool LeftMargin() { return LRMargin( true ); } bool RightMargin(bool bAPI = false) { return LRMargin( false, bAPI ); } - bool SttEndDoc( bool bStt ); + SW_DLLPUBLIC bool SttEndDoc( bool bStt ); bool MovePage( SwWhichPage, SwPosPage ); - bool MovePara( SwWhichPara, SwMoveFnCollection const & ); - bool MoveSection( SwWhichSection, SwMoveFnCollection const & ); - bool MoveTable( SwWhichTable, SwMoveFnCollection const & ); + SW_DLLPUBLIC bool MovePara( SwWhichPara, SwMoveFnCollection const & ); + SW_DLLPUBLIC bool MoveSection( SwWhichSection, SwMoveFnCollection const & ); + SW_DLLPUBLIC bool MoveTable( SwWhichTable, SwMoveFnCollection const & ); void MoveColumn( SwWhichColumn, SwPosColumn ); bool MoveRegion( SwWhichRegion, SwMoveFnCollection const & ); // note: DO NOT call it FindText because windows.h - sal_Int32 Find_Text( const i18nutil::SearchOptions2& rSearchOpt, + SW_DLLPUBLIC sal_Int32 Find_Text( const i18nutil::SearchOptions2& rSearchOpt, bool bSearchInNotes, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, @@ -408,7 +408,7 @@ public: * true: Place the cursor at the start of the character/field. This is used when setting * the cursor is done in order to get at the properties under the mouse pointer. */ - int SetCursor(const Point& rPt, bool bOnlyText = false, bool bBlock = true, + SW_DLLPUBLIC int SetCursor(const Point& rPt, bool bOnlyText = false, bool bBlock = true, bool bFieldInfo = false); /* @@ -427,7 +427,7 @@ public: inline void SetMark(); inline bool HasMark() const; - void ClearMark(); + SW_DLLPUBLIC void ClearMark(); /** Ensure point and mark of the current PaM are in a specific order. @@ -436,15 +436,15 @@ public: swap the PaM. false: If the mark is behind the point then swap the PaM. */ - void NormalizePam(bool bPointFirst = true); + SW_DLLPUBLIC void NormalizePam(bool bPointFirst = true); - void SwapPam(); - bool TestCurrPam( const Point & rPt, + SW_DLLPUBLIC void SwapPam(); + SW_DLLPUBLIC bool TestCurrPam( const Point & rPt, bool bTstHit = false); // only exact matches void KillPams(); /// store a copy of the current cursor on the cursor stack - void Push(); + SW_DLLPUBLIC void Push(); enum class PopMode { DeleteCurrent, DeleteStack }; /* * Delete a cursor @@ -454,15 +454,15 @@ public: * @return <true> if there was one on the stack, <false> otherwise */ bool Pop(PopMode, ::std::optional<SwCallLink>& roLink); - bool Pop(PopMode); + SW_DLLPUBLIC bool Pop(PopMode); /* * Combine 2 Cursors. * Delete the topmost from the stack and move its Mark into the current. */ void Combine(); - void SttCursorMove(); - void EndCursorMove( const bool bIdleEnd = false ); + SW_DLLPUBLIC void SttCursorMove(); + SW_DLLPUBLIC void EndCursorMove( const bool bIdleEnd = false ); /* * When the focus is lost the selected ranges are not displayed anymore. @@ -474,8 +474,8 @@ public: void ShellGetFocus(); // Methods for displaying or hiding the visible text cursor. - void ShowCursor(); - void HideCursor(); + SW_DLLPUBLIC void ShowCursor(); + SW_DLLPUBLIC void HideCursor(); // Methods for displaying or hiding the selected ranges with visible cursor. void ShowCursors( bool bCursorVis ); void HideCursors(); @@ -487,15 +487,15 @@ public: void SetSendAccessibleCursorEvents(bool bEnable) { m_bSendAccessibleCursorEvents = bEnable; }; // Return current frame in which the cursor is placed. - SwContentFrame *GetCurrFrame( const bool bCalcFrame = true ) const; + SW_DLLPUBLIC SwContentFrame *GetCurrFrame( const bool bCalcFrame = true ) const; //true if cursor is hidden because of readonly. //false if it is working despite readonly. - bool IsCursorReadonly() const; + SW_DLLPUBLIC bool IsCursorReadonly() const; // Cursor is placed in something that is protected or selection contains // something that is protected. - bool HasReadonlySel(bool isReplace = false) const; + SW_DLLPUBLIC bool HasReadonlySel(bool isReplace = false) const; bool HasHiddenSections() const; // Can the cursor be set to read only ranges? @@ -520,7 +520,7 @@ public: // Check if the current cursor contains a selection, i.e. // if Mark is set and SPoint and Mark are different. - bool HasSelection() const; + SW_DLLPUBLIC bool HasSelection() const; // Check if a selection exists, i.e. if the current cursor comprises a selection. inline bool IsSelection() const; @@ -554,11 +554,11 @@ public: // Return current page number: // true: in which cursor is located. // false: which is visible at the upper margin. - void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, + SW_DLLPUBLIC void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, bool bAtCursorPos = true, const bool bCalcFrame = true ); // Returns current page's sequential number (1-based),in which cursor is located, ignoring autoinserted empty pages. // Returns 0 on error - sal_uInt16 GetPageNumSeqNonEmpty(); + SW_DLLPUBLIC sal_uInt16 GetPageNumSeqNonEmpty(); // Determine how "empty pages" are handled // (used in PhyPage). sal_uInt16 GetNextPrevPageNum( bool bNext = true ); @@ -566,7 +566,7 @@ public: // Move cursor at the beginning of page "nPage". bool GotoPage( sal_uInt16 nPage ); - sal_uInt16 GetPageCnt(); + SW_DLLPUBLIC sal_uInt16 GetPageCnt(); bool GoNextCursor(); @@ -575,16 +575,16 @@ public: void GoNextPrevCursorSetSearchLabel(const bool bNext); // at CurrentCursor.SPoint - ::sw::mark::IMark* SetBookmark( + SW_DLLPUBLIC ::sw::mark::IMark* SetBookmark( const vcl::KeyCode&, const OUString& rName, IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::MarkType::BOOKMARK); - ::sw::mark::IMark* SetBookmark2( + SW_DLLPUBLIC ::sw::mark::IMark* SetBookmark2( const vcl::KeyCode&, const OUString& rName, bool bHide, const OUString& rCondition); - bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurrentCursor.SPoint + SW_DLLPUBLIC bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurrentCursor.SPoint bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart ); bool GoNextBookmark(); // true, if there was one bool GoPrevBookmark(); @@ -601,15 +601,15 @@ public: // get the selected text at the current cursor. It will be filled with // fields etc. - OUString GetSelText() const; + SW_DLLPUBLIC OUString GetSelText() const; /// Check if Point of current cursor is placed within a table. - const SwTableNode* IsCursorInTable() const; + SW_DLLPUBLIC const SwTableNode* IsCursorInTable() const; bool MoveOutOfTable(); bool TrySelectOuterTable(); bool MoveStartText(); - bool IsCursorInFootnote() const; + SW_DLLPUBLIC bool IsCursorInFootnote() const; inline Point& GetCursorDocPos() const; // get cursor position relative to the page it is in @@ -624,8 +624,8 @@ public: OUString GetBoxNms() const; // set Cursor to the next/previous cell - bool GoNextCell( bool bAppendLine = true ); - bool GoPrevCell(); + SW_DLLPUBLIC bool GoNextCell( bool bAppendLine = true ); + SW_DLLPUBLIC bool GoPrevCell(); // go to this box (if available and inside of table) bool GotoTable( const OUString& rName ); @@ -634,7 +634,7 @@ public: bool SelTableCol() { return SelTableRowOrCol( false ); } bool SelTableBox(); - bool SelTable(); + SW_DLLPUBLIC bool SelTable(); void GotoNextNum(); void GotoPrevNum(); @@ -643,7 +643,7 @@ public: // to the next/previous or the given OutlineNode void GotoOutline( SwOutlineNodes::size_type nIdx ); // find the "outline position" in the nodes array of the current chapter - SwOutlineNodes::size_type GetOutlinePos(sal_uInt8 nLevel = UCHAR_MAX, SwPaM* pPaM = nullptr); + SW_DLLPUBLIC SwOutlineNodes::size_type GetOutlinePos(sal_uInt8 nLevel = UCHAR_MAX, SwPaM* pPaM = nullptr); // select the given range of OutlineNodes. Optionally including the children // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell) void MakeOutlineSel(SwOutlineNodes::size_type nSttPos, SwOutlineNodes::size_type nEndPos, @@ -666,7 +666,7 @@ public: m_pBlockCursor if exist and of interest (param bBlock) otherwise m_pCurrentCursor */ - SwShellCursor* getShellCursor( bool bBlock ); + SW_DLLPUBLIC SwShellCursor* getShellCursor( bool bBlock ); const SwShellCursor* getShellCursor( bool bBlock ) const { return const_cast<SwCursorShell*>(this)->getShellCursor( bBlock ); } @@ -679,19 +679,19 @@ public: SwShellTableCursor* GetTableCursor() { return m_pTableCursor; } size_t UpdateTableSelBoxes(); - bool GotoFootnoteText(); ///< jump from content to footnote + SW_DLLPUBLIC bool GotoFootnoteText(); ///< jump from content to footnote bool GotoFootnoteAnchor(); ///< jump from footnote to anchor - bool GotoPrevFootnoteAnchor(); - bool GotoNextFootnoteAnchor(); + SW_DLLPUBLIC bool GotoPrevFootnoteAnchor(); + SW_DLLPUBLIC bool GotoNextFootnoteAnchor(); void GotoFlyAnchor(); ///< jump from the frame to the anchor - bool GotoHeaderText(); ///< jump from the content to the header + SW_DLLPUBLIC bool GotoHeaderText(); ///< jump from the content to the header bool GotoFooterText(); ///< jump from the content to the footer // jump to the header/footer of the given or current PageDesc bool SetCursorInHdFt(size_t nDescNo, bool bInHeader, bool bEven = false, bool bFirst = false); // is point of cursor in header/footer. pbInHeader return true if it is // in a headerframe otherwise in a footerframe - bool IsInHeaderFooter( bool* pbInHeader = nullptr ) const; + SW_DLLPUBLIC bool IsInHeaderFooter( bool* pbInHeader = nullptr ) const; bool GotoNextTOXBase( const OUString* = nullptr ); bool GotoPrevTOXBase( const OUString* = nullptr ); @@ -699,7 +699,7 @@ public: // jump to the next or previous index entry bool GotoNxtPrvTOXMark( bool bNext = true ); // jump to the next/previous index mark of this type - const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir ); + SW_DLLPUBLIC const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir ); // jump to the next or previous table formula // optionally only to broken formulas @@ -721,7 +721,7 @@ public: // (This is needed for displaying the Drag&Drop/Copy-Cursor.) bool SetVisibleCursor( const Point &rPt ); inline void UnSetVisibleCursor(); - SwVisibleCursor* GetVisibleCursor() const; + SW_DLLPUBLIC SwVisibleCursor* GetVisibleCursor() const; // jump to the next or previous field of the corresponding type bool MoveFieldType( @@ -742,29 +742,29 @@ public: static SwTextField* GetTextFieldAtCursor( const SwPaM* pCursor, ::sw::GetTextAttrMode eMode); - static SwField* GetFieldAtCursor( + SW_DLLPUBLIC static SwField* GetFieldAtCursor( const SwPaM* pCursor, const bool bIncludeInputFieldAtStart ); - SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const; - bool CursorInsideInputField() const; - SwTextContentControl* CursorInsideContentControl() const; - static bool PosInsideInputField( const SwPosition& rPos ); + SW_DLLPUBLIC SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const; + SW_DLLPUBLIC bool CursorInsideInputField() const; + SW_DLLPUBLIC SwTextContentControl* CursorInsideContentControl() const; + SW_DLLPUBLIC static bool PosInsideInputField( const SwPosition& rPos ); bool DocPtInsideInputField( const Point& rDocPt ) const; static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos ); static sal_Int32 EndOfInputFieldAtPos( const SwPosition& rPos ); // Return number of cursors in ring (The flag indicates whether // only cursors containing selections are requested). - sal_uInt16 GetCursorCnt( bool bAll = true ) const; + SW_DLLPUBLIC sal_uInt16 GetCursorCnt( bool bAll = true ) const; // Char Travelling - methods (in crstrvl1.cxx) bool GoStartWord(); bool GoEndWord(); bool GoNextWord(); - bool GoPrevWord(); + SW_DLLPUBLIC bool GoPrevWord(); bool GoNextSentence(); - bool GoStartSentence(); - bool GoEndSentence(); + SW_DLLPUBLIC bool GoStartSentence(); + SW_DLLPUBLIC bool GoEndSentence(); bool SelectWord( const Point* pPt ); void ExpandToSentenceBorders(); @@ -774,11 +774,11 @@ public: bool IsInWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; bool IsStartSentence() const; bool IsEndSentence() const; - bool IsSttPara() const; - bool IsEndPara() const; + SW_DLLPUBLIC bool IsSttPara() const; + SW_DLLPUBLIC bool IsEndPara() const; bool IsEndOfTable() const; ///< at the very last SwPosition inside a table bool IsStartOfDoc() const; - bool IsEndOfDoc() const; + SW_DLLPUBLIC bool IsEndOfDoc() const; bool IsInFrontOfLabel() const; bool IsAtLeftMargin() const { return IsAtLRMargin( true ); } bool IsAtRightMargin() const { return IsAtLRMargin( false, true/*bAPI*/ ); } @@ -805,7 +805,7 @@ public: // set the cursor to a NOT protected/hidden node bool FindValidContentNode( bool bOnlyText ); - bool GetContentAtPos( const Point& rPt, + SW_DLLPUBLIC bool GetContentAtPos( const Point& rPt, SwContentAtPos& rContentAtPos, bool bSetCursor = false, SwRect* pFieldRect = nullptr ); @@ -826,7 +826,7 @@ public: bool GotoINetAttr( const SwTextINetFormat& rAttr ); const SwFormatINetFormat* FindINetAttr( std::u16string_view rName ) const; - bool SelectTextModel(sal_Int32 nStart, sal_Int32 nEnd); + SW_DLLPUBLIC bool SelectTextModel(sal_Int32 nStart, sal_Int32 nEnd); #ifdef SW_DLLIMPLEMENTATION bool SelectTextView(TextFrameIndex nStart, TextFrameIndex nEnd); // result is only valid while cursor isn't moved! @@ -849,15 +849,15 @@ public: bool GetShadowCursorPos( const Point& rPt, SwFillMode eFillMode, SwRect& rRect, sal_Int16& rOrient ); - bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode ); + SW_DLLPUBLIC bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode ); const SwRangeRedline* SelNextRedline(); const SwRangeRedline* SelPrevRedline(); - const SwRangeRedline* GotoRedline( SwRedlineTable::size_type nArrPos, bool bSelect ); + SW_DLLPUBLIC const SwRangeRedline* GotoRedline( SwRedlineTable::size_type nArrPos, bool bSelect ); bool GotoFootnoteAnchor(const SwTextFootnote& rTextFootnote); - SAL_DLLPRIVATE SvxFrameDirection GetTextDirection( const Point* pPt = nullptr ) const; + SvxFrameDirection GetTextDirection( const Point* pPt = nullptr ) const; // is cursor or the point in/over a vertical formatted text? bool IsInVerticalText( const Point* pPt = nullptr ) const; // is cursor or the point in/over a right to left formatted text? diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 6372bb8ca585..d9dde916b798 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -193,7 +193,7 @@ void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem ); using SwRubyList = std::vector<std::unique_ptr<SwRubyListEntry>>; // Represents the model of a Writer document. -class SW_DLLPUBLIC SwDoc final +class SwDoc final { friend class ::sw::DocumentContentOperationsManager; @@ -354,7 +354,7 @@ private: FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat ); void CopyFormatArr( const SwFormatsBase& rSourceArr, SwFormatsBase const & rDestArr, FNCopyFormat fnCopyFormat, SwFormat& rDfltFormat ); - void CopyPageDescHeaderFooterImpl( bool bCpyHeader, + SW_DLLPUBLIC void CopyPageDescHeaderFooterImpl( bool bCpyHeader, const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat ); SwDoc( const SwDoc &) = delete; @@ -371,7 +371,7 @@ private: const OUString& rFormula, std::vector<OUString>& rUsedDBNames ); - void EnsureNumberFormatter(); // must be called with mNumberFormatterMutex locked + SW_DLLPUBLIC void EnsureNumberFormatter(); // must be called with mNumberFormatterMutex locked bool UnProtectTableCells( SwTable& rTable ); @@ -387,10 +387,10 @@ private: // CharTimer calls this method. void DoUpdateAllCharts(); - DECL_DLLPRIVATE_LINK( DoUpdateModifiedOLE, Timer *, void ); + DECL_LINK( DoUpdateModifiedOLE, Timer *, void ); public: - SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool ); + SW_DLLPUBLIC SwFormat *MakeCharFormat_(const OUString &, SwFormat *, bool, bool ); SwFormat *MakeFrameFormat_(const OUString &, SwFormat *, bool, bool ); private: @@ -411,8 +411,8 @@ public: void SetDocumentType( DocumentType eDocType ) { meDocType = eDocType; } // Life cycle - SwDoc(); - ~SwDoc(); + SW_DLLPUBLIC SwDoc(); + SW_DLLPUBLIC ~SwDoc(); bool IsInDtor() const { return mbDtor; } @@ -432,7 +432,7 @@ private: @returns the current reference count of the instance for debugging purposes. */ - sal_Int32 acquire(); + SW_DLLPUBLIC sal_Int32 acquire(); /** Releases a reference to an instance. A caller has to call 'release' when a before acquired reference to an instance is no longer needed. 'acquire' and 'release' calls need to @@ -441,7 +441,7 @@ private: @returns the current reference count of the instance for debugging purposes. */ - sal_Int32 release(); + SW_DLLPUBLIC sal_Int32 release(); /** Returns the current reference count. This method should be used for debugging purposes. Using it otherwise is a signal of a design flaw. */ @@ -449,8 +449,8 @@ public: sal_Int32 getReferenceCount() const; // IDocumentSettingAccess - IDocumentSettingAccess const & getIDocumentSettingAccess() const; //The IDocumentSettingAccess interface - IDocumentSettingAccess & getIDocumentSettingAccess(); + SW_DLLPUBLIC IDocumentSettingAccess const & getIDocumentSettingAccess() const; //The IDocumentSettingAccess interface + SW_DLLPUBLIC IDocumentSettingAccess & getIDocumentSettingAccess(); ::sw::DocumentSettingManager & GetDocumentSettingManager(); //The implementation of the interface with some additional methods ::sw::DocumentSettingManager const& GetDocumentSettingManager() const; sal_uInt32 getRsid() const; @@ -460,33 +460,33 @@ public: // IDocumentDeviceAccess IDocumentDeviceAccess const & getIDocumentDeviceAccess() const; - IDocumentDeviceAccess & getIDocumentDeviceAccess(); + SW_DLLPUBLIC IDocumentDeviceAccess & getIDocumentDeviceAccess(); // IDocumentMarkAccess - IDocumentMarkAccess* getIDocumentMarkAccess(); - const IDocumentMarkAccess* getIDocumentMarkAccess() const; + SW_DLLPUBLIC IDocumentMarkAccess* getIDocumentMarkAccess(); + SW_DLLPUBLIC const IDocumentMarkAccess* getIDocumentMarkAccess() const; // IDocumentRedlineAccess IDocumentRedlineAccess const& getIDocumentRedlineAccess() const; - IDocumentRedlineAccess& getIDocumentRedlineAccess(); + SW_DLLPUBLIC IDocumentRedlineAccess& getIDocumentRedlineAccess(); ::sw::DocumentRedlineManager const& GetDocumentRedlineManager() const; - ::sw::DocumentRedlineManager& GetDocumentRedlineManager(); + SW_DLLPUBLIC ::sw::DocumentRedlineManager& GetDocumentRedlineManager(); // IDocumentUndoRedo - IDocumentUndoRedo & GetIDocumentUndoRedo(); + SW_DLLPUBLIC IDocumentUndoRedo & GetIDocumentUndoRedo(); IDocumentUndoRedo const& GetIDocumentUndoRedo() const; // IDocumentLinksAdministration IDocumentLinksAdministration const & getIDocumentLinksAdministration() const; - IDocumentLinksAdministration & getIDocumentLinksAdministration(); + SW_DLLPUBLIC IDocumentLinksAdministration & getIDocumentLinksAdministration(); ::sw::DocumentLinksAdministrationManager const & GetDocumentLinksAdministrationManager() const; ::sw::DocumentLinksAdministrationManager & GetDocumentLinksAdministrationManager(); // IDocumentFieldsAccess IDocumentFieldsAccess const & getIDocumentFieldsAccess() const; - IDocumentFieldsAccess & getIDocumentFieldsAccess(); + SW_DLLPUBLIC IDocumentFieldsAccess & getIDocumentFieldsAccess(); ::sw::DocumentFieldsManager & GetDocumentFieldsManager(); @@ -497,7 +497,7 @@ public: // IDocumentContentOperations IDocumentContentOperations const & getIDocumentContentOperations() const; - IDocumentContentOperations & getIDocumentContentOperations(); + SW_DLLPUBLIC IDocumentContentOperations & getIDocumentContentOperations(); ::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const; ::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager(); @@ -506,34 +506,34 @@ public: // IDocumentStylePoolAccess IDocumentStylePoolAccess const & getIDocumentStylePoolAccess() const; - IDocumentStylePoolAccess & getIDocumentStylePoolAccess(); + SW_DLLPUBLIC IDocumentStylePoolAccess & getIDocumentStylePoolAccess(); // SwLineNumberInfo - const SwLineNumberInfo& GetLineNumberInfo() const; - void SetLineNumberInfo(const SwLineNumberInfo& rInfo); + SW_DLLPUBLIC const SwLineNumberInfo& GetLineNumberInfo() const; + SW_DLLPUBLIC void SetLineNumberInfo(const SwLineNumberInfo& rInfo); // IDocumentStatistics IDocumentStatistics const & getIDocumentStatistics() const; - IDocumentStatistics & getIDocumentStatistics(); + SW_DLLPUBLIC IDocumentStatistics & getIDocumentStatistics(); ::sw::DocumentStatisticsManager const & GetDocumentStatisticsManager() const; ::sw::DocumentStatisticsManager & GetDocumentStatisticsManager(); // IDocumentState IDocumentState const & getIDocumentState() const; - IDocumentState & getIDocumentState(); + SW_DLLPUBLIC IDocumentState & getIDocumentState(); // IDocumentDrawModelAccess void AddDrawUndo( std::unique_ptr<SdrUndoAction> ); - IDocumentDrawModelAccess const & getIDocumentDrawModelAccess() const; - IDocumentDrawModelAccess & getIDocumentDrawModelAccess(); + SW_DLLPUBLIC IDocumentDrawModelAccess const & getIDocumentDrawModelAccess() const; + SW_DLLPUBLIC IDocumentDrawModelAccess & getIDocumentDrawModelAccess(); ::sw::DocumentDrawModelManager const & GetDocumentDrawModelManager() const; ::sw::DocumentDrawModelManager & GetDocumentDrawModelManager(); // IDocumentLayoutAccess - IDocumentLayoutAccess const & getIDocumentLayoutAccess() const; - IDocumentLayoutAccess & getIDocumentLayoutAccess(); + SW_DLLPUBLIC IDocumentLayoutAccess const & getIDocumentLayoutAccess() const; + SW_DLLPUBLIC IDocumentLayoutAccess & getIDocumentLayoutAccess(); ::sw::DocumentLayoutManager const & GetDocumentLayoutManager() const; ::sw::DocumentLayoutManager & GetDocumentLayoutManager(); @@ -557,11 +557,11 @@ public: // IDocumentListsAccess IDocumentListsAccess const & getIDocumentListsAccess() const; - IDocumentListsAccess & getIDocumentListsAccess(); + SW_DLLPUBLIC IDocumentListsAccess & getIDocumentListsAccess(); //IDocumentExternalData IDocumentExternalData const & getIDocumentExternalData() const; - IDocumentExternalData & getIDocumentExternalData(); + SW_DLLPUBLIC IDocumentExternalData & getIDocumentExternalData(); //End of Interfaces @@ -569,7 +569,7 @@ public: const OUString& getDocAccTitle() const { return msDocAccTitle; } // INextInterface here - DECL_DLLPRIVATE_LINK(CalcFieldValueHdl, EditFieldInfo*, void); + DECL_LINK(CalcFieldValueHdl, EditFieldInfo*, void); // OLE ??? bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; } @@ -593,7 +593,7 @@ public: have to be surrounded completely by css::awt::Selection. ( Start < Pos < End ) !!! (Required for Writers.) */ - SwPosFlyFrames GetAllFlyFormats( const SwPaM*, + SW_DLLPUBLIC SwPosFlyFrames GetAllFlyFormats( const SwPaM*, bool bDrawAlso, bool bAsCharAlso = false ) const; @@ -613,7 +613,7 @@ public: false: no propagation */ - SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType, + SW_DLLPUBLIC SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType, const SwPosition* pAnchorPos, const SfxItemSet* pSet = nullptr, SwFrameFormat *pParent = nullptr, @@ -629,7 +629,7 @@ public: // these items work for the UNO API and thus e.g. for ODF import/export) void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet); - bool SetFlyFrameAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet ); + SW_DLLPUBLIC bool SetFlyFrameAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet ); bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat, SfxItemSet* pSet = nullptr, bool bKeepOrient = false ); @@ -643,9 +643,9 @@ public: // Footnotes // Footnote information const SwFootnoteInfo& GetFootnoteInfo() const { return *mpFootnoteInfo; } - void SetFootnoteInfo(const SwFootnoteInfo& rInfo); + SW_DLLPUBLIC void SetFootnoteInfo(const SwFootnoteInfo& rInfo); const SwEndNoteInfo& GetEndNoteInfo() const { return *mpEndNoteInfo; } - void SetEndNoteInfo(const SwEndNoteInfo& rInfo); + SW_DLLPUBLIC void SetEndNoteInfo(const SwEndNoteInfo& rInfo); SwFootnoteIdxs& GetFootnoteIdxs() { return *mpFootnoteIdxs; } const SwFootnoteIdxs& GetFootnoteIdxs() const { return *mpFootnoteIdxs; } /// change footnotes in range @@ -676,35 +676,35 @@ public: void ChangeAuthorityData(const SwAuthEntry* pNewData); bool IsInHeaderFooter( const SwNode& ) const; - SvxFrameDirection GetTextDirection( const SwPosition& rPos, + SW_DLLPUBLIC SvxFrameDirection GetTextDirection( const SwPosition& rPos, const Point* pPt = nullptr ) const; - bool IsInVerticalText( const SwPosition& rPos ) const; + SW_DLLPUBLIC bool IsInVerticalText( const SwPosition& rPos ) const; // Database and DB-Manager void SetDBManager( SwDBManager* pNewMgr ) { m_pDBManager = pNewMgr; } SwDBManager* GetDBManager() const { return m_pDBManager; } void ChangeDBFields( const std::vector<OUString>& rOldNames, const OUString& rNewName ); - void SetInitDBFields(bool b); + SW_DLLPUBLIC void SetInitDBFields(bool b); // Find out which databases are used by fields. void GetAllUsedDB( std::vector<OUString>& rDBNameList, const std::vector<OUString>* pAllDBNames = nullptr ); void ChgDBData( const SwDBData& rNewData ); - SwDBData const & GetDBData(); + SW_DLLPUBLIC SwDBData const & GetDBData(); // Some helper functions OUString GetUniqueGrfName(std::u16string_view rPrefix = std::u16string_view()) const; OUString GetUniqueOLEName() const; - OUString GetUniqueFrameName() const; + SW_DLLPUBLIC OUString GetUniqueFrameName() const; OUString GetUniqueShapeName() const; - OUString GetUniqueDrawObjectName() const; + SW_DLLPUBLIC OUString GetUniqueDrawObjectName() const; - o3tl::sorted_vector<SwRootFrame*> GetAllLayouts(); + SW_DLLPUBLIC o3tl::sorted_vector<SwRootFrame*> GetAllLayouts(); void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName ); - const SwFlyFrameFormat* FindFlyByName( const OUString& rName, SwNodeType nNdTyp = SwNodeType::NONE ) const; + SW_DLLPUBLIC const SwFlyFrameFormat* FindFlyByName( const OUString& rName, SwNodeType nNdTyp = SwNodeType::NONE ) const; static void GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName, OUString* pFltName ); @@ -725,10 +725,10 @@ public: /** Set attribute in given format.1y * If Undo is enabled, the old values is added to the Undo history. */ - void SetAttr( const SfxPoolItem&, SwFormat& ); + SW_DLLPUBLIC void SetAttr( const SfxPoolItem&, SwFormat& ); /** Set attribute in given format.1y * If Undo is enabled, the old values is added to the Undo history. */ - void SetAttr( const SfxItemSet&, SwFormat& ); + SW_DLLPUBLIC void SetAttr( const SfxItemSet&, SwFormat& ); // method to reset a certain attribute at the given format void ResetAttrAtFormat( const std::vector<sal_uInt16>& rIds, @@ -740,7 +740,7 @@ public: void SetDefault( const SfxItemSet& ); // Query default attribute in this document. - const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const; + SW_DLLPUBLIC const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const; template<class T> const T& GetDefault( TypedWhichId<T> nWhich ) const { return static_cast<const T&>(GetDefault(sal_uInt16(nWhich))); @@ -774,12 +774,12 @@ public: // Remove all language dependencies from all existing formats void RemoveAllFormatLanguageDependencies(); - SwFrameFormat *MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom, + SW_DLLPUBLIC SwFrameFormat* MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom, bool bBroadcast = false, bool bAuto = true); - void DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false ); + SW_DLLPUBLIC void DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false ); SwFrameFormat* FindFrameFormatByName( const OUString& rName ) const; - SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom, + SW_DLLPUBLIC SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom, bool bBroadcast = false ); void DelCharFormat(size_t nFormat, bool bBroadcast = false); void DelCharFormat(SwCharFormat const * pFormat, bool bBroadcast = false); @@ -792,7 +792,7 @@ public: SwTextFormatColl* GetDfltTextFormatColl() { return mpDfltTextFormatColl.get(); } const SwTextFormatColls *GetTextFormatColls() const { return mpTextFormatCollTable.get(); } SwTextFormatColls *GetTextFormatColls() { return mpTextFormatCollTable.get(); } - SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName, + SW_DLLPUBLIC SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName, SwTextFormatColl *pDerivedFrom, bool bBroadcast = false); SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString &rFormatName, @@ -807,7 +807,7 @@ public: The new parameter <bResetListAttrs> indicates, if the list attributes (list style, restart at and restart with) are cleared as well in case that <bReset = true> and the paragraph style has a list style attribute set. */ - bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat, + SW_DLLPUBLIC bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat, const bool bReset = true, const bool bResetListAttrs = false, SwRootFrame const* pLayout = nullptr); @@ -825,17 +825,17 @@ public: // Table formatting const sw::TableFrameFormats* GetTableFrameFormats() const { return mpTableFrameFormatTable.get(); } sw::TableFrameFormats* GetTableFrameFormats() { return mpTableFrameFormatTable.get(); } - size_t GetTableFrameFormatCount( bool bUsed ) const; + SW_DLLPUBLIC size_t GetTableFrameFormatCount( bool bUsed ) const; SwTableFormat& GetTableFrameFormat(size_t nFormat, bool bUsed ) const; SwTableFormat* MakeTableFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom); void DelTableFrameFormat( SwTableFormat* pFormat ); - SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const; + SW_DLLPUBLIC SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const; /** Access to frames. Iterate over Flys - for Basic-Collections. */ - size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const; + SW_DLLPUBLIC size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const; SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes = false ); - std::vector<SwFrameFormat const*> GetFlyFrameFormats( + SW_DLLPUBLIC std::vector<SwFrameFormat const*> GetFlyFrameFormats( FlyCntType eType, bool bIgnoreTextBoxes); @@ -849,10 +849,10 @@ public: void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true ); // Replace all property defaults with those from rSource. - void ReplaceDefaults( const SwDoc& rSource ); + SW_DLLPUBLIC void ReplaceDefaults( const SwDoc& rSource ); // Replace all compatibility options with those from rSource. - void ReplaceCompatibilityOptions( const SwDoc& rSource ); + SW_DLLPUBLIC void ReplaceCompatibilityOptions( const SwDoc& rSource ); /** Replace all user defined document properties with xSourceDocProps. Convenience function used by ReplaceDocumentProperties to skip some UNO calls. @@ -863,13 +863,13 @@ public: This includes the user defined document properties! */ - void ReplaceDocumentProperties(const SwDoc& rSource, bool mailMerge = false); + SW_DLLPUBLIC void ReplaceDocumentProperties(const SwDoc& rSource, bool mailMerge = false); // Query if style (paragraph- / character- / frame- / page-) is used. bool IsUsed( const sw::BroadcastingModify& ) const; /// Query if table style is used. bool IsUsed( const SwTableAutoFormat& ) const; - bool IsUsed( const SwNumRule& ) const; + SW_DLLPUBLIC bool IsUsed( const SwNumRule& ) const; // Set name of newly loaded document template. size_t SetDocPattern(const OUString& rPatternName); @@ -895,13 +895,13 @@ public: size_t GetPageDescCnt() const { return m_PageDescs.size(); } const SwPageDesc& GetPageDesc(const size_t i) const { return *m_PageDescs[i]; } SwPageDesc& GetPageDesc(size_t const i) { return *m_PageDescs[i]; } - SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = nullptr) const; + SW_DLLPUBLIC SwPageDesc* FindPageDesc(const OUString& rName, size_t* pPos = nullptr) const; // Just searches the pointer in the m_PageDescs vector! bool ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos) const; /** Copy the complete PageDesc - beyond document and "deep"! Optionally copying of PoolFormatId, -HlpId can be prevented. */ - void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, + SW_DLLPUBLIC void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, bool bCopyPoolIds = true ); /** Copy header (with contents) from SrcFormat to DestFormat @@ -915,12 +915,12 @@ public: { CopyPageDescHeaderFooterImpl( false, rSrcFormat, rDestFormat ); } // For Reader - void ChgPageDesc( const OUString & rName, const SwPageDesc& ); - void ChgPageDesc( size_t i, const SwPageDesc& ); + SW_DLLPUBLIC void ChgPageDesc( const OUString & rName, const SwPageDesc& ); + SW_DLLPUBLIC void ChgPageDesc( size_t i, const SwPageDesc& ); void DelPageDesc( const OUString & rName, bool bBroadcast = false); void DelPageDesc( size_t i, bool bBroadcast = false ); void PreDelPageDesc(SwPageDesc const * pDel); - SwPageDesc* MakePageDesc(const OUString &rName, const SwPageDesc* pCpy = nullptr, + SW_DLLPUBLIC SwPageDesc* MakePageDesc(const OUString &rName, const SwPageDesc* pCpy = nullptr, bool bRegardLanguage = true, bool bBroadcast = false); void BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamily, @@ -933,11 +933,11 @@ public: // Methods for tables/indices static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ); void DeleteTOXMark( const SwTOXMark* pTOXMark ); - const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark, + SW_DLLPUBLIC const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark, SwTOXSearch eDir, bool bInReadOnly ); // Insert/Renew table/index - SwTOXBaseSection* InsertTableOf( const SwPosition& rPos, + SW_DLLPUBLIC SwTOXBaseSection* InsertTableOf( const SwPosition& rPos, const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr, bool bExpand = false, @@ -950,7 +950,7 @@ public: void InsertTableOf( SwNodeOffset nSttNd, SwNodeOffset nEndNd, const SwTOXBase& rTOX, const SfxItemSet* pSet ); - static SwTOXBase* GetCurTOX( const SwPosition& rPos ); + SW_DLLPUBLIC static SwTOXBase* GetCurTOX( const SwPosition& rPos ); static const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX); bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes ); @@ -988,8 +988,8 @@ public: void SetInWriterfilterImport(bool const b) { mbInWriterfilterImport = b; } // Manage types of tables/indices - sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const; - const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const; + SW_DLLPUBLIC sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const; + SW_DLLPUBLIC const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const; const SwTOXType* InsertTOXType( const SwTOXType& rTyp ); const SwTOXTypes& GetTOXTypes() const { return *mpTOXTypes; } @@ -1040,8 +1040,8 @@ public: { return mpOutlineRule; } - void SetOutlineNumRule( const SwNumRule& rRule ); - void PropagateOutlineRule(); + SW_DLLPUBLIC void SetOutlineNumRule( const SwNumRule& rRule ); + SW_DLLPUBLIC void PropagateOutlineRule(); // Outline - promote / demote. bool OutlineUpDown(const SwPaM& rPam, short nOffset, SwRootFrame const* pLayout = nullptr); @@ -1049,7 +1049,7 @@ public: /// Outline - move up / move down. bool MoveOutlinePara( const SwPaM& rPam, SwOutlineNodes::difference_type nOffset); - bool GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame const* = nullptr) const; + SW_DLLPUBLIC bool GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame const* = nullptr) const; /** Accept changes of outline styles for OutlineRule. @param bResetIndentAttrs Optional parameter - default value false: @@ -1088,19 +1088,19 @@ public: void AddNumRule(SwNumRule * pRule); // add optional parameter <eDefaultNumberFormatPositionAndSpaceMode> - sal_uInt16 MakeNumRule( const OUString &rName, + SW_DLLPUBLIC sal_uInt16 MakeNumRule( const OUString &rName, const SwNumRule* pCpy = nullptr, bool bBroadcast = false, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode = SvxNumberFormat::LABEL_WIDTH_AND_POSITION ); sal_uInt16 FindNumRule( std::u16string_view rName ) const; - SwNumRule* FindNumRulePtr( const OUString& rName ) const; + SW_DLLPUBLIC SwNumRule* FindNumRulePtr( const OUString& rName ) const; // Deletion only possible if Rule is not used! bool RenameNumRule(const OUString & aOldName, const OUString & aNewName, bool bBroadcast = false); - bool DelNumRule( const OUString& rName, bool bBroadCast = false ); - OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr, bool bAutoNum = true ) const; + SW_DLLPUBLIC bool DelNumRule( const OUString& rName, bool bBroadCast = false ); + SW_DLLPUBLIC OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr, bool bAutoNum = true ) const; void UpdateNumRule(); // Update all invalids. void ChgNumRuleFormats( const SwNumRule& rRule ); @@ -1176,7 +1176,7 @@ public: propagation. false: do not propagate */ - const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HeadlineNoBorder + SW_DLLPUBLIC const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HeadlineNoBorder const SwPosition& rPos, sal_uInt16 nRows, sal_uInt16 nCols, sal_Int16 eAdjust, const SwTableAutoFormat* pTAFormat = nullptr, @@ -1207,7 +1207,7 @@ public: sal_uInt16 nCnt = 1, bool bBehind = true, bool bInsertDummy = true ); void InsertRow( const SwCursor& rCursor, sal_uInt16 nCnt = 1, bool bBehind = true ); - bool InsertRow( const SwSelBoxes& rBoxes, + SW_DLLPUBLIC bool InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt = 1, bool bBehind = true, bool bInsertDummy = true ); // Delete Columns/Rows in table. @@ -1251,7 +1251,7 @@ public: bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet ); /// Return the available table styles. - SwTableAutoFormatTable& GetTableStyles(); + SW_DLLPUBLIC SwTableAutoFormatTable& GetTableStyles(); const SwTableAutoFormatTable& GetTableStyles() const { return const_cast<SwDoc*>(this)->GetTableStyles(); @@ -1259,11 +1259,11 @@ public: /// Counts table styles without triggering lazy-load of them. bool HasTableStyles() const { return m_pTableStyles != nullptr; } // Create a new table style. Tracked by Undo. - SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool bBroadcast = false); + SW_DLLPUBLIC SwTableAutoFormat* MakeTableStyle(const OUString& rName, bool bBroadcast = false); // Delete table style named rName. Tracked by undo. - std::unique_ptr<SwTableAutoFormat> DelTableStyle(const OUString& rName, bool bBroadcast = false); + SW_DLLPUBLIC std::unique_ptr<SwTableAutoFormat> DelTableStyle(const OUString& rName, bool bBroadcast = false); // Change (replace) a table style named rName. Tracked by undo. - void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& rNewFormat); + SW_DLLPUBLIC void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& rNewFormat); const SwCellStyleTable& GetCellStyles() const { return *mpCellStyles; } SwCellStyleTable& GetCellStyles() { return *mpCellStyles; } @@ -1319,7 +1319,7 @@ public: /** @return names of all references that are set in document. If array pointer is 0 return only whether a RefMark is set in document. */ - sal_uInt16 GetRefMarks( std::vector<OUString>* = nullptr ) const; + SW_DLLPUBLIC sal_uInt16 GetRefMarks( std::vector<OUString>* = nullptr ) const; void DeleteFormatRefMark(const SwFormatRefMark* pFormatRefMark); @@ -1339,7 +1339,7 @@ public: // Search for an EditShell. SwEditShell const * GetEditShell() const; - SwEditShell* GetEditShell(); + SW_DLLPUBLIC SwEditShell* GetEditShell(); ::sw::IShellCursorSupplier * GetIShellCursorSupplier(); // OLE 2.0-notification. @@ -1347,7 +1347,7 @@ public: const Link<bool,void>& GetOle2Link() const {return maOle2Link;} // insert section (the ODF kind of section, not the nodesarray kind) - SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &, + SW_DLLPUBLIC SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &, std::tuple<SwTOXBase const*, sw::RedlineMode, sw::FieldmarkMode, sw::ParagraphBreakMode> const* pTOXBase, SfxItemSet const*const pAttr, bool const bUpdate = true); static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange, @@ -1359,7 +1359,7 @@ public: void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false ); void UpdateSection(size_t const nSect, SwSectionData &, SfxItemSet const*const = nullptr, bool const bPreventLinkUpdate = false); - OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const; + SW_DLLPUBLIC OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const; /* @@@MAINTAINABILITY-HORROR@@@ The model should not have anything to do with a shell. @@ -1377,10 +1377,10 @@ public: const SfxObjectShellLock& GetTmpDocShell() const { return mxTmpDocShell; } // For Autotexts? (text modules) They have only one SVPersist at their disposal. - SfxObjectShell* GetPersist() const; + SW_DLLPUBLIC SfxObjectShell* GetPersist() const; // Pointer to storage of SfxDocShells. Can be 0!!! - css::uno::Reference< css::embed::XStorage > GetDocStorage(); + SW_DLLPUBLIC css::uno::Reference< css::embed::XStorage > GetDocStorage(); // Query / set flag indicating if document is loaded asynchronously at this moment. bool IsInLoadAsynchron() const { return mbInLoadAsynchron; } @@ -1441,12 +1441,12 @@ public: bool HasInvisibleContent() const; // delete invisible content, like hidden sections and paragraphs - bool RemoveInvisibleContent(); + SW_DLLPUBLIC bool RemoveInvisibleContent(); // restore the invisible content if it's available on the undo stack bool RestoreInvisibleContent(); // Replace fields by text - mailmerge support - SAL_DLLPRIVATE bool ConvertFieldsToText(SwRootFrame const& rLayout); + bool ConvertFieldsToText(SwRootFrame const& rLayout); // Create sub-documents according to given collection. // If no collection is given, use chapter styles for 1st level. @@ -1487,7 +1487,7 @@ public: void SetOLEObjModified(); // Uno - Interfaces - std::shared_ptr<SwUnoCursor> CreateUnoCursor( const SwPosition& rPos, bool bTableCursor = false ); + SW_DLLPUBLIC std::shared_ptr<SwUnoCursor> CreateUnoCursor( const SwPosition& rPos, bool bTableCursor = false ); // FeShell - Interfaces // !!! These assume always an existing layout !!! @@ -1538,7 +1538,7 @@ public: /// bNoShrink keeps table size the same by distributing excess space proportionately. void AdjustCellWidth( const SwCursor& rCursor, const bool bBalance, const bool bNoShrink ); - SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest ); + SW_DLLPUBLIC SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest ); SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest ); void Unchain( SwFrameFormat &rFormat ); @@ -1595,7 +1595,7 @@ public: const bool bValue ); // Change a format undoable. - void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet); + SW_DLLPUBLIC void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet); void RenameFormat(SwFormat & rFormat, const OUString & sNewName, bool bBroadcast = false); @@ -1642,19 +1642,19 @@ public: void disposeXForms( ); //Update all the page masters - void SetDefaultPageMode(bool bSquaredPageMode); - bool IsSquaredPageMode() const; + SW_DLLPUBLIC void SetDefaultPageMode(bool bSquaredPageMode); + SW_DLLPUBLIC bool IsSquaredPageMode() const; const css::uno::Reference< ooo::vba::word::XFind >& getVbaFind() const { return mxVbaFind; } void setVbaFind( const css::uno::Reference< ooo::vba::word::XFind > &xFind) { mxVbaFind = xFind; } css::uno::Reference< css::script::vba::XVBAEventProcessor > const & GetVbaEventProcessor(); - void SetVbaEventProcessor(); + SW_DLLPUBLIC void SetVbaEventProcessor(); void SetVBATemplateToProjectCache( css::uno::Reference< css::container::XNameContainer > const & xCache ) { m_xTemplateToProjectCache = xCache; }; const css::uno::Reference< css::container::XNameContainer >& GetVBATemplateToProjectCache() const { return m_xTemplateToProjectCache; }; ::sfx2::IXmlIdRegistry& GetXmlIdRegistry(); - ::sw::MetaFieldManager & GetMetaFieldManager(); - ::SwContentControlManager& GetContentControlManager(); - ::sw::UndoManager & GetUndoManager(); + SW_DLLPUBLIC ::sw::MetaFieldManager & GetMetaFieldManager(); + SW_DLLPUBLIC ::SwContentControlManager& GetContentControlManager(); + SW_DLLPUBLIC ::sw::UndoManager & GetUndoManager(); ::sw::UndoManager const& GetUndoManager() const; SfxObjectShell* CreateCopy(bool bCallInitNew, bool bEmpty) const; diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 2b753530159a..f90bad0dbc0f 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -137,7 +137,7 @@ typedef std::vector<SwGetINetAttr> SwGetINetAttrs; #define CNT_HasGrf(USH) ((USH)&CNT_GRF) #define CNT_HasOLE(USH) ((USH)&CNT_OLE) -class SW_DLLPUBLIC SwEditShell : public SwCursorShell +class SwEditShell : public SwCursorShell { static SvxSwAutoFormatFlags* s_pAutoFormatFlags; @@ -150,11 +150,11 @@ class SW_DLLPUBLIC SwEditShell : public SwCursorShell /** Returns pointer to a SwGrfNode that will be used by GetGraphic() and GetGraphicSize(). */ - SAL_DLLPRIVATE SwGrfNode *GetGrfNode_() const ; + SwGrfNode *GetGrfNode_() const ; - SAL_DLLPRIVATE void DeleteSel(SwPaM& rPam, bool isArtificialSelection, bool goLeft = false, bool* pUndo = nullptr); + void DeleteSel(SwPaM& rPam, bool isArtificialSelection, bool goLeft = false, bool* pUndo = nullptr); - SAL_DLLPRIVATE void SetSectionAttr_( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ); + void SetSectionAttr_( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ); using SwViewShell::UpdateFields; using sw::BroadcastingModify::GetInfo; @@ -162,7 +162,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCursorShell public: /// Edit (all selected ranges). void Insert( sal_Unicode, bool bOnlyCurrCursor = false ); - void Insert2( const OUString &, const bool bForceExpandHints = false ); + SW_DLLPUBLIC void Insert2( const OUString &, const bool bForceExpandHints = false ); void Overwrite( const OUString & ); /** Replace a selected range in a TextNode by given string. @@ -170,7 +170,7 @@ public: bRegExpRplc - replace tabs (\\t) and insert found string (not \&). E.g.: Fnd: "zzz", Repl: "xx\t\\t..&..\&" --> "xx\t<Tab>..zzz..&" */ - bool Replace( const OUString& rNewStr, bool bRegExpRplc ); + SW_DLLPUBLIC bool Replace( const OUString& rNewStr, bool bRegExpRplc ); /** Replace a selected range in a TextNode by given string. Possible comments will be kept (moved to the end of the selection). */ @@ -178,26 +178,26 @@ public: /** Delete content of all ranges. If whole nodes are selected, these nodes get deleted. */ - bool Delete(bool isArtificialSelection = false, bool goLeft = false); + SW_DLLPUBLIC bool Delete(bool isArtificialSelection = false, bool goLeft = false); /// Remove a complete paragraph. - bool DelFullPara(); + SW_DLLPUBLIC bool DelFullPara(); /// Change text to Upper/Lower/Hiragana/Katakana/... void TransliterateText( TransliterationFlags nType ); /// Count words in current selection. - void CountWords( SwDocStat& rStat ) const; + SW_DLLPUBLIC void CountWords( SwDocStat& rStat ) const; /// Replace fields by text - mailmerge support. - SAL_DLLPRIVATE bool ConvertFieldsToText(); + bool ConvertFieldsToText(); /// Set all numbering start points to a fixed value - mailmerge support. void SetNumberingRestart(); /// Embeds all local links (ranges/graphics). - sal_uInt16 GetLinkUpdMode() const; - void SetLinkUpdMode( sal_uInt16 nMode ); + SW_DLLPUBLIC sal_uInt16 GetLinkUpdMode() const; + SW_DLLPUBLIC void SetLinkUpdMode( sal_uInt16 nMode ); /// Copy content of all ranges at current position of cursor to given Shell. bool Copy( SwEditShell& rDestShell ); @@ -208,8 +208,8 @@ public: Copy all selections to the document. */ bool CopySelToDoc( SwDoc& rInsDoc ); - void SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); - bool AppendTextNode(); + SW_DLLPUBLIC void SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); + SW_DLLPUBLIC bool AppendTextNode(); void AutoFormatBySplitNode(); /** If cursor is in an INetAttribute it will be deleted completely @@ -231,11 +231,11 @@ public: level is SvxNumberFormat::LABEL_ALIGNMENT. */ bool GetPaMAttr( SwPaM* pPaM, SfxItemSet& , const bool bMergeIndentValuesOfNumRule = false ) const; - bool GetCurAttr( SfxItemSet& , + SW_DLLPUBLIC bool GetCurAttr( SfxItemSet& , const bool bMergeIndentValuesOfNumRule = false ) const; - void SetAttrItem( const SfxPoolItem&, SetAttrMode nFlags = SetAttrMode::DEFAULT, + SW_DLLPUBLIC void SetAttrItem( const SfxPoolItem&, SetAttrMode nFlags = SetAttrMode::DEFAULT, const bool bParagraphSetting = false ); - void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, + SW_DLLPUBLIC void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, SwPaM* pCursor = nullptr, const bool bParagraphSetting = false ); /** Get RES_CHRATR_* items of one type in the current selection. @@ -253,7 +253,7 @@ public: * output parameter - the SfxItemSet where the automatic paragraph format attribute(s) will be store. * The attributes aren't invalidated or cleared if the function reach the getMaxLookup limit. */ - void GetCurParAttr( SfxItemSet& rSet ) const; + SW_DLLPUBLIC void GetCurParAttr( SfxItemSet& rSet ) const; /** * Get the paragraph format attribute(s) of the selection(s) described by a SwPaM. * @@ -267,10 +267,10 @@ public: void GetPaMParAttr( SwPaM* pPaM, SfxItemSet& rSet ) const; /// Set attribute as new default attribute in document. - void SetDefault( const SfxPoolItem& ); + SW_DLLPUBLIC void SetDefault( const SfxPoolItem& ); /// Query default attribute of document. - const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const; + SW_DLLPUBLIC const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const; template<class T> const T& GetDefault( TypedWhichId<T> nWhich ) const { return static_cast<const T&>(GetDefault(sal_uInt16(nWhich))); @@ -280,23 +280,23 @@ public: void GCAttr(); /// @return the scripttype of the selection. - SvtScriptType GetScriptType() const; + SW_DLLPUBLIC SvtScriptType GetScriptType() const; /// @return the language at current cursor position. - LanguageType GetCurLang() const; + SW_DLLPUBLIC LanguageType GetCurLang() const; /// TABLE size_t GetTableFrameFormatCount( bool bUsed = false ) const; SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed = false ) const; - OUString GetUniqueTableName() const; + SW_DLLPUBLIC OUString GetUniqueTableName() const; /// CHAR - sal_uInt16 GetCharFormatCount() const; - SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const; + SW_DLLPUBLIC sal_uInt16 GetCharFormatCount() const; + SW_DLLPUBLIC SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const; SwCharFormat* GetCurCharFormat() const; void FillByEx(SwCharFormat*); SwCharFormat* MakeCharFormat( const OUString& rName ); - SwCharFormat* FindCharFormatByName( const OUString& rName ) const; + SW_DLLPUBLIC SwCharFormat* FindCharFormatByName( const OUString& rName ) const; /* FormatCollections (new) - Explaining the general naming pattern: * GetXXXCount() returns the count of xxx in the document. @@ -310,8 +310,8 @@ public: // TXT SwTextFormatColl& GetDfltTextFormatColl() const; - sal_uInt16 GetTextFormatCollCount() const; - SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const; + SW_DLLPUBLIC sal_uInt16 GetTextFormatCollCount() const; + SW_DLLPUBLIC SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const; /** * Get the named paragraph format of the current selection. * @@ -322,7 +322,7 @@ public: * selections are sort by their order of creation * (last created selection first, oldest selection at last). */ - SwTextFormatColl* GetCurTextFormatColl() const; + SW_DLLPUBLIC SwTextFormatColl* GetCurTextFormatColl() const; /** * Get the named paragraph format of the selection(s) described by a SwPaM. * @@ -335,23 +335,23 @@ public: // #i62675# /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTextFormatColl(..)> - void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false); - SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName, + SW_DLLPUBLIC void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false); + SW_DLLPUBLIC SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName, SwTextFormatColl *pDerivedFrom = nullptr); void FillByEx(SwTextFormatColl*); - SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const; + SW_DLLPUBLIC SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const; /// @return "Auto-Collection" with given Id. If it does not exist create it. - SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId ); + SW_DLLPUBLIC SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId ); /// @return required automatic format base class. SwFormat* GetFormatFromPool( sal_uInt16 nId ); /// @return required automatic page style. - SwPageDesc* GetPageDescFromPool( sal_uInt16 nId ); + SW_DLLPUBLIC SwPageDesc* GetPageDescFromPool( sal_uInt16 nId ); /// Query if the paragraph-/character-/frame-/page-style is used. - bool IsUsed( const sw::BroadcastingModify& ) const; + SW_DLLPUBLIC bool IsUsed( const sw::BroadcastingModify& ) const; /// @return required automatic format. SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) @@ -364,7 +364,7 @@ public: std::vector<svx::ClassificationResult> CollectAdvancedClassification(); SfxWatermarkItem GetWatermark() const; - void SetWatermark(const SfxWatermarkItem& rText); + SW_DLLPUBLIC void SetWatermark(const SfxWatermarkItem& rText); /// Sign the paragraph at the cursor. void SignParagraph(); @@ -403,53 +403,53 @@ public: bool InsertField(SwField const &, const bool bForceExpandHints); - void UpdateOneField(SwField &); ///< One single field. + SW_DLLPUBLIC void UpdateOneField(SwField &); ///< One single field. - size_t GetFieldTypeCount(SwFieldIds nResId = SwFieldIds::Unknown) const; - SwFieldType* GetFieldType(size_t nField, SwFieldIds nResId = SwFieldIds::Unknown) const; - SwFieldType* GetFieldType(SwFieldIds nResId, const OUString& rName) const; + SW_DLLPUBLIC size_t GetFieldTypeCount(SwFieldIds nResId = SwFieldIds::Unknown) const; + SW_DLLPUBLIC SwFieldType* GetFieldType(size_t nField, SwFieldIds nResId = SwFieldIds::Unknown) const; + SW_DLLPUBLIC SwFieldType* GetFieldType(SwFieldIds nResId, const OUString& rName) const; void RemoveFieldType(size_t nField); void RemoveFieldType(SwFieldIds nResId, const OUString& rName); void FieldToText( SwFieldType const * pType ); - void ChangeAuthorityData(const SwAuthEntry* pNewData); + SW_DLLPUBLIC void ChangeAuthorityData(const SwAuthEntry* pNewData); /// Database information. - SwDBData const & GetDBData() const; + SW_DLLPUBLIC SwDBData const & GetDBData() const; void ChgDBData(const SwDBData& SwDBData); - void ChangeDBFields( const std::vector<OUString>& rOldNames, + SW_DLLPUBLIC void ChangeDBFields( const std::vector<OUString>& rOldNames, const OUString& rNewName ); - void GetAllUsedDB( std::vector<OUString>& rDBNameList, + SW_DLLPUBLIC void GetAllUsedDB( std::vector<OUString>& rDBNameList, std::vector<OUString> const * pAllDBNames ); bool IsAnyDatabaseFieldInDoc()const; /// Check whether DB fields point to an available data source and returns it. bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const; - void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update - void LockExpFields(); - void UnlockExpFields(); + SW_DLLPUBLIC void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update + SW_DLLPUBLIC void LockExpFields(); + SW_DLLPUBLIC void UnlockExpFields(); bool IsExpFieldsLocked() const; - SwFieldUpdateFlags GetFieldUpdateFlags() const; - void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags ); + SW_DLLPUBLIC SwFieldUpdateFlags GetFieldUpdateFlags() const; + SW_DLLPUBLIC void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags ); /// For evaluation of DB fields (new DB-manager). - SwDBManager* GetDBManager() const; + SW_DLLPUBLIC SwDBManager* GetDBManager() const; - SwFieldType* InsertFieldType(const SwFieldType &); + SW_DLLPUBLIC SwFieldType* InsertFieldType(const SwFieldType &); /// Changes in document? - bool IsModified() const; - void SetModified(); - void ResetModified(); - void SetUndoNoResetModified(); + SW_DLLPUBLIC bool IsModified() const; + SW_DLLPUBLIC void SetModified(); + SW_DLLPUBLIC void ResetModified(); + SW_DLLPUBLIC void SetUndoNoResetModified(); /// Document - Statistics void UpdateDocStat(); - const SwDocStat &GetUpdatedDocStat(); + SW_DLLPUBLIC const SwDocStat &GetUpdatedDocStat(); void Insert(const SwTOXMark& rMark); @@ -463,36 +463,36 @@ public: const SfxItemSet* pSet = nullptr); void UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr); - const SwTOXBase* GetCurTOX() const; - const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false ); - void SetDefaultTOXBase(const SwTOXBase& rBase); + SW_DLLPUBLIC const SwTOXBase* GetCurTOX() const; + SW_DLLPUBLIC const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false ); + SW_DLLPUBLIC void SetDefaultTOXBase(const SwTOXBase& rBase); static bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase); void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, bool bReadonly); - sal_uInt16 GetTOXCount() const; - const SwTOXBase* GetTOX( sal_uInt16 nPos ) const; - bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes ); + SW_DLLPUBLIC sal_uInt16 GetTOXCount() const; + SW_DLLPUBLIC const SwTOXBase* GetTOX( sal_uInt16 nPos ) const; + SW_DLLPUBLIC bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes ); /// After reading file update all content tables. void SetUpdateTOX( bool bFlag ); bool IsUpdateTOX() const; /// Manage types of content tables. - sal_uInt16 GetTOXTypeCount(TOXTypes eTyp) const; - const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const; + SW_DLLPUBLIC sal_uInt16 GetTOXTypeCount(TOXTypes eTyp) const; + SW_DLLPUBLIC const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const; void InsertTOXType(const SwTOXType& rTyp); /// AutoMark file - OUString const & GetTOIAutoMarkURL() const; + SW_DLLPUBLIC OUString const & GetTOIAutoMarkURL() const; void SetTOIAutoMarkURL(const OUString& rSet); void ApplyAutoMark(); /// Key for managing index. - void GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const; + SW_DLLPUBLIC void GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const; - void SetOutlineNumRule(const SwNumRule&); - const SwNumRule* GetOutlineNumRule() const; + SW_DLLPUBLIC void SetOutlineNumRule(const SwNumRule&); + SW_DLLPUBLIC const SwNumRule* GetOutlineNumRule() const; bool OutlineUpDown( short nOffset = 1 ); @@ -500,7 +500,7 @@ public: bool IsProtectedOutlinePara() const; - const SwNumRule* GetNumRuleAtCurrCursorPos() const; + SW_DLLPUBLIC const SwNumRule* GetNumRuleAtCurrCursorPos() const; /** Returns the numbering rule found at the paragraphs of the current selection, if all paragraphs of the current selection have the same or none numbering rule applied. */ @@ -527,11 +527,11 @@ public: void NumUpDown( bool bDown = true ); - bool MoveParagraph( SwNodeOffset nOffset = SwNodeOffset(1)); + SW_DLLPUBLIC bool MoveParagraph( SwNodeOffset nOffset = SwNodeOffset(1)); bool MoveNumParas( bool bUpperLower, bool bUpperLeft ); /// Switch on/off of numbering via Delete/Backspace. - bool NumOrNoNum(bool bDelete = false, bool bChkStart = true); + SW_DLLPUBLIC bool NumOrNoNum(bool bDelete = false, bool bChkStart = true); // #i23726# // #i90078# @@ -561,7 +561,7 @@ public: bool SelectionHasNumber() const; bool SelectionHasBullet() const; - OUString GetUniqueNumRuleName() const; + SW_DLLPUBLIC OUString GetUniqueNumRuleName() const; void ChgNumRuleFormats( const SwNumRule& rRule ); /// Set (and query if) a numbering with StartFlag starts at current PointPos. @@ -582,19 +582,19 @@ public: /** Undo. Maintain UndoHistory in Document. Reset UndoHistory at Save, SaveAs, Create ??? */ - void DoUndo( bool bOn = true ); - bool DoesUndo() const; + SW_DLLPUBLIC void DoUndo( bool bOn = true ); + SW_DLLPUBLIC bool DoesUndo() const; void DoGroupUndo( bool bUn ); bool DoesGroupUndo() const; void DelAllUndoObj(); /// Undo: set up Undo parenthesis, return nUndoId of this parenthesis. - SwUndoId StartUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr ); + SW_DLLPUBLIC SwUndoId StartUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr ); /// Closes parenthesis of nUndoId, not used by UI. - SwUndoId EndUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr ); + SW_DLLPUBLIC SwUndoId EndUndo( SwUndoId eUndoId = SwUndoId::EMPTY, const SwRewriter * pRewriter = nullptr ); - bool GetLastUndoInfo(OUString *const o_pStr, + SW_DLLPUBLIC bool GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId, const SwView* pView = nullptr) const; bool GetFirstRedoInfo(OUString *const o_pStr, @@ -608,16 +608,16 @@ public: /// should only be called by sw::UndoManager! void HandleUndoRedoContext(::sw::UndoRedoContext & rContext); - void Undo(sal_uInt16 const nCount = 1, sal_uInt16 nOffset = 0); - void Redo(sal_uInt16 const nCount = 1); + SW_DLLPUBLIC void Undo(sal_uInt16 const nCount = 1, sal_uInt16 nOffset = 0); + SW_DLLPUBLIC void Redo(sal_uInt16 const nCount = 1); void Repeat(sal_uInt16 const nCount); /// For all views of this document. - void StartAllAction(); - void EndAllAction(); + SW_DLLPUBLIC void StartAllAction(); + SW_DLLPUBLIC void EndAllAction(); /// To enable set up of StartActions and EndActions. - virtual void CalcLayout() override; + SW_DLLPUBLIC virtual void CalcLayout() override; /// Determine form of content. Return Type at CurrentCursor->SPoint. sal_uInt16 GetCntType() const; @@ -649,7 +649,7 @@ public: } /** Query text within selection. */ - void GetSelectedText( OUString &rBuf, + SW_DLLPUBLIC void GetSelectedText( OUString &rBuf, ParaBreakType nHndlParaBreak = ParaBreakType::ToBlank ); /** @return graphic, if CurrentCursor->Point() points to a SwGrfNode @@ -670,7 +670,7 @@ public: void ClearAutomaticContour(); /// @return the size of a graphic in Twips if cursor is in a graphic. - bool GetGrfSize(Size&) const; + SW_DLLPUBLIC bool GetGrfSize(Size&) const; /** @return name and filter of a graphic if the cursor is in a graphic, else give a rap on the knuckles! @@ -687,13 +687,13 @@ public: // #i73788# /// Remove default parameter, because method always called this default value. - Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys! + SW_DLLPUBLIC Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys! const SwFlyFrameFormat* FindFlyByName( const OUString& rName ) const; /** @return a ClientObject, if CurrentCursor->Point() points to a SwOLENode (and mark is neither set not pointint to same ClientObject) else give rap on the knuckles. */ - svt::EmbeddedObjectRef& GetOLEObject() const; + SW_DLLPUBLIC svt::EmbeddedObjectRef& GetOLEObject() const; /// Is there an OLEObject with this name (SwFormat)? bool HasOLEObj( std::u16string_view rName ) const; @@ -741,7 +741,7 @@ public: * function does not move the user's cursor to the first cell of the just inserted table, use * `MoveTable(GotoPrevTable, fnTableStart)` to do that. */ - const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< All + SW_DLLPUBLIC const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< All sal_uInt16 nRows, sal_uInt16 nCols, const SwTableAutoFormat* pTAFormat = nullptr ); @@ -750,26 +750,26 @@ public: sal_uInt16 nRows, sal_uInt16 nCols ); void UpdateTable(); - void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName ); + SW_DLLPUBLIC void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName ); - SwFrameFormat *GetTableFormat(); - bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< All + SW_DLLPUBLIC SwFrameFormat *GetTableFormat(); + SW_DLLPUBLIC bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< All sal_Unicode cCh, const SwTableAutoFormat* pTAFormat = nullptr ); - bool TableToText( sal_Unicode cCh ); + SW_DLLPUBLIC bool TableToText( sal_Unicode cCh ); bool IsTextToTableAvailable() const; bool GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const; - void SetTableBoxFormulaAttrs( const SfxItemSet& rSet ); + SW_DLLPUBLIC void SetTableBoxFormulaAttrs( const SfxItemSet& rSet ); bool IsTableBoxTextFormat() const; OUString GetTableBoxText() const; TableChgMode GetTableChgMode() const; - void SetTableChgMode( TableChgMode eMode ); + SW_DLLPUBLIC void SetTableChgMode( TableChgMode eMode ); /// Split table at cursor position. - void SplitTable( SplitTable_HeadlineOption eMode ); + SW_DLLPUBLIC void SplitTable( SplitTable_HeadlineOption eMode ); /** Merge tables. @@ -779,7 +779,7 @@ public: bool MergeTable( bool bWithPrev ); /// Set up InsertDB as table Undo. - void AppendUndoForInsertFromDB( bool bIsTable ); + SW_DLLPUBLIC void AppendUndoForInsertFromDB( bool bIsTable ); /// Functions used for spell checking and text conversion. @@ -849,8 +849,8 @@ public: /// Set our styles according to the respective rules. void AutoFormat( const SvxSwAutoFormatFlags* pAFlags, bool bCurrentParagraphOnly ); - static SvxSwAutoFormatFlags* GetAutoFormatFlags(); - static void SetAutoFormatFlags(SvxSwAutoFormatFlags const *); + SW_DLLPUBLIC static SvxSwAutoFormatFlags* GetAutoFormatFlags(); + SW_DLLPUBLIC static void SetAutoFormatFlags(SvxSwAutoFormatFlags const *); /// Calculates selection. OUString Calculate(); @@ -859,7 +859,7 @@ public: bool bKeepSelection = false ); void GetINetAttrs(SwGetINetAttrs& rArr , bool bIncludeInToxContent = true); - OUString GetDropText( const sal_Int32 nChars ) const; + SW_DLLPUBLIC OUString GetDropText( const sal_Int32 nChars ) const; void ReplaceDropText( const OUString &rStr, SwPaM* pPaM = nullptr ); /** May an outline be moved or copied? @@ -867,20 +867,20 @@ public: bool IsOutlineMovable( SwOutlineNodes::size_type nIdx ) const; bool IsOutlineCopyable( SwOutlineNodes::size_type nIdx ) const; - sal_Int32 GetLineCount(); + SW_DLLPUBLIC sal_Int32 GetLineCount(); /// Query and set footnote-text/number. Set... to current SSelection! - bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = nullptr ); - bool SetCurFootnote( const SwFormatFootnote& rFillFootnote ); - bool HasFootnotes( bool bEndNotes = false ) const; + SW_DLLPUBLIC bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = nullptr ); + SW_DLLPUBLIC bool SetCurFootnote( const SwFormatFootnote& rFillFootnote ); + SW_DLLPUBLIC bool HasFootnotes( bool bEndNotes = false ) const; - size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false ); + SW_DLLPUBLIC size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false ); /// @return list of all footnotes and their first portions of text. - SwSection const* InsertSection( + SW_DLLPUBLIC SwSection const* InsertSection( SwSectionData & rNewData, SfxItemSet const*const = nullptr ); - bool IsInsRegionAvailable() const; - const SwSection* GetCurrSection() const; + SW_DLLPUBLIC bool IsInsRegionAvailable() const; + SW_DLLPUBLIC const SwSection* GetCurrSection() const; /** @return current range like Cet CurrSection(). But this function iterates also over frames and catches the range even if the cursor is positioned in @@ -889,23 +889,23 @@ public: and not an inner one. */ SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = nullptr ); - size_t GetSectionFormatCount() const; - size_t GetSectionFormatPos(const SwSectionFormat&) const; - const SwSectionFormat& GetSectionFormat(size_t nFormat) const; - void DelSectionFormat( size_t nFormat); - void UpdateSection( size_t const nSect, SwSectionData &, + SW_DLLPUBLIC size_t GetSectionFormatCount() const; + SW_DLLPUBLIC size_t GetSectionFormatPos(const SwSectionFormat&) const; + SW_DLLPUBLIC const SwSectionFormat& GetSectionFormat(size_t nFormat) const; + SW_DLLPUBLIC void DelSectionFormat( size_t nFormat); + SW_DLLPUBLIC void UpdateSection( size_t const nSect, SwSectionData &, SfxItemSet const*const = nullptr); bool IsAnySectionInDoc() const; - OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const; + SW_DLLPUBLIC OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const; /// Set attributes. - void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = nullptr); + SW_DLLPUBLIC void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = nullptr); /** Search inside the cursor selection for full selected sections. if any part of section in the selection @return 0. if more than one in the selection return the count. */ - sal_uInt16 GetFullSelectedSectionCount() const; + SW_DLLPUBLIC sal_uInt16 GetFullSelectedSectionCount() const; /** Special insert: Insert a new text node just before or after a section or table, if the cursor is positioned at the start/end of said @@ -918,7 +918,7 @@ public: /// Optimizing UI. void SetNewDoc(); - sfx2::LinkManager& GetLinkManager(); + SW_DLLPUBLIC sfx2::LinkManager& GetLinkManager(); inline const sfx2::LinkManager& GetLinkManager() const; /** Adjust left margin via object bar (similar to adjustment of numerations). @@ -928,7 +928,7 @@ public: void MoveLeftMargin( bool bRight, bool bModulus = true ); /// Query NumberFormatter from document. - SvNumberFormatter* GetNumberFormatter(); + SW_DLLPUBLIC SvNumberFormatter* GetNumberFormatter(); const SvNumberFormatter* GetNumberFormatter() const { return const_cast<SwEditShell*>(this)->GetNumberFormatter(); } @@ -950,13 +950,13 @@ public: void GotoGlobalDocContent( const SwGlblDocContent& rPos ); /// For Redlining. - RedlineFlags GetRedlineFlags() const; - void SetRedlineFlags( RedlineFlags eMode ); + SW_DLLPUBLIC RedlineFlags GetRedlineFlags() const; + SW_DLLPUBLIC void SetRedlineFlags( RedlineFlags eMode ); bool IsRedlineOn() const; - SwRedlineTable::size_type GetRedlineCount() const; + SW_DLLPUBLIC SwRedlineTable::size_type GetRedlineCount() const; const SwRangeRedline& GetRedline( SwRedlineTable::size_type nPos ) const; - bool AcceptRedline( SwRedlineTable::size_type nPos ); - bool RejectRedline( SwRedlineTable::size_type nPos ); + SW_DLLPUBLIC bool AcceptRedline( SwRedlineTable::size_type nPos ); + SW_DLLPUBLIC bool RejectRedline( SwRedlineTable::size_type nPos ); bool AcceptRedlinesInSelection(); bool RejectRedlinesInSelection(); @@ -969,26 +969,26 @@ public: const SwRangeRedline* GetCurrRedline() const; /// Redline attributes have been changed. Updated views. - void UpdateRedlineAttr(); + SW_DLLPUBLIC void UpdateRedlineAttr(); /// Compare two documents. tools::Long CompareDoc( const SwDoc& rDoc ); /// Merge two documents. - tools::Long MergeDoc( const SwDoc& rDoc ); + SW_DLLPUBLIC tools::Long MergeDoc( const SwDoc& rDoc ); /// Footnote attributes global to document. - const SwFootnoteInfo& GetFootnoteInfo() const; - void SetFootnoteInfo(const SwFootnoteInfo& rInfo); - const SwEndNoteInfo& GetEndNoteInfo() const; - void SetEndNoteInfo(const SwEndNoteInfo& rInfo); + SW_DLLPUBLIC const SwFootnoteInfo& GetFootnoteInfo() const; + SW_DLLPUBLIC void SetFootnoteInfo(const SwFootnoteInfo& rInfo); + SW_DLLPUBLIC const SwEndNoteInfo& GetEndNoteInfo() const; + SW_DLLPUBLIC void SetEndNoteInfo(const SwEndNoteInfo& rInfo); - const SwLineNumberInfo &GetLineNumberInfo() const; - void SetLineNumberInfo( const SwLineNumberInfo& rInfo); + SW_DLLPUBLIC const SwLineNumberInfo &GetLineNumberInfo() const; + SW_DLLPUBLIC void SetLineNumberInfo( const SwLineNumberInfo& rInfo); /// Labels: Synchronize ranges. void SetLabelDoc( bool bFlag ); - bool IsLabelDoc() const; + SW_DLLPUBLIC bool IsLabelDoc() const; /// Interface for TextInputData - (for input of Japanese/Chinese chars.) void CreateExtTextInput(LanguageType eInputLanguage); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index a0a3a64176d7..9431a2058ef4 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -198,7 +198,7 @@ enum class SwTab class SdrDropMarkerOverlay; struct SwColCache; -class SW_DLLPUBLIC SwFEShell : public SwEditShell +class SwFEShell : public SwEditShell { private: mutable std::unique_ptr<SwColCache> m_pColumnCache; @@ -212,38 +212,38 @@ private: /// table copied to the clipboard by the last private copy bool m_bTableCopied; - SAL_DLLPRIVATE SwFlyFrame *FindFlyFrame( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const; + SwFlyFrame *FindFlyFrame( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const; /// Terminate actions for all shells and call ChangeLink. - SAL_DLLPRIVATE void EndAllActionAndCall(); + void EndAllActionAndCall(); - SAL_DLLPRIVATE void ScrollTo( const Point &rPt ); + void ScrollTo( const Point &rPt ); - SAL_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId ); + void ChangeOpaque( SdrLayerID nLayerId ); /** Used for mouse operations on a table: @return a cell frame that is 'close' to rPt. */ - SAL_DLLPRIVATE const SwFrame *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const; + const SwFrame *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const; // 0 == not in any column. - SAL_DLLPRIVATE static sal_uInt16 GetCurColNum_( const SwFrame *pFrame, + static sal_uInt16 GetCurColNum_( const SwFrame *pFrame, SwGetCurColNumPara* pPara ); - SAL_DLLPRIVATE void GetTabCols_(SwTabCols &rToFill, const SwFrame *pBox) const; - SAL_DLLPRIVATE void GetTabRows_(SwTabCols &rToFill, const SwFrame *pBox) const; + void GetTabCols_(SwTabCols &rToFill, const SwFrame *pBox) const; + void GetTabRows_(SwTabCols &rToFill, const SwFrame *pBox) const; - SAL_DLLPRIVATE bool ImpEndCreate(); + bool ImpEndCreate(); /// Methods for copying of draw objects. - SAL_DLLPRIVATE bool CopyDrawSel( SwFEShell& rDestShell, const Point& rSttPt, + bool CopyDrawSel( SwFEShell& rDestShell, const Point& rSttPt, const Point& rInsPt, bool bIsMove, bool bSelectInsert ); /// Get list of marked SdrObjects; /// helper method for GetSelFrameType, IsSelContainsControl. - SAL_DLLPRIVATE const SdrMarkList* GetMarkList_() const; + const SdrMarkList* GetMarkList_() const; - SAL_DLLPRIVATE bool CheckHeadline( bool bRepeat ) const; + bool CheckHeadline( bool bRepeat ) const; using SwEditShell::Copy; @@ -256,27 +256,27 @@ public: virtual ~SwFEShell() override; /// Copy and Paste methods for internal clipboard. - void Copy( SwDoc& rClpDoc, const OUString* pNewClpText = nullptr ); - bool Paste( SwDoc& rClpDoc, bool bNestedTable = false ); + SW_DLLPUBLIC void Copy( SwDoc& rClpDoc, const OUString* pNewClpText = nullptr ); + SW_DLLPUBLIC bool Paste( SwDoc& rClpDoc, bool bNestedTable = false ); /// Paste some pages into another doc - used in mailmerge. - void PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage); + SW_DLLPUBLIC void PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage); /// Copy-Method for Drag&Drop - bool Copy( SwFEShell&, const Point& rSttPt, const Point& rInsPt, + SW_DLLPUBLIC bool Copy( SwFEShell&, const Point& rSttPt, const Point& rInsPt, bool bIsMove = false, bool bSelectInsert = true ); void SelectFlyFrame( SwFlyFrame& rFrame ); - void UnfloatFlyFrame(); + SW_DLLPUBLIC void UnfloatFlyFrame(); /// Is selected frame within another frame? - const SwFrameFormat* IsFlyInFly(); + SW_DLLPUBLIC const SwFrameFormat* IsFlyInFly(); /** If an object has been given, exactly this object is selected (instead of searching over position). */ - bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = nullptr ); - void DelSelectedObj(); + SW_DLLPUBLIC bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = nullptr ); + SW_DLLPUBLIC void DelSelectedObj(); /** Move selection upwards or downwards (Z-Order). TRUE = to top or bottom. @@ -304,13 +304,13 @@ public: /** @return if Upper of frame at current position is section frame Currently only used by the rules. To be replaced by something more sophisticated one day. */ - bool IsDirectlyInSection() const; + SW_DLLPUBLIC bool IsDirectlyInSection() const; /** For return values see above FrameType. pPt: Cursr or DocPos respectively; bStopAtFly: Stop at flys or continue over anchor. Although (0,TRUE) is kind of a standard, the parameters are not defaulted here in order to force more conscious use especially of bStopAtFly. */ - FrameTypeFlags GetFrameType( const Point *pPt, bool bStopAtFly ) const; + SW_DLLPUBLIC FrameTypeFlags GetFrameType( const Point *pPt, bool bStopAtFly ) const; FrameTypeFlags GetSelFrameType() const; //Selection (Drawing) /** check whether selected frame contains a control; @@ -326,12 +326,12 @@ public: SwRect GetObjRect() const; /// For moving flys with keyboard. - SwRect GetFlyRect() const; + SW_DLLPUBLIC SwRect GetFlyRect() const; /** i#17567 - adjustments to allow negative vertical positions for fly frames anchored to paragraph or to character. i#18732 - adjustments for new option 'FollowTextFlow' i#22341 - adjustments for new vertical alignment at top of line */ - void CalcBoundRect( SwRect& _orRect, + SW_DLLPUBLIC void CalcBoundRect( SwRect& _orRect, const RndStdIds _nAnchorId, const sal_Int16 _eHoriRelOrient = css::text::RelOrientation::FRAME, const sal_Int16 _eVertRelOrient = css::text::RelOrientation::FRAME, @@ -370,7 +370,7 @@ public: const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const; /** Which Protection is set at selected object? */ - FlyProtectFlags IsSelObjProtected( FlyProtectFlags eType ) const; + SW_DLLPUBLIC FlyProtectFlags IsSelObjProtected( FlyProtectFlags eType ) const; /** Deliver graphic in rName besides graphic name. If graphic is linked give name with path. rbLink is TRUE if graphic is linked. */ @@ -384,29 +384,29 @@ public: bool IsObjDecorative() const; void SetObjDecorative(bool isDecorative); - bool IsFrameSelected() const; + SW_DLLPUBLIC bool IsFrameSelected() const; bool GetFlyFrameAttr( SfxItemSet &rSet ) const; - bool SetFlyFrameAttr( SfxItemSet &rSet ); + SW_DLLPUBLIC bool SetFlyFrameAttr( SfxItemSet &rSet ); static SfxItemSetFixed<RES_VERT_ORIENT, RES_ANCHOR> makeItemSetFromFormatAnchor(SfxItemPool& rPool, const SwFormatAnchor &rAnchor); void ResetFlyFrameAttr( const SfxItemSet* pSet ); - const SwFrameFormat *NewFlyFrame( const SfxItemSet &rSet, bool bAnchValid = false, + SW_DLLPUBLIC const SwFrameFormat *NewFlyFrame( const SfxItemSet &rSet, bool bAnchValid = false, SwFrameFormat *pParent = nullptr ); - void SetFlyPos( const Point &rAbsPos); - Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false ); + SW_DLLPUBLIC void SetFlyPos( const Point &rAbsPos); + SW_DLLPUBLIC Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false ); /** Determines whether a frame or its environment is vertically formatted and right-to-left. also determines, if frame or its environment is in Mongolian layout (vertical left-to-right) - add output parameter <bVertL2R> */ - bool IsFrameVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const; + SW_DLLPUBLIC bool IsFrameVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const; SwFrameFormat* GetSelectedFrameFormat() const; ///< If frame then frame style, else 0. void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point const * pDocPos = nullptr ); ///< If frame then set frame style. // Get selected fly - SwFlyFrame* GetSelectedFlyFrame() const; + SW_DLLPUBLIC SwFlyFrame* GetSelectedFlyFrame() const; // Get current fly in which the cursor is positioned - SwFlyFrame* GetCurrFlyFrame(const bool bCalcFrame = true) const; + SW_DLLPUBLIC SwFlyFrame* GetCurrFlyFrame(const bool bCalcFrame = true) const; // Get selected fly, but if none Get current fly in which the cursor is positioned SwFlyFrame* GetSelectedOrCurrFlyFrame() const; @@ -421,7 +421,7 @@ public: { return GotoObj( false, eType); } /// Iterate over flys - for Basic-collections. - size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const; + SW_DLLPUBLIC size_t GetFlyCount( FlyCntType eType, bool bIgnoreTextBoxes = false ) const; const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType, bool bIgnoreTextBoxes = false) const; std::vector<SwFrameFormat const*> GetFlyFrameFormats( @@ -432,7 +432,7 @@ public: /// Get FlyFrameFormat; for UI macro linkage at Flys const SwFrameFormat* GetFlyFrameFormat() const; - SwFrameFormat* GetFlyFrameFormat(); + SW_DLLPUBLIC SwFrameFormat* GetFlyFrameFormat(); /** OLE. Server requires new size. Desired values are adjusted as frame attributes. If the values are not allowed, the formatting clips and determines scaling. @@ -463,16 +463,16 @@ public: void SetCheckForOLEInCaption( bool bFlag ) { m_bCheckForOLEInCaption = bFlag; } /// Set name at selected FlyFrame. - void SetFlyName( const OUString& rName ); + SW_DLLPUBLIC void SetFlyName( const OUString& rName ); OUString GetFlyName() const; /// get reference to OLE object (if there is one) for selected FlyFrame css::uno::Reference < css::embed::XEmbeddedObject > GetOleRef() const; /// Created unique name for frame. - OUString GetUniqueGrfName() const; - OUString GetUniqueOLEName() const; - OUString GetUniqueFrameName() const; + SW_DLLPUBLIC OUString GetUniqueGrfName() const; + SW_DLLPUBLIC OUString GetUniqueOLEName() const; + SW_DLLPUBLIC OUString GetUniqueFrameName() const; /// Jump to named Fly (graphic/OLE). bool GotoFly( const OUString& rName, FlyCntType eType, @@ -504,7 +504,7 @@ public: const SdrObject* GetBestObject(bool bNext, GotoObjFlags eType, bool bFlat = true, const svx::ISdrObjectFilter* pFilter = nullptr, bool* pbWrapped = nullptr); - bool GotoObj( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny); + SW_DLLPUBLIC bool GotoObj( bool bNext, GotoObjFlags eType = GotoObjFlags::DrawAny); /// Set DragMode (e.g. Rotate), but do nothing when frame is selected. void SetDragMode( SdrDragMode eSdrDragMode ); @@ -518,12 +518,12 @@ public: // RotGrfFlyFrame: check if RotationMode is possible bool IsRotationOfSwGrfNodePossible() const; - size_t IsObjSelected() const; ///< @return object count, but doesn't count the objects in groups. + SW_DLLPUBLIC size_t IsObjSelected() const; ///< @return object count, but doesn't count the objects in groups. bool IsObjSelected( const SdrObject& rObj ) const; bool IsObjSameLevelWithMarked(const SdrObject* pObj) const; const SdrMarkList* GetMarkList() const{ return GetMarkList_(); }; - void EndTextEdit(); ///< Deletes object if required. + SW_DLLPUBLIC void EndTextEdit(); ///< Deletes object if required. /** Anchor type of selected object, RndStdIds::UNKNOWN if ambiguous or in case of frame selection. Else RndStdIds::FLY_AT_PAGE or RndStdIds::FLY_AT_PARA. */ @@ -534,10 +534,10 @@ public: or SdrCreateCmd::NextPoint for a polygon may be relevant. After RESTRAINTEND the object is created and selected. BreakCreate interrupts the process. In this case no object is selected. */ - bool BeginCreate( SdrObjKind eSdrObjectKind, const Point &rPos ); + SW_DLLPUBLIC bool BeginCreate( SdrObjKind eSdrObjectKind, const Point &rPos ); bool BeginCreate( SdrObjKind eSdrObjectKind, SdrInventor eObjInventor, const Point &); - void MoveCreate ( const Point &rPos ); - bool EndCreate ( SdrCreateCmd eSdrCreateCmd ); + SW_DLLPUBLIC void MoveCreate ( const Point &rPos ); + SW_DLLPUBLIC bool EndCreate ( SdrCreateCmd eSdrCreateCmd ); void BreakCreate(); bool IsDrawCreate() const; void CreateDefaultShape(SdrObjKind eSdrObjectKind, const tools::Rectangle& rRect, sal_uInt16 nSlotId); @@ -561,7 +561,7 @@ public: /** frmatr.hxx. Here no enum because of dependencies. bool value only for internal use! Anchor is newly set according to current document position. Anchor is not re-set. */ - void ChgAnchor( RndStdIds eAnchorId, bool bSameOnly = false, + SW_DLLPUBLIC void ChgAnchor( RndStdIds eAnchorId, bool bSameOnly = false, bool bPosCorr = true ); bool SetDrawingAttr( SfxItemSet &rSet ); @@ -578,7 +578,7 @@ public: bool IsAlignPossible() const; void SetCalcFieldValueHdl(Outliner* pOutliner); - void Insert(const OUString& rGrfName, + SW_DLLPUBLIC void Insert(const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const SfxItemSet* pFlyAttrSet ); @@ -604,50 +604,50 @@ public: Point GetRelativePagePosition(const Point& rDocPos); /// Hide or show layout-selection and pass call to CursorSh. - void ShellLoseFocus(); + SW_DLLPUBLIC void ShellLoseFocus(); void ShellGetFocus(); /// PageDescriptor-interface void ChgCurPageDesc( const SwPageDesc& ); - size_t GetCurPageDesc( const bool bCalcFrame = true ) const; + SW_DLLPUBLIC size_t GetCurPageDesc( const bool bCalcFrame = true ) const; size_t GetMousePageDesc( const Point &rPt ) const; - size_t GetPageDescCnt() const; - SwPageDesc* FindPageDescByName( const OUString& rName, + SW_DLLPUBLIC size_t GetPageDescCnt() const; + SW_DLLPUBLIC SwPageDesc* FindPageDescByName( const OUString& rName, bool bGetFromPool = false, size_t* pPos = nullptr ); - const SwPageDesc& GetPageDesc( size_t i ) const; - void ChgPageDesc( size_t i, const SwPageDesc& ); + SW_DLLPUBLIC const SwPageDesc& GetPageDesc( size_t i ) const; + SW_DLLPUBLIC void ChgPageDesc( size_t i, const SwPageDesc& ); /** if inside all selection only one PageDesc, @return this. Otherwise @return 0 pointer */ - const SwPageDesc* GetSelectedPageDescs() const; + SW_DLLPUBLIC const SwPageDesc* GetSelectedPageDescs() const; - const SwRect& GetAnyCurRect( CurRectType eType, + SW_DLLPUBLIC const SwRect& GetAnyCurRect( CurRectType eType, const Point* pPt = nullptr, const css::uno::Reference < css::embed::XEmbeddedObject >& = css::uno::Reference < css::embed::XEmbeddedObject >() ) const; /// Page number of the page containing Point, O if no page. sal_uInt16 GetPageNumber( const Point &rPoint ) const; - bool GetPageNumber( tools::Long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; + SW_DLLPUBLIC bool GetPageNumber( tools::Long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&, SfxItemSet* pFlyAttrSet ); bool FinishOLEObj(); ///< Shutdown server. void GetTableAttr( SfxItemSet & ) const; - void SetTableAttr( const SfxItemSet & ); + SW_DLLPUBLIC void SetTableAttr( const SfxItemSet & ); bool HasWholeTabSelection() const; /// Is content of a table cell or at least a table cell completely selected? bool HasBoxSelection() const; - void InsertRow( sal_uInt16 nCnt, bool bBehind ); - void InsertCol( sal_uInt16 nCnt, bool bBehind ); // 0 == at the end. - bool DeleteCol(); + SW_DLLPUBLIC void InsertRow( sal_uInt16 nCnt, bool bBehind ); + SW_DLLPUBLIC void InsertCol( sal_uInt16 nCnt, bool bBehind ); // 0 == at the end. + SW_DLLPUBLIC bool DeleteCol(); void DeleteTable(); - bool DeleteRow(bool bCompleteTable = false); + SW_DLLPUBLIC bool DeleteRow(bool bCompleteTable = false); SwTable::SearchType GetTableInsertMode() const { return m_eTableInsertMode; } void SetTableInsertMode( SwTable::SearchType eFlag ) { m_eTableInsertMode = eFlag; } @@ -661,12 +661,12 @@ public: /// Split cell vertically or horizontally. void SplitTab( bool bVert, sal_uInt16 nCnt, bool bSameHeight ); - bool Sort(const SwSortOptions&); // sorting + SW_DLLPUBLIC bool Sort(const SwSortOptions&); // sorting - void SetRowHeight( const SwFormatFrameSize &rSz ); + SW_DLLPUBLIC void SetRowHeight( const SwFormatFrameSize &rSz ); /// Pointer must be destroyed by caller != 0. - std::unique_ptr<SwFormatFrameSize> GetRowHeight() const; + SW_DLLPUBLIC std::unique_ptr<SwFormatFrameSize> GetRowHeight() const; void SetRowSplit( const SwFormatRowSplit &rSz ); std::unique_ptr<SwFormatRowSplit> GetRowSplit() const; @@ -680,16 +680,16 @@ public: void GetTabBorders( SfxItemSet& rSet) const; void SetTabLineStyle(const Color* pColor, bool bSetLine = false, const editeng::SvxBorderLine* pBorderLine = nullptr); - void SetTabBackground( const SvxBrushItem &rNew ); + SW_DLLPUBLIC void SetTabBackground( const SvxBrushItem &rNew ); void GetTabBackground( std::unique_ptr<SvxBrushItem>& rToFill ) const; - void SetBoxBackground( const SvxBrushItem &rNew ); + SW_DLLPUBLIC void SetBoxBackground( const SvxBrushItem &rNew ); bool GetBoxBackground( std::unique_ptr<SvxBrushItem>& rToFill ) const; ///< FALSE ambiguous. void SetBoxDirection( const SvxFrameDirectionItem& rNew ); bool GetBoxDirection( std::unique_ptr<SvxFrameDirectionItem>& rToFill ) const; ///< FALSE ambiguous. - void SetRowBackground( const SvxBrushItem &rNew ); + SW_DLLPUBLIC void SetRowBackground( const SvxBrushItem &rNew ); bool GetRowBackground( std::unique_ptr<SvxBrushItem>& rToFill ) const; ///< FALSE ambiguous. SwTab WhichMouseTabCol( const Point &rPt ) const; @@ -707,16 +707,16 @@ public: void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const; void SetMouseTabRows( const SwTabCols &rNew, bool bCurColOnly, const Point &rPt ); - void ProtectCells(); /**< If a table selection exists it is destroyed in case + SW_DLLPUBLIC void ProtectCells(); /**< If a table selection exists it is destroyed in case cursor is not allowed in readonly. */ - void UnProtectCells(); ///< Refers to table selection. + SW_DLLPUBLIC void UnProtectCells(); ///< Refers to table selection. void UnProtectTables(); ///< Unprotect all tables in selection. bool HasTableAnyProtection( const OUString* pTableName, bool* pFullTableProtection ); bool CanUnProtectCells() const; sal_uInt16 GetRowsToRepeat() const; - void SetRowsToRepeat( sal_uInt16 nNumOfRows ); + SW_DLLPUBLIC void SetRowsToRepeat( sal_uInt16 nNumOfRows ); sal_uInt16 GetVirtPageNum() const; /** @return the number of table rows currently selected @@ -733,7 +733,7 @@ public: /// Set table style of the current table. void SetTableStyle(const OUString& rStyleName); - bool SetTableStyle(const SwTableAutoFormat& rNew); + SW_DLLPUBLIC bool SetTableStyle(const SwTableAutoFormat& rNew); /// Update the direct formatting according to the current table style. /// @param pTableNode Table node to update. When nullptr, current cursor position is used. @@ -741,7 +741,7 @@ public: /// @param pStyleName new style to apply bool UpdateTableStyleFormatting(SwTableNode *pTableNode = nullptr, bool bResetDirect = false, OUString const* pStyleName = nullptr); - bool GetTableAutoFormat( SwTableAutoFormat& rGet ); + SW_DLLPUBLIC bool GetTableAutoFormat( SwTableAutoFormat& rGet ); void SetColRowWidthHeight( TableChgWidthHeightType eType, sal_uInt16 nDiff ); @@ -749,7 +749,7 @@ public: /** Phy: real page count. Virt: consider offset that may have been set by user. */ - sal_uInt16 GetPhyPageNum() const; + SW_DLLPUBLIC sal_uInt16 GetPhyPageNum() const; void SetNewPageOffset( sal_uInt16 nOffset ); void SetPageOffset( sal_uInt16 nOffset ); ///< Changes last page offset. @@ -762,23 +762,23 @@ public: const bool bCpyBrd ); /// The ruler needs some information too. - sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = nullptr ) const; //0 == not in any column. + SW_DLLPUBLIC sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = nullptr ) const; //0 == not in any column. sal_uInt16 GetCurMouseColNum( const Point &rPt ) const; size_t GetCurTabColNum() const; //0 == not in any table. size_t GetCurMouseTabColNum( const Point &rPt ) const; sal_uInt16 GetCurOutColNum() const; ///< Current outer column. bool IsColRightToLeft() const; - bool IsTableRightToLeft() const; + SW_DLLPUBLIC bool IsTableRightToLeft() const; bool IsMouseTableRightToLeft( const Point &rPt ) const; bool IsTableVertical() const; bool IsLastCellInRow() const; /// Width of current range for column-dialog. - tools::Long GetSectionWidth( SwFormat const & rFormat ) const; + SW_DLLPUBLIC tools::Long GetSectionWidth( SwFormat const & rFormat ) const; - void GetConnectableFrameFormats + SW_DLLPUBLIC void GetConnectableFrameFormats (SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors, std::vector< OUString > & aPrevPageVec, std::vector< OUString > & aThisPageVec, @@ -819,7 +819,7 @@ public: void ToggleHeaderFooterEdit( ); static void SetLineEnds(SfxItemSet& rAttr, SdrObject const & rObj, sal_uInt16 nSlotId); - SAL_DLLPRIVATE void ClearColumnRowCache(SwTabFrame const*); + void ClearColumnRowCache(SwTabFrame const*); }; void ClearFEShellTabCols(SwDoc & rDoc, SwTabFrame const*const pFrame); diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index 751a4033f20e..6254801bf8a7 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -262,7 +262,7 @@ cppu::WeakImplHelper css::lang::XServiceInfo > SwCollectionBaseClass; -class SW_DLLPUBLIC SwXTextTables final : public SwCollectionBaseClass, +class SwXTextTables final : public SwCollectionBaseClass, public SwUnoCollection { virtual ~SwXTextTables() override; @@ -287,7 +287,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; - static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat); + SW_DLLPUBLIC static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat); }; typedef |