sd/sdi/_drvwsh.sdi | 5 +++++
sd/source/ui/view/drviews2.cxx | 17 ++++++++++++++++-
sd/source/ui/view/drviewsf.cxx | 1 +
vcl/unx/gtk3/fpicker/SalGtkPicker.cxx | 2 +-
4 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 2a79c050ec7dc23766ca1aa4813a43fa8d29e632
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 11 16:55:12 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 11 20:36:39 2019 +0100
GtkSalFrame toplevel might not be a GtkWindow
in the rare embedded case, e.g. ASPO extensions option window
Change-Id: Iedacdbc6b795ee5fbe7471b9f19f8f7f6c746204
Reviewed-on: https://gerrit.libreoffice.org/82458
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
index e3c27f1379dd..c847774d13d3 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
@@ -100,7 +100,7 @@ GtkWindow* RunDialog::GetTransientFor()
{
GtkSalFrame *pFrame = dynamic_cast<GtkSalFrame *>(
pWindow->ImplGetFrame() );
if( pFrame )
- pParent = GTK_WINDOW( pFrame->getWindow() );
+ pParent = GTK_WINDOW(gtk_widget_get_toplevel(pFrame->getWindow()));
}
return pParent;
commit 3a2c69a59542c25e95f0368dc81d552a006fdaeb
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 11 17:07:05 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 11 20:36:26 2019 +0100
Related: tdf#121239 overline missing in draw/impress
where underline already exists
Change-Id: I87df3f3965526266b94f10fa04448b32a81fd99a
Reviewed-on: https://gerrit.libreoffice.org/82459
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 6a30f87e9b59..73f9bf4f2a5f 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -2717,6 +2717,11 @@ interface DrawView
ExecMethod = ExecChar ;
StateMethod = GetAttrState ;
]
+ SID_ATTR_CHAR_OVERLINE
+ [
+ ExecMethod = ExecChar ;
+ StateMethod = GetAttrState ;
+ ]
SID_ATTR_CHAR_UNDERLINE
[
ExecMethod = ExecChar ;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index ebed254a497b..00a595becb44 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -3542,7 +3542,22 @@ void DrawViewShell::ExecChar( SfxRequest &rReq )
{
FontLineStyle eFU = aEditAttr.Get( EE_CHAR_UNDERLINE
).GetLineStyle();
aNewAttr.Put( SvxUnderlineItem( eFU != LINESTYLE_NONE
?LINESTYLE_NONE : LINESTYLE_SINGLE, EE_CHAR_UNDERLINE ) );
- }//aNewAttr.Put( (const SvxUnderlineItem&)aEditAttr.Get(
EE_CHAR_UNDERLINE ) );
+ }
+ }
+ break;
+ case SID_ATTR_CHAR_OVERLINE:
+ if( rReq.GetArgs() )
+ {
+ const SvxOverlineItem* pItem =
rReq.GetArg<SvxOverlineItem>(SID_ATTR_CHAR_OVERLINE);
+ if (pItem)
+ {
+ aNewAttr.Put(*pItem);
+ }
+ else
+ {
+ FontLineStyle eFU = aEditAttr.Get( EE_CHAR_OVERLINE
).GetLineStyle();
+ aNewAttr.Put( SvxOverlineItem( eFU != LINESTYLE_NONE
?LINESTYLE_NONE : LINESTYLE_SINGLE, EE_CHAR_OVERLINE ) );
+ }
}
break;
case SID_ATTR_CHAR_SHADOWED:
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 0c28df0d34be..0ecfefece2b7 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -389,6 +389,7 @@ void DrawViewShell::GetAttrState( SfxItemSet& rSet )
case SID_ATTR_CHAR_FONTHEIGHT:
case SID_ATTR_CHAR_SHADOWED:
case SID_ATTR_CHAR_POSTURE:
+ case SID_ATTR_CHAR_OVERLINE:
case SID_ATTR_CHAR_UNDERLINE:
case SID_ATTR_CHAR_STRIKEOUT:
case SID_ATTR_CHAR_WEIGHT:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
