diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-09-28 04:29:56 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-09-28 05:00:40 +0200 |
| commit | 6cf28dda1526f40bf2c1cecd45764ff70f428b82 (patch) | |
| tree | 865ffd6c219795b14385754fa50ffb9cf61bf32f /svx/source | |
| parent | 116737681a9a9a0ea02e454d7d898a13f75def9b (diff) | |
Fix build [-Werror=reorder]
In file included from /home/mike/libreoffice/svx/source/items/hlnkitem.cxx:22:
/home/mike/libreoffice/include/svx/hlnkitem.hxx: In constructor ‘SvxHyperlinkItem::SvxHyperlinkItem(sal_uInt16, const rtl::OUString&, const rtl::OUString&, const rtl::OUString&, const rtl::OUString&, SvxLinkInsertMode, HyperDialogEvent, const SvxMacroTableDtor*, const rtl::OUString&)’:
/home/mike/libreoffice/include/svx/hlnkitem.hxx:60:22: error: ‘SvxHyperlinkItem::nMacroEvents’ will be initialized after [-Werror=reorder]
60 | HyperDialogEvent nMacroEvents;
| ^~~~~~~~~~~~
/home/mike/libreoffice/include/svx/hlnkitem.hxx:55:14: error: ‘rtl::OUString SvxHyperlinkItem::sReplacementText’ [-Werror=reorder]
55 | OUString sReplacementText;
| ^~~~~~~~~~~~~~~~
/home/mike/libreoffice/svx/source/items/hlnkitem.cxx:43:1: error: when initialized here [-Werror=reorder]
43 | SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, const OUString& rName, const OUString& rURL,
| ^~~~~~~~~~~~~~~~
after commit fb3597932ad9322feb58115528ca1dae070edfa5
Author rash419 <rashesh.padia@collabora.com>
Date Thu Sep 15 18:02:06 2022 +0530
svx: extended SvxHyperlinkItem to have a new property sReplacementText
Change-Id: Ia8be467919ac6f617a19f310535c6fff9b5e178e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140686
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/items/hlnkitem.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index f8500277316a..ef497dd938a7 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -48,9 +48,9 @@ SvxHyperlinkItem::SvxHyperlinkItem( sal_uInt16 _nWhich, const OUString& rName, c sURL (rURL), sTarget (rTarget), eType (eTyp), + sReplacementText (rReplacementText), sIntName (rIntName), - nMacroEvents (nEvents), - sReplacementText (rReplacementText) + nMacroEvents (nEvents) { if (pMacroTbl) pMacroTable.reset( new SvxMacroTableDtor ( *pMacroTbl ) ); |