tdf#119130 only have the active postit as a dialog control...
in which pressing ctrl+tab cycles between text and button so we don't waste
time searching thousands of SwAnnotationWins
Change-Id: Iba34882c6588fc9414004f0ed3b2b779f77b30d1
Reviewed-on: https://gerrit.libreoffice.org/58682
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 8579cfb..eb880bf 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -59,7 +59,6 @@ class SwAnnotationWin : public vcl::Window
{
public:
SwAnnotationWin( SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr,
SwSidebarItem& rSidebarItem,
SwFormatField* aField );
diff --git a/sw/source/core/fields/postithelper.cxx b/sw/source/core/fields/postithelper.cxx
index 6858e7e..2705b77 100644
--- a/sw/source/core/fields/postithelper.cxx
+++ b/sw/source/core/fields/postithelper.cxx
@@ -150,7 +150,7 @@ VclPtr<sw::annotation::SwAnnotationWin> SwAnnotationItem::GetSidebarWindow(
SwEditWin& rEditWin,
SwPostItMgr& aMgr)
{
return VclPtr<sw::annotation::SwAnnotationWin>::Create( rEditWin, WB_DIALOGCONTROL,
return VclPtr<sw::annotation::SwAnnotationWin>::Create( rEditWin,
aMgr,
*this,
&mrFormatField );
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 1cb721e..f779c63 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -62,11 +62,10 @@
namespace sw { namespace annotation {
SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr,
SwSidebarItem& rSidebarItem,
SwFormatField* aField )
: Window(&rEditWin, nBits)
: Window(&rEditWin)
, maBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "modules/swriter/ui/annotationmenu.ui", "")
, mrMgr(aMgr)
, mrView(rEditWin.GetView())
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index f1c467d..380831b 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1109,10 +1109,20 @@ void SwAnnotationWin::ActivatePostIt()
if ( !Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
GetOutlinerView()->SetBackgroundColor(mColorDark);
//tdf#119130 only have the active postit as a dialog control in which pressing
//ctrl+tab cycles between text and button so we don't waste time searching
//thousands of SwAnnotationWins
SetStyle(GetStyle() | WB_DIALOGCONTROL);
}
void SwAnnotationWin::DeactivatePostIt()
{
//tdf#119130 only have the active postit as a dialog control in which pressing
//ctrl+tab cycles between text and button so we don't waste time searching
//thousands of SwAnnotationWins
SetStyle(GetStyle() & ~WB_DIALOGCONTROL);
// remove selection, #i87073#
if (GetOutlinerView()->GetEditView().HasSelection())
{
