sc/source/filter/xml/xmltransformationi.cxx | 1 +
sw/inc/AnnotationWin.hxx | 1 -
sw/source/core/fields/postithelper.cxx | 2 +-
sw/source/uibase/docvw/AnnotationWin.cxx | 3 +--
sw/source/uibase/docvw/AnnotationWin2.cxx | 10 ++++++++++
5 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit b8a83417ed080b4c63b797d3f6837c49cdbdd2a2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 7 13:44:17 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Aug 7 17:18:01 2018 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 8579cfb8db6a..eb880bf8dba2 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 6858e7e7daf0..2705b773c48c 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 1cb721e4f4dc..f779c63e503c 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 f1c467db21f0..380831b966c8 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())
{
commit 0dced3431fd7ef664d55d73ac9b1ec76d28c51fd
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 7 14:23:24 2018 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Aug 7 17:17:48 2018 +0200
coverity#1438379 Uninitialized scalar field
Change-Id: Ic8614c2c455a5a49592ee5f8ef0c91bf4d729e1e
Reviewed-on: https://gerrit.libreoffice.org/58686
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/xml/xmltransformationi.cxx
b/sc/source/filter/xml/xmltransformationi.cxx
index f48fa02ecdc0..c23de6f34b24 100644
--- a/sc/source/filter/xml/xmltransformationi.cxx
+++ b/sc/source/filter/xml/xmltransformationi.cxx
@@ -581,6 +581,7 @@ uno::Reference<xml::sax::XFastContextHandler>
ScXMLDateTimeContext::ScXMLDateTimeContext(
ScXMLImport& rImport, const
rtl::Reference<sax_fastparser::FastAttributeList>& rAttrList)
: ScXMLImportContext(rImport)
+ , maType(sc::DATETIME_TRANSFORMATION_TYPE::DATE_STRING)
{
if (rAttrList.is())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
