diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-04 16:30:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-02-06 12:16:04 +0100 |
| commit | 69c546e1e7a697217f273baa7c1729ff823efd76 (patch) | |
| tree | 4533c38b84d1cd57f86094ac816f0eb7c526ade1 /solenv | |
| parent | 2c61782812b1b8b382dd48a04a712da9eaeb4685 (diff) | |
weld annotation window
note the labels in sw/uiconfig/swriter/ui/annotation.ui are deliberately
yaligned to 0 to retain the preexisting SwAnnotationWin::PaintTile hack which
depends on this for bin/run gtktiledviewer --enable-tiled-annotations to
not show clipped author/date/etc labels
Change-Id: I53827aa98ed4d71d532a5993d21c6e22190b8063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107264
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/excludelist | 3 | ||||
| -rw-r--r-- | solenv/sanitizers/ui/modules/swriter.suppr | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 25d5fe43d99f..4bda736c6736 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -13378,7 +13378,6 @@ sw/source/uibase/dochdl/swdtflvr.cxx sw/source/uibase/docvw/AnchorOverlayObject.cxx sw/source/uibase/docvw/AnchorOverlayObject.hxx sw/source/uibase/docvw/AnnotationMenuButton.cxx -sw/source/uibase/docvw/AnnotationMenuButton.hxx sw/source/uibase/docvw/AnnotationWin.cxx sw/source/uibase/docvw/AnnotationWin2.cxx sw/source/uibase/docvw/DashedLine.cxx @@ -13392,8 +13391,6 @@ sw/source/uibase/docvw/ShadowOverlayObject.cxx sw/source/uibase/docvw/ShadowOverlayObject.hxx sw/source/uibase/docvw/SidebarTxtControl.cxx sw/source/uibase/docvw/SidebarTxtControl.hxx -sw/source/uibase/docvw/SidebarTxtControlAcc.cxx -sw/source/uibase/docvw/SidebarTxtControlAcc.hxx sw/source/uibase/docvw/SidebarWinAcc.cxx sw/source/uibase/docvw/SidebarWinAcc.hxx sw/source/uibase/docvw/edtdd.cxx diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr index 922203ebcc9d..fff3bdcb39bd 100644 --- a/solenv/sanitizers/ui/modules/swriter.suppr +++ b/solenv/sanitizers/ui/modules/swriter.suppr @@ -1,5 +1,6 @@ sw/uiconfig/swriter/ui/abstractdialog.ui://GtkLabel[@id='label4'] orphan-label sw/uiconfig/swriter/ui/addentrydialog.ui://GtkEntry[@id='entry'] no-labelled-by +sw/uiconfig/swriter/ui/annotation.ui://GtkDrawingArea[@id='editview'] no-labelled-by sw/uiconfig/swriter/ui/asciifilterdialog.ui://GtkLabel[@id='label5'] orphan-label sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui://GtkLabel[@id='label1'] orphan-label sw/uiconfig/swriter/ui/authenticationsettingsdialog.ui://GtkLabel[@id='label2'] orphan-label |