[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - svtools/source

[Ilhan Yesil (via logerrit)]

 svtools/source/uno/wizard/wizardpagecontroller.cxx |   26 +
 1 file changed, 22 insertions(+), 4 deletions(-)

New commits:
commit f933248c042e6fa8ed29daf19fd8bba47a5cc3d6
Author: Ilhan Yesil 
AuthorDate: Fri Dec 16 07:30:13 2022 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Mar 9 12:41:57 2023 +

Related: tdf#132110 use the container child size as default size

if the container size wasn't changed

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147382
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 9c978e4c75e342b2345ff4fcbd1b5751627d8baf)

also includes:

tdf#152508 Initiate container request size after call of createPage

As the container's request size of wizard pages can't be changed
directly by the UNO call setPosSize, the UNO caller can set the size
in the callback function createPage, this size will then taken as
request size. This doesn't solve the problem entirely as descriped
in tdf#152508, but the most important is, that the wizard page can
be initialized with an appropriate size at startup.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144287
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Weghorn 
(cherry picked from commit aef2ee893c7b76794bc9db869f08bbbea60606a8)

Change-Id: I0bd4843768b727b8b75cbcb7ec92bd2b501b550d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147412
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx 
b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 333d7ce27351..57ed08c6f164 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -50,10 +50,28 @@ namespace svt::uno
 try
 {
 // Plug a toplevel SalFrame into the native page which can host 
our awt widgetry
-
m_xWizardPage.set(m_xController->createPage(pParent->CreateChildFrame(), 
i_nPageId), UNO_SET_THROW);
-
-Reference< XWindow > xPageWindow(m_xWizardPage->getWindow(), 
UNO_SET_THROW);
-xPageWindow->setVisible( true );
+css::uno::Reference xChildFrame = 
pParent->CreateChildFrame();
+com::sun::star::awt::Rectangle r0 = xChildFrame->getPosSize();
+m_xWizardPage.set(m_xController->createPage(xChildFrame, 
i_nPageId), UNO_SET_THROW);
+
+css::uno::Reference 
xPageWindow(m_xWizardPage->getWindow(), UNO_SET_THROW);
+
+// If size of page is changed by createPage, then the requested 
size of the container
+// should also be set to this size, to avoid annoying resizings.
+com::sun::star::awt::Rectangle r1 = xChildFrame->getPosSize();
+
+if (r0.Width != r1.Width || r0.Height != r1.Height)
+pParent->set_size_request(r1.Width, r1.Height);
+else
+{
+// tdf#132110 If the parent size wasn't overridden, then use
+// the size of the child if that was set
+com::sun::star::awt::Rectangle aChildRect = 
xPageWindow->getPosSize();
+if (aChildRect.Width && aChildRect.Height)
+pParent->set_size_request(aChildRect.Width, 
aChildRect.Height);
+}
+
+xPageWindow->setVisible(true);
 }
 catch( const Exception& )
 {

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - cui/source

[Ilhan Yesil (via logerrit)]

 cui/source/dialogs/about.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1538a8df2a224646f7ae09427bfc1bb35c2f6f24
Author: Ilhan Yesil 
AuthorDate: Wed Jan 11 08:49:06 2023 +0100
Commit: Michael Weghorn 
CommitDate: Fri Jan 13 12:49:10 2023 +

Show LHM own BuildVersion without link to website

As the LHM specific build version has no valid link to
the build website, the link to the website will be hidden.

Change-Id: Id3da6a9fdf83348eae0b23d9ec7b5e141005b081
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145318
Tested-by: Michael Weghorn 
Reviewed-by: Michael Weghorn 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 614c559e1039..fbdb4e489461 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -81,7 +81,9 @@ AboutDialog::AboutDialog(weld::Window* pParent)
 m_xDialog->set_version(GetVersionString());
 m_xDialog->set_copyright(GetCopyrightString());
 
-SetBuildIdLink();
+//LHM specific: link is invalid, so hide it
+m_xDialog->set_website_label(OUString());
+m_xDialog->set_website(OUString());
 
 SetLogo();
 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - vcl/source vcl/unx

[Ilhan Yesil (via logerrit)]

 vcl/source/control/imp_listbox.cxx|9 +++--
 vcl/source/control/listbox.cxx|   14 +++---
 vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx |   20 +++-
 3 files changed, 25 insertions(+), 18 deletions(-)

New commits:
commit 3a2b58b03d07308a902cc42c53be6afb7d8dbbfc
Author: Ilhan Yesil 
AuthorDate: Mon Mar 21 13:27:52 2022 +0100
Commit: Ilhan Yesil 
CommitDate: Wed Jan 4 09:10:53 2023 +

tdf#148109 Paint background color in listbox

The combobox described in 148109 is indeed a listbox.
If drop down list is not open and only the selected item
is shown without having the focus, the background color
will be paint either it's defined as native control
or not.

Change-Id: I210916fbe07f74aaa5835bf2c88e764b010c6d61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131904
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit ff7e00e12ff80bd708f31a1d886d000907ceb31a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144991
Tested-by: Ilhan Yesil 
Reviewed-by: Ilhan Yesil 

diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index dee65a2c2a80..fdfe0647bbe9 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2699,18 +2699,23 @@ void ImplWin::ImplDraw(vcl::RenderContext& 
rRenderContext, bool bLayout)
 if( bMouseOver )
 nState |= ControlState::ROLLOVER;
 
+Color aBackgroundColor = COL_AUTO;
+if (IsControlBackground())
+aBackgroundColor = GetControlBackground();
+
 // if parent has no border, then nobody has drawn the background
 // since no border window exists. so draw it here.
 WinBits nParentStyle = pWin->GetStyle();
 if( ! (nParentStyle & WB_BORDER) || (nParentStyle & WB_NOBORDER) )
 {
 tools::Rectangle aParentRect( Point( 0, 0 ), 
pWin->GetSizePixel() );
+
 pWin->DrawNativeControl( ControlType::Listbox, 
ControlPart::Entire, aParentRect,
- nState, aControlValue, OUString() );
+ nState, aControlValue, OUString(), 
aBackgroundColor);
 }
 
 bNativeOK = rRenderContext.DrawNativeControl(ControlType::Listbox, 
ControlPart::Entire, aCtrlRegion,
- nState, 
aControlValue, OUString());
+ nState, 
aControlValue, OUString(), aBackgroundColor);
 }
 
 if (bIsEnabled)
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index 2de9f387011a..541727541abe 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -780,17 +780,9 @@ void ListBox::StateChanged( StateChangedType nType )
 mpImplLB->SetControlBackground( GetControlBackground() );
 if ( mpImplWin )
 {
-if ( mpImplWin->IsNativeControlSupported(ControlType::Listbox, 
ControlPart::Entire) )
-{
-// Transparent background
-mpImplWin->SetBackground();
-mpImplWin->SetControlBackground();
-}
-else
-{
-mpImplWin->SetBackground( 
mpImplLB->GetMainWindow()->GetControlBackground() );
-mpImplWin->SetControlBackground( 
mpImplLB->GetMainWindow()->GetControlBackground() );
-}
+
+mpImplWin->SetBackground( GetControlBackground() );
+mpImplWin->SetControlBackground( GetControlBackground() );
 mpImplWin->SetFont( mpImplLB->GetMainWindow()->GetFont() );
 mpImplWin->Invalidate();
 }
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 8ab9f5cc4617..85c7133d3eaf 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -1332,9 +1332,8 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, 
cairo_t *cr,
 else
 {
 render_common(mpListboxStyle, cr, aRect, flags);
-render_common(mpListboxBoxStyle, cr, aRect, flags);
-
 render_common(mpListboxButtonStyle, cr, aRect, flags);
+render_common(mpListboxBoxStyle, cr, aRect, flags);
 
 gtk_render_arrow(mpListboxButtonArrowStyle, cr,
  G_PI,
@@ -2631,13 +2630,24 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 case RenderType::Combobox:
 if (pBgCssProvider)
 {
-gtk_style_context_add_provider(mpComboboxEntryStyle, 
GTK_STYLE_PROVIDER(pBgCssProvider),
-   
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+if (nType == ControlType::Combobox)
+{
+

[Libreoffice-commits] core.git: vcl/source vcl/unx

[Ilhan Yesil (via logerrit)]

 vcl/source/control/imp_listbox.cxx|8 ++--
 vcl/source/control/listbox.cxx|   14 +++---
 vcl/unx/gtk3/salnativewidgets-gtk.cxx |   20 +++-
 3 files changed, 24 insertions(+), 18 deletions(-)

New commits:
commit ff7e00e12ff80bd708f31a1d886d000907ceb31a
Author: Ilhan Yesil 
AuthorDate: Mon Mar 21 13:27:52 2022 +0100
Commit: Michael Weghorn 
CommitDate: Tue Jan 3 07:03:55 2023 +

tdf#148109 Paint background color in listbox

The combobox described in 148109 is indeed a listbox.
If drop down list is not open and only the selected item
is shown without having the focus, the background color
will be paint either it's defined as native control
or not.

Change-Id: I210916fbe07f74aaa5835bf2c88e764b010c6d61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131904
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/source/control/imp_listbox.cxx 
b/vcl/source/control/imp_listbox.cxx
index 531244925062..75bc1fd622e2 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -2603,6 +2603,10 @@ void ImplWin::ImplDraw(vcl::RenderContext& 
rRenderContext, bool bLayout)
 if( bMouseOver )
 nState |= ControlState::ROLLOVER;
 
+Color aBackgroundColor = COL_AUTO;
+if (IsControlBackground())
+aBackgroundColor = GetControlBackground();
+
 // if parent has no border, then nobody has drawn the background
 // since no border window exists. so draw it here.
 WinBits nParentStyle = pWin->GetStyle();
@@ -2610,11 +2614,11 @@ void ImplWin::ImplDraw(vcl::RenderContext& 
rRenderContext, bool bLayout)
 {
 tools::Rectangle aParentRect( Point( 0, 0 ), 
pWin->GetSizePixel() );
 pWin->GetOutDev()->DrawNativeControl( ControlType::Listbox, 
ControlPart::Entire, aParentRect,
- nState, aControlValue, OUString() );
+ nState, aControlValue, OUString(), 
aBackgroundColor);
 }
 
 bNativeOK = rRenderContext.DrawNativeControl(ControlType::Listbox, 
ControlPart::Entire, aCtrlRegion,
- nState, 
aControlValue, OUString());
+ nState, 
aControlValue, OUString(), aBackgroundColor);
 }
 
 if (bIsEnabled)
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index e463b2ff958c..ce3cbba69aec 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -771,17 +771,9 @@ void ListBox::StateChanged( StateChangedType nType )
 mpImplLB->SetControlBackground( GetControlBackground() );
 if ( mpImplWin )
 {
-if ( mpImplWin->IsNativeControlSupported(ControlType::Listbox, 
ControlPart::Entire) )
-{
-// Transparent background
-mpImplWin->SetBackground();
-mpImplWin->SetControlBackground();
-}
-else
-{
-mpImplWin->SetBackground( 
mpImplLB->GetMainWindow()->GetControlBackground() );
-mpImplWin->SetControlBackground( 
mpImplLB->GetMainWindow()->GetControlBackground() );
-}
+
+mpImplWin->SetBackground( GetControlBackground() );
+mpImplWin->SetControlBackground( GetControlBackground() );
 mpImplWin->SetFont( mpImplLB->GetMainWindow()->GetFont() );
 mpImplWin->Invalidate();
 }
diff --git a/vcl/unx/gtk3/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
index 6fc1be3f8257..f55b45a8b92b 100644
--- a/vcl/unx/gtk3/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/salnativewidgets-gtk.cxx
@@ -1005,9 +1005,8 @@ void GtkSalGraphics::PaintCombobox( GtkStateFlags flags, 
cairo_t *cr,
 else
 {
 render_common(mpListboxStyle, cr, aRect, flags);
-render_common(mpListboxBoxStyle, cr, aRect, flags);
-
 render_common(mpListboxButtonStyle, cr, aRect, flags);
+render_common(mpListboxBoxStyle, cr, aRect, flags);
 
 gtk_render_arrow(mpListboxButtonArrowStyle, cr,
  G_PI,
@@ -1882,13 +1881,24 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 case RenderType::Combobox:
 if (pBgCssProvider)
 {
-gtk_style_context_add_provider(mpComboboxEntryStyle, 
GTK_STYLE_PROVIDER(pBgCssProvider),
-   
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+if (nType == ControlType::Combobox)
+{
+gtk_style_context_add_provider(mpComboboxEntryStyle, 
GTK_STYLE_PROVIDER(pBgCssProvider),
+   

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - svtools/source

[Ilhan Yesil (via logerrit)]

 svtools/source/uno/wizard/wizardpagecontroller.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 16be7b74fe3187333a6ff544ee90d3c1093b9177
Author: Ilhan Yesil 
AuthorDate: Fri Dec 16 07:30:13 2022 +0100
Commit: Michael Weghorn 
CommitDate: Mon Jan 2 09:01:15 2023 +

tdf#152508 Initiate container request size after call of createPage

As the container's request size of wizard pages can't be changed
directly by the UNO call setPosSize, the UNO caller can set the size
in the callback function createPage, this size will then taken as
request size. This doesn't solve the problem entirely as descriped
in tdf#152508, but the most important is, that the wizard page can
be initialized with an appropriate size at startup.

Change-Id: I1899da9c018681291559eb7c0de25a3e2e8af14e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144287
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Weghorn 
(cherry picked from commit aef2ee893c7b76794bc9db869f08bbbea60606a8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144809
Tested-by: Michael Weghorn 

diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx 
b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 3faf68258b10..bbb081a01313 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -54,7 +54,16 @@ namespace svt { namespace uno
 try
 {
 // Plug a toplevel SalFrame into the native page which can host 
our awt widgetry
-
m_xWizardPage.set(m_xController->createPage(pParent->CreateChildFrame(), 
i_nPageId), UNO_SET_THROW);
+css::uno::Reference xChildFrame = 
pParent->CreateChildFrame();
+// If size of page is changed by createPage, then the requested 
size of the container
+// should also be set to this size, to avoid annoying resizings.
+com::sun::star::awt::Rectangle r0 = xChildFrame->getPosSize();
+m_xWizardPage.set(m_xController->createPage(xChildFrame, 
i_nPageId), UNO_SET_THROW);
+com::sun::star::awt::Rectangle r1 = xChildFrame->getPosSize();
+if (r0.Width != r1.Width || r0.Height != r1.Height)
+{
+pParent->set_size_request(r1.Width, r1.Height);
+}
 
 Reference< XWindow > xPageWindow(m_xWizardPage->getWindow(), 
UNO_SET_THROW);
 xPageWindow->setVisible( true );

[Libreoffice-commits] core.git: svtools/source

[Ilhan Yesil (via logerrit)]

 svtools/source/uno/wizard/wizardpagecontroller.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit aef2ee893c7b76794bc9db869f08bbbea60606a8
Author: Ilhan Yesil 
AuthorDate: Fri Dec 16 07:30:13 2022 +0100
Commit: Michael Weghorn 
CommitDate: Thu Dec 29 13:46:04 2022 +

tdf#152508 Initiate container request size after call of createPage

As the container's request size of wizard pages can't be changed
directly by the UNO call setPosSize, the UNO caller can set the size
in the callback function createPage, this size will then taken as
request size. This doesn't solve the problem entirely as descriped
in tdf#152508, but the most important is, that the wizard page can
be initialized with an appropriate size at startup.

Change-Id: I1899da9c018681291559eb7c0de25a3e2e8af14e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144287
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Weghorn 

diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx 
b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 333d7ce27351..850d9b102c7a 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -50,7 +50,16 @@ namespace svt::uno
 try
 {
 // Plug a toplevel SalFrame into the native page which can host 
our awt widgetry
-
m_xWizardPage.set(m_xController->createPage(pParent->CreateChildFrame(), 
i_nPageId), UNO_SET_THROW);
+css::uno::Reference xChildFrame = 
pParent->CreateChildFrame();
+// If size of page is changed by createPage, then the requested 
size of the container
+// should also be set to this size, to avoid annoying resizings.
+com::sun::star::awt::Rectangle r0 = xChildFrame->getPosSize();
+m_xWizardPage.set(m_xController->createPage(xChildFrame, 
i_nPageId), UNO_SET_THROW);
+com::sun::star::awt::Rectangle r1 = xChildFrame->getPosSize();
+if (r0.Width != r1.Width || r0.Height != r1.Height)
+{
+pParent->set_size_request(r1.Width, r1.Height);
+}
 
 Reference< XWindow > xPageWindow(m_xWizardPage->getWindow(), 
UNO_SET_THROW);
 xPageWindow->setVisible( true );

[Libreoffice-commits] core.git: forms/source include/toolkit include/vcl offapi/com toolkit/source vcl/inc vcl/source

[Ilhan Yesil (via logerrit)]

 forms/source/inc/frm_strings.hxx  |2 
 include/toolkit/helper/property.hxx   |4 
 include/vcl/toolkit/combobox.hxx  |2 
 include/vcl/toolkit/lstbox.hxx|2 
 offapi/com/sun/star/awt/UnoControlComboBoxModel.idl   |   12 ++
 offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl  |   12 ++
 offapi/com/sun/star/awt/UnoControlDateFieldModel.idl  |   12 ++
 offapi/com/sun/star/awt/UnoControlEditModel.idl   |   12 ++
 offapi/com/sun/star/awt/UnoControlFixedTextModel.idl  |   12 ++
 offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl |   12 ++
 offapi/com/sun/star/awt/UnoControlListBoxModel.idl|   12 ++
 offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl   |   12 ++
 offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl   |   12 ++
 offapi/com/sun/star/awt/UnoControlTimeFieldModel.idl  |   12 ++
 toolkit/source/awt/vclxwindow.cxx |   46 +++
 toolkit/source/awt/vclxwindows.cxx|   81 ++
 toolkit/source/controls/formattedcontrol.cxx  |2 
 toolkit/source/controls/unocontrolmodel.cxx   |4 
 toolkit/source/helper/property.cxx|2 
 vcl/inc/listbox.hxx   |2 
 vcl/source/control/combobox.cxx   |   34 +
 vcl/source/control/imp_listbox.cxx|   30 +
 vcl/source/control/listbox.cxx|   22 +++
 23 files changed, 351 insertions(+), 2 deletions(-)

New commits:
commit ba164651bbdbde1b8a4ae3495b845ebc13b01bad
Author: Ilhan Yesil 
AuthorDate: Fri Jul 1 08:17:19 2022 +0200
Commit: Michael Weghorn 
CommitDate: Mon Sep 19 13:30:15 2022 +0200

tdf#149797 Change highlight background color in some controls

The highlight and highlighttext colors can be set for some
controls. So as example a selected item in a listbox can now
be paint with anothers colors then the standard blue. Controls
are: listbox, combobox, edit field and some special edit
fields like date, currency and others.

Change-Id: Iace2dd9a1a61abb7819b6c81eb0b8030912db32b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136691
Reviewed-by: Michael Weghorn 
Tested-by: Jenkins

diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 35d9dab77234..79f23aa46985 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -213,6 +213,8 @@ inline constexpr OUStringLiteral PROPERTY_BACKGROUNDCOLOR = 
u"BackgroundColor";
 inline constexpr OUStringLiteral PROPERTY_ICONSIZE = u"IconSize";
 inline constexpr OUStringLiteral PROPERTY_TEXTLINECOLOR = u"TextLineColor";
 inline constexpr OUStringLiteral PROPERTY_HIDEINACTIVESELECTION = 
u"HideInactiveSelection";
+inline constexpr OUStringLiteral PROPERTY_HIGHLIGHT_COLOR = u"HighlightColor";
+inline constexpr OUStringLiteral PROPERTY_HIGHLIGHT_TEXT_COLOR = 
u"HighlightTextColor";
 
 inline constexpr OUStringLiteral PROPERTY_SHOW_POSITION = u"ShowPosition";
 inline constexpr OUStringLiteral PROPERTY_SHOW_NAVIGATION = u"ShowNavigation";
diff --git a/include/toolkit/helper/property.hxx 
b/include/toolkit/helper/property.hxx
index 4a8fe2385317..92adc587d171 100644
--- a/include/toolkit/helper/property.hxx
+++ b/include/toolkit/helper/property.hxx
@@ -204,7 +204,9 @@ namespace com::sun::star::uno {
 #define BASEPROPERTY_INACTIVE_SEL_BACKGROUND_COLOR  166
 #define BASEPROPERTY_ACTIVE_SEL_TEXT_COLOR  167
 #define BASEPROPERTY_INACTIVE_SEL_TEXT_COLOR168
-#define BASEPROPERTY_TYPEDITEMLIST  169 // AnySequence
+#define BASEPROPERTY_HIGHLIGHT_COLOR169
+#define BASEPROPERTY_HIGHLIGHT_TEXT_COLOR   170
+#define BASEPROPERTY_TYPEDITEMLIST  171 // AnySequence
 
 
 // These properties are not bound, they are always extracted from the 
BASEPROPERTY_FONTDESCRIPTOR property
diff --git a/include/vcl/toolkit/combobox.hxx b/include/vcl/toolkit/combobox.hxx
index bdc415744662..f5d8a10f1ced 100644
--- a/include/vcl/toolkit/combobox.hxx
+++ b/include/vcl/toolkit/combobox.hxx
@@ -106,6 +106,8 @@ public:
 
 voidDrawEntry( const UserDrawEvent& rEvt );
 voidSetBorderStyle( WindowBorderStyle nBorderStyle );
+voidSetHighlightColor(const Color& rColor);
+voidSetHighlightTextColor(const Color& rColor);
 
 /**
  * Adds a new separator at the given position n.
diff --git a/include/vcl/toolkit/lstbox.hxx b/include/vcl/toolkit/lstbox.hxx
index e3bcc1297082..8890fb7ec931 100644
--- a/include/vcl/toolkit/lstbox.hxx
+++ b/include/vcl/toolkit/lstbox.hxx
@@ -209,6 +209,8 @@ public:
 
 voidEnableMultiSelection( bool bMulti );
 boolIsMultiSelectionEnabled() const;
+void

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - toolkit/source

[Ilhan Yesil (via logerrit)]

 toolkit/source/awt/vclxtabpagecontainer.cxx   |2 ++
 toolkit/source/controls/controlmodelcontainerbase.cxx |4 
 toolkit/source/controls/tabpagemodel.cxx  |1 +
 3 files changed, 7 insertions(+)

New commits:
commit c2930857b65856a5ee94c19ad71b5cc8e36fef02
Author: Ilhan Yesil 
AuthorDate: Wed Jun 15 12:52:34 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Aug 8 13:37:57 2022 +0200

tdf#149575 UnoControlTabPageContainer: Handle tab image

Setting a tab page's image in the tab button is done via
method 'XTabPageModel.setImageURL'.

Change-Id: Ideb096f88037dac26abe90fccae2251dcce84659
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135900
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 0f1837306ae5c2c2e10f256b872c46b0bfba00dd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137603
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 51789915de42..f44851dde3f7 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -228,6 +228,8 @@ void 
VCLXTabPageContainer::propertiesChange(const::css::uno::SequenceSetPageEnabled(nId, xTabPageModel->getEnabled());
 } else if (rEvent.PropertyName == GetPropertyName(BASEPROPERTY_TITLE)) 
{
 pTabCtrl->SetPageText(nId, xTabPageModel->getTitle());
+} else if (rEvent.PropertyName == 
GetPropertyName(BASEPROPERTY_IMAGEURL)) {
+pTabCtrl->SetPageImage(nId, 
TkResMgr::getImageFromURL(xTabPageModel->getImageURL()));
 }
 }
 }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 971fc0fd0825..835b893491e3 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -784,6 +784,10 @@ OUString SAL_CALL ControlModelContainerBase::getImageURL()
 void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& 
_imageurl )
 {
 m_sImageURL = _imageurl;
+SolarMutexGuard aGuard;
+Reference xThis(*this, UNO_QUERY);
+xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL), 
Any(_imageurl));
+
 }
 OUString SAL_CALL ControlModelContainerBase::getToolTip()
 {
diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index cbf477e6bb86..360ca710256d 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -52,6 +52,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< 
XComponentContext > c
 ImplRegisterProperty( BASEPROPERTY_SCROLLHEIGHT );
 ImplRegisterProperty( BASEPROPERTY_SCROLLTOP );
 ImplRegisterProperty( BASEPROPERTY_SCROLLLEFT );
+ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
 }
 
 OUString SAL_CALL UnoControlTabPageModel::getImplementationName()

[Libreoffice-commits] core.git: toolkit/source

[Ilhan Yesil (via logerrit)]

 toolkit/source/awt/vclxtabpagecontainer.cxx   |2 ++
 toolkit/source/controls/controlmodelcontainerbase.cxx |4 
 toolkit/source/controls/tabpagemodel.cxx  |1 +
 3 files changed, 7 insertions(+)

New commits:
commit 0f1837306ae5c2c2e10f256b872c46b0bfba00dd
Author: Ilhan Yesil 
AuthorDate: Wed Jun 15 12:52:34 2022 +0200
Commit: Michael Weghorn 
CommitDate: Fri Jun 17 08:15:14 2022 +0200

tdf#149575 UnoControlTabPageContainer: Handle tab image

Setting a tab page's image in the tab button is done via
method 'XTabPageModel.setImageURL'.

Change-Id: Ideb096f88037dac26abe90fccae2251dcce84659
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135900
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 80124c9de868..18e12cdab488 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -224,6 +224,8 @@ void 
VCLXTabPageContainer::propertiesChange(const::css::uno::SequenceSetPageEnabled(nId, xTabPageModel->getEnabled());
 } else if (rEvent.PropertyName == GetPropertyName(BASEPROPERTY_TITLE)) 
{
 pTabCtrl->SetPageText(nId, xTabPageModel->getTitle());
+} else if (rEvent.PropertyName == 
GetPropertyName(BASEPROPERTY_IMAGEURL)) {
+pTabCtrl->SetPageImage(nId, 
TkResMgr::getImageFromURL(xTabPageModel->getImageURL()));
 }
 }
 }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 677d000f9e50..9099c65cc553 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -768,6 +768,10 @@ OUString SAL_CALL ControlModelContainerBase::getImageURL()
 void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& 
_imageurl )
 {
 m_sImageURL = _imageurl;
+SolarMutexGuard aGuard;
+Reference xThis(*this, UNO_QUERY);
+xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL), 
Any(_imageurl));
+
 }
 OUString SAL_CALL ControlModelContainerBase::getToolTip()
 {
diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index c82e54e417c6..cbfbebd78c51 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -52,6 +52,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< 
XComponentContext > c
 ImplRegisterProperty( BASEPROPERTY_SCROLLHEIGHT );
 ImplRegisterProperty( BASEPROPERTY_SCROLLTOP );
 ImplRegisterProperty( BASEPROPERTY_SCROLLLEFT );
+ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
 }
 
 OUString SAL_CALL UnoControlTabPageModel::getImplementationName()

[Libreoffice-commits] core.git: android/Bootstrap android/source include/LibreOfficeKit libreofficekit/source sc/source

[Ilhan Yesil (via logerrit)]

 android/Bootstrap/src/org/libreoffice/kit/Document.java  |1 
 android/source/src/java/org/libreoffice/InvalidationHandler.java |   54 
+-
 include/LibreOfficeKit/LibreOfficeKitEnums.h |   15 ++
 libreofficekit/source/gtk/lokdocview.cxx |1 
 sc/source/ui/inc/gridwin.hxx |3 
 sc/source/ui/view/gridwin.cxx|7 +
 sc/source/ui/view/tabvwsh3.cxx   |2 
 7 files changed, 79 insertions(+), 4 deletions(-)

New commits:
commit e72a7368b368a822d2400ee7db60312226ad3195
Author: Ilhan Yesil 
AuthorDate: Mon May 31 15:10:47 2021 +0200
Commit: Michael Weghorn 
CommitDate: Fri Sep 3 11:45:21 2021 +0200

tdf#131548 Android: jump to cell

Added LOK_CALLBACK_SC_FOLLOW_JUMP: fire this signal to jump to cell
cursor in android viewer. Payload format same as
LOK_CALLBACK_INVALIDATE_TILES.

Change-Id: Ic896baccf1327d6ccdf104811446e3454a42679e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116448
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java 
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index 69f8f76c3eb4..ed7208da5924 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -92,6 +92,7 @@ public class Document {
 public static final int CALLBACK_COMMENT = 32;
 public static final int CALLBACK_INVALIDATE_HEADER = 33;
 public static final int CALLBACK_CELL_ADDRESS = 34;
+public static final int CALLBACK_SC_FOLLOW_JUMP = 52;
 
 /**
  * Set text selection types
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index d74f150bfb44..0f3f1dd7b889 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -55,6 +55,7 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 && messageID != Document.CALLBACK_DOCUMENT_PASSWORD
 && messageID != Document.CALLBACK_HYPERLINK_CLICKED
 && messageID != Document.CALLBACK_SEARCH_RESULT_SELECTION
+&& messageID != Document.CALLBACK_SC_FOLLOW_JUMP
 && messageID != Document.CALLBACK_TEXT_SELECTION
 && messageID != Document.CALLBACK_TEXT_SELECTION_START
 && messageID != Document.CALLBACK_TEXT_SELECTION_END)
@@ -114,6 +115,9 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 case Document.CALLBACK_CELL_CURSOR:
 invalidateCellCursor(payload);
 break;
+case Document.CALLBACK_SC_FOLLOW_JUMP:
+jumpToCell(payload);
+break;
 case Document.CALLBACK_INVALIDATE_HEADER:
 invalidateHeader();
 break;
@@ -214,6 +218,14 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 }
 }
 
+private void jumpToCell(String payload) {
+RectF cellCursorRect = convertPayloadCellToRectangle(payload);
+
+if (cellCursorRect != null) {
+moveViewportToMakeSelectionVisible(cellCursorRect);
+}
+}
+
 /**
  * Handles the search result selection message, which is a JSONObject
  *
@@ -368,6 +380,40 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 if (coordinates.length != 4) {
 return null;
 }
+return convertPayloadToRectangle(coordinates);
+}
+
+/**
+ * Parses the payload text with rectangle coordinates and converts to 
rectangle in pixel coordinates
+ *
+ * @param payload - invalidation message payload text
+ * @return rectangle in pixel coordinates
+ */
+public RectF convertPayloadCellToRectangle(String payload) {
+String payloadWithoutWhitespace = payload.replaceAll("\\s", ""); // 
remove all whitespace from the string
+
+if (payloadWithoutWhitespace.isEmpty() || 
payloadWithoutWhitespace.equals("EMPTY")) {
+return null;
+}
+
+String[] coordinates = payloadWithoutWhitespace.split(",");
+
+if (coordinates.length != 6 ) {
+return null;
+}
+return convertPayloadToRectangle(coordinates);
+}
+
+/**
+ * Converts rectangle coordinates to rectangle in pixel coordinates
+ *
+ * @param coordinates - the first four items defines the rectangle
+ * @return rectangle in pixel coordinates
+ */
+public RectF convertPayloadToRectangle(String[] coordinates) {
+if (coordinates.length < 4 ) {
+return 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source

[Ilhan Yesil (via logerrit)]

 sc/source/ui/inc/gridwin.hxx   |6 +++
 sc/source/ui/view/gridwin.cxx  |4 ++
 sc/source/ui/view/gridwin4.cxx |   62 +
 sc/source/ui/view/tabview5.cxx |7 
 4 files changed, 79 insertions(+)

New commits:
commit ff3f749cd08851ee4eb0991eabee0327ca081a45
Author: Ilhan Yesil 
AuthorDate: Fri Mar 6 13:40:59 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Jun 23 19:45:15 2021 +0200

tdf#124983 In calc make printable page borders initially visible

If option "LibreOfficeDev Calc/View/Page breaks"
is enabled, breaks should be visible. But if the document
is opened the first time or a tab is opened the first time,
the breaks are not calculated yet and therefore not visible.
To avoid calculations during the load of the document, a
timer will be triggered to calculate the breaks after loading
is finished.

Change-Id: I87219c62e20882b19d36042692efd2e6a8d8190a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90101
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 86e300df241312f6152da1cfa3cb2b8c668d1df5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117718

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 09e46d7a4e21..daf6c35b652c 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -309,6 +309,10 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public 
vcl::Window, public DropTargetHel
 voidInvalidateLOKViewCursor(const tools::Rectangle& 
rCursorRect,
 const Fraction aScaleX, const 
Fraction aScaleY);
 
+Timer   maShowPageBreaksTimer;
+boolbInitialPageBreaks;
+voidSetupInitialPageBreaks(ScDocument& rDoc, SCTAB nTab, bool 
bSetup);
+DECL_LINK(InitiatePageBreaksTimer, Timer*, void);
 protected:
 virtual voidPrePaint(vcl::RenderContext& rRenderContext) override;
 virtual voidPaint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect) override;
@@ -490,6 +494,8 @@ public:
 void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
 void updateLOKInputHelp(const OUString& title, const OUString& content) 
const;
 
+void initiatePageBreaks();
+
 protected:
 void ImpCreateOverlayObjects();
 void ImpDestroyOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b6412ae36fbb..c2c115c4371c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -424,6 +424,10 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, 
ScViewData& rData, ScSplitPos
 
 GetOutDev()->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
 EnableRTL( false );
+
+bInitialPageBreaks = true;
+maShowPageBreaksTimer.SetInvokeHandler(LINK(this, ScGridWindow, 
InitiatePageBreaksTimer));
+maShowPageBreaksTimer.SetTimeout(1);
 }
 
 ScGridWindow::~ScGridWindow()
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 9c1ff475449a..f1e53ed61cb8 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -76,6 +76,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& 
rVisible )
 {
@@ -1267,6 +1270,30 @@ void ScGridWindow::DrawContent(OutputDevice , 
const ScTableInfo& rTableI
 
 if (mpNoteMarker)
 mpNoteMarker->Draw(); // Above the cursor, in drawing map mode
+
+SetupInitialPageBreaks(rDoc, nTab, bPage&& bInitialPageBreaks);
+}
+
+
+void ScGridWindow::SetupInitialPageBreaks(ScDocument& rDoc, SCTAB nTab, bool 
bSetup)
+{
+// tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page breaks
+// is enabled, breaks should be visible. If the document is opened the 
first
+// time, the breaks are not calculated yet, so for this initialization
+// a timer will be triggered here.
+if (bSetup)
+{
+std::set aColBreaks;
+std::set aRowBreaks;
+rDoc.GetAllColBreaks(aColBreaks, nTab, true, false);
+rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false);
+if (aColBreaks.size() == 0 || aRowBreaks.size() == 0)
+{
+maShowPageBreaksTimer.SetPriority(TaskPriority::DEFAULT_IDLE);
+maShowPageBreaksTimer.Start();
+bInitialPageBreaks = false;
+}
+}
 }
 
 namespace
@@ -2316,4 +2343,39 @@ void ScGridWindow::DataChanged( const DataChangedEvent& 
rDCEvt )
 Invalidate();
 }
 
+void ScGridWindow::initiatePageBreaks()
+{
+bInitialPageBreaks = true;
+}
+
+IMPL_LINK(ScGridWindow, InitiatePageBreaksTimer, Timer*, pTimer, void)
+{
+if (pTimer == )
+{
+ScDocument& rDoc = mrViewData.GetDocument();
+const ScViewOptions& rOpts = mrViewData.GetOptions();
+bool bPage = rOpts.GetOption(VOPT_PAGEBREAKS);
+ScDocShell* 

[Libreoffice-commits] core.git: sc/source

[Ilhan Yesil (via logerrit)]

 sc/source/ui/inc/gridwin.hxx   |6 +++
 sc/source/ui/view/gridwin.cxx  |4 ++
 sc/source/ui/view/gridwin4.cxx |   62 +
 sc/source/ui/view/tabview5.cxx |7 
 4 files changed, 79 insertions(+)

New commits:
commit 86e300df241312f6152da1cfa3cb2b8c668d1df5
Author: Ilhan Yesil 
AuthorDate: Fri Mar 6 13:40:59 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Jun 23 17:17:18 2021 +0200

tdf#124983 In calc make printable page borders initially visible

If option "LibreOfficeDev Calc/View/Page breaks"
is enabled, breaks should be visible. But if the document
is opened the first time or a tab is opened the first time,
the breaks are not calculated yet and therefore not visible.
To avoid calculations during the load of the document, a
timer will be triggered to calculate the breaks after loading
is finished.

Change-Id: I87219c62e20882b19d36042692efd2e6a8d8190a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90101
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 09e46d7a4e21..daf6c35b652c 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -309,6 +309,10 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public 
vcl::Window, public DropTargetHel
 voidInvalidateLOKViewCursor(const tools::Rectangle& 
rCursorRect,
 const Fraction aScaleX, const 
Fraction aScaleY);
 
+Timer   maShowPageBreaksTimer;
+boolbInitialPageBreaks;
+voidSetupInitialPageBreaks(ScDocument& rDoc, SCTAB nTab, bool 
bSetup);
+DECL_LINK(InitiatePageBreaksTimer, Timer*, void);
 protected:
 virtual voidPrePaint(vcl::RenderContext& rRenderContext) override;
 virtual voidPaint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect) override;
@@ -490,6 +494,8 @@ public:
 void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
 void updateLOKInputHelp(const OUString& title, const OUString& content) 
const;
 
+void initiatePageBreaks();
+
 protected:
 void ImpCreateOverlayObjects();
 void ImpDestroyOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index b6412ae36fbb..c2c115c4371c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -424,6 +424,10 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, 
ScViewData& rData, ScSplitPos
 
 GetOutDev()->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
 EnableRTL( false );
+
+bInitialPageBreaks = true;
+maShowPageBreaksTimer.SetInvokeHandler(LINK(this, ScGridWindow, 
InitiatePageBreaksTimer));
+maShowPageBreaksTimer.SetTimeout(1);
 }
 
 ScGridWindow::~ScGridWindow()
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 9c1ff475449a..f1e53ed61cb8 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -76,6 +76,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& 
rVisible )
 {
@@ -1267,6 +1270,30 @@ void ScGridWindow::DrawContent(OutputDevice , 
const ScTableInfo& rTableI
 
 if (mpNoteMarker)
 mpNoteMarker->Draw(); // Above the cursor, in drawing map mode
+
+SetupInitialPageBreaks(rDoc, nTab, bPage&& bInitialPageBreaks);
+}
+
+
+void ScGridWindow::SetupInitialPageBreaks(ScDocument& rDoc, SCTAB nTab, bool 
bSetup)
+{
+// tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page breaks
+// is enabled, breaks should be visible. If the document is opened the 
first
+// time, the breaks are not calculated yet, so for this initialization
+// a timer will be triggered here.
+if (bSetup)
+{
+std::set aColBreaks;
+std::set aRowBreaks;
+rDoc.GetAllColBreaks(aColBreaks, nTab, true, false);
+rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false);
+if (aColBreaks.size() == 0 || aRowBreaks.size() == 0)
+{
+maShowPageBreaksTimer.SetPriority(TaskPriority::DEFAULT_IDLE);
+maShowPageBreaksTimer.Start();
+bInitialPageBreaks = false;
+}
+}
 }
 
 namespace
@@ -2316,4 +2343,39 @@ void ScGridWindow::DataChanged( const DataChangedEvent& 
rDCEvt )
 Invalidate();
 }
 
+void ScGridWindow::initiatePageBreaks()
+{
+bInitialPageBreaks = true;
+}
+
+IMPL_LINK(ScGridWindow, InitiatePageBreaksTimer, Timer*, pTimer, void)
+{
+if (pTimer == )
+{
+ScDocument& rDoc = mrViewData.GetDocument();
+const ScViewOptions& rOpts = mrViewData.GetOptions();
+bool bPage = rOpts.GetOption(VOPT_PAGEBREAKS);
+ScDocShell* pDocSh = mrViewData.GetDocShell();
+bool bModified = pDocSh->IsModified();
+// tdf#124983, if option LibreOfficeDev 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - vcl/source

[Ilhan Yesil (via logerrit)]

 vcl/source/control/button.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a939574a8d229a45ef92262bf0f02f1ec1903125
Author: Ilhan Yesil 
AuthorDate: Mon Dec 14 17:39:55 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Tue May 18 15:28:37 2021 +0200

tdf#138901 Refresh button tooltip in sidebar created by extension

The button's tooltip is refreshed after setting the button's text.

Change-Id: I08f272c43c3312d462981d46ab961ef925eeccbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107718
Tested-by: Jenkins
Reviewed-by: Ilhan Yesil 
(cherry picked from commit f1d9648b5196eacac080a2a4db42c06829554107)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114292
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index a4ae36cffe15..5607a62d833a 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -77,6 +77,7 @@ public:
 longmnSeparatorX;
 DrawButtonFlags mnButtonState;
 boolmbSmallSymbol;
+boolmbGeneratedTooltip;
 
 Image   maImage;
 ImageAlign  meImageAlign;
@@ -87,7 +88,7 @@ public:
 };
 
 ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), 
mnButtonState(DrawButtonFlags::NONE),
-mbSmallSymbol(false), maImage(), meImageAlign(ImageAlign::Top), 
meSymbolAlign(SymbolAlign::LEFT)
+mbSmallSymbol(false), mbGeneratedTooltip(false), maImage(), 
meImageAlign(ImageAlign::Top), meSymbolAlign(SymbolAlign::LEFT)
 {
 }
 
@@ -219,8 +220,13 @@ void Button::ImplDrawAlignedImage(OutputDevice* pDev, 
Point& rPos,
 tools::Rectangle textRect = GetTextRect(
 tools::Rectangle(Point(), Size(0x7fff, 0x7fff)), aText, 
nTextStyle);
 // If the button text doesn't fit into it, put it into a tooltip 
(might happen in sidebar)
+if (GetQuickHelpText()!= aText && mpButtonData->mbGeneratedTooltip)
+SetQuickHelpText("");
 if (GetQuickHelpText().isEmpty() && textRect.getWidth() > 
rSize.getWidth())
+{
 SetQuickHelpText(aText);
+mpButtonData->mbGeneratedTooltip = true;
+}
 
 ImplSetFocusRect(aOutRect);
 rSize = aOutRect.GetSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Ilhan Yesil (via logerrit)]

 vcl/source/control/button.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f1d9648b5196eacac080a2a4db42c06829554107
Author: Ilhan Yesil 
AuthorDate: Mon Dec 14 17:39:55 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Apr 19 12:46:33 2021 +0200

tdf#138901 Refresh button tooltip in sidebar created by extension

The button's tooltip is refreshed after setting the button's text.

Change-Id: I08f272c43c3312d462981d46ab961ef925eeccbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107718
Tested-by: Jenkins
Reviewed-by: Ilhan Yesil 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index f26561cf0890..08ede8f8afbd 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -79,6 +79,7 @@ public:
 tools::LongmnSeparatorX;
 DrawButtonFlags mnButtonState;
 boolmbSmallSymbol;
+boolmbGeneratedTooltip;
 
 Image   maImage;
 ImageAlign  meImageAlign;
@@ -91,7 +92,7 @@ public:
 };
 
 ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), 
mnButtonState(DrawButtonFlags::NONE),
-mbSmallSymbol(false), maImage(), meImageAlign(ImageAlign::Top), 
meSymbolAlign(SymbolAlign::LEFT), maCustomContentImage()
+mbSmallSymbol(false), mbGeneratedTooltip(false), maImage(), 
meImageAlign(ImageAlign::Top), meSymbolAlign(SymbolAlign::LEFT), 
maCustomContentImage()
 {
 }
 
@@ -237,8 +238,13 @@ void Button::ImplDrawAlignedImage(OutputDevice* pDev, 
Point& rPos,
 tools::Rectangle textRect = GetTextRect(
 tools::Rectangle(Point(), Size(0x7fff, 0x7fff)), aText, 
nTextStyle);
 // If the button text doesn't fit into it, put it into a tooltip 
(might happen in sidebar)
+if (GetQuickHelpText()!= aText && mpButtonData->mbGeneratedTooltip)
+SetQuickHelpText("");
 if (GetQuickHelpText().isEmpty() && textRect.getWidth() > 
rSize.getWidth())
+{
 SetQuickHelpText(aText);
+mpButtonData->mbGeneratedTooltip = true;
+}
 
 ImplSetFocusRect(aOutRect);
 rSize = aOutRect.GetSize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - svtools/source

[Ilhan Yesil (via logerrit)]

 svtools/source/uno/wizard/wizardshell.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21511280f9a376906a57dde082f899aa9f7b37a7
Author: Ilhan Yesil 
AuthorDate: Tue Nov 10 18:22:39 2020 +0100
Commit: Michael Weghorn 
CommitDate: Wed Mar 3 18:46:02 2021 +0100

tdf#138116 Accurate minimal height for wizard opened by extension

There is no way to set the minimum height by the UNO API.
Therefore the requested size will be reduced.

Change-Id: Ie657518a83ffb6873e4fd2a5640580b5198a38d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105566
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 502da85432ed195213268272dda966fddc269716)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111887
Tested-by: Michael Weghorn 
Reviewed-by: Michael Weghorn 

diff --git a/svtools/source/uno/wizard/wizardshell.cxx 
b/svtools/source/uno/wizard/wizardshell.cxx
index 6d72a1219a50..addae913aa0f 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -175,7 +175,7 @@ namespace svt { namespace uno
 : BuilderPage(pParent, pController, "svt/ui/emptypage.ui", 
"EmptyPage")
 {
 
m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width() * 70,
-   m_xContainer->get_text_height() 
* 45);
+   m_xContainer->get_text_height() 
* 10);
 }
 weld::Container* GetContainer() const { return m_xContainer.get(); 
}
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sfx2/source

[Ilhan Yesil (via logerrit)]

 sfx2/source/sidebar/UnoDeck.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 12403996d2356bc40c89c37a9fbe2a727180bf83
Author: Ilhan Yesil 
AuthorDate: Thu Nov 12 15:33:24 2020 +0100
Commit: Michael Weghorn 
CommitDate: Mon Jan 25 09:53:04 2021 +0100

tdf#138160 Set minimal width of sidebar tabpage after UNO call

Call OpenThenToggleDeck in SidebarController instead SwitchToDeck
to ensure the minimal width of the tabpage is considered and
the width of the sidebar is set correctly.

Change-Id: I27c21572b5c648b3ddbb4d908d40af686ac87a9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105758
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 7206de4f3d9eecdcbdd98294fa50f01c4c9ece9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109797
Tested-by: Michael Weghorn 
Reviewed-by: Michael Weghorn 

diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx
index 9a77c064b3e3..cf4b3a6a9228 100644
--- a/sfx2/source/sidebar/UnoDeck.cxx
+++ b/sfx2/source/sidebar/UnoDeck.cxx
@@ -95,13 +95,16 @@ void SAL_CALL SfxUnoDeck::activate( const sal_Bool 
bActivate )
 
 SidebarController* pSidebarController = getSidebarController();
 
+// tdf#138160: OpenThenToggleDeck takes care of minimal width
 if (bActivate)
-pSidebarController->SwitchToDeck(mDeckId);
+pSidebarController->OpenThenToggleDeck(mDeckId);
 else
+{
 pSidebarController->SwitchToDefaultDeck();
+// update the sidebar
+pSidebarController->NotifyResize();
+}
 
-// update the sidebar
-pSidebarController->NotifyResize();
 }
 
 uno::Reference SAL_CALL SfxUnoDeck::getPanels()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Ilhan Yesil (via logerrit)]

 sfx2/source/sidebar/UnoDeck.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 7206de4f3d9eecdcbdd98294fa50f01c4c9ece9c
Author: Ilhan Yesil 
AuthorDate: Thu Nov 12 15:33:24 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Dec 23 00:19:13 2020 +0100

tdf#138160 Set minimal width of sidebar tabpage after UNO call

Call OpenThenToggleDeck in SidebarController instead SwitchToDeck
to ensure the minimal width of the tabpage is considered and
the width of the sidebar is set correctly.

Change-Id: I27c21572b5c648b3ddbb4d908d40af686ac87a9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105758
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Thorsten Behrens 

diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx
index 122afbe018a2..0350ef1250c3 100644
--- a/sfx2/source/sidebar/UnoDeck.cxx
+++ b/sfx2/source/sidebar/UnoDeck.cxx
@@ -95,13 +95,16 @@ void SAL_CALL SfxUnoDeck::activate( const sal_Bool 
bActivate )
 
 SidebarController* pSidebarController = getSidebarController();
 
+// tdf#138160: OpenThenToggleDeck takes care of minimal width
 if (bActivate)
-pSidebarController->SwitchToDeck(mDeckId);
+pSidebarController->OpenThenToggleDeck(mDeckId);
 else
+{
 pSidebarController->SwitchToDefaultDeck();
+// update the sidebar
+pSidebarController->NotifyResize();
+}
 
-// update the sidebar
-pSidebarController->NotifyResize();
 }
 
 uno::Reference SAL_CALL SfxUnoDeck::getPanels()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Ilhan Yesil (via logerrit)]

 svtools/source/uno/wizard/wizardshell.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 502da85432ed195213268272dda966fddc269716
Author: Ilhan Yesil 
AuthorDate: Tue Nov 10 18:22:39 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Nov 16 15:57:45 2020 +0100

tdf#138116 Accurate minimal height for wizard opened by extension

There is no way to set the minimum height by the UNO API.
Therefore the requested size will be reduced.

Change-Id: Ie657518a83ffb6873e4fd2a5640580b5198a38d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105566
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/svtools/source/uno/wizard/wizardshell.cxx 
b/svtools/source/uno/wizard/wizardshell.cxx
index 7876e62ac65f..7c946f0cf34f 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -175,7 +175,7 @@ namespace svt::uno
 : BuilderPage(pParent, pController, "svt/ui/emptypage.ui", 
"EmptyPage")
 {
 
m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width() * 70,
-   m_xContainer->get_text_height() 
* 45);
+   m_xContainer->get_text_height() 
* 10);
 }
 weld::Container* GetContainer() const { return m_xContainer.get(); 
}
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - svtools/source

[Ilhan Yesil (via logerrit)]

 svtools/source/control/roadmap.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e73aee0475a78b285078faa849a972969b01767d
Author: Ilhan Yesil 
AuthorDate: Wed Jun 10 10:01:00 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 25 00:31:54 2020 +0200

tdf#133859 Wizard service: reinitialize data of roadmap

Cherry-picked only part from master due to different class
architecture in master..

In libreoffice versions before 6.4, an ORoadmap class was used in the
wizard. There, if the ORoadmap data are reinitialized, the
InCompleteHyperLabel object must be destroyed first, before it will
be set to nullptr.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95969
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 54a3daec02f2eeada04efcd7958da4152db4611a)

Change-Id: I5b4b2e6b3666b58acccace385c622f0a065fc368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96925
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/svtools/source/control/roadmap.cxx 
b/svtools/source/control/roadmap.cxx
index e9c3bf9e302b..e1e89389807f 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -203,6 +203,7 @@ ORoadmap::ORoadmap(vcl::Window* _pParent, WinBits 
_nWinStyle)
 
 void ORoadmap::implInit(vcl::RenderContext& rRenderContext)
 {
+delete m_pImpl->InCompleteHyperLabel;
 m_pImpl->InCompleteHyperLabel = nullptr;
 m_pImpl->setCurItemID(-1);
 m_pImpl->setComplete(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source

[Ilhan Yesil (via logerrit)]

 vcl/source/control/roadmap.cxx   |1 +
 vcl/source/control/roadmapwizard.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit cd971797acea4611dc51fb0fcc08632f83bd10c1
Author: Ilhan Yesil 
AuthorDate: Wed Jun 10 10:01:00 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 25 00:29:48 2020 +0200

tdf#133859 Wizard service: disable 'Next' button if path has only base item

If the wizard dialog for extensions has only the base item in the first
path, there is no need to proceed to the next page, as there is no one.
This will be checked and if so, the 'Next' button disabled.

In libreoffice versions before 6.4, an ORoadmap class was used in the
wizard. There, if the ORoadmap data are reinitialized, the
InCompleteHyperLabel object must be destroyed first, before it will
be set to nullptr.

Change-Id: I5b4b2e6b3666b58acccace385c622f0a065fc368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95969
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 54a3daec02f2eeada04efcd7958da4152db4611a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96795

diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index 8d228e629c4b..9dbf0ab17456 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -204,6 +204,7 @@ ORoadmap::ORoadmap(vcl::Window* _pParent, WinBits 
_nWinStyle)
 
 void ORoadmap::implInit(vcl::RenderContext& rRenderContext)
 {
+delete m_pImpl->InCompleteHyperLabel;
 m_pImpl->InCompleteHyperLabel = nullptr;
 m_pImpl->setCurItemID(-1);
 m_pImpl->setComplete(true);
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index 160724c78ab3..bc84ce616551 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -580,6 +580,11 @@ namespace vcl
 {
 // check how many paths are still allowed
 const WizardPath& rActivePath( m_pImpl->aPaths[ 
m_pImpl->nActivePath ] );
+
+// if current path has only the base item, it is not possible to 
proceed without activating another path
+if(rActivePath.size()<=1)
+return false;
+
 sal_Int32 nCurrentStatePathIndex = 
RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath );
 
 size_t nPossiblePaths(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/source

[Ilhan Yesil (via logerrit)]

 vcl/source/control/roadmap.cxx   |1 +
 vcl/source/control/roadmapwizard.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit a6b26c0e8544675ff2b76a1342d670032d974f60
Author: Ilhan Yesil 
AuthorDate: Wed Jun 10 10:01:00 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 25 00:28:55 2020 +0200

tdf#133859 Wizard service: disable 'Next' button if path has only base item

If the wizard dialog for extensions has only the base item in the first
path, there is no need to proceed to the next page, as there is no one.
This will be checked and if so, the 'Next' button disabled.

In libreoffice versions before 6.4, an ORoadmap class was used in the
wizard. There, if the ORoadmap data are reinitialized, the
InCompleteHyperLabel object must be destroyed first, before it will
be set to nullptr.

Change-Id: I5b4b2e6b3666b58acccace385c622f0a065fc368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95969
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 54a3daec02f2eeada04efcd7958da4152db4611a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96999

diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index 3b954c156ccf..9f7e6a0e12ef 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -208,6 +208,7 @@ ORoadmap::ORoadmap(vcl::Window* _pParent, WinBits 
_nWinStyle)
 
 void ORoadmap::implInit(vcl::RenderContext& rRenderContext)
 {
+delete m_pImpl->InCompleteHyperLabel;
 m_pImpl->InCompleteHyperLabel = nullptr;
 m_pImpl->setCurItemID(-1);
 m_pImpl->setComplete(true);
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index 3e887ad922b7..d73cc1a18a5b 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -586,6 +586,11 @@ namespace vcl
 {
 // check how many paths are still allowed
 const WizardPath& rActivePath( m_pImpl->aPaths[ 
m_pImpl->nActivePath ] );
+
+// if current path has only the base item, it is not possible to 
proceed without activating another path
+if(rActivePath.size()<=1)
+return false;
+
 sal_Int32 nCurrentStatePathIndex = 
RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath );
 
 size_t nPossiblePaths(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

[Ilhan Yesil (via logerrit)]

 vcl/source/control/roadmap.cxx   |1 +
 vcl/source/control/roadmapwizard.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit 54a3daec02f2eeada04efcd7958da4152db4611a
Author: Ilhan Yesil 
AuthorDate: Wed Jun 10 10:01:00 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Sat Jun 20 01:45:22 2020 +0200

tdf#133859 Wizard service: disable 'Next' button if path has only base item

If the wizard dialog for extensions has only the base item in the first
path, there is no need to proceed to the next page, as there is no one.
This will be checked and if so, the 'Next' button disabled.

In libreoffice versions before 6.4, an ORoadmap class was used in the
wizard. There, if the ORoadmap data are reinitialized, the
InCompleteHyperLabel object must be destroyed first, before it will
be set to nullptr.

Change-Id: I5b4b2e6b3666b58acccace385c622f0a065fc368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95969
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index 3b954c156ccf..9f7e6a0e12ef 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -208,6 +208,7 @@ ORoadmap::ORoadmap(vcl::Window* _pParent, WinBits 
_nWinStyle)
 
 void ORoadmap::implInit(vcl::RenderContext& rRenderContext)
 {
+delete m_pImpl->InCompleteHyperLabel;
 m_pImpl->InCompleteHyperLabel = nullptr;
 m_pImpl->setCurItemID(-1);
 m_pImpl->setComplete(true);
diff --git a/vcl/source/control/roadmapwizard.cxx 
b/vcl/source/control/roadmapwizard.cxx
index 3e887ad922b7..d73cc1a18a5b 100644
--- a/vcl/source/control/roadmapwizard.cxx
+++ b/vcl/source/control/roadmapwizard.cxx
@@ -586,6 +586,11 @@ namespace vcl
 {
 // check how many paths are still allowed
 const WizardPath& rActivePath( m_pImpl->aPaths[ 
m_pImpl->nActivePath ] );
+
+// if current path has only the base item, it is not possible to 
proceed without activating another path
+if(rActivePath.size()<=1)
+return false;
+
 sal_Int32 nCurrentStatePathIndex = 
RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath );
 
 size_t nPossiblePaths(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmloff/source

[Ilhan Yesil (via logerrit)]

 xmloff/source/draw/sdpropls.cxx |   52 
 1 file changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 561dd7ba983a0f40bff46169eb17358f73f6ff41
Author: Ilhan Yesil 
AuthorDate: Tue Aug 21 18:14:33 2018 +0200
Commit: Michael Stahl 
CommitDate: Fri May 8 21:05:34 2020 +0200

tdf#114400 Export drawoo:fontwork-xyz attributes

The attributes can be read in the old and the new namespace,
but will be exported only in the new namespace.

Change-Id: Ia79aad425105d94d460a819eaa3e4a35ac4c73e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/59411
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 5f8c72307e33..e2b4c5e91a2d 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -235,34 +235,34 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
 GMAP( "D3DShadow3D",XML_NAMESPACE_DR3D, 
XML_SHADOW, XML_SD_TYPE_SHADOW, 0 ),
 
 // #FontWork# attributes
-GMAP( "FontWorkStyle",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_STYLE, XML_SD_TYPE_FONTWORK_STYLE, CTF_FONTWORK_STYLE  
),
-GMAP( "FontWorkAdjust", XML_NAMESPACE_DRAW, 
XML_FONTWORK_ADJUST,
XML_SD_TYPE_FONTWORK_ADJUST,CTF_FONTWORK_ADJUST ),
-GMAP( "FontWorkDistance",   XML_NAMESPACE_DRAW, 
XML_FONTWORK_DISTANCE,  XML_TYPE_MEASURE,   
CTF_FONTWORK_DISTANCE   ),
-GMAP( "FontWorkStart",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_START, XML_TYPE_MEASURE,   
CTF_FONTWORK_START  ),
-GMAP( "FontWorkMirror", XML_NAMESPACE_DRAW, 
XML_FONTWORK_MIRROR,XML_TYPE_BOOL,  
CTF_FONTWORK_MIRROR ),
-GMAP( "FontWorkOutline",XML_NAMESPACE_DRAW, 
XML_FONTWORK_OUTLINE,   XML_TYPE_BOOL,  
CTF_FONTWORK_OUTLINE),
-GMAP( "FontWorkShadow", XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW,
XML_SD_TYPE_FONTWORK_SHADOW,CTF_FONTWORK_SHADOW ),
-GMAP( "FontWorkShadowColor",XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW_COLOR,  XML_TYPE_COLOR, 
CTF_FONTWORK_SHADOWCOLOR),
-GMAP( "FontWorkShadowOffsetX",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW_OFFSET_X,   XML_TYPE_MEASURE,   
CTF_FONTWORK_SHADOWOFFSETX  ),
-GMAP( "FontWorkShadowOffsetY",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW_OFFSET_Y,   XML_TYPE_MEASURE,   
CTF_FONTWORK_SHADOWOFFSETY  ),
-GMAP( "FontWorkForm",   XML_NAMESPACE_DRAW, 
XML_FONTWORK_FORM,  XML_SD_TYPE_FONTWORK_FORM,  
CTF_FONTWORK_FORM   ),
-GMAP( "FontWorkHideForm",   XML_NAMESPACE_DRAW, 
XML_FONTWORK_HIDE_FORM, XML_TYPE_BOOL,  
CTF_FONTWORK_HIDEFORM   ),
-GMAP( "FontWorkShadowTransparence", XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW_TRANSPARENCE,   XML_TYPE_PERCENT,   
CTF_FONTWORK_SHADOWTRANSPARENCE ),
+GMAP( "FontWorkStyle",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_STYLE, XML_SD_TYPE_FONTWORK_STYLE| 
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_STYLE  ),
+GMAP( "FontWorkAdjust", XML_NAMESPACE_DRAW, 
XML_FONTWORK_ADJUST,XML_SD_TYPE_FONTWORK_ADJUST | 
MID_FLAG_ELEMENT_ITEM_EXPORT,CTF_FONTWORK_ADJUST ),
+GMAP( "FontWorkDistance",   XML_NAMESPACE_DRAW, 
XML_FONTWORK_DISTANCE,  XML_TYPE_MEASURE | 
MID_FLAG_ELEMENT_ITEM_EXPORT,   CTF_FONTWORK_DISTANCE   ),
+GMAP( "FontWorkStart",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_START, XML_TYPE_MEASURE | 
MID_FLAG_ELEMENT_ITEM_EXPORT,   CTF_FONTWORK_START  ),
+GMAP( "FontWorkMirror", XML_NAMESPACE_DRAW, 
XML_FONTWORK_MIRROR,XML_TYPE_BOOL | 
MID_FLAG_ELEMENT_ITEM_EXPORT,  CTF_FONTWORK_MIRROR ),
+GMAP( "FontWorkOutline",XML_NAMESPACE_DRAW, 
XML_FONTWORK_OUTLINE,   XML_TYPE_BOOL | 
MID_FLAG_ELEMENT_ITEM_EXPORT,  CTF_FONTWORK_OUTLINE),
+GMAP( "FontWorkShadow", XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW,XML_SD_TYPE_FONTWORK_SHADOW | 
MID_FLAG_ELEMENT_ITEM_EXPORT,CTF_FONTWORK_SHADOW ),
+GMAP( "FontWorkShadowColor",XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW_COLOR,  XML_TYPE_COLOR | 
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWCOLOR),
+GMAP( "FontWorkShadowOffsetX",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW_OFFSET_X,   XML_TYPE_MEASURE | 
MID_FLAG_ELEMENT_ITEM_EXPORT,   CTF_FONTWORK_SHADOWOFFSETX  ),
+GMAP( "FontWorkShadowOffsetY",  XML_NAMESPACE_DRAW, 
XML_FONTWORK_SHADOW_OFFSET_Y,   XML_TYPE_MEASURE | 

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - svx/source

[Ilhan Yesil (via logerrit)]

Rebased ref, commits from common ancestor:
commit 12b4efb1216fc494443795b06e9ad92bcad2c306
Author: Ilhan Yesil 
AuthorDate: Tue Nov 13 11:20:15 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Dec 12 13:40:21 2019 +0100

tdf#116051 Right border visible after hiding neighbour column

Added an else statement to take into account that a hidden column
has a neighboured left column with a right border.

Reviewed-on: https://gerrit.libreoffice.org/63326
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 392729c735bb82eecf29bae5527ec786ca293f34)
Reviewed-on: https://gerrit.libreoffice.org/67054
Reviewed-by: Ilhan Yesil 
Tested-by: Ilhan Yesil 
(cherry picked from commit efc741c41483b2402378391b7fba36377c886a8e)
Reviewed-on: https://gerrit.libreoffice.org/84857
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

Change-Id: Ia415d422dd2fa305604e48cce55661408b835ea6

diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index f0934c48dd7c..9e14810261b9 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1103,28 +1103,30 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 basegfx::B2DVector aX(basegfx::utils::getColumn(aCoordinateSystem, 
0));
 basegfx::B2DVector aY(basegfx::utils::getColumn(aCoordinateSystem, 
1));
 
+// get needed local values
+basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
+const bool bOverlapX(rCell.mbOverlapX);
+const bool bFirstCol(nCol == nFirstCol);
+
+// handle rotation: If cell is rotated, handle lower/right edge 
inside
+// this local geometry due to the created CoordinateSystem already 
representing
+// the needed transformations.
+const bool bRotated(rCell.IsRotated());
+
+// Additionally avoid double-handling by suppressing handling when 
self not rotated,
+// but above/left is rotated and thus already handled. Two 
directly connected
+// rotated will paint/create both edges, they might be rotated 
differently.
+const bool bSupressLeft(!bRotated && nCol > nFirstCol && CELL(nCol 
- 1, nRow).IsRotated());
+const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
+
 if(!aX.equalZero() && !aY.equalZero())
 {
-// get needed local values
-basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
-const bool bOverlapX(rCell.mbOverlapX);
+// additionally needed local values
 const bool bOverlapY(rCell.mbOverlapY);
-const bool bFirstCol(nCol == nFirstCol);
 const bool bLastCol(nCol == nLastCol);
 const bool bFirstRow(nRow == nFirstRow);
 const bool bLastRow(nRow == nLastRow);
 
-// handle rotation: If cell is rotated, handle lower/right 
edge inside
-// this local geometry due to the created CoordinateSystem 
already representing
-// the needed transformations.
-const bool bRotated(rCell.IsRotated());
-
-// Additionally avoid double-handling by suppressing handling 
when self not rotated,
-// but above/left is rotated and thus already handled. Two 
directly connected
-// rotated will paint/create both edges, they might be rotated 
differently.
-const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
-const bool bSupressLeft(!bRotated && nCol > nFirstCol && 
CELL(nCol - 1, nRow).IsRotated());
-
 // create upper line for this Cell
 if ((!bOverlapY // true for first line in merged cells 
or cells
 || bFirstRow)   // true for non_Calc usages of this 
tooling
@@ -1281,6 +1283,21 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 }
 }
 }
+else
+{
+// create left line for this Cell
+if ((!bOverlapX // true for first column in merged 
cells or cells
+|| bFirstCol)   // true for non_Calc usages of this 
tooling
+&& !bSupressLeft)   // true when left is not rotated, so 
edge is already handled (see bRotated)
+{
+const Style& rLeft(GetCellStyleLeft(nCol, nRow));
+
+if (rLeft.IsUsed())
+{
+HelperCreateVerticalEntry(*this, rLeft, nCol, nRow, 
aOrigin, aX, aY, aVerticalSequences[nCol - nStartCol], true, pForceColor);
+ 

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - svx/source

[Ilhan Yesil (via logerrit)]

 svx/source/dialog/framelinkarray.cxx |   47 +++
 1 file changed, 32 insertions(+), 15 deletions(-)

New commits:
commit c6223e1808f113c6962571bc206c4aecec0c2bd7
Author: Ilhan Yesil 
AuthorDate: Tue Nov 13 11:20:15 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Dec 10 14:59:08 2019 +0100

tdf#116051 Right border visible after hiding neighbour column

Added an else statement to take into account that a hidden column
has a neighboured left column with a right border.

Change-Id: Ia415d422dd2fa305604e48cce55661408b835ea6
Reviewed-on: https://gerrit.libreoffice.org/63326
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 392729c735bb82eecf29bae5527ec786ca293f34)
Reviewed-on: https://gerrit.libreoffice.org/67054
Reviewed-by: Ilhan Yesil 
Tested-by: Ilhan Yesil 
(cherry picked from commit efc741c41483b2402378391b7fba36377c886a8e)
Reviewed-on: https://gerrit.libreoffice.org/84857
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/svx/source/dialog/framelinkarray.cxx 
b/svx/source/dialog/framelinkarray.cxx
index f0934c48dd7c..2afaa3171654 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -1103,28 +1103,30 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 basegfx::B2DVector aX(basegfx::utils::getColumn(aCoordinateSystem, 
0));
 basegfx::B2DVector aY(basegfx::utils::getColumn(aCoordinateSystem, 
1));
 
+// get needed local values
+basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
+const bool bOverlapX(rCell.mbOverlapX);
+const bool bFirstCol(nCol == nFirstCol);
+
+// handle rotation: If cell is rotated, handle lower/right edge 
inside
+// this local geometry due to the created CoordinateSystem already 
representing
+// the needed transformations.
+const bool bRotated(rCell.IsRotated());
+
+// Additionally avoid double-handling by suppressing handling when 
self not rotated,
+// but above/left is rotated and thus already handled. Two 
directly connected
+// rotated will paint/create both edges, they might be rotated 
differently.
+const bool bSupressLeft(!bRotated && nCol > nFirstCol && CELL(nCol 
- 1, nRow).IsRotated());
+const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
+
 if(!aX.equalZero() && !aY.equalZero())
 {
-// get needed local values
-basegfx::B2DPoint 
aOrigin(basegfx::utils::getColumn(aCoordinateSystem, 2));
-const bool bOverlapX(rCell.mbOverlapX);
+// additionally needed local values
 const bool bOverlapY(rCell.mbOverlapY);
-const bool bFirstCol(nCol == nFirstCol);
 const bool bLastCol(nCol == nLastCol);
 const bool bFirstRow(nRow == nFirstRow);
 const bool bLastRow(nRow == nLastRow);
 
-// handle rotation: If cell is rotated, handle lower/right 
edge inside
-// this local geometry due to the created CoordinateSystem 
already representing
-// the needed transformations.
-const bool bRotated(rCell.IsRotated());
-
-// Additionally avoid double-handling by suppressing handling 
when self not rotated,
-// but above/left is rotated and thus already handled. Two 
directly connected
-// rotated will paint/create both edges, they might be rotated 
differently.
-const bool bSuppressAbove(!bRotated && nRow > nFirstRow && 
CELL(nCol, nRow - 1).IsRotated());
-const bool bSupressLeft(!bRotated && nCol > nFirstCol && 
CELL(nCol - 1, nRow).IsRotated());
-
 // create upper line for this Cell
 if ((!bOverlapY // true for first line in merged cells 
or cells
 || bFirstRow)   // true for non_Calc usages of this 
tooling
@@ -1281,6 +1283,21 @@ drawinglayer::primitive2d::Primitive2DContainer 
Array::CreateB2DPrimitiveRange(
 }
 }
 }
+else
+{
+// create left line for this Cell
+if ((!bOverlapX // true for first column in merged 
cells or cells
+|| bFirstCol)   // true for non_Calc usages of this 
tooling
+&& !bSupressLeft)   // true when left is not rotated, so 
edge is already handled (see bRotated)
+{
+const Style& rLeft(GetCellStyleLeft(nCol, nRow));
+
+if (rLeft.IsUsed())
+{
+HelperCreateVerticalEntry(*this, rLeft, 

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sc/source

[Ilhan Yesil (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 312383b311d6f1733b3750d279b54486dd64e3b9
Author: Ilhan Yesil 
AuthorDate: Wed Jul 10 15:41:27 2019 +0200
Commit: Michael Weghorn 
CommitDate: Mon Oct 7 15:29:08 2019 +0200

tdf#124983 In calc make printable page borders also initially visible

If option "LibreOfficeDev Calc/View/Page breaks"
is enabled, breaks should be visible. But if the document
is opened the first time, the breaks are not calculated yet
and therefore not visible.

Change-Id: I651e4df4a9c292aa953888498a5c9d0fb5b8c8d2
Reviewed-on: https://gerrit.libreoffice.org/75355
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit caeb7b141280a65e60525f11a7e6514b76e12e11)
Reviewed-on: https://gerrit.libreoffice.org/80353
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 62ccfd036e27..7be9555961fb 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -68,6 +68,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& 
rVisible )
 {
@@ -557,6 +558,23 @@ void ScGridWindow::DrawContent(OutputDevice , 
const ScTableInfo& rTableI
 bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP );
 
 bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
+// tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page breaks
+// is enabled, breaks should be visible. If the document is opened the 
first
+// time, the breaks are not calculated yet, so this initialization is
+// done here.
+if (bPage)
+{
+std::set aColBreaks;
+std::set aRowBreaks;
+rDoc.GetAllColBreaks(aColBreaks, nTab, true, false);
+rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false);
+if (aColBreaks.size() == 0 || aRowBreaks.size() == 0)
+{
+ScDocShell* pDocSh = pViewData->GetDocShell();
+ScPrintFunc aPrintFunc(pDocSh, pDocSh->GetPrinter(), nTab);
+aPrintFunc.UpdatePages();
+}
+}
 
 bool bPageMode = pViewData->IsPagebreakMode();
 if (bPageMode)  // after FindChanged
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Ilhan Yesil (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit caeb7b141280a65e60525f11a7e6514b76e12e11
Author: Ilhan Yesil 
AuthorDate: Wed Jul 10 15:41:27 2019 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 1 22:13:09 2019 +0200

tdf#124983 In calc make printable page borders also initially visible

If option "LibreOfficeDev Calc/View/Page breaks"
is enabled, breaks should be visible. But if the document
is opened the first time, the breaks are not calculated yet
and therefore not visible.

Change-Id: I651e4df4a9c292aa953888498a5c9d0fb5b8c8d2
Reviewed-on: https://gerrit.libreoffice.org/75355
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 4893b31c6b1b..947961218438 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -69,6 +69,7 @@
 #include 
 #include 
 #include 
+#include 
 
 static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& 
rVisible )
 {
@@ -560,6 +561,23 @@ void ScGridWindow::DrawContent(OutputDevice , 
const ScTableInfo& rTableI
 bool bGridFirst = !rOpts.GetOption( VOPT_GRID_ONTOP );
 
 bool bPage = rOpts.GetOption( VOPT_PAGEBREAKS );
+// tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page breaks
+// is enabled, breaks should be visible. If the document is opened the 
first
+// time, the breaks are not calculated yet, so this initialization is
+// done here.
+if (bPage)
+{
+std::set aColBreaks;
+std::set aRowBreaks;
+rDoc.GetAllColBreaks(aColBreaks, nTab, true, false);
+rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false);
+if (aColBreaks.size() == 0 || aRowBreaks.size() == 0)
+{
+ScDocShell* pDocSh = pViewData->GetDocShell();
+ScPrintFunc aPrintFunc(pDocSh, pDocSh->GetPrinter(), nTab);
+aPrintFunc.UpdatePages();
+}
+}
 
 bool bPageMode = pViewData->IsPagebreakMode();
 if (bPageMode)  // after FindChanged
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source extensions/inc extensions/source offapi/com reportdesign/inc reportdesign/source xmloff/source

[Ilhan Yesil (via logerrit)]

 dbaccess/inc/strings.hxx  |1 
 dbaccess/source/core/api/TableDeco.cxx|3 
 dbaccess/source/core/api/datasettings.cxx |3 
 dbaccess/source/core/api/table.cxx|3 
 dbaccess/source/core/inc/datasettings.hxx |1 
 dbaccess/source/inc/stringconstants.hxx   |1 
 extensions/inc/helpids.h  |1 
 extensions/inc/strings.hrc|1 
 extensions/source/propctrlr/formmetadata.cxx  |4 -
 extensions/source/propctrlr/formmetadata.hxx  |1 
 extensions/source/propctrlr/formstrings.hxx   |1 
 offapi/com/sun/star/report/XReportComponent.idl   |   10 ++
 reportdesign/inc/ReportHelperDefines.hxx  |2 
 reportdesign/inc/helpids.h|1 
 reportdesign/inc/strings.hrc  |1 
 reportdesign/inc/strings.hxx  |2 
 reportdesign/source/core/inc/ReportComponent.hxx  |2 
 reportdesign/source/core/inc/ReportHelperImpl.hxx |9 ++
 reportdesign/source/filter/xml/xmlColumn.cxx  |   25 +--
 reportdesign/source/filter/xml/xmlExport.cxx  |   39 +++
 reportdesign/source/filter/xml/xmlExport.hxx  |1 
 reportdesign/source/filter/xml/xmlHelper.cxx  |3 
 reportdesign/source/filter/xml/xmlTable.cxx   |2 
 reportdesign/source/filter/xml/xmlTable.hxx   |7 +-
 reportdesign/source/ui/inc/metadata.hxx   |   61 +-
 reportdesign/source/ui/inspection/GeometryHandler.cxx |1 
 reportdesign/source/ui/inspection/metadata.cxx|2 
 xmloff/source/table/XMLTableExport.cxx|4 -
 28 files changed, 149 insertions(+), 43 deletions(-)

New commits:
commit 260caebf8a2382bcde1fb9ff74ceb1b940654e6f
Author: Ilhan Yesil 
AuthorDate: Tue May 8 14:17:56 2018 +0200
Commit: Lionel Elie Mamane 
CommitDate: Fri Sep 13 10:45:01 2019 +0200

tdf#45789 [API CHANGE] Automatic row height in reports

The controls have now an AutoGrow flag which is saved as
style:min-row-height instead of style:row-height on
style:table-row-properties in content.xml.
In this case the table row height will be allowed to grow to accommodate
the content.

Note: in the conceptual model of reportdesigner this is a per-control
property but in the current implementation, it is a per-row property in
the ODF file. Thus, as soon as one control in the row has the AutoGrow
property set, they all do.

Change-Id: I95c25599e06af0f2f12e72a7cfc0881206f02039
Reviewed-on: https://gerrit.libreoffice.org/53977
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins

diff --git a/dbaccess/inc/strings.hxx b/dbaccess/inc/strings.hxx
index a0909f00c639..793807f0c58c 100644
--- a/dbaccess/inc/strings.hxx
+++ b/dbaccess/inc/strings.hxx
@@ -89,6 +89,7 @@
 #define PROPERTY_HELPFILENAME "HelpFileName"
 #define PROPERTY_WIDTH "Width"
 #define PROPERTY_ROW_HEIGHT "RowHeight"
+#define PROPERTY_AUTOGROW "AutoGrow"
 #define PROPERTY_FORMATKEY "FormatKey"
 #define PROPERTY_ALIGN "Align"
 #define PROPERTY_FONT "FontDescriptor"
diff --git a/dbaccess/source/core/api/TableDeco.cxx 
b/dbaccess/source/core/api/TableDeco.cxx
index c2c99f269e91..ddc04e4750bd 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -110,6 +110,7 @@ sal_Bool SAL_CALL 
ODBTableDecorator::convertFastPropertyValue(
 case PROPERTY_ID_APPLYFILTER:
 case PROPERTY_ID_FONT:
 case PROPERTY_ID_ROW_HEIGHT:
+case PROPERTY_ID_AUTOGROW:
 case PROPERTY_ID_TEXTCOLOR:
 case PROPERTY_ID_TEXTLINECOLOR:
 case PROPERTY_ID_TEXTEMPHASIS:
@@ -156,6 +157,7 @@ void 
ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con
 case PROPERTY_ID_APPLYFILTER:
 case PROPERTY_ID_FONT:
 case PROPERTY_ID_ROW_HEIGHT:
+case PROPERTY_ID_AUTOGROW:
 case PROPERTY_ID_TEXTCOLOR:
 case PROPERTY_ID_TEXTLINECOLOR:
 case PROPERTY_ID_TEXTEMPHASIS:
@@ -236,6 +238,7 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, 
sal_Int32 _nHandle) c
 case PROPERTY_ID_APPLYFILTER:
 case PROPERTY_ID_FONT:
 case PROPERTY_ID_ROW_HEIGHT:
+case PROPERTY_ID_AUTOGROW:
 case PROPERTY_ID_TEXTCOLOR:
 case PROPERTY_ID_TEXTLINECOLOR:
 case PROPERTY_ID_TEXTEMPHASIS:
diff --git a/dbaccess/source/core/api/datasettings.cxx 
b/dbaccess/source/core/api/datasettings.cxx
index 37ec588f4de3..0eabe9fa9b12 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -65,6 +65,9 @@ void ODataSettings::registerPropertiesFor(ODataSettings_Base* 
_pItem)
 registerMayBeVoidProperty(PROPERTY_ROW_HEIGHT, PROPERTY_ID_ROW_HEIGHT, 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Ilhan Yesil (via logerrit)]

 sw/source/uibase/wrtsh/wrtsh1.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 1ac02ebd93cfaccc4fc7fee27d44dcbce5b57677
Author: Ilhan Yesil 
AuthorDate: Mon Jul 8 12:45:14 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 13 13:14:51 2019 +0200

tdf#125100 After insert of calc document as OLE object, content is shown

After inserting an OLE object, the object has to be shown with
the preview of it's content. The flag for this is set in the
InsertObject method.

Change-Id: I9f0f362190bb9ab0bc36987cf0a6f969932544ec
Reviewed-on: https://gerrit.libreoffice.org/75207
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 7dbeb17da18612df84a4f865057059f7eea8350c)
Reviewed-on: https://gerrit.libreoffice.org/77391
Tested-by: Jenkins

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 16acb2c7cc5f..1fde6f925dc4 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -463,6 +463,11 @@ void SwWrtShell::InsertObject( const 
svt::EmbeddedObjectRef& xRef, SvGlobalName
 
 bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, 
SwFlyFrameFormat **pFlyFrameFormat )
 {
+//tdf#125100 Ensure that ole object is initially shown as pictogram
+comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
mxDoc->GetDocShell()->getEmbeddedObjectContainer();
+bool bSaveUserAllowsLinkUpdate = 
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
+rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true);
+
 ResetCursorStack();
 StartAllAction();
 
@@ -583,6 +588,8 @@ bool SwWrtShell::InsertOleObject( const 
svt::EmbeddedObjectRef& xRef, SwFlyFrame
 
 EndUndo(SwUndoId::INSERT, );
 
+
rEmbeddedObjectContainer.setUserAllowsLinkUpdate(bSaveUserAllowsLinkUpdate);
+
 return bActivate;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Ilhan Yesil (via logerrit)]

 sw/source/uibase/wrtsh/wrtsh1.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 7dbeb17da18612df84a4f865057059f7eea8350c
Author: Ilhan Yesil 
AuthorDate: Mon Jul 8 12:45:14 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Aug 13 11:32:51 2019 +0200

tdf#125100 After insert of calc document as OLE object, content is shown

After inserting an OLE object, the object has to be shown with
the preview of it's content. The flag for this is set in the
InsertObject method.

Change-Id: I9f0f362190bb9ab0bc36987cf0a6f969932544ec
Reviewed-on: https://gerrit.libreoffice.org/75207
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 1bf28c2f8c54..c81e41d25c2a 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -470,6 +470,11 @@ void SwWrtShell::InsertObject( const 
svt::EmbeddedObjectRef& xRef, SvGlobalName
 
 bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, 
SwFlyFrameFormat **pFlyFrameFormat )
 {
+//tdf#125100 Ensure that ole object is initially shown as pictogram
+comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
mxDoc->GetDocShell()->getEmbeddedObjectContainer();
+bool bSaveUserAllowsLinkUpdate = 
rEmbeddedObjectContainer.getUserAllowsLinkUpdate();
+rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true);
+
 ResetCursorStack();
 StartAllAction();
 
@@ -590,6 +595,8 @@ bool SwWrtShell::InsertOleObject( const 
svt::EmbeddedObjectRef& xRef, SwFlyFrame
 
 EndUndo(SwUndoId::INSERT, );
 
+
rEmbeddedObjectContainer.setUserAllowsLinkUpdate(bSaveUserAllowsLinkUpdate);
+
 return bActivate;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source

[Ilhan Yesil (via logerrit)]

 sw/source/core/layout/paintfrm.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 68514ba20f8feff3d18bb6e6d78052934882e840
Author: Ilhan Yesil 
AuthorDate: Fri Jul 5 11:50:49 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 7 23:19:25 2019 +0200

tdf#126222 Headers/footers are at correct position after scrolling

After scrolling, the positions of headers and footers of the
previous pages have to be updated, else these headers and
footers could get visible at a wrong position.

Change-Id: I25508cc0fc0bb7a6e59aeb996e2e7e0a0e23511f
Reviewed-on: https://gerrit.libreoffice.org/75118
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 80ae85d89866e501496189b2749071869ab6e98c)
Reviewed-on: https://gerrit.libreoffice.org/76964
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 53088b40b862..937f90246480 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2993,6 +2993,18 @@ void SwRootFrame::PaintSwFrame(vcl::RenderContext& 
rRenderContext, SwRect const&
 
 const SwPageFrame *pPage = pSh->Imp()->GetFirstVisPage();
 
+// #126222. The positions of headers and footers of the previous
+// pages have to be updated, else these headers and footers could
+// get visible at a wrong position.
+const SwPageFrame *pPageDeco = static_cast(pPage->GetPrev());
+while (pPageDeco)
+{
+pPageDeco->PaintDecorators();
+OSL_ENSURE(!pPageDeco->GetPrev() || 
pPageDeco->GetPrev()->IsPageFrame(),
+"Neighbour of page is not a page.");
+pPageDeco = static_cast(pPageDeco->GetPrev());
+}
+
 const bool bBookMode = 
gProp.pSGlobalShell->GetViewOptions()->IsViewLayoutBookMode();
 if ( bBookMode && pPage->GetPrev() && static_cast(pPage->GetPrev())->IsEmptyPage() )
 pPage = static_cast(pPage->GetPrev());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sw/source

[Ilhan Yesil (via logerrit)]

 sw/source/core/layout/paintfrm.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 499cd0c7eb48ef457de61f60735f0efe38068a6d
Author: Ilhan Yesil 
AuthorDate: Fri Jul 5 11:50:49 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Aug 7 23:11:49 2019 +0200

tdf#126222 Headers/footers are at correct position after scrolling

After scrolling, the positions of headers and footers of the
previous pages have to be updated, else these headers and
footers could get visible at a wrong position.

Change-Id: I25508cc0fc0bb7a6e59aeb996e2e7e0a0e23511f
Reviewed-on: https://gerrit.libreoffice.org/75118
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 80ae85d89866e501496189b2749071869ab6e98c)
Reviewed-on: https://gerrit.libreoffice.org/76966
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index c1316945ec6f..dcbe5d32822b 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2994,6 +2994,18 @@ void SwRootFrame::PaintSwFrame(vcl::RenderContext& 
rRenderContext, SwRect const&
 
 const SwPageFrame *pPage = pSh->Imp()->GetFirstVisPage();
 
+// #126222. The positions of headers and footers of the previous
+// pages have to be updated, else these headers and footers could
+// get visible at a wrong position.
+const SwPageFrame *pPageDeco = static_cast(pPage->GetPrev());
+while (pPageDeco)
+{
+pPageDeco->PaintDecorators();
+OSL_ENSURE(!pPageDeco->GetPrev() || 
pPageDeco->GetPrev()->IsPageFrame(),
+"Neighbour of page is not a page.");
+pPageDeco = static_cast(pPageDeco->GetPrev());
+}
+
 const bool bBookMode = 
gProp.pSGlobalShell->GetViewOptions()->IsViewLayoutBookMode();
 if ( bBookMode && pPage->GetPrev() && static_cast(pPage->GetPrev())->IsEmptyPage() )
 pPage = static_cast(pPage->GetPrev());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Ilhan Yesil (via logerrit)]

 sw/source/core/layout/paintfrm.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit b4c97df4b868607d87ac88ca85c4700c5248e4f4
Author: Ilhan Yesil 
AuthorDate: Fri Jul 5 11:50:49 2019 +0200
Commit: Xisco Faulí 
CommitDate: Mon Aug 5 13:46:10 2019 +0200

tdf#126222 Headers/footers are at correct position after scrolling

After scrolling, the positions of headers and footers of the
previous pages have to be updated, else these headers and
footers could get visible at a wrong position.

Change-Id: I25508cc0fc0bb7a6e59aeb996e2e7e0a0e23511f
Reviewed-on: https://gerrit.libreoffice.org/75118
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 80ae85d89866e501496189b2749071869ab6e98c)
Reviewed-on: https://gerrit.libreoffice.org/76970
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index ef8cd93212bb..bb547a588f3d 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2982,6 +2982,18 @@ void SwRootFrame::PaintSwFrame(vcl::RenderContext& 
rRenderContext, SwRect const&
 
 const SwPageFrame *pPage = pSh->Imp()->GetFirstVisPage();
 
+// #126222. The positions of headers and footers of the previous
+// pages have to be updated, else these headers and footers could
+// get visible at a wrong position.
+const SwPageFrame *pPageDeco = static_cast(pPage->GetPrev());
+while (pPageDeco)
+{
+pPageDeco->PaintDecorators();
+OSL_ENSURE(!pPageDeco->GetPrev() || 
pPageDeco->GetPrev()->IsPageFrame(),
+"Neighbour of page is not a page.");
+pPageDeco = static_cast(pPageDeco->GetPrev());
+}
+
 const bool bBookMode = 
gProp.pSGlobalShell->GetViewOptions()->IsViewLayoutBookMode();
 if ( bBookMode && pPage->GetPrev() && static_cast(pPage->GetPrev())->IsEmptyPage() )
 pPage = static_cast(pPage->GetPrev());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Ilhan Yesil (via logerrit)]

 sw/source/core/layout/paintfrm.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 80ae85d89866e501496189b2749071869ab6e98c
Author: Ilhan Yesil 
AuthorDate: Fri Jul 5 11:50:49 2019 +0200
Commit: Michael Stahl 
CommitDate: Fri Jul 26 13:24:35 2019 +0200

tdf#126222 Headers/footers are at correct position after scrolling

After scrolling, the positions of headers and footers of the
previous pages have to be updated, else these headers and
footers could get visible at a wrong position.

Change-Id: I25508cc0fc0bb7a6e59aeb996e2e7e0a0e23511f
Reviewed-on: https://gerrit.libreoffice.org/75118
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 36f1cd69ff5d..e17d38550eec 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2987,6 +2987,18 @@ void SwRootFrame::PaintSwFrame(vcl::RenderContext& 
rRenderContext, SwRect const&
 
 const SwPageFrame *pPage = pSh->Imp()->GetFirstVisPage();
 
+// #126222. The positions of headers and footers of the previous
+// pages have to be updated, else these headers and footers could
+// get visible at a wrong position.
+const SwPageFrame *pPageDeco = static_cast(pPage->GetPrev());
+while (pPageDeco)
+{
+pPageDeco->PaintDecorators();
+OSL_ENSURE(!pPageDeco->GetPrev() || 
pPageDeco->GetPrev()->IsPageFrame(),
+"Neighbour of page is not a page.");
+pPageDeco = static_cast(pPageDeco->GetPrev());
+}
+
 const bool bBookMode = 
gProp.pSGlobalShell->GetViewOptions()->IsViewLayoutBookMode();
 if ( bBookMode && pPage->GetPrev() && static_cast(pPage->GetPrev())->IsEmptyPage() )
 pPage = static_cast(pPage->GetPrev());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source

[Ilhan Yesil (via logerrit)]

 cui/source/options/certpath.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit e3b95b4a2efc3641236f3cfb3a1f5aaf5843045e
Author: Ilhan Yesil 
AuthorDate: Wed May 29 12:02:47 2019 +0200
Commit: Michael Weghorn 
CommitDate: Thu Jul 4 16:54:39 2019 +0200

tdf#125552 Don't show deleted certificate folder in Certificate Path dialog

Added a check to ensure that certificate folder exists.

Change-Id: I351a58bbc606ac48eb9bdc85aaf0dbf8533a3d10
Reviewed-on: https://gerrit.libreoffice.org/73149
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 6be961a7b6b5594b65f651522ef19f38bb9579aa)
Reviewed-on: https://gerrit.libreoffice.org/75087
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 59d0d8834b0c..57f34df44a15 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -94,7 +94,23 @@ CertPathDialog::CertPathDialog(vcl::Window* pParent)
 
officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString());
 
 if (!sUserSetCertPath.isEmpty())
-AddCertPath(m_sManual, sUserSetCertPath);
+{
+// check existence
+::osl::DirectoryItem aUserPathItem;
+OUString sUserSetCertURLPath;
+osl::FileBase::getFileURLFromSystemPath(sUserSetCertPath, 
sUserSetCertURLPath);
+::osl::FileBase::RC result = ::osl::DirectoryItem::get( 
sUserSetCertURLPath, aUserPathItem );
+if ( result == ::osl::FileBase::E_None  )
+{
+::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
+result = aUserPathItem.getFileStatus( aStatus );
+if ( result == ::osl::FileBase::E_None  )
+{
+// the cert path exists
+AddCertPath(m_sManual, sUserSetCertPath);
+}
+}
+}
 }
 catch (const uno::Exception )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Ilhan Yesil (via logerrit)]

 cui/source/options/certpath.cxx |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 6be961a7b6b5594b65f651522ef19f38bb9579aa
Author: Ilhan Yesil 
AuthorDate: Wed May 29 12:02:47 2019 +0200
Commit: Katarina Behrens 
CommitDate: Mon Jul 1 21:06:10 2019 +0200

tdf#125552 Don't show deleted certificate folder in Certificate Path dialog

Added a check to ensure that certificate folder exists.

Change-Id: I351a58bbc606ac48eb9bdc85aaf0dbf8533a3d10
Reviewed-on: https://gerrit.libreoffice.org/73149
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 9e3406d07016..9bd43b850e6f 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -90,7 +90,23 @@ CertPathDialog::CertPathDialog(weld::Window* pParent)
 
officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString());
 
 if (!sUserSetCertPath.isEmpty())
-AddCertPath(m_sManual, sUserSetCertPath);
+{
+// check existence
+::osl::DirectoryItem aUserPathItem;
+OUString sUserSetCertURLPath;
+osl::FileBase::getFileURLFromSystemPath(sUserSetCertPath, 
sUserSetCertURLPath);
+::osl::FileBase::RC result = ::osl::DirectoryItem::get( 
sUserSetCertURLPath, aUserPathItem );
+if ( result == ::osl::FileBase::E_None  )
+{
+::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
+result = aUserPathItem.getFileStatus( aStatus );
+if ( result == ::osl::FileBase::E_None  )
+{
+// the cert path exists
+AddCertPath(m_sManual, sUserSetCertPath);
+}
+}
+}
 }
 catch (const uno::Exception &)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sw/qa sw/source

[Ilhan Yesil (via logerrit)]

 sw/qa/extras/ooxmlexport/data/textinput.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx   |   11 +++
 sw/source/filter/ww8/docxexport.cxx |7 +--
 3 files changed, 16 insertions(+), 2 deletions(-)

New commits:
commit d179d77b6743ffb7d77bb3671b3e49ee19d76ba3
Author: Ilhan Yesil 
AuthorDate: Thu May 23 17:52:04 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Fri May 31 00:41:14 2019 +0200

tdf#125103 Writer: input fields will be exported to docx

Changed the solution https://gerrit.libreoffice.org/#/c/70786/
of Vasily sligthly, so MS Office can recognize fields still
as fields.

ooxmlexport13 is not present in the 5.2 branch, so test case
is merged into ooxmlexport7.

Reviewed-on: https://gerrit.libreoffice.org/72868
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk 
(cherry picked from commit 62d156ef0daccd2680161ef8b9b99d8a7bc0)

Change-Id: Id45330a96dfe002685c6ef3dc62e408c5f9f46c4
Reviewed-on: https://gerrit.libreoffice.org/73079
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/extras/ooxmlexport/data/textinput.odt 
b/sw/qa/extras/ooxmlexport/data/textinput.odt
new file mode 100644
index ..04b8d054c354
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/textinput.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index 4b3f0f1acf03..cfe5dd9c13fe 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -1910,6 +1910,17 @@ DECLARE_OOXMLEXPORT_TEST(testSignatureLineShape, 
"signature-line-all-props-set.d
 CPPUNIT_ASSERT_EQUAL(OUString("Check the machines!"), 
aSigningInstructions);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTextInput, "textinput.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+// Ensure we have a formfield
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " 
FILLIN \"\"");
+// and it's content is not gone
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[5]/w:t", 
"SomeText");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 2abbe899f130..063b76b2e90a 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -365,9 +365,12 @@ void DocxExport::DoComboBox(const OUString& rName,
 m_pDocumentFS->endElementNS( XML_w, XML_ffData );
 }
 
-void DocxExport::DoFormText(const SwInputField* /*pField*/)
+void DocxExport::DoFormText(const SwInputField* pField)
 {
-OSL_TRACE( "TODO DocxExport::ForFormText()" );
+
+assert(pField);
+const OUString sStr = FieldString(ww::eFILLIN) + "\"" + pField->GetPar2() 
+ "\"";
+OutputField(pField, ww::eFILLIN, sStr);
 }
 
 OString DocxExport::OutputChart( uno::Reference< frame::XModel >& xModel, 
sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/qa sw/source

[Ilhan Yesil (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx |2 +-
 sw/source/filter/ww8/docxexport.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7869bf3d5e71f5c5acfeb83f1695f643d57dd2f9
Author: Ilhan Yesil 
AuthorDate: Thu May 23 17:52:04 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 30 00:08:14 2019 +0200

tdf#125103 Writer: input fields will be exported to docx

Changed the solution https://gerrit.libreoffice.org/#/c/70786/
of Vasily sligthly, so MS Office can recognize fields still
as fields.

Reviewed-on: https://gerrit.libreoffice.org/72868
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk 
(cherry picked from commit 62d156ef0daccd2680161ef8b9b99d8a7bc0)

Change-Id: Id45330a96dfe002685c6ef3dc62e408c5f9f46c4
Reviewed-on: https://gerrit.libreoffice.org/73100
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 25fc6b4d69f7..cddb19256f2e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -777,7 +777,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextInput, "textinput.odt")
 if (!pXmlDoc)
 return;
 // Ensure we have a formfield
-assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " 
FORMTEXT ");
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " 
FILLIN \"\"");
 // and it's content is not gone
 assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[5]/w:t", 
"SomeText");
 }
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index e4a2d274544e..cce452fe409c 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -378,8 +378,8 @@ void DocxExport::DoComboBox(const OUString& rName,
 void DocxExport::DoFormText(const SwInputField* pField)
 {
 assert(pField);
-const OUString sStr = FieldString(ww::eFORMTEXT);
-OutputField(pField, ww::eFORMTEXT, sStr);
+const OUString sStr = FieldString(ww::eFILLIN) + "\"" + pField->GetPar2() 
+ "\"";
+OutputField(pField, ww::eFILLIN, sStr);
 }
 
 OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & 
xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sc/inc sc/source

[Ilhan Yesil (via logerrit)]

 sc/inc/document.hxx   |2 +-
 sc/inc/drwlayer.hxx   |2 +-
 sc/source/core/data/documen9.cxx  |4 ++--
 sc/source/core/data/drwlayer.cxx  |   19 ++-
 sc/source/ui/docshell/docfunc.cxx |   17 +
 sc/source/ui/view/viewfunc.cxx|   11 +--
 6 files changed, 44 insertions(+), 11 deletions(-)

New commits:
commit f10f83bde06b0303a0d56dac120ecb53349250f2
Author: Ilhan Yesil 
AuthorDate: Mon Mar 18 15:29:11 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Mon May 27 17:58:08 2019 +0200

tdf#123762 Cell anchored object is deleted if cell is deleted

If an object is anchored to a cell, then it is expected that
this object belongs to this cell and it's survive after a
deletion of the cell makes no sense. So the anchored object
will be deleted together with the cell. Objects anchored to
the page are not affected.

Reviewed-on: https://gerrit.libreoffice.org/69390
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit d2fa9c0d657877c967e41fdd0091f81d1b7ca048)

Change-Id: I91f24bf92ab5329aba1d053b3cf5fba77bf16e4f
Reviewed-on: https://gerrit.libreoffice.org/72800
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index dff46dffd699..be7630b13461 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1469,7 +1469,7 @@ public:
 bool HasOLEObjectsInArea( const ScRange& rRange, 
const ScMarkData* pTabMark = nullptr );
 
 void DeleteObjectsInArea( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCROW nRow2,
-  const ScMarkData& rMark 
);
+  const ScMarkData& rMark, 
bool bAnchored = false );
 void DeleteObjectsInSelection( const ScMarkData& 
rMark );
 
 void DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2, const ScMarkData& rMark,
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 48741497ac0e..1713d3b94120 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -143,7 +143,7 @@ public:
 boolHasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW 
nEndRow );
 
 voidDeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
-SCCOL nCol2,SCROW nRow2 );
+SCCOL nCol2,SCROW nRow2, bool 
bAnchored = false );
 voidDeleteObjectsInSelection( const ScMarkData& rMark );
 
 voidCopyToClip( ScDocument* pClipDoc, SCTAB nTab, const 
tools::Rectangle& rRange );
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 5433142df41a..179b54eae0f3 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -260,7 +260,7 @@ bool ScDocument::DrawGetPrintArea( ScRange& rRange, bool 
bSetHor, bool bSetVer )
 }
 
 void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
-const ScMarkData& rMark )
+const ScMarkData& rMark, bool bAnchored)
 {
 if (!mpDrawLayer)
 return;
@@ -269,7 +269,7 @@ void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCR
 ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
 for (; itr != itrEnd && *itr < nTabCount; ++itr)
 if (maTabs[*itr])
-mpDrawLayer->DeleteObjectsInArea( *itr, nCol1, nRow1, nCol2, nRow2 
);
+mpDrawLayer->DeleteObjectsInArea( *itr, nCol1, nRow1, nCol2, 
nRow2, bAnchored);
 }
 
 void ScDocument::DeleteObjectsInSelection( const ScMarkData& rMark )
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 8739d3b195c0..7dc7c6a4e62c 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1359,7 +1359,7 @@ bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW 
nStartRow, SCROW nEndRow )
 }
 
 void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
-SCCOL nCol2,SCROW nRow2 )
+SCCOL nCol2,SCROW nRow2, bool 
bAnchored )
 {
 OSL_ENSURE( pDoc, "ScDrawLayer::DeleteObjectsInArea without document" );
 if ( !pDoc )
@@ -1389,8 +1389,17 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL 
nCol1,SCROW nRow1,
 if (!IsNoteCaption( pObject ))
 {
 tools::Rectangle aObjRect = pObject->GetCurrentBoundRect();
-if ( aDelRect.IsInside( aObjRect ) )
-ppObj[nDelCount++] = pObject;
+if (aDelRect.IsInside(aObjRect))
+{
+if (bAnchored)
+{
+  

[Libreoffice-commits] core.git: sw/qa sw/source

[Ilhan Yesil (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |2 +-
 sw/source/filter/ww8/docxexport.cxx|4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 62d156ef0daccd2680161ef8b9b99d8a7bc0
Author: Ilhan Yesil 
AuthorDate: Thu May 23 17:52:04 2019 +0200
Commit: Vasily Melenchuk 
CommitDate: Mon May 27 08:41:17 2019 +0200

tdf#125103 Writer: input fields will be exported to docx

Changed the solution https://gerrit.libreoffice.org/#/c/70786/
of Vasily sligthly, so MS Office can recognize fields still
as fields.

Change-Id: Id45330a96dfe002685c6ef3dc62e408c5f9f46c4
Reviewed-on: https://gerrit.libreoffice.org/72868
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 4254a619e17a..edbc0964685d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -245,7 +245,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextInput, "textinput.odt")
 if (!pXmlDoc)
 return;
 // Ensure we have a formfield
-assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " 
FORMTEXT ");
+assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[3]/w:instrText", " 
FILLIN \"\"");
 // and it's content is not gone
 assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[5]/w:t", 
"SomeText");
 }
diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 75a28e020a91..f0db6407c55d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -378,8 +378,8 @@ void DocxExport::DoComboBox(const OUString& rName,
 void DocxExport::DoFormText(const SwInputField* pField)
 {
 assert(pField);
-const OUString sStr = FieldString(ww::eFORMTEXT);
-OutputField(pField, ww::eFORMTEXT, sStr);
+const OUString sStr = FieldString(ww::eFILLIN) + "\"" + pField->GetPar2() 
+ "\"";
+OutputField(pField, ww::eFILLIN, sStr);
 }
 
 OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & 
xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sc/inc sc/source

[Ilhan Yesil (via logerrit)]

 sc/inc/document.hxx   |2 +-
 sc/inc/drwlayer.hxx   |2 +-
 sc/source/core/data/documen9.cxx  |4 ++--
 sc/source/core/data/drwlayer.cxx  |   26 ++
 sc/source/ui/docshell/docfunc.cxx |   17 +
 sc/source/ui/view/viewfunc.cxx|   11 +--
 6 files changed, 52 insertions(+), 10 deletions(-)

New commits:
commit cd0d6b6190759eb5f14e081e1c5ca789b1ca471f
Author: Ilhan Yesil 
AuthorDate: Mon Mar 18 15:29:11 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Wed May 22 13:47:44 2019 +0200

tdf#123762 Cell anchored object is deleted if cell is deleted

If an object is anchored to a cell, then it is expected that
this object belongs to this cell and it's survive after a
deletion of the cell makes no sense. So the anchored object
will be deleted together with the cell. Objects anchored to
the page are not affected.

Reviewed-on: https://gerrit.libreoffice.org/69390
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit d2fa9c0d657877c967e41fdd0091f81d1b7ca048)

Change-Id: I91f24bf92ab5329aba1d053b3cf5fba77bf16e4f
Reviewed-on: https://gerrit.libreoffice.org/72665
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 690bab10710d..aa98d27e5240 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1381,7 +1381,7 @@ public:
 boolHasOLEObjectsInArea( const ScRange& rRange, const 
ScMarkData* pTabMark = nullptr );
 
 voidDeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2,
-const ScMarkData& rMark );
+const ScMarkData& rMark, bool 
bAnchored = false);
 voidDeleteObjectsInSelection( const ScMarkData& rMark );
 
 void DeleteArea(
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 091d8f1da471..261459968c25 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -146,7 +146,7 @@ public:
 boolHasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW 
nEndRow );
 
 voidDeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
-SCCOL nCol2,SCROW nRow2 );
+SCCOL nCol2,SCROW nRow2, bool 
bAnchored = false );
 voidDeleteObjectsInSelection( const ScMarkData& rMark );
 
 voidCopyToClip( ScDocument* pClipDoc, SCTAB nTab, const 
Rectangle& rRange );
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 984f21eeb311..b1f5745edb90 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -269,7 +269,7 @@ void ScDocument::DrawCopyPage( sal_uInt16 nOldPos, 
sal_uInt16 nNewPos )
 }
 
 void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
-const ScMarkData& rMark )
+const ScMarkData& rMark, bool bAnchored)
 {
 if (!pDrawLayer)
 return;
@@ -278,7 +278,7 @@ void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCR
 ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end();
 for (; itr != itrEnd && *itr < nTabCount; ++itr)
 if (maTabs[*itr])
-pDrawLayer->DeleteObjectsInArea( *itr, nCol1, nRow1, nCol2, nRow2 
);
+pDrawLayer->DeleteObjectsInArea( *itr, nCol1, nRow1, nCol2, nRow2, 
bAnchored);
 }
 
 void ScDocument::DeleteObjectsInSelection( const ScMarkData& rMark )
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 8bccca95b0ec..eb471d300b07 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1373,7 +1373,7 @@ bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW 
nStartRow, SCROW nEndRow )
 }
 
 void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
-SCCOL nCol2,SCROW nRow2 )
+SCCOL nCol2,SCROW nRow2, bool 
bAnchored )
 {
 OSL_ENSURE( pDoc, "ScDrawLayer::DeleteObjectsInArea without document" );
 if ( !pDoc )
@@ -1403,8 +1403,17 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL 
nCol1,SCROW nRow1,
 if (!IsNoteCaption( pObject ))
 {
 Rectangle aObjRect = pObject->GetCurrentBoundRect();
-if ( aDelRect.IsInside( aObjRect ) )
-ppObj[nDelCount++] = pObject;
+if (aDelRect.IsInside(aObjRect))
+{
+if (bAnchored)
+{
+ScAnchorType aAnchorType = 
ScDrawLayer::GetAnchorType(*pObject);
+if (aAnchorType == SCA_CELL || aAnchorType == 
SCA_CELL_RESIZE)
+

[Libreoffice-commits] core.git: sc/inc sc/source

[Ilhan Yesil (via logerrit)]

 sc/inc/document.hxx   |2 +-
 sc/inc/drwlayer.hxx   |2 +-
 sc/source/core/data/documen9.cxx  |4 ++--
 sc/source/core/data/drwlayer.cxx  |   19 ++-
 sc/source/ui/docshell/docfunc.cxx |   17 +
 sc/source/ui/view/viewfunc.cxx|   11 +--
 6 files changed, 44 insertions(+), 11 deletions(-)

New commits:
commit d2fa9c0d657877c967e41fdd0091f81d1b7ca048
Author: Ilhan Yesil 
AuthorDate: Mon Mar 18 15:29:11 2019 +0100
Commit: Eike Rathke 
CommitDate: Wed May 15 00:07:11 2019 +0200

tdf#123762 Cell anchored object is deleted if cell is deleted

If an object is anchored to a cell, then it is expected that
this object belongs to this cell and it's survive after a
deletion of the cell makes no sense. So the anchored object
will be deleted together with the cell. Objects anchored to
the page are not affected.

Change-Id: I91f24bf92ab5329aba1d053b3cf5fba77bf16e4f
Reviewed-on: https://gerrit.libreoffice.org/69390
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index d36db2e6fef4..dd59a74c44e4 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1512,7 +1512,7 @@ public:
 bool HasOLEObjectsInArea( const ScRange& rRange, 
const ScMarkData* pTabMark = nullptr );
 
 void DeleteObjectsInArea( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCROW nRow2,
-  const ScMarkData& rMark 
);
+  const ScMarkData& rMark, 
bool bAnchored = false );
 void DeleteObjectsInSelection( const ScMarkData& 
rMark );
 
 void DeleteArea( SCCOL nCol1, SCROW nRow1, SCCOL 
nCol2, SCROW nRow2, const ScMarkData& rMark,
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 143868c0e6ce..9f8268be03b8 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -143,7 +143,7 @@ public:
 boolHasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW 
nEndRow );
 
 voidDeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
-SCCOL nCol2,SCROW nRow2 );
+SCCOL nCol2,SCROW nRow2, bool 
bAnchored = false );
 voidDeleteObjectsInSelection( const ScMarkData& rMark );
 
 voidCopyToClip( ScDocument* pClipDoc, SCTAB nTab, const 
tools::Rectangle& rRange );
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index d5146ed509ad..d873b820c31f 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -248,7 +248,7 @@ bool ScDocument::DrawGetPrintArea( ScRange& rRange, bool 
bSetHor, bool bSetVer )
 }
 
 void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
-const ScMarkData& rMark )
+const ScMarkData& rMark, bool bAnchored)
 {
 if (!mpDrawLayer)
 return;
@@ -259,7 +259,7 @@ void ScDocument::DeleteObjectsInArea( SCCOL nCol1, SCROW 
nRow1, SCCOL nCol2, SCR
 if (rTab >= nTabCount)
 break;
 if (maTabs[rTab])
-mpDrawLayer->DeleteObjectsInArea( rTab, nCol1, nRow1, nCol2, nRow2 
);
+mpDrawLayer->DeleteObjectsInArea( rTab, nCol1, nRow1, nCol2, 
nRow2, bAnchored);
 }
 }
 
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 90f92296534c..f27af11fc71a 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1360,7 +1360,7 @@ bool ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW 
nStartRow, SCROW nEndRow )
 }
 
 void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
-SCCOL nCol2,SCROW nRow2 )
+SCCOL nCol2,SCROW nRow2, bool 
bAnchored )
 {
 OSL_ENSURE( pDoc, "ScDrawLayer::DeleteObjectsInArea without document" );
 if ( !pDoc )
@@ -1390,8 +1390,17 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL 
nCol1,SCROW nRow1,
 if (!IsNoteCaption( pObject ))
 {
 tools::Rectangle aObjRect = pObject->GetCurrentBoundRect();
-if ( aDelRect.IsInside( aObjRect ) )
-ppObj[nDelCount++] = pObject;
+if (aDelRect.IsInside(aObjRect))
+{
+if (bAnchored)
+{
+ScAnchorType aAnchorType = 
ScDrawLayer::GetAnchorType(*pObject);
+if(aAnchorType == SCA_CELL || aAnchorType == 
SCA_CELL_RESIZE)
+ppObj[nDelCount++] = pObject;
+}
+else
+ppObj[nDelCount++] = pObject;
+}