vcl/inc/helpwin.hxx | 2 ++
vcl/source/app/help.cxx | 18 ++++++++++++------
vcl/source/pdf/XmpMetadata.cxx | 5 ++---
3 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 602ea7c873082f80626d562209cb36d99e20bbf5
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Jul 7 13:44:07 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Jul 7 18:34:01 2023 +0200
Prolongate hide timeout in call to Help::Show*, when reusing existing window
Otherwise, when moving mouse, and the tooltip follows it and updates its
content,
it would still hide after the initial timeout, only to re-appear on the
next move.
Change-Id: I3c93240f752301f2a86acabce54fe735d6e06550
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154163
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index db8456fd2103..5a9975cee88d 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -69,6 +69,8 @@ public:
Size CalcOutSize() const;
const tools::Rectangle& GetHelpArea() const { return maHelpArea; }
+
+ void ResetHideTimer();
};
void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle,
QuickHelpFlags nStyle,
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 8336a5b1c20f..2ed0f96ec15d 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -446,12 +446,7 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer, void)
{
if ( pTimer == &maShowTimer )
{
- if ( mnHelpWinStyle == HELPWINSTYLE_QUICK )
- {
- // start auto-hide-timer for non-ShowTip windows
- if ( this == ImplGetSVHelpData().mpHelpWin )
- maHideTimer.Start();
- }
+ ResetHideTimer();
ImplShow();
}
else
@@ -480,6 +475,16 @@ OUString HelpTextWindow::GetText() const
return maHelpText;
}
+void HelpTextWindow::ResetHideTimer()
+{
+ if (mnHelpWinStyle == HELPWINSTYLE_QUICK)
+ {
+ // start auto-hide-timer for non-ShowTip windows
+ if (this == ImplGetSVHelpData().mpHelpWin)
+ maHideTimer.Start();
+ }
+}
+
void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 nHelpWinStyle,
QuickHelpFlags nStyle,
const OUString& rHelpText,
const Point& rScreenPos, const tools::Rectangle&
rHelpArea )
@@ -515,6 +520,7 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16
nHelpWinStyle, QuickHe
if( pHelpWin->IsVisible() )
pHelpWin->Invalidate();
}
+ pHelpWin->ResetHideTimer(); // It is shown anew, so prolongate the
hide timeout
return;
}
commit 41717420af68994c2fde522ea86db6e5ed643034
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Fri Jul 7 16:43:45 2023 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Jul 7 18:32:30 2023 +0200
tdf#153472 vcl: PDF/A export: produce valid XMP metadata
* historically the PDF export claimed to produce PDF/A-1a, which was
removed from the UI in commit ed4a0eed82e2f29e8163a445db992d22c6d07134
"tdf#62728 add PDF/A-2 support, change UI default to use that", and
then reintroduced, presumably intentionally changed, as PDF/A-1b in
commit 49cfcf777d03abf59557cad021b4e5c4445de3c0 "tdf#62728 Provide
both A/1 and A/2 in PDF export dialog"
Adapt the XMP metadata to always write "B".
* if PDF/UA is enabled, veraPDF complains about the added pdfuaid:part:
Specification: ISO 19005-2:2011, Clause: 6.6.2.3, Test number: 7
All properties specified in XMP form shall use either the predefined
schemas defined in the XMP Specification, ISO 19005-1 or this part of ISO
19005, or any extension schemas that comply with 6.6.2.3.2.
Change-Id: I77b9fb728476e85830e3771135ac5a269e96b306
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154169
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/vcl/source/pdf/XmpMetadata.cxx b/vcl/source/pdf/XmpMetadata.cxx
index 156e849f4097..d4c58c23348b 100644
--- a/vcl/source/pdf/XmpMetadata.cxx
+++ b/vcl/source/pdf/XmpMetadata.cxx
@@ -48,7 +48,6 @@ void XmpMetadata::write()
if (mnPDF_A > 0)
{
OString sPdfVersion = OString::number(mnPDF_A);
- OString sPdfConformance = (mnPDF_A == 1) ? "A" : "B";
aXmlWriter.startElement("rdf:Description");
aXmlWriter.attribute("rdf:about", OString(""));
@@ -59,7 +58,7 @@ void XmpMetadata::write()
aXmlWriter.endElement();
aXmlWriter.startElement("pdfaid:conformance");
- aXmlWriter.content(sPdfConformance);
+ aXmlWriter.content("B");
aXmlWriter.endElement();
aXmlWriter.endElement();
@@ -108,7 +107,7 @@ void XmpMetadata::write()
}
// PDF/UA
- if (mbPDF_UA)
+ if (mbPDF_UA && mnPDF_A == 0) // veraPDF says this is not allowed in
PDF/A-[123][ab]
{
OString sPdfUaVersion = OString::number(1);
aXmlWriter.startElement("rdf:Description");
