vcl/source/gdi/pdfwriter_impl.hxx | 24 ++++++++++++------------
vcl/unx/gtk3/gtk3gtkobject.cxx | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 69b221263be58118b3293363ab9ecf7581c50c6f
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Dec 30 17:50:25 2019 +0100
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Mon Dec 30 19:45:18 2019 +0100
pdf: move PDFAnnotation out of PDFWriterImpl class
Change-Id: I37db3419eeaa8c5f8096a663a2ccede178bfadf7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86016
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx
b/vcl/source/gdi/pdfwriter_impl.hxx
index 8ee67280c962..1e6f40c24843 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -348,6 +348,18 @@ struct PDFOutlineEntry
{}
};
+struct PDFAnnotation
+{
+ sal_Int32 m_nObject;
+ tools::Rectangle m_aRect;
+ sal_Int32 m_nPage;
+
+ PDFAnnotation()
+ : m_nObject( -1 ),
+ m_nPage( -1 )
+ {}
+};
+
}
class PDFWriterImpl : public VirtualDevice
@@ -357,18 +369,6 @@ class PDFWriterImpl : public VirtualDevice
public:
friend struct vcl::pdf::PDFPage;
- struct PDFAnnotation
- {
- sal_Int32 m_nObject;
- tools::Rectangle m_aRect;
- sal_Int32 m_nPage;
-
- PDFAnnotation()
- : m_nObject( -1 ),
- m_nPage( -1 )
- {}
- };
-
struct PDFLink : public PDFAnnotation
{
sal_Int32 m_nDest; // set to -1 for URL, to a dest
else
commit 82a22f62e5b1c7bfa7fb117a0423475f10410194
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Dec 29 23:24:42 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Dec 30 19:45:10 2019 +0100
Fix GDK_KEY_RELEASE -> GDK_KEY_RELEASE_MASK
...as found with recent Clang 10 trunk:
> vcl/unx/gtk3/gtk3gtkobject.cxx:255:76: error: bitwise operation between
different enumeration types ('GdkEventMask' and 'GdkEventType') is deprecated
[-Werror,-Wdeprecated-enum-enum-conversion]
> gtk_widget_add_events( GTK_WIDGET( m_pSocket ),
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
>
~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~
This is presumably a typo originating with
31fa4545985acc1594107e087cedc2d99b3d0f0b "split the gtk2 and gtk2
gtkobjects".
<https://developer.gnome.org/gtk3/stable/GtkWidget.html#gtk-widget-add-events>
states that the "gint events" parameter of gtk_widget_add_events is "an
event
mask, see GdkEventMask", and /usr/include/gtk-3.0/gdk/gdktypes.h has
> typedef enum
> {
[...]
> GDK_KEY_PRESS_MASK = 1 << 10,
> GDK_KEY_RELEASE_MASK = 1 << 11,
[...]
> } GdkEventMask;
while /usr/include/gtk-3.0/gdk/gdkevents.h (both
gtk3-devel-3.24.13-1.fc31.x86_64) has
> typedef enum
> {
[...]
> GDK_KEY_PRESS = 8,
> GDK_KEY_RELEASE = 9,
[...]
> } GdkEventType;
Change-Id: I23acfef5e59803d2b71eed6c65a78e9895e415af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85971
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index d038a6121432..9b9fff958908 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -252,9 +252,9 @@ void GtkSalObject::signalDestroy( GtkWidget* pObj, gpointer
object )
void GtkSalObjectBase::SetForwardKey( bool bEnable )
{
if( bEnable )
- gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE );
+ gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK );
else
- gtk_widget_set_events( GTK_WIDGET( m_pSocket ), ~(GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE) & gtk_widget_get_events( GTK_WIDGET( m_pSocket ) ) );
+ gtk_widget_set_events( GTK_WIDGET( m_pSocket ), ~(GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK) & gtk_widget_get_events( GTK_WIDGET( m_pSocket ) ) );
}
GtkSalObjectWidgetClip::GtkSalObjectWidgetClip(GtkSalFrame* pParent, bool
bShow)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
