mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce symbol visibility in vcl

Browse Source 
Change-Id: Ibe6154dc5de6251fb39952caa190d53a6fd1fd89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164926
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2024-03-16 09:46:01 +02:00
parent c492de66a0
commit e501580dec
2 changed files with 69 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
bin/find-can-be-private-symbols.functions.results
View File

@@ -9884,74 +9884,6 @@ TextAttribFontColor::operator==(TextAttrib const&) const
TextAttribFontWeight::Clone() const
TextAttribFontWeight::SetFont(vcl::Font&) const
TextAttribFontWeight::operator==(TextAttrib const&) const
TextEngine::CalcParaHeight(unsigned int) const
TextEngine::CalcTextHeight() const
TextEngine::CalcTextWidth(unsigned int)
TextEngine::CalcTextWidth(unsigned int, int, int)
TextEngine::CheckIdleFormatter()
TextEngine::ConnectContents(unsigned int)
TextEngine::CreateAndInsertEmptyLine(unsigned int)
TextEngine::CreateLines(unsigned int)
TextEngine::CreateTextPortions(unsigned int, int)
TextEngine::CursorMoved(unsigned int)
TextEngine::Draw(OutputDevice*, Point const&)
TextEngine::FindCharAttrib(TextPaM const&, unsigned short) const
TextEngine::FormatAndUpdate(TextView*)
TextEngine::FormatDoc()
TextEngine::FormatFullDoc()
TextEngine::GetBreakIterator()
TextEngine::GetCharPos(unsigned int, unsigned long, long)
TextEngine::GetEditCursor(TextPaM const&, bool, bool)
TextEngine::GetInvalidYOffsets(unsigned int)
TextEngine::GetText(LineEnd) const
TextEngine::GetTextLen() const
TextEngine::GetTextLen(TextSelection const&) const
TextEngine::GetTextLines(LineEnd) const
TextEngine::GetView(unsigned short) const
TextEngine::GetViewCount() const
TextEngine::IdleFormatAndUpdate(TextView*, unsigned short)
TextEngine::ImpBreakLine(unsigned int, TextLine*, int, long)
TextEngine::ImpCharsInserted(unsigned int, int, int)
TextEngine::ImpCharsRemoved(unsigned int, int, int)
TextEngine::ImpConnectParagraphs(unsigned int, unsigned int)
TextEngine::ImpDeleteText(TextSelection const&)
TextEngine::ImpFindIndex(unsigned int, Point const&)
TextEngine::ImpGetAlign() const
TextEngine::ImpGetLocaleDataWrapper()
TextEngine::ImpGetOutputOffset(unsigned int, TextLine*, int, int)
TextEngine::ImpGetPortionXOffset(unsigned int, TextLine const*, unsigned long)
TextEngine::ImpGetRightToLeft(unsigned int, int)
TextEngine::ImpGetXPos(unsigned int, TextLine*, int, bool)
TextEngine::ImpInitDoc()
TextEngine::ImpInitLayoutMode(OutputDevice*)
TextEngine::ImpInitWritingDirections(unsigned int)
TextEngine::ImpInsertParaBreak(TextPaM const&)
TextEngine::ImpInsertParaBreak(TextSelection const&)
TextEngine::ImpInsertText(TextSelection const&, char16_t, bool)
TextEngine::ImpInsertText(TextSelection const&, rtl::OUString const&)
TextEngine::ImpPaint(OutputDevice*, Point const&, tools::Rectangle const*, TextSelection const*)
TextEngine::ImpParagraphInserted(unsigned int)
TextEngine::ImpParagraphRemoved(unsigned int)
TextEngine::ImpRemoveChars(TextPaM const&, int)
TextEngine::ImpRemoveParagraph(unsigned int)
TextEngine::ImpRemoveText()
TextEngine::InsertContent(std::unique_ptr<TextNode, std::default_delete<TextNode> >, unsigned int)
TextEngine::InsertUndo(std::unique_ptr<TextUndo, std::default_delete<TextUndo> >, bool)
TextEngine::IsSimpleCharInput(KeyEvent const&)
TextEngine::RecalcTextPortion(unsigned int, int, int)
TextEngine::SeekCursor(unsigned int, int, vcl::Font&, OutputDevice*)
TextEngine::SetLeftMargin(unsigned short)
TextEngine::SetLocale(com::sun::star::lang::Locale const&)
TextEngine::SetMaxTextLen(int)
TextEngine::SetRightToLeft(bool)
TextEngine::SetTextAlign(TxtAlign)
TextEngine::SplitContent(unsigned int, int)
TextEngine::SplitTextPortion(unsigned int, int)
TextEngine::TextModified()
TextEngine::UndoActionEnd()
TextEngine::UndoActionStart(unsigned short)
TextEngine::UpdateViews(TextView*)
TextEngine::ValidatePaM(TextPaM&) const
TextEngine::ValidateSelection(TextSelection&) const
TextListenerMultiplexer::acquire()
TextListenerMultiplexer::disposing(com::sun::star::lang::EventObject const&)

138
include/vcl/texteng.hxx
View File

@@ -123,21 +123,21 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster
bool mbRightToLeft : 1;
bool mbHasMultiLineParas : 1;
void CursorMoved( sal_uInt32 nNode );
void TextModified();
SAL_DLLPRIVATE void CursorMoved( sal_uInt32 nNode );
SAL_DLLPRIVATE void TextModified();
void ImpInitDoc();
void ImpRemoveText();
TextPaM ImpDeleteText( const TextSelection& rSel );
TextPaM ImpInsertText( const TextSelection& rSel, sal_Unicode c, bool bOverwrite = false );
TextPaM ImpInsertText( const TextSelection& rSel, const OUString& rText );
TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection );
TextPaM ImpInsertParaBreak( const TextPaM& rPaM );
void ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars );
TextPaM ImpConnectParagraphs( sal_uInt32 nLeft, sal_uInt32 nRight );
void ImpRemoveParagraph( sal_uInt32 nPara );
void ImpInitWritingDirections( sal_uInt32 nPara );
LocaleDataWrapper* ImpGetLocaleDataWrapper();
SAL_DLLPRIVATE void ImpInitDoc();
SAL_DLLPRIVATE void ImpRemoveText();
SAL_DLLPRIVATE TextPaM ImpDeleteText( const TextSelection& rSel );
SAL_DLLPRIVATE TextPaM ImpInsertText( const TextSelection& rSel, sal_Unicode c, bool bOverwrite = false );
SAL_DLLPRIVATE TextPaM ImpInsertText( const TextSelection& rSel, const OUString& rText );
SAL_DLLPRIVATE TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection );
SAL_DLLPRIVATE TextPaM ImpInsertParaBreak( const TextPaM& rPaM );
SAL_DLLPRIVATE void ImpRemoveChars( const TextPaM& rPaM, sal_Int32 nChars );
SAL_DLLPRIVATE TextPaM ImpConnectParagraphs( sal_uInt32 nLeft, sal_uInt32 nRight );
SAL_DLLPRIVATE void ImpRemoveParagraph( sal_uInt32 nPara );
SAL_DLLPRIVATE void ImpInitWritingDirections( sal_uInt32 nPara );
SAL_DLLPRIVATE LocaleDataWrapper* ImpGetLocaleDataWrapper();
// to remain compatible in the minor release we copy the above ImpInsertText
// function and add the extra parameter we need but make sure this function
@@ -148,57 +148,57 @@ class VCL_DLLPUBLIC TextEngine : public SfxBroadcaster
SAL_DLLPRIVATE bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const;
// broadcast or adjust selections
void ImpParagraphInserted( sal_uInt32 nPara );
void ImpParagraphRemoved( sal_uInt32 nPara );
void ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
void ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
SAL_DLLPRIVATE void ImpParagraphInserted( sal_uInt32 nPara );
SAL_DLLPRIVATE void ImpParagraphRemoved( sal_uInt32 nPara );
SAL_DLLPRIVATE void ImpCharsRemoved( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
SAL_DLLPRIVATE void ImpCharsInserted( sal_uInt32 nPara, sal_Int32 nPos, sal_Int32 nChars );
DECL_DLLPRIVATE_LINK( IdleFormatHdl, Timer *, void );
void CheckIdleFormatter();
void IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 );
SAL_DLLPRIVATE void CheckIdleFormatter();
SAL_DLLPRIVATE void IdleFormatAndUpdate( TextView* pCurView, sal_uInt16 nMaxTimerRestarts = 5 );
bool CreateLines( sal_uInt32 nPara );
void CreateAndInsertEmptyLine( sal_uInt32 nPara );
void ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nPortionStart, tools::Long nRemainingWidth );
std::size_t SplitTextPortion( sal_uInt32 nPara, sal_Int32 nPos );
void CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos );
void RecalcTextPortion( sal_uInt32 nPara, sal_Int32 nStartPos, sal_Int32 nNewChars );
void SeekCursor( sal_uInt32 nNode, sal_Int32 nPos, vcl::Font& rFont, OutputDevice* pOutDev );
SAL_DLLPRIVATE bool CreateLines( sal_uInt32 nPara );
SAL_DLLPRIVATE void CreateAndInsertEmptyLine( sal_uInt32 nPara );
SAL_DLLPRIVATE void ImpBreakLine( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nPortionStart, tools::Long nRemainingWidth );
SAL_DLLPRIVATE std::size_t SplitTextPortion( sal_uInt32 nPara, sal_Int32 nPos );
SAL_DLLPRIVATE void CreateTextPortions( sal_uInt32 nPara, sal_Int32 nStartPos );
SAL_DLLPRIVATE void RecalcTextPortion( sal_uInt32 nPara, sal_Int32 nStartPos, sal_Int32 nNewChars );
SAL_DLLPRIVATE void SeekCursor( sal_uInt32 nNode, sal_Int32 nPos, vcl::Font& rFont, OutputDevice* pOutDev );
void FormatDoc();
void FormatFullDoc();
void FormatAndUpdate( TextView* pCurView = nullptr );
SAL_DLLPRIVATE void FormatDoc();
SAL_DLLPRIVATE void FormatFullDoc();
SAL_DLLPRIVATE void FormatAndUpdate( TextView* pCurView = nullptr );
bool IsFormatting() const { return mbIsFormatting; }
void UpdateViews( TextView* pCurView = nullptr );
SAL_DLLPRIVATE void UpdateViews( TextView* pCurView = nullptr );
void ImpPaint( OutputDevice* pOut, const Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* pSelection = nullptr );
SAL_DLLPRIVATE void ImpPaint( OutputDevice* pOut, const Point& rStartPos, tools::Rectangle const* pPaintArea, TextSelection const* pSelection = nullptr );
bool IsFormatted() const { return mbFormatted; }
sal_Int32 GetCharPos( sal_uInt32 nPara, std::vector<TextLine>::size_type nLine, tools::Long nDocPosX );
tools::Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false );
sal_Int32 ImpFindIndex( sal_uInt32 nPortion, const Point& rPosInPara );
tools::Long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const * pLine, std::size_t nTextPortion );
tools::Long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false );
tools::Long ImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 );
bool ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos );
static void ImpInitLayoutMode( OutputDevice* pOutDev );
TxtAlign ImpGetAlign() const;
SAL_DLLPRIVATE sal_Int32 GetCharPos( sal_uInt32 nPara, std::vector<TextLine>::size_type nLine, tools::Long nDocPosX );
SAL_DLLPRIVATE tools::Rectangle GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bPreferPortionStart = false );
SAL_DLLPRIVATE sal_Int32 ImpFindIndex( sal_uInt32 nPortion, const Point& rPosInPara );
SAL_DLLPRIVATE tools::Long ImpGetPortionXOffset( sal_uInt32 nPara, TextLine const * pLine, std::size_t nTextPortion );
SAL_DLLPRIVATE tools::Long ImpGetXPos( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, bool bPreferPortionStart = false );
SAL_DLLPRIVATE tools::Long ImpGetOutputOffset( sal_uInt32 nPara, TextLine* pLine, sal_Int32 nIndex, sal_Int32 nIndex2 );
SAL_DLLPRIVATE bool ImpGetRightToLeft( sal_uInt32 nPara, sal_Int32 nPos );
SAL_DLLPRIVATE static void ImpInitLayoutMode( OutputDevice* pOutDev );
SAL_DLLPRIVATE TxtAlign ImpGetAlign() const;
tools::Long CalcTextHeight() const;
tools::Long CalcParaHeight( sal_uInt32 nParagraph ) const;
tools::Long CalcTextWidth( sal_uInt32 nPara );
tools::Long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen);
Range GetInvalidYOffsets( sal_uInt32 nPortion );
SAL_DLLPRIVATE tools::Long CalcTextHeight() const;
SAL_DLLPRIVATE tools::Long CalcParaHeight( sal_uInt32 nParagraph ) const;
SAL_DLLPRIVATE tools::Long CalcTextWidth( sal_uInt32 nPara );
SAL_DLLPRIVATE tools::Long CalcTextWidth( sal_uInt32 nPara, sal_Int32 nPortionStart, sal_Int32 nPortionLen);
SAL_DLLPRIVATE Range GetInvalidYOffsets( sal_uInt32 nPortion );
// for Undo/Redo
void InsertContent( std::unique_ptr<TextNode> pNode, sal_uInt32 nPara );
TextPaM SplitContent( sal_uInt32 nNode, sal_Int32 nSepPos );
TextPaM ConnectContents( sal_uInt32 nLeftNode );
SAL_DLLPRIVATE void InsertContent( std::unique_ptr<TextNode> pNode, sal_uInt32 nPara );
SAL_DLLPRIVATE TextPaM SplitContent( sal_uInt32 nNode, sal_Int32 nSepPos );
SAL_DLLPRIVATE TextPaM ConnectContents( sal_uInt32 nLeftNode );
// adjust PaM's and selections that were transferred to the API to a valid range
void ValidateSelection( TextSelection& rSel ) const;
void ValidatePaM( TextPaM& rPaM ) const;
SAL_DLLPRIVATE void ValidateSelection( TextSelection& rSel ) const;
SAL_DLLPRIVATE void ValidatePaM( TextPaM& rPaM ) const;
public:
TextEngine();
@@ -207,30 +207,30 @@ public:
TextEngine& operator=( const TextEngine& ) = delete;
void SetText( const OUString& rStr );
OUString GetText( LineEnd aSeparator = LINEEND_LF ) const;
SAL_DLLPRIVATE OUString GetText( LineEnd aSeparator = LINEEND_LF ) const;
OUString GetText( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const;
OUString GetTextLines( LineEnd aSeparator = LINEEND_LF ) const;
SAL_DLLPRIVATE OUString GetTextLines( LineEnd aSeparator = LINEEND_LF ) const;
void ReplaceText(const TextSelection& rSel, const OUString& rText);
sal_Int32 GetTextLen() const;
sal_Int32 GetTextLen( const TextSelection& rSel ) const;
SAL_DLLPRIVATE sal_Int32 GetTextLen() const;
SAL_DLLPRIVATE sal_Int32 GetTextLen( const TextSelection& rSel ) const;
void SetFont( const vcl::Font& rFont );
const vcl::Font& GetFont() const { return maFont; }
void SetLeftMargin( sal_uInt16 n );
SAL_DLLPRIVATE void SetLeftMargin( sal_uInt16 n );
void SetUpdateMode( bool bUpdate );
bool GetUpdateMode() const { return mbUpdate; }
sal_uInt16 GetViewCount() const;
TextView* GetView( sal_uInt16 nView ) const;
SAL_DLLPRIVATE sal_uInt16 GetViewCount() const;
SAL_DLLPRIVATE TextView* GetView( sal_uInt16 nView ) const;
void InsertView( TextView* pTextView );
void RemoveView( TextView* pTextView );
TextView* GetActiveView() const { return mpActiveView;}
void SetActiveView( TextView* pView );
void SetMaxTextLen( sal_Int32 nLen );
SAL_DLLPRIVATE void SetMaxTextLen( sal_Int32 nLen );
sal_Int32 GetMaxTextLen() const { return mnMaxTextLen; }
void SetMaxTextWidth( tools::Long nWidth );
@@ -250,14 +250,14 @@ public:
sal_uInt16 GetLineCount( sal_uInt32 nParagraph ) const;
sal_Int32 GetLineLen( sal_uInt32 nParagraph, sal_uInt16 nLine ) const;
void SetRightToLeft( bool bR2L );
SAL_DLLPRIVATE void SetRightToLeft( bool bR2L );
bool IsRightToLeft() const { return mbRightToLeft; }
bool HasUndoManager() const { return mpUndoManager != nullptr; }
SfxUndoManager& GetUndoManager();
void UndoActionStart( sal_uInt16 nId = 0 );
void UndoActionEnd();
void InsertUndo( std::unique_ptr<TextUndo> pUndo, bool bTryMerge = false );
SAL_DLLPRIVATE void UndoActionStart( sal_uInt16 nId = 0 );
SAL_DLLPRIVATE void UndoActionEnd();
SAL_DLLPRIVATE void InsertUndo( std::unique_ptr<TextUndo> pUndo, bool bTryMerge = false );
bool IsInUndo() const { return mbIsInUndo; }
void SetIsInUndo( bool bInUndo ) { mbIsInUndo = bInUndo; }
void ResetUndo();
@@ -277,22 +277,22 @@ public:
OUString GetWord( const TextPaM& rCursorPos, TextPaM* pStartOfWord = nullptr, TextPaM* pEndOfWord = nullptr );
const TextAttrib* FindAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const;
const TextCharAttrib* FindCharAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const;
SAL_DLLPRIVATE const TextCharAttrib* FindCharAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const;
void RemoveAttribs( sal_uInt32 nPara );
void SetAttrib( const TextAttrib& rAttr, sal_uInt32 nPara, sal_Int32 nStart, sal_Int32 nEnd );
TxtAlign GetTextAlign() const { return meAlign; }
void SetTextAlign( TxtAlign eAlign );
SAL_DLLPRIVATE void SetTextAlign( TxtAlign eAlign );
void Draw( OutputDevice* pDev, const Point& rPos );
SAL_DLLPRIVATE void Draw( OutputDevice* pDev, const Point& rPos );
void SetLocale( const css::lang::Locale& rLocale );
SAL_DLLPRIVATE void SetLocale( const css::lang::Locale& rLocale );
css::lang::Locale const & GetLocale();
css::uno::Reference< css::i18n::XBreakIterator > const & GetBreakIterator();
SAL_DLLPRIVATE css::uno::Reference< css::i18n::XBreakIterator > const & GetBreakIterator();
static bool DoesKeyChangeText( const KeyEvent& rKeyEvent );
static bool IsSimpleCharInput( const KeyEvent& rKeyEvent );
SAL_DLLPRIVATE static bool IsSimpleCharInput( const KeyEvent& rKeyEvent );
const Color& GetTextColor() const { return maTextColor; }
};