date:20201006

Re: calc: jumbo sheets on windows (never gonna happen)

2020-10-06 Thread Dennis Roczek



Am 07.10.2020 um 04:45 schrieb Andrew Pitonyak:
> how often I see it is highly dependent on which projects I happen to be 
> working at the time period. I think it's crazy? Yes. Do people do it 
> successfully? Yes.




well... or not
https://arstechnica.com/tech-policy/2020/10/excel-glitch-may-have-caused-uk-to-underreport-covid-19-cases-by-15841/


*lol*




OpenPGP_0xCE3E41FDCE2AB6D9.asc
Description: application/pgp-keys


OpenPGP_signature
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - chart2/source include/svx sc/source svx/source

2020-10-06 Thread Szymon Kłos (via logerrit)

 chart2/source/controller/inc/ChartController.hxx|1 
 chart2/source/controller/main/ChartController.cxx   |4 +
 chart2/source/controller/main/ChartController_Tools.cxx |   38 
 include/svx/xgrad.hxx   |2 
 sc/source/ui/drawfunc/drawsh2.cxx   |   30 
 svx/source/xoutdev/xattr.cxx|   18 +++
 6 files changed, 93 insertions(+)

New commits:
commit 7a061d5c8778fee58f966eee7f95917a5a74123e
Author: Szymon Kłos 
AuthorDate: Tue Sep 29 13:40:41 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 7 08:53:04 2020 +0200

Set correct gradient color for chart background in sidebar

Change-Id: I98dc177494fddc4a975479e99aba7b6318051b1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103618
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104033
Reviewed-by: Szymon Kłos 

diff --git a/sc/source/ui/drawfunc/drawsh2.cxx 
b/sc/source/ui/drawfunc/drawsh2.cxx
index 264f81998af9..e5339cc22940 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -343,6 +344,35 @@ static void setupFillColorForChart(SfxViewShell* pShell, 
SfxItemSet& rSet)
 
pShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
 (".uno:FillColor=" + 
std::to_string(nFillColor)).c_str());
 }
+
+if (comphelper::LibreOfficeKit::isActive() && 
xInfo->hasPropertyByName("FillGradientName"))
+{
+OUString aGradientName;
+xPropSet->getPropertyValue("FillGradientName") 
>>= aGradientName;
+
+::css::uno::Reference< 
::css::frame::XController > xChartController = xChart->getCurrentController();
+if( xChartController.is() )
+{
+
css::uno::Reference 
xFact(xChartController->getModel(), css::uno::UNO_QUERY);
+
+if (xFact.is())
+{
+
css::uno::Reference xNameAccess(
+
xFact->createInstance("com.sun.star.drawing.GradientTable"), 
css::uno::UNO_QUERY);
+
+if (xNameAccess.is() && 
xNameAccess->hasByName(aGradientName))
+{
+css::uno::Any aAny = 
xNameAccess->getByName(aGradientName);
+
+XFillGradientItem aItem;
+aItem.SetName(aGradientName);
+aItem.PutValue(aAny, 
MID_FILLGRADIENT);
+
+rSet.Put(aItem);
+}
+}
+}
+}
 }
 }
 }
commit 8fdaa15db9a9303c42184e7d3a2b32a4b5e1c340
Author: Szymon Kłos 
AuthorDate: Tue Sep 29 15:11:41 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Oct 7 08:52:58 2020 +0200

lok: Add posibility to change chart fill gradient

Change-Id: I942d478cd870036710390d2c03413b6fc0454038
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103619
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104034
Reviewed-by: Szymon Kłos 

diff --git a/chart2/source/controller/inc/ChartController.hxx 
b/chart2/source/controller/inc/ChartController.hxx
index 6894ab3b3592..5e5c229cd147 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -503,6 +503,7 @@ private:
 void executeDispatch_LOKSetTextSelection(int nType, int nX, int nY);
 void executeDispatch_LOKPieSegmentDragging(int nOffset);
 void executeDispatch_FillColor(sal_uInt32 nColor);
+void executeDispatch_FillGradient(OUString sJSONGradient);
 
 void sendPopupRequest(OUString const & rCID, tools::Rectangle aRectangle);
 
diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index c2dc975d02f2..8fedb472ca04 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1113,6 +1113,10 @@ void SAL_CALL ChartController::dispatch(
 this->executeDispatch_FillColor(nColor);
 }
 }
+else if(aCommand.startsWith("FillGradient"))
+{
+

[Libreoffice-commits] core.git: bin/lint-ui.py chart2/uiconfig cui/uiconfig dbaccess/uiconfig extensions/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig sw/uiconfig vcl/qa vcl/uiconfig

2020-10-06 Thread Noel (via logerrit)

 bin/lint-ui.py |2 +-
 chart2/uiconfig/ui/sidebarseries.ui|2 +-
 chart2/uiconfig/ui/tp_3D_SceneIllumination.ui  |4 ++--
 cui/uiconfig/ui/numberingformatpage.ui |2 +-
 cui/uiconfig/ui/optfltrembedpage.ui|2 +-
 cui/uiconfig/ui/optlingupage.ui|4 ++--
 cui/uiconfig/ui/optviewpage.ui |4 ++--
 cui/uiconfig/ui/paraindentspacing.ui   |2 +-
 dbaccess/uiconfig/ui/userdetailspage.ui|2 +-
 extensions/uiconfig/sabpilot/ui/gridfieldsselectionpage.ui |2 +-
 extensions/uiconfig/sabpilot/ui/groupradioselectionpage.ui |2 +-
 extensions/uiconfig/scanner/ui/sanedialog.ui   |2 +-
 sc/uiconfig/scalc/ui/datafielddialog.ui|2 +-
 sc/uiconfig/scalc/ui/optcalculatepage.ui   |4 ++--
 sc/uiconfig/scalc/ui/retypepassdialog.ui   |4 ++--
 sd/uiconfig/simpress/ui/dockinganimation.ui|2 +-
 sfx2/uiconfig/ui/documentfontspage.ui  |2 +-
 sfx2/uiconfig/ui/helpindexpage.ui  |2 +-
 sw/uiconfig/swriter/ui/flddbpage.ui|2 +-
 sw/uiconfig/swriter/ui/mmresultemaildialog.ui  |4 ++--
 sw/uiconfig/swriter/ui/mmresultprintdialog.ui  |4 ++--
 sw/uiconfig/swriter/ui/mmresultsavedialog.ui   |2 +-
 sw/uiconfig/swriter/ui/mmsendmails.ui  |4 ++--
 sw/uiconfig/swriter/ui/optcompatpage.ui|2 +-
 sw/uiconfig/swriter/ui/optformataidspage.ui|2 +-
 sw/uiconfig/swriter/ui/viewoptionspage.ui  |2 +-
 vcl/qa/cppunit/builder/demo.ui |6 +++---
 vcl/uiconfig/ui/printdialog.ui |2 +-
 28 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 8eff280bc08ec3d7b2312ae4ee48df4d7328b7de
Author: Noel 
AuthorDate: Fri Oct 2 12:35:26 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 7 08:15:06 2020 +0200

ui files: fix some capitalisation issues

Change-Id: Id2efb6e5f1c115cb31a6afd3f988fe156c5ad56e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103829
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 124e1bf58316..8860547bef58 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -163,7 +163,7 @@ def check_title_labels(root):
 words = re.split(r'[^a-zA-Z0-9:_-]', title.text)
 first = True
 for word in words:
-if len(word) and word[0].islower() and (word not in IGNORED_WORDS 
or first):
+if len(word) and word[0].islower() and (word not in IGNORED_WORDS) 
and not first:
 lint_assert(False, "The word '" + word + "' should be 
capitalized", label)
 first = False
 
diff --git a/chart2/uiconfig/ui/sidebarseries.ui 
b/chart2/uiconfig/ui/sidebarseries.ui
index 568569464a9e..8e600fbfab8d 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -290,7 +290,7 @@
   
 True
 False
-label
+Label
 
   
 
diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui 
b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 5c7091ff26ee..b9c2e6d7c586 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -308,7 +308,7 @@
   
 True
 False
-_Light source
+_Light Source
 True
 BTN_LIGHT_1
 0
@@ -391,7 +391,7 @@
   
 True
 False
-_Ambient light
+_Ambient Light
 True
 LB_AMBIENTLIGHT
 0
diff --git a/cui/uiconfig/ui/numberingformatpage.ui 
b/cui/uiconfig/ui/numberingformatpage.ui
index f19a0b797835..c92c42f55749 100644
--- a/cui/uiconfig/ui/numberingformatpage.ui
+++ b/cui/uiconfig/ui/numberingformatpage.ui
@@ -188,7 +188,7 @@
   
 True
 False
-_Format code
+_Format Code
 True
 formatted
 
diff --git a/cui/uiconfig/ui/optfltrembedpage.ui 
b/cui/uiconfig/ui/optfltrembedpage.ui
index 53740a863a72..50e7ee89d6aa 100644
--- a/cui/uiconfig/ui/optfltrembedpage.ui
+++ b/cui/uiconfig/ui/optfltrembedpage.ui
@@ -355,7 +355,7 @@
   
 True
 False
-Lock files
+Lock Files
 
   
 
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index e3172620e90c..3f57

[Libreoffice-commits] core.git: bin/lint-ui.py cui/uiconfig dbaccess/uiconfig fpicker/uiconfig sc/uiconfig sfx2/uiconfig sw/uiconfig

2020-10-06 Thread Noel Grandin (via logerrit)

 bin/lint-ui.py  |   13 +++--
 cui/uiconfig/ui/certdialog.ui   |1 +
 cui/uiconfig/ui/macroselectordialog.ui  |1 +
 cui/uiconfig/ui/specialcharacters.ui|1 +
 cui/uiconfig/ui/tsaurldialog.ui |2 ++
 dbaccess/uiconfig/ui/collectionviewdialog.ui|3 +++
 fpicker/uiconfig/ui/remotefilesdialog.ui|1 +
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui|1 +
 sc/uiconfig/scalc/ui/chisquaretestdialog.ui |1 +
 sc/uiconfig/scalc/ui/correlationdialog.ui   |1 +
 sc/uiconfig/scalc/ui/covariancedialog.ui|1 +
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui |1 +
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui  |1 +
 sc/uiconfig/scalc/ui/fourieranalysisdialog.ui   |1 +
 sc/uiconfig/scalc/ui/movingaveragedialog.ui |1 +
 sc/uiconfig/scalc/ui/randomnumbergenerator.ui   |2 ++
 sc/uiconfig/scalc/ui/regressiondialog.ui|1 +
 sc/uiconfig/scalc/ui/samplingdialog.ui  |1 +
 sc/uiconfig/scalc/ui/ttestdialog.ui |1 +
 sc/uiconfig/scalc/ui/ztestdialog.ui |1 +
 sfx2/uiconfig/ui/versioncommentdialog.ui|1 +
 sw/uiconfig/swriter/ui/bibliographyentry.ui |1 +
 sw/uiconfig/swriter/ui/indexentry.ui|1 +
 23 files changed, 29 insertions(+), 10 deletions(-)

New commits:
commit 3d056824c687df567c05bf31554fa40ea2baef18
Author: Noel Grandin 
AuthorDate: Tue Oct 6 16:19:19 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 7 08:14:42 2020 +0200

Revert "lint-ui: check that we only have one has_default==True"

This reverts commit c9e3952e76a9c06d5a1d2f583829ce9eb5b9df64.

Reason for revert: Some of the code manipulates visibility 
programmatically, and it is quite fine to has more than one has_default if only 
one of them is visible at a time.

Change-Id: Ia4f565c7d21d232d3038c3489952782c8e2a7be5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103977
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index c3344c3a3b51..124e1bf58316 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -76,23 +76,16 @@ def check_top_level_widget(element):
 #lint_assert(border_width.text == BORDER_WIDTH,
 #"Top level 'border_width' property should be " + 
BORDER_WIDTH, border_width)
 
-# check that
-# (*) any widget which has 'has-default' also has 'can-default'
-# (*) we have at most one has-default widget
-# 'has-default' means that when ENTER is pressed, this widget is 
triggered, normally the OK button
-has_default_count = 0
+# check that any widget which has 'has-default' also has 'can-default'
 for widget in element.findall('.//object'):
 if not widget.attrib['class']:
 continue
-child_widget_type = widget.attrib['class']
+widget_type = widget.attrib['class']
 has_defaults = widget.findall("./property[@name='has_default']")
 if len(has_defaults) > 0 and has_defaults[0].text == "True":
-has_default_count += 1
 can_defaults = widget.findall("./property[@name='can_default']")
 lint_assert(len(can_defaults)>0 and can_defaults[0].text == "True",
-"has_default without can_default in " + child_widget_type + " 
with id = '" + widget.attrib['id'] + "'", widget)
-lint_assert(has_default_count <= 1,
-"more than one child with has_default=='True' in top-level widget " + 
widget_type, element)
+"has_default without can_default in " + widget_type + " with 
id = '" + widget.attrib['id'] + "'", widget)
 
 def check_button_box_spacing(element):
 spacing = element.findall("property[@name='spacing']")
diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui
index 0794e6278c4b..39d84c5df216 100644
--- a/cui/uiconfig/ui/certdialog.ui
+++ b/cui/uiconfig/ui/certdialog.ui
@@ -41,6 +41,7 @@
 True
 True
 True
+True
 True
 True
 
diff --git a/cui/uiconfig/ui/macroselectordialog.ui 
b/cui/uiconfig/ui/macroselectordialog.ui
index d9757531fd3e..ea485c283a37 100644
--- a/cui/uiconfig/ui/macroselectordialog.ui
+++ b/cui/uiconfig/ui/macroselectordialog.ui
@@ -42,6 +42,7 @@
 Add
 True
 True
+True
 True
 True
   
diff --git a/cui/uiconfig/ui/specialcharacters.ui 
b/cui/uiconfig/ui/specialcharacters.ui
index 684031a9fe53..9e8e5323828c 100644
--- a/cui/uiconfig/ui/specialcharacters.ui
+++ b/cui/uiconfig/ui/specialcharacters.ui
@@ -24,6 +24,7 @@
 _Insert
 True
 True
+

RE: calc: jumbo sheets on windows (never gonna happen)

2020-10-06 Thread Andrew Pitonyak

I think that the important point is that people do it in excel. They then try 
to open the file and they cannot. I have certainly been handled really large 
files perhaps it is simply a CSV file with lots of rows and I know how to deal 
with the spreadsheet so that's how I open it. Quick and dirty and off we go.

In general, these types of files come from a client so what are you going to 
do. I cannot tell you the number of times that someone has said hey we want to 
be able to open that in a spreadsheet program.

how often I see it is highly dependent on which projects I happen to be working 
at the time period. I think it's crazy? Yes. Do people do it successfully? Yes.

⁣Sent from BlueMail 

On Oct 6, 2020, 6:22 PM, at 6:22 PM, nicholas ferguson 
 wrote:
>Can I ask what kind of platform would you use for 16 million rows that
>involve calculations?
>
>From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On
>Behalf Of Dan Lewis
>Sent: Tuesday, October 06, 2020 2:59 PM
>To: libreoffice@lists.freedesktop.org
>Subject: Re: calc: jumbo sheets on windows (never gonna happen)
>
>From my perspective, one needs to learn how to create a database in
>Base including tables, queries, forms and report when working with this
>much data. It is designed to handle large amounts of it. MySQL,
>Postgresql, and Oracle can be used as a backend  for Base being the
>front end.
>Dan
>On 10/6/20 12:09, Noel Grandin wrote:
>Hi
>
>i.e. very large spreadsheets of up to 16 million rows.
>
>So I did some more investigation into this. In various places, we need
>to accumulate things like row-heights and other things, numbers which,
>with jumbo sheets, easily exceed 32-bits.
>
>HOWEVER
>
>All over the place, we pass these values through
>sal_uLong/sal_Long/long/unsigned long.
>
>Which is 32-bits on Windows. Doh!
>
>Honestly, the only solution I can think of (and one I confidently
>expect us to reject), is that we declare a flag day, and search and
>replace sal_Long/sal_uLong/long/unsigned long with a 64-bit type across
>the ENTIRE code base.
>
>Regards, Noel Grandin.
>
>
>
>
>___
>LibreOffice mailing list
>LibreOffice@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
>
>
>___
>LibreOffice mailing list
>LibreOffice@lists.freedesktop.org
>https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-10-06 Thread Jan-Marek Glogowski (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   14 ---
 sfx2/source/dialog/backingwindow.cxx   |   16 -
 sfx2/source/dialog/backingwindow.hxx   |1 
 3 files changed, 31 deletions(-)

New commits:
commit a927e0964ba0442d53fffb22c577e54bcf183ed7
Author: Jan-Marek Glogowski 
AuthorDate: Sat Sep 19 20:53:34 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Oct 7 04:12:36 2020 +0200

tdf#136555 drop custom start center button colors

Custom button text or background colors don't play nice with any
complex theming. Maybe we should still allow a custom background
color for the button bar, but probably that attempt is also futile
and clashes with theming easily.

As long as the botton bar uses themable push-buttons as a control
custom coloring will break at some point, as these buttons can
have too many states, which curently depend on the theme. There is
no way for LO to know, if a roll-over button will return with a
different backround or just some changed border from a themed
paint call.

So this reverts the button part of tdf#90452. It doesn't affect
the preview area, as that is a custom widget, which doesn't use
any theming, but has it's own setting - for better or worse.

Change-Id: I1ef17a50d15a5876a11bce89ae3f764aa91f66bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103041
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 
Reviewed-by: Jan-Marek Glogowski 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index f764d3d7aa45..b5bcb9c8bde0 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3699,20 +3699,6 @@
   
   
 
-
-  
-  
-Specifies the background color of the start center.
-  
-  14540253
-
-
-  
-  
-Specifies the text color of the buttons in the start 
center.
-  
-  3355443
-
 
   
   
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index ead00a2beeb9..48bb6c1cf416 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -68,7 +68,6 @@ float const fMultiplier = 1.4f;
 BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
 Window( i_pParent ),
 mbLocalViewInitialized(false),
-
maButtonsTextColor(Color(officecfg::Office::Common::Help::StartCenter::StartCenterTextColor::get())),
 mbInitControls( false )
 {
 m_pUIBuilder.reset(new VclBuilder(this, AllSettings::GetUIRootDir(), 
"sfx/ui/startcenter.ui", "StartCenter" ));
@@ -255,19 +254,10 @@ void BackingWindow::initControls()
 mpExtensionsButton->SetClickHdl(LINK(this, BackingWindow, 
ExtLinkClickHdl));
 
 // setup nice colors
-mpCreateLabel->SetControlForeground(maButtonsTextColor);
 vcl::Font 
aFont(mpCreateLabel->GetSettings().GetStyleSettings().GetLabelFont());
 aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
 mpCreateLabel->SetControlFont(aFont);
 
-mpHelpButton->SetControlForeground(maButtonsTextColor);
-mpExtensionsButton->SetControlForeground(maButtonsTextColor);
-
-const Color 
aButtonsBackground(officecfg::Office::Common::Help::StartCenter::StartCenterBackgroundColor::get());
-
-mpAllButtonsBox->SetBackground(aButtonsBackground);
-mpSmallButtonsBox->SetBackground(aButtonsBackground);
-
 // motif image under the buttons
 Wallpaper aWallpaper(get("motif")->GetImage().GetBitmapEx());
 aWallpaper.SetStyle(WallpaperStyle::BottomRight);
@@ -307,9 +297,6 @@ void BackingWindow::setupButton( PushButton* pButton )
 vcl::Font 
aFont(pButton->GetSettings().GetStyleSettings().GetPushButtonFont());
 aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
 pButton->SetControlFont(aFont);
-
-// color that fits the theme
-pButton->SetControlForeground(maButtonsTextColor);
 pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
 }
 
@@ -319,9 +306,6 @@ void BackingWindow::setupButton( MenuToggleButton* pButton )
 aFont.SetFontSize(Size(0, aFont.GetFontSize().Height() * fMultiplier));
 pButton->SetControlFont(aFont);
 
-// color that fits the theme
-pButton->SetControlForeground(maButtonsTextColor);
-
 PopupMenu* pMenu = pButton->GetPopupMenu();
 pMenu->SetMenuFlags(pMenu->GetMenuFlags() | 
MenuFlags::AlwaysShowDisabledEntries);
 
diff --git a/sfx2/source/dialog/backingwindow.hxx 
b/sfx2/source/dialog/backingwindow.hxx
index 15ab2fe0728f..99d7bd6b7ccc 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -78,7 +78,6 @@

Re: calc: jumbo sheets on windows (never gonna happen)

2020-10-06 Thread Dan Lewis

I would use MySQL as a back end. In a database, all the calculations 
that you mention are created in queries using SQL. And yes, MySQL can 
handle tables with millions of rows of data. But there is a lot of 
learning that has to be done to learn how to use MySQL. Setting up the 
tables takes some time and understanding as well.


Dan

On 10/6/20 17:10, nicholas ferguson wrote:


Can I ask what kind of platform would you use for 16 million rows that 
involve calculations?


*From:*LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] 
*On Behalf Of *Dan Lewis

*Sent:* Tuesday, October 06, 2020 2:59 PM
*To:* libreoffice@lists.freedesktop.org
*Subject:* Re: calc: jumbo sheets on windows (never gonna happen)

From my perspective, one needs to learn how to create a database in 
Base including tables, queries, forms and report when working with 
this much data. It is designed to handle large amounts of it. MySQL, 
Postgresql, and Oracle can be used as a backend  for Base being the 
front end.


Dan

On 10/6/20 12:09, Noel Grandin wrote:

Hi

i.e. very large spreadsheets of up to 16 million rows.

So I did some more investigation into this. In various places, we
need to accumulate things like row-heights and other things,
numbers which, with jumbo sheets, easily exceed 32-bits.

HOWEVER

All over the place, we pass these values through
sal_uLong/sal_Long/long/unsigned long.

Which is 32-bits on Windows. Doh!

Honestly, the only solution I can think of (and one I confidently
expect us to reject), is that we declare a flag day, and search
and replace sal_Long/sal_uLong/long/unsigned long with a 64-bit
type across the ENTIRE code base.

Regards, Noel Grandin.



___

LibreOffice mailing list

LibreOffice@lists.freedesktop.org


https://lists.freedesktop.org/mailman/listinfo/libreoffice

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac vcl/source

2020-10-06 Thread Thorsten Behrens (via logerrit)

Rebased ref, commits from common ancestor:
commit 6b55b62b3e94fb1d5405264f4b03d107f73705c2
Author: Thorsten Behrens 
AuthorDate: Wed Oct 7 01:22:20 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Oct 7 01:32:01 2020 +0200

Bump version to 6.1.7.19

Change-Id: I8cd0ec2fead4ddb0718d63377d2600f8d13812c9

diff --git a/configure.ac b/configure.ac
index 502814cf7a20..e519d688b62a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice powered by 
CIB],[6.1.7.18],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.19],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit 3e2f7e0ef4fbb61a0f3875ea10e72f985786c865
Author: Thorsten Behrens 
AuthorDate: Wed Oct 7 01:30:48 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Oct 7 01:32:01 2020 +0200

Fixups to build on c++11-only compilers

This is a follow-up to:
 - c258db7bea59bd536d71fd91c960d3bd9e1b4bb4

avoiding breakage on gcc48 for CentOS6 baseline (which has no full
c++14 support yet)

Change-Id: I5460bce0416e2e5c3fe5b7ab9ea0c6ffdb5da9f6

diff --git a/vcl/source/pdf/PDFiumLibrary.cxx b/vcl/source/pdf/PDFiumLibrary.cxx
index 330c473ac6dc..2bfa76e61559 100644
--- a/vcl/source/pdf/PDFiumLibrary.cxx
+++ b/vcl/source/pdf/PDFiumLibrary.cxx
@@ -9,6 +9,7 @@
  */
 
 #include 
+#include 
 
 #if HAVE_FEATURE_PDFIUM
 
@@ -52,7 +53,7 @@ std::unique_ptr PDFiumDocument::openPage(int 
nIndex)
 FPDF_PAGE pPage = FPDF_LoadPage(mpPdfDocument, nIndex);
 if (pPage)
 {
-pPDFiumPage = std::make_unique(pPage);
+pPDFiumPage = o3tl::make_unique(pPage);
 }
 return pPDFiumPage;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Thorsten Behrens (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79b972d3befa8202df8ee2e6ab71a4fdbe2db05f
Author: Thorsten Behrens 
AuthorDate: Wed Oct 7 01:22:20 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Oct 7 01:22:20 2020 +0200

Bump version to 6.1.7.19

Change-Id: I8cd0ec2fead4ddb0718d63377d2600f8d13812c9

diff --git a/configure.ac b/configure.ac
index 502814cf7a20..e519d688b62a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice powered by 
CIB],[6.1.7.18],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by 
CIB],[6.1.7.19],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

gerrit Jenkins Android machine fails

2020-10-06 Thread julien2412

Hello,

I resumed build 2 or 3 times for
https://gerrit.libreoffice.org/c/core/+/104040 but Jenkins Android fails
with:
ERROR: Error fetching remote repo 'origin'
hudson.plugins.git.GitException: Failed to fetch from
https://git.libreoffice.org/core
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:996)
at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1237)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1297)
at hudson.scm.SCM.checkout(SCM.java:505)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1206)
at
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:637)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:509)
at hudson.model.Run.execute(Run.java:1894)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at hudson.model.ResourceController.execute(ResourceController.java:97)
at hudson.model.Executor.run(Executor.java:428)
Caused by: hudson.plugins.git.GitException: Command "git config
remote.origin.url https://git.libreoffice.org/core"; returned status code 4:
stdout: 
stderr: error: failed to write new configuration file
/home/tdf/lode/jenkins/workspace/android_x86/.git/config.lock

at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2450)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2380)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2376)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1923)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1935)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.setRemoteUrl(CliGitAPIImpl.java:1549)
at hudson.plugins.git.GitAPI.setRemoteUrl(GitAPI.java:161)
at sun.reflect.GeneratedMethodAccessor60.invoke(Unknown Source)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:936)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:909)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:860)
at hudson.remoting.UserRequest.perform(UserRequest.java:211)
at hudson.remoting.UserRequest.perform(UserRequest.java:54)
at hudson.remoting.Request$2.run(Request.java:375)
at
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:73)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:748)
Suppressed: hudson.remoting.Channel$CallSiteStackTrace: Remote call to 
hc-3
at 
hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1800)
at
hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357)
at hudson.remoting.Channel.call(Channel.java:1001)
at
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:286)
at com.sun.proxy.$Proxy66.setRemoteUrl(Unknown Source)
at
org.jenkinsci.plugins.gitclient.RemoteGitImpl.setRemoteUrl(RemoteGitImpl.java:299)
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:984)
at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:1237)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1297)
at hudson.scm.SCM.checkout(SCM.java:505)
at 
hudson.model.AbstractProject.checkout(AbstractProject.java:1206)
at
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:637)
at 
jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:509)
at hudson.model.Run.execute(Run.java:1894)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at 
hudson.model.ResourceController.execute(ResourceController.java:97)
at hudson.model.Executor.run(Executor.java:428)

Any idea?

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

git indicates "helpcontent2" modified

2020-10-06 Thread julien2412

Hello,

After having recreated from scratch my local repo, I got now:
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git restore ..." to discard changes in working directory)
modified:   helpcontent2 (new commits)

with:
git diff
diff --git a/helpcontent2 b/helpcontent2
index a9deae83c3b1..5494e02b2527 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a9deae83c3b11cdb138069b97f3cd6111ff6a19f
+Subproject commit 5494e02b2527f27a8cfbbd0a4a125443f3851715

whereas I got:
julien@debianamd:~/lo/libreoffice$ git branch
* master

julien@debianamd:~/lo/libreoffice/helpcontent2$ git branch
* master

julien@debianamd:~/lo/libreoffice$ git pull -r
load pubkey "/home/julien/.ssh/id_rsa": invalid format
Already up to date.

julien@debianamd:~/lo/libreoffice/helpcontent2$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

julien@debianamd:~/lo/libreoffice/helpcontent2$ git pull -r
load pubkey "/home/julien/.ssh/id_rsa": invalid format
Already up to date.

Thanks to gitk, I got extra info:
 Local uncommitted changes, not checked in to index

- helpcontent2
-
Submodule helpcontent2 a9deae83c3b1..5494e02b2527:
  > tdf#96446 Fix Librelogo code example
  > Fix duplicate information on AVERAGEIF
  > tdf#137196 update help for Format Page tab for all modules
  > tdf#133403 update PDF export help pages
  > Revise explanation in File - Close help page
  > tdf#131305 Add note about shortcut for editing a comment
  > tdf#137084  add the More Breaks submenu to Insert help page
  > Update DocInformation (field) help page
  > Fix Help build
  > Workaround for buggy SVG export of image
  > tdf#132643 Translate German section IDs
  > tdf#132643 Translate German section IDs
...
But I don't know what to do with this.

It's appeared some days ago and I don't know why.
It's not blocking for me but quite annoying.

Any idea?

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: calc: jumbo sheets on windows (never gonna happen)

2020-10-06 Thread nicholas ferguson

Can I ask what kind of platform would you use for 16 million rows that involve 
calculations?

From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf 
Of Dan Lewis
Sent: Tuesday, October 06, 2020 2:59 PM
To: libreoffice@lists.freedesktop.org
Subject: Re: calc: jumbo sheets on windows (never gonna happen)

>From my perspective, one needs to learn how to create a database in Base 
>including tables, queries, forms and report when working with this much data. 
>It is designed to handle large amounts of it. MySQL, Postgresql, and Oracle 
>can be used as a backend  for Base being the front end.
Dan
On 10/6/20 12:09, Noel Grandin wrote:
Hi

i.e. very large spreadsheets of up to 16 million rows.

So I did some more investigation into this. In various places, we need to 
accumulate things like row-heights and other things, numbers which, with jumbo 
sheets, easily exceed 32-bits.

HOWEVER

All over the place, we pass these values through 
sal_uLong/sal_Long/long/unsigned long.

Which is 32-bits on Windows. Doh!

Honestly, the only solution I can think of (and one I confidently expect us to 
reject), is that we declare a flag day, and search and replace 
sal_Long/sal_uLong/long/unsigned long with a 64-bit type across the ENTIRE code 
base.

Regards, Noel Grandin.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-10-06 Thread Bjoern Michaelsen (via logerrit)

 sw/source/core/txtnode/SwGrammarContact.cxx |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

New commits:
commit a883002d8e2fd77f80c43b7b2e6ac329d83d929d
Author: Bjoern Michaelsen 
AuthorDate: Mon Oct 5 01:46:22 2020 +0200
Commit: Bjoern Michaelsen 
CommitDate: Tue Oct 6 22:09:33 2020 +0200

SwGrammarContext: ::Modify no more

Change-Id: I5569ba4f7fb00477233a5ffaabf9b2c8dca207c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103939
Tested-by: Jenkins
Reviewed-by: Bjoern Michaelsen 

diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx 
b/sw/source/core/txtnode/SwGrammarContact.cxx
index fc6883ca92ab..ad1e510e6d2a 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -56,7 +56,7 @@ public:
 virtual void finishGrammarCheck( SwTextNode& rTextNode ) override;
 protected:
 // virtual function of SwClient
-virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) 
override;
+virtual void SwClientNotify( const SwModify&, const SfxHint& rHint) 
override;
 };
 
 }
@@ -142,18 +142,14 @@ SwGrammarMarkUp* SwGrammarContact::getGrammarCheck( 
SwTextNode& rTextNode, bool
 return pRet;
 }
 
-void SwGrammarContact::Modify( const SfxPoolItem* pOld, const SfxPoolItem * )
+void SwGrammarContact::SwClientNotify(const SwModify&, const SfxHint& rHint)
 {
-if( !pOld || pOld->Which() != RES_OBJECTDYING )
+auto pLegacy = dynamic_cast(&rHint);
+if(!pLegacy || pLegacy->GetWhich() != RES_OBJECTDYING)
 return;
-
-const SwPtrMsgPoolItem *pDead = static_cast(pOld);
-if( pDead->pObject == GetRegisteredIn() )
-{// if my current paragraph dies, I throw the proxy list away
-aTimer.Stop();
-EndListeningAll();
-mpProxyList.reset();
-}
+aTimer.Stop();
+EndListeningAll();
+mpProxyList.reset();
 }
 
 void SwGrammarContact::finishGrammarCheck( SwTextNode& rTextNode )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

License

2020-10-06 Thread Triveni Remany

All of my past & future contributions to LibreOffice may be
 licensed under the MPLv2/LGPLv3+ dual license.


Triveni Remany

Sent from my iPhone
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: git indicates "helpcontent2" modified

2020-10-06 Thread Ilmari Lauhakangas


Do this while in the core repository:

git submodule update

https://wiki.documentfoundation.org/Development/Submodules

"By default your submodules repository is in a state called 'detached 
HEAD'."


So it is not desirable to have helpcontent2 be in branch master.

Ilmari

julien2412 kirjoitti 6.10.2020 klo 22.15:

Hello,

After having recreated from scratch my local repo, I got now:
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
   (use "git add ..." to update what will be committed)
   (use "git restore ..." to discard changes in working directory)
modified:   helpcontent2 (new commits)

with:
git diff
diff --git a/helpcontent2 b/helpcontent2
index a9deae83c3b1..5494e02b2527 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a9deae83c3b11cdb138069b97f3cd6111ff6a19f
+Subproject commit 5494e02b2527f27a8cfbbd0a4a125443f3851715

whereas I got:
julien@debianamd:~/lo/libreoffice$ git branch
* master

julien@debianamd:~/lo/libreoffice/helpcontent2$ git branch
* master

julien@debianamd:~/lo/libreoffice$ git pull -r
load pubkey "/home/julien/.ssh/id_rsa": invalid format
Already up to date.

julien@debianamd:~/lo/libreoffice/helpcontent2$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

julien@debianamd:~/lo/libreoffice/helpcontent2$ git pull -r
load pubkey "/home/julien/.ssh/id_rsa": invalid format
Already up to date.

Thanks to gitk, I got extra info:
  Local uncommitted changes, not checked in to index

- helpcontent2
-
Submodule helpcontent2 a9deae83c3b1..5494e02b2527:
   > tdf#96446 Fix Librelogo code example
   > Fix duplicate information on AVERAGEIF
   > tdf#137196 update help for Format Page tab for all modules
   > tdf#133403 update PDF export help pages
   > Revise explanation in File - Close help page
   > tdf#131305 Add note about shortcut for editing a comment
   > tdf#137084  add the More Breaks submenu to Insert help page
   > Update DocInformation (field) help page
   > Fix Help build
   > Workaround for buggy SVG export of image
   > tdf#132643 Translate German section IDs
   > tdf#132643 Translate German section IDs
...
But I don't know what to do with this.

It's appeared some days ago and I don't know why.
It's not blocking for me but quite annoying.

Any idea?

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: calc: jumbo sheets on windows (never gonna happen)

2020-10-06 Thread Dan Lewis

From my perspective, one needs to learn how to create a database in 
Base including tables, queries, forms and report when working with this 
much data. It is designed to handle large amounts of it. MySQL, 
Postgresql, and Oracle can be used as a backend  for Base being the 
front end.


Dan

On 10/6/20 12:09, Noel Grandin wrote:

Hi

i.e. very large spreadsheets of up to 16 million rows.

So I did some more investigation into this. In various places, we need 
to accumulate things like row-heights and other things, numbers which, 
with jumbo sheets, easily exceed 32-bits.


HOWEVER

All over the place, we pass these values through 
sal_uLong/sal_Long/long/unsigned long.


Which is 32-bits on Windows. Doh!

Honestly, the only solution I can think of (and one I confidently 
expect us to reject), is that we declare a flag day, and search and 
replace sal_Long/sal_uLong/long/unsigned long with a 64-bit type 
across the ENTIRE code base.


Regards, Noel Grandin.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: cannot access my extension page

2020-10-06 Thread Heiko Tietze

You are not listed on https://extensions.libreoffice.org. Have you regsitered at
https://auth.documentfoundation.org/?

On 06.10.20 17:27, johndorazio wrote:
> Ok I've recreated accounts. Username is *johnrdorazio* Main email address is
> *pri...@johnromanodorazio.com* Extension is
> *https://extensions.libreoffice.org/en/extensions/show/bibleget-i-o*



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-10-06 Thread Miklos Vajna (via logerrit)

 oox/source/drawingml/shape.cxx |   16 ++
 oox/source/drawingml/textbodypropertiescontext.cxx |5 
 sd/qa/unit/data/pptx/shape-text-adjust-left.pptx   |binary
 sd/qa/unit/data/xml/n762695_0.xml  |6 -
 sd/qa/unit/data/xml/n762695_1.xml  |   10 -
 sd/qa/unit/data/xml/n819614_0.xml  |  114 ++---
 sd/qa/unit/data/xml/n820786_0.xml  |  102 +-
 sd/qa/unit/data/xml/tdf109317_0.xml|   12 +-
 sd/qa/unit/import-tests.cxx|   27 
 9 files changed, 162 insertions(+), 130 deletions(-)

New commits:
commit bcfe68c96893c39b07c15efd99cd010d6736f560
Author: Miklos Vajna 
AuthorDate: Mon Oct 5 21:06:01 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 6 19:15:42 2020 +0200

tdf#137023 PPTX import: fix unexpected center alignment of shape text, 2nd 
try

Regression from commit 10bb02efd8afd42e633e370480104e2575546d8e
(tdf#129685 PPTX import: fix unexpected centering of shape text,
2020-09-18), now the problem was that some text should be left aligned,
but was centered.

Fix the problem by reverting most of the above commit: XML changes,
changes to SdImportTest::testTdf113198() (manual testing show that this
change is not needed after all) and changes to the
TextBodyPropertiesContext ctor in oox/ (but not the testcase itself).

Fix tdf#113198 again, this time in Shape::createAndInsert(), which is
meant to be closer to what the binary PPT import does.

With this, all cases from tdf#104722, tdf#113198, tdf#129685 and
tdf#137023 are meant to be handled correctly at the same time.

(cherry picked from commit dfa1856cdb4c69985ef1e809d33055427b6fbd76)

Change-Id: Id785252c26fc407cd74c9cfb55624091798d7773
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104006
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104023

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 31ea0c696281..b49b52fdd9ce 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1452,6 +1452,22 @@ Reference< XShape > const & Shape::createAndInsert(
 xText->setString("");
 Reference < XTextCursor > xAt = xText->createTextCursor();
 getTextBody()->insertAt( rFilterBase, xText, xAt, 
aCharStyleProperties, mpMasterTextListStyle );
+
+const TextParagraphVector& rParagraphs = 
getTextBody()->getParagraphs();
+if (!rParagraphs.empty())
+{
+const std::shared_ptr& pParagraph = 
rParagraphs[0];
+if (pParagraph->getProperties().getParaAdjust())
+{
+style::ParagraphAdjust eAdjust = 
*pParagraph->getProperties().getParaAdjust();
+if (eAdjust == style::ParagraphAdjust_CENTER)
+{
+// If the first paragraph is centered, then set 
the para adjustment of
+// the shape itself to centered as well.
+aPropertySet.setAnyProperty(PROP_ParaAdjust, 
uno::makeAny(eAdjust));
+}
+}
+}
 }
 }
 else if (mbTextBox)
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index af02c6f981d8..d696b4c3ac70 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -123,11 +123,6 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( 
ContextHandler2Helper cons
 {
 mrTextBodyProp.meVA = GetTextVerticalAdjust( rAttribs.getToken( 
XML_anchor, XML_t ) );
 mrTextBodyProp.maPropertyMap.setProperty( PROP_TextVerticalAdjust, 
mrTextBodyProp.meVA);
-if (mrTextBodyProp.meVA == drawing::TextVerticalAdjust_CENTER)
-{
-mrTextBodyProp.maPropertyMap.setProperty(PROP_TextHorizontalAdjust,
- 
TextHorizontalAdjust_CENTER);
-}
 }
 
 // Push defaults
diff --git a/sd/qa/unit/data/pptx/shape-text-adjust-left.pptx 
b/sd/qa/unit/data/pptx/shape-text-adjust-left.pptx
new file mode 100644
index ..d197425b9703
Binary files /dev/null and b/sd/qa/unit/data/pptx/shape-text-adjust-left.pptx 
differ
diff --git a/sd/qa/unit/data/xml/n762695_0.xml 
b/sd/qa/unit/data/xml/n762695_0.xml
index fe02e3f00d0d..710a5039ab69 100644
--- a/sd/qa/unit/data/xml/n762695_0.xml
+++ b/sd/qa/unit/data/xml/n762695_0.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   
   
   
@@ -86,7 +86,7 @@

   
  
- 
+ 
   
   
   
@@ -163,7 +163,7 @@

   
  
- 
+ 
   
   
   
diff --git a/sd/qa/unit/data/xml/n762695_

[Libreoffice-commits] core.git: include/LibreOfficeKit include/vcl sc/source sd/source sw/source vcl/source

2020-10-06 Thread gokaysatir (via logerrit)

 include/LibreOfficeKit/LibreOfficeKitEnums.h |7 +++
 include/vcl/unohelp2.hxx |6 +-
 sc/source/ui/view/editsh.cxx |9 -
 sd/source/ui/view/drviews2.cxx   |   13 -
 sw/source/uibase/shells/textsh1.cxx  |   13 ++---
 vcl/source/app/unohelp2.cxx  |   13 -
 6 files changed, 50 insertions(+), 11 deletions(-)

New commits:
commit 19a0fbf456129e011cb9ab9ab6ab730cba274bbd
Author: gokaysatir 
AuthorDate: Tue Sep 22 13:00:44 2020 +0300
Commit: Gökay ŞATIR 
CommitDate: Tue Oct 6 18:47:39 2020 +0200

Online: Copy hyperlink location. / Core side.

Payload format is added to LOK_CALLBACK_CLIPBOARD_CHANGED.
Clipboard changed event is not fired when "copy hyperlink location" command 
is issued.
So i added a call to LOK_CALLBACK_CLIPBOARD_CHANGED inside 
TextDataObject::CopyStringTo function.

Change-Id: I8157572288da88b5522662e13abe151ef8548b34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103164
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103872
Tested-by: Jenkins

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 750e64f529f9..9a0eb01ca840 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -644,10 +644,9 @@ typedef enum
  * Notification that the clipboard contents have changed.
  * Typically fired in response to copying to clipboard.
  *
- * The payload currently is empty and it's up to the
- * client to get the contents, if necessary. However,
- * in the future the contents might be included for
- * convenience.
+ * Payload is optional. When payload is empty, Online gets string from 
selected text.
+ * Payload format is JSON.
+ * Example: { "mimeType": "string", "content": "some content" }
  */
 LOK_CALLBACK_CLIPBOARD_CHANGED = 38,
 
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index a95474417cf6..91c4ce6ce0e2 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -25,6 +25,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 namespace com::sun::star::datatransfer::clipboard {
 class XClipboard;
@@ -56,7 +59,8 @@ namespace vcl::unohelper {
 /// copies a given string to a given clipboard
 static  voidCopyStringTo(
 const OUString& rContent,
-const css::uno::Reference< 
css::datatransfer::clipboard::XClipboard >& rxClipboard
+const css::uno::Reference< 
css::datatransfer::clipboard::XClipboard >& rxClipboard,
+std::function *callback = nullptr
 );
 };
 
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 9e8768fe27d6..83e4adaf815f 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -641,7 +641,14 @@ void ScEditShell::Execute( SfxRequest& rReq )
 {
 uno::Reference 
xClipboard
 = pEditView->GetWindow()->GetClipboard();
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+std::function callback = [&] 
(int callbackType, const char* text) { 
rViewData.GetViewShell()->libreOfficeKitViewCallback(callbackType, text); } ;
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard, 
&callback);
+}
+else
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard, 
nullptr);
 }
 }
 break;
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 8f511aab3922..f32acb5d3182 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2250,7 +2250,18 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 {
 uno::Reference 
xClipboard
 = pOutView->GetWindow()->GetClipboard();
-
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard);
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+std::function callback = [&] 
(int callbackType, const char* text)
+{
+SfxViewFrame* pFrame = GetViewFrame();
+
pFrame->GetViewShell()->libreOfficeKitViewCallback(callbackType, text);
+};
+
vcl::unohelper::TextDataObject::CopyStringTo(pURLField->GetURL(), xClipboard, 
&callback);
+}
+

[Libreoffice-commits] core.git: desktop/source extensions/source filter/source reportdesign/source sd/inc sd/source slideshow/source writerfilter/source

2020-10-06 Thread Noel (via logerrit)

 desktop/source/lib/init.cxx   |2 +-
 extensions/source/propctrlr/browserview.cxx   |2 +-
 extensions/source/propctrlr/browserview.hxx   |2 +-
 extensions/source/propctrlr/defaultforminspection.cxx |2 +-
 extensions/source/propctrlr/handlerhelper.cxx |4 ++--
 extensions/source/propctrlr/handlerhelper.hxx |4 ++--
 extensions/source/propctrlr/propertyeditor.cxx|2 +-
 extensions/source/propctrlr/propertyeditor.hxx|2 +-
 filter/source/svg/svgwriter.cxx   |2 +-
 filter/source/svg/svgwriter.hxx   |2 +-
 reportdesign/source/ui/dlg/Navigator.cxx  |   12 ++--
 sd/inc/Outliner.hxx   |4 ++--
 sd/inc/sddll.hxx  |2 +-
 sd/source/filter/sdpptwrp.cxx |2 +-
 sd/source/ui/animations/CustomAnimationList.cxx   |4 ++--
 sd/source/ui/app/sddll.cxx|2 +-
 sd/source/ui/dlg/sdtreelb.cxx |2 +-
 sd/source/ui/inc/GraphicObjectBar.hxx |2 +-
 sd/source/ui/inc/MediaObjectBar.hxx   |2 +-
 sd/source/ui/inc/registerinterfaces.hxx   |2 +-
 sd/source/ui/table/tablefunction.cxx  |2 +-
 sd/source/ui/table/tableobjectbar.cxx |2 +-
 sd/source/ui/view/GraphicObjectBar.cxx|2 +-
 sd/source/ui/view/MediaObjectBar.cxx  |2 +-
 sd/source/ui/view/Outliner.cxx|8 
 sd/source/ui/view/drtxtob1.cxx|2 +-
 sd/source/ui/view/drviews2.cxx|2 +-
 slideshow/source/engine/box2dtools.cxx|   10 +-
 slideshow/source/inc/box2dtools.hxx   |   10 +-
 writerfilter/source/dmapper/GraphicImport.cxx |2 +-
 writerfilter/source/dmapper/GraphicImport.hxx |2 +-
 writerfilter/source/dmapper/TableData.hxx |6 +++---
 32 files changed, 54 insertions(+), 54 deletions(-)

New commits:
commit 1f8fbff65d91f1d8297b94dd67fffceb7475dce5
Author: Noel 
AuthorDate: Tue Oct 6 15:32:30 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 6 18:37:47 2020 +0200

loplugin:const* make some params and methods const

Change-Id: I97c5bbb929a2a4a029af4e6cb0fd571bbc2b698b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104030
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0d94f67cea11..a05da99d47a6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -715,7 +715,7 @@ std::string extractPrivateKey(const std::string & 
privateKey)
 return privateKey.substr(pos1, pos2);
 }
 
-OUString lcl_getCurrentDocumentMimeType(LibLODocument_Impl* pDocument)
+OUString lcl_getCurrentDocumentMimeType(const LibLODocument_Impl* pDocument)
 {
 SfxBaseModel* pBaseModel = 
dynamic_cast(pDocument->mxComponent.get());
 if (!pBaseModel)
diff --git a/extensions/source/propctrlr/browserview.cxx 
b/extensions/source/propctrlr/browserview.cxx
index b599856e123f..df0c6693b9bd 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -27,7 +27,7 @@ namespace pcr
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-
OPropertyBrowserView::OPropertyBrowserView(css::uno::Reference&
 rContext, weld::Builder& rBuilder)
+OPropertyBrowserView::OPropertyBrowserView(const 
css::uno::Reference& rContext, weld::Builder& 
rBuilder)
 : m_xPropBox(new OPropertyEditor(rContext, rBuilder))
 , m_nActivePage(0)
 {
diff --git a/extensions/source/propctrlr/browserview.hxx 
b/extensions/source/propctrlr/browserview.hxx
index ac2042b84b10..9ac3de1480b6 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -35,7 +35,7 @@ namespace pcr
 Link   m_aPageActivationHandler;
 
 public:
-explicit 
OPropertyBrowserView(css::uno::Reference& 
rContext, weld::Builder& rBuilder);
+explicit OPropertyBrowserView(const 
css::uno::Reference& rContext, weld::Builder& 
rBuilder);
 ~OPropertyBrowserView();
 
 OPropertyEditor&getPropertyBox() { return *m_xPropBox; }
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx 
b/extensions/source/propctrlr/defaultforminspection.cxx
index 809279330ae8..1b546c40fa66 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -207,7 +207,7 @@ namespace pcr
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 extensions_propctrlr_DefaultFormComponentInspectorModel_get_implementation(
-css::uno::XComponentContext* context , css::un

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

2020-10-06 Thread Noel (via logerrit)

 sc/inc/recursionhelper.hxx  |4 ++--
 sc/inc/refdata.hxx  |   12 ++--
 sc/source/core/tool/compiler.cxx|   24 
 sc/source/core/tool/interpr1.cxx|2 +-
 sc/source/core/tool/recursionhelper.cxx |2 +-
 sc/source/core/tool/refdata.cxx |   12 ++--
 sc/source/core/tool/token.cxx   |   12 ++--
 sc/source/filter/excel/excel.cxx|2 +-
 sc/source/filter/excel/xilink.cxx   |2 +-
 sc/source/filter/inc/xeextlst.hxx   |2 +-
 sc/source/filter/inc/xilink.hxx |2 +-
 sc/source/filter/oox/formulabuffer.cxx  |2 +-
 sc/source/filter/xml/xmlcelli.cxx   |2 +-
 sc/source/filter/xml/xmlcelli.hxx   |2 +-
 sc/source/ui/app/inputhdl.cxx   |2 +-
 sc/source/ui/cctrl/checklistmenu.cxx|2 +-
 sc/source/ui/dbgui/csvruler.cxx |2 +-
 sc/source/ui/docshell/docfunc.cxx   |2 +-
 sc/source/ui/drawfunc/drawsh.cxx|2 +-
 sc/source/ui/inc/csvruler.hxx   |2 +-
 sc/source/ui/inc/inputhdl.hxx   |2 +-
 sc/source/ui/inc/tabvwsh.hxx|6 +++---
 sc/source/ui/inc/viewdata.hxx   |8 
 sc/source/ui/view/tabvwshc.cxx  |6 +++---
 sc/source/ui/view/viewdata.cxx  |8 
 25 files changed, 62 insertions(+), 62 deletions(-)

New commits:
commit 4bc31abb56f806ee399344160ce0d7c27af48f5e
Author: Noel 
AuthorDate: Tue Oct 6 15:32:12 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 6 18:37:07 2020 +0200

loplugin:const* make some params and methods const

Change-Id: If621bb2585fda4afef4be9a189c7f4c8d358
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104029
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 48508ec61e64..d6ba2a3ca8ab 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -113,7 +113,7 @@ public:
 /** Detects a simple cycle involving formula-groups and singleton 
formula-cells. */
 bool PushFormulaGroup(ScFormulaCell* pCell);
 void PopFormulaGroup();
-bool AnyCycleMemberInDependencyEvalMode(ScFormulaCell* pCell);
+bool AnyCycleMemberInDependencyEvalMode(const ScFormulaCell* pCell);
 bool AnyParentFGInCycle();
 void SetFormulaGroupDepEvalMode(bool bSet);
 // When dependency computation detects a cycle, it may not compute proper 
cell values.
@@ -126,7 +126,7 @@ public:
 void CleanTemporaryGroupCells();
 
 void SetFormulaGroupSet(o3tl::sorted_vector* pSet) { 
pFGSet = pSet; }
-bool HasFormulaGroupSet() { return pFGSet != nullptr; }
+bool HasFormulaGroupSet() const { return pFGSet != nullptr; }
 bool CheckFGIndependence(ScFormulaCellGroup* pFG);
 void SetGroupsIndependent(bool bSet) { bGroupsIndependent = bSet; }
 bool AreGroupsIndependent() { return bGroupsIndependent; }
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 4688793d6447..a2c9313b607e 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -101,9 +101,9 @@ public:
 loaded. */
 bool ValidExternal(const ScDocument& rDoc) const;
 
-ScAddress toAbs( ScSheetLimits& rLimits, const ScAddress& rPos ) const;
+ScAddress toAbs( const ScSheetLimits& rLimits, const ScAddress& rPos ) 
const;
 ScAddress toAbs( const ScDocument& rDoc, const ScAddress& rPos ) const;
-void SetAddress( ScSheetLimits& rLimits, const ScAddress& rAddr, const 
ScAddress& rPos );
+void SetAddress( const ScSheetLimits& rLimits, const ScAddress& rAddr, 
const ScAddress& rPos );
 SCROW Row() const;
 SCCOL Col() const;
 SCTAB Tab() const;
@@ -168,12 +168,12 @@ struct ScComplexRefData
 return Ref1.Col() == 0 && Ref2.Col() == MAXCOL && !Ref1.IsColRel() && 
!Ref2.IsColRel();
 }
 
-SC_DLLPUBLIC ScRange toAbs( ScSheetLimits& rLimits, const ScAddress& rPos 
) const;
+SC_DLLPUBLIC ScRange toAbs( const ScSheetLimits& rLimits, const ScAddress& 
rPos ) const;
 SC_DLLPUBLIC ScRange toAbs( const ScDocument& rDoc, const ScAddress& rPos 
) const;
 
 /** Set a new range, assuming that the ordering of the range matches the
 ordering of the reference data flags already set. */
-void SetRange( ScSheetLimits& rLimits, const ScRange& rRange, const 
ScAddress& rPos );
+void SetRange( const ScSheetLimits& rLimits, const ScRange& rRange, const 
ScAddress& rPos );
 
 /** Adjust ordering (front-top-left/rear-bottom-right) to a new position. 
*/
 void PutInOrder( const ScAddress& rPos );
@@ -183,8 +183,8 @@ struct ScComplexRefData
 /** Enlarge range if reference passed is not within existing range.
 ScAddress position is used to calculate absolute references from
 relative references. */
-ScComplexRefData& Extend( ScSheetLimits& rLimits, const ScSingleRefData & 
rRef, const ScAddress & rPos );
-ScComplexRefData& Exte

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

2020-10-06 Thread Noel (via logerrit)

 sw/inc/AnnotationWin.hxx|4 ++--
 sw/inc/doc.hxx  |2 +-
 sw/inc/fesh.hxx |2 +-
 sw/inc/fldbas.hxx   |2 +-
 sw/inc/ndgrf.hxx|2 +-
 sw/inc/numrule.hxx  |2 +-
 sw/inc/shellio.hxx  |2 +-
 sw/source/core/access/AccessibilityCheck.cxx|3 ++-
 sw/source/core/doc/docnum.cxx   |2 +-
 sw/source/core/doc/notxtfrm.cxx |2 +-
 sw/source/core/doc/number.cxx   |2 +-
 sw/source/core/fields/fldbas.cxx|2 +-
 sw/source/core/inc/notxtfrm.hxx |2 +-
 sw/source/core/inc/txtfrm.hxx   |2 +-
 sw/source/core/text/EnhancedPDFExportHelper.cxx |2 +-
 sw/source/core/text/porfld.cxx  |4 ++--
 sw/source/core/text/porfld.hxx  |2 +-
 sw/source/core/text/txtfld.cxx  |2 +-
 sw/source/filter/html/htmlbas.cxx   |2 +-
 sw/source/filter/html/htmlreqifreader.cxx   |2 +-
 sw/source/filter/html/wrthtml.hxx   |2 +-
 sw/source/uibase/docvw/AnnotationWin2.cxx   |4 ++--
 sw/source/uibase/inc/conttree.hxx   |2 +-
 sw/source/uibase/inc/edtwin.hxx |2 +-
 sw/source/uibase/shells/drawdlg.cxx |4 ++--
 sw/source/uibase/shells/drwtxtex.cxx|2 +-
 sw/source/uibase/utlui/content.cxx  |4 ++--
 sw/source/uibase/utlui/glbltree.cxx |2 +-
 28 files changed, 34 insertions(+), 33 deletions(-)

New commits:
commit 9bf762769826a872e196051a9ec0540a598973de
Author: Noel 
AuthorDate: Tue Oct 6 15:32:05 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 6 18:36:28 2020 +0200

loplugin:const* make some params and methods const

Change-Id: I3c8ca72b2b41a4f82ee20cbe025b41425f32e715
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104028
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 3be381bf3a7c..e55cda17c41c 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -150,12 +150,12 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public 
vcl::Window
 boolIsFollow() const { return mbIsFollow; }
 voidSetFollow( bool bIsFollow) { mbIsFollow = bIsFollow; };
 
-sal_Int32   GetMetaHeight();
+sal_Int32   GetMetaHeight() const;
 sal_Int32   GetMinimumSizeWithMeta() const;
 sal_Int32   GetMinimumSizeWithoutMeta() const;
 sal_Int32   GetMetaButtonAreaWidth() const;
 sal_Int32   GetScrollbarWidth() const;
-sal_Int32   GetNumFields();
+sal_Int32   GetNumFields() const;
 
 voidSetSpellChecking();
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6d2d785dc655..115a08a4b17b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1146,7 +1146,7 @@ public:
 
 bool NumOrNoNum( const SwNodeIndex& rIdx, bool bDel = false);
 
-void StopNumRuleAnimations( OutputDevice* );
+void StopNumRuleAnimations( const OutputDevice* );
 
 /** Insert new table at position @param rPos (will be inserted before 
Node!).
  For AutoFormat at input: columns have to be set at predefined width.
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 570597a7e580..0639833d0b1e 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -646,7 +646,7 @@ public:
 SwTable::SearchType GetTableInsertMode() const { return 
m_eTableInsertMode; }
 void SetTableInsertMode( SwTable::SearchType eFlag )  { m_eTableInsertMode 
= eFlag; }
 
-bool GetTableCopied()  { return m_bTableCopied; }
+bool GetTableCopied() const { return m_bTableCopied; }
 void SetTableCopied( bool bCopied )  { m_bTableCopied = bCopied; }
 
 bool DeleteTableSel();///< Current selection, may be whole table.
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 24c5c9ae3093..68cd955f97c0 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -276,7 +276,7 @@ public:
 SwFormatField* FindFormatForField(const SwField*) const;
 SwFormatField* FindFormatForPostItId(sal_uInt32 nPostItId) const;
 void CollectPostIts(std::vector& rvFormatFields, 
IDocumentRedlineAccess const& rIDRA, bool HideRedlines);
-bool HasHiddenInformationNotes();
+bool HasHiddenInformationNotes() const;
 void GatherNodeIndex(std::vector& rvNodeIndex);
 void GatherRefFields(std::vector& rvRFields, const 
sal_uInt16 nTyp);
 void GatherFields(std::vector& rvFormatFields, bool 
bCollectOnlyInDocNodes=true) const;
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index a5fd33f51fe5..ee53db6a7c3c 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -84,7 +84,7 @@ public:
 /// wrappers for non-const calls at GraphicOb

[Libreoffice-commits] core.git: basctl/source chart2/source cui/source dbaccess/source include/svx oox/source svx/inc svx/source xmlsecurity/source

2020-10-06 Thread Noel (via logerrit)

 basctl/source/basicide/baside2.hxx|2 -
 basctl/source/basicide/baside2b.cxx   |2 -
 chart2/source/controller/inc/CommandDispatchContainer.hxx |2 -
 chart2/source/controller/sidebar/ChartAreaPanel.cxx   |2 -
 chart2/source/controller/sidebar/ChartLinePanel.cxx   |4 +-
 chart2/source/view/inc/VSeriesPlotter.hxx |2 -
 cui/source/customize/SvxNotebookbarConfigPage.cxx |2 -
 cui/source/dialogs/AdditionsDialog.cxx|2 -
 cui/source/inc/AdditionsDialog.hxx|2 -
 cui/source/inc/cfg.hxx|2 -
 dbaccess/source/ui/app/AppDetailPageHelper.cxx|4 +-
 dbaccess/source/ui/app/AppDetailPageHelper.hxx|4 +-
 dbaccess/source/ui/app/AppDetailView.cxx  |2 -
 dbaccess/source/ui/app/AppDetailView.hxx  |2 -
 dbaccess/source/ui/app/AppTitleWindow.cxx |2 -
 dbaccess/source/ui/app/AppTitleWindow.hxx |2 -
 dbaccess/source/ui/app/AppView.cxx|2 -
 dbaccess/source/ui/app/AppView.hxx|2 -
 dbaccess/source/ui/browser/dsEntriesNoExp.cxx |4 +-
 dbaccess/source/ui/browser/dsbrowserDnD.cxx   |2 -
 dbaccess/source/ui/browser/unodatbr.cxx   |4 +-
 dbaccess/source/ui/control/tabletree.cxx  |2 -
 dbaccess/source/ui/inc/WCopyTable.hxx |2 -
 dbaccess/source/ui/inc/tabletree.hxx  |2 -
 dbaccess/source/ui/inc/unodatbr.hxx   |   10 ++---
 dbaccess/source/ui/misc/WCopyTable.cxx|2 -
 include/svx/bmpmask.hxx   |2 -
 include/svx/signaturelinehelper.hxx   |2 -
 include/svx/svdmrkv.hxx   |2 -
 oox/source/drawingml/diagram/diagram.hxx  |2 -
 svx/inc/tbxcolorupdate.hxx|2 -
 svx/source/dialog/_bmpmask.cxx|2 -
 svx/source/dialog/signaturelinehelper.cxx |2 -
 svx/source/form/datanavi.cxx  |2 -
 svx/source/form/filtnav.cxx   |2 -
 svx/source/form/fmPropBrw.cxx |2 -
 svx/source/form/fmexch.cxx|4 +-
 svx/source/form/navigatortree.cxx |6 +--
 svx/source/inc/StylesPreviewWindow.hxx|   24 +++---
 svx/source/inc/datanavi.hxx   |2 -
 svx/source/inc/fmPropBrw.hxx  |2 -
 svx/source/inc/fmexch.hxx |4 +-
 svx/source/inc/fmexpl.hxx |6 +--
 svx/source/sidebar/inspector/InspectorTextPanel.cxx   |2 -
 svx/source/sidebar/line/LinePropertyPanelBase.cxx |2 -
 svx/source/svdraw/svdmrkv.cxx |2 -
 svx/source/tbxctrls/StylesPreviewWindow.cxx   |   11 +++---
 svx/source/tbxctrls/tbxcolorupdate.cxx|2 -
 xmlsecurity/source/helper/pdfsignaturehelper.cxx  |2 -
 49 files changed, 81 insertions(+), 78 deletions(-)

New commits:
commit 2ac309188820036b1b99f983e8b793445e9b2ab2
Author: Noel 
AuthorDate: Tue Oct 6 13:09:02 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 6 18:35:45 2020 +0200

loplugin:const* make some params and methods const

Change-Id: Idec482c21c270912f9bcaeb980077c1616f67c8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104022
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 49e9c3759f6d..b999767aaeb1 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -206,7 +206,7 @@ private:
 
 SbxBase* ImplGetSBXForEntry(const weld::TreeIter& rEntry, bool& 
rbArrayElement);
 
-void implEnableChildren(weld::TreeIter& rEntry, bool bEnable);
+void implEnableChildren(const weld::TreeIter& rEntry, bool bEnable);
 
 DECL_STATIC_LINK(WatchWindow, ButtonHdl, weld::Button&, void);
 DECL_LINK(TreeListHdl, weld::TreeView&, void);
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 8c2f9514843b..391a8fe0a91e 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2341,7 +2341,7 @@ OUString implCreateTypeStringForDimArray( WatchItem* 
pItem, SbxDataType eType )
 
 } // namespace
 
-void WatchWindow::implEnableChildren(weld::TreeIter& rEntry, bool bEnable)
+void WatchWindow::implEnableChildren(const weld::TreeIter& rEntry, bool 
bEnable)
 {
 if (bEnable)
 {
diff --git a/chart2/source/controller/in

(OT) LibreWaterloo Meeting on LibreLogo

2020-10-06 Thread Marc Paré

I just thought that some of you may be interested.

I am one of the coordinators of the LibreWaterloo (Waterloo, Canada)
LibreOffice Community Group. Our meeting tomorrow night (Wednesday 7th
of October at 7PM (UTC-4) is welcoming Gilvan Vilarim to speak on
LibreLogo in education and he will also have us try a bit of LibreLogo.
Should be a good discussion.

If you are interested in sitting in on the meeting, just send me a
response and I will send you back later tonight (Tuesday UTC-4) the room
link as well as access code to the meeting.

*** NOTE THAT Gilvan will also be presenting on October 17 at the 2020
Latin American Conference which is part of a side-event of the openSUSE
+ LibreOffice conference. *** (schedule pending)

Cheers,

Marc

-- 
Marc Paré
m...@marcpare.com
https://www.parEntreprise.com
parEntreprise.com Supports OpenDocument Formats (ODF)
parEntreprise.com Supports http://www.LibreOffice.org
LibreOffice Office Suite - 220 million users and growing!
Over 1,000 project developers with impeccable help from its user base.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

calc: jumbo sheets on windows (never gonna happen)

2020-10-06 Thread Noel Grandin

Hi

i.e. very large spreadsheets of up to 16 million rows.

So I did some more investigation into this. In various places, we need to
accumulate things like row-heights and other things, numbers which, with
jumbo sheets, easily exceed 32-bits.

HOWEVER

All over the place, we pass these values through
sal_uLong/sal_Long/long/unsigned long.

Which is 32-bits on Windows. Doh!

Honestly, the only solution I can think of (and one I confidently expect us
to reject), is that we declare a flag day, and search and replace
sal_Long/sal_uLong/long/unsigned long with a 64-bit type across the ENTIRE
code base.

Regards, Noel Grandin.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: cannot access my extension page

2020-10-06 Thread johndorazio

Ok I've recreated accounts.Username is *johnrdorazio*Main email address is
*pri...@johnromanodorazio.com*Extension is
*https://extensions.libreoffice.org/en/extensions/show/bibleget-i-o*



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basic/qa

2020-10-06 Thread Andreas Heinisch (via logerrit)

 basic/qa/basic_coverage/test_cverr_method.vb |   26 +-
 1 file changed, 9 insertions(+), 17 deletions(-)

New commits:
commit 698e5d54182d96a1fd0c3b864ba0e618f82dd1f1
Author: Andreas Heinisch 
AuthorDate: Mon Oct 5 12:20:50 2020 +0200
Commit: Mike Kaganski 
CommitDate: Tue Oct 6 17:17:55 2020 +0200

tdf#123025 - fixed broken tests for cverr method

Change-Id: I44eb44107a24207764da24b4e01b407570342013
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103956
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/basic/qa/basic_coverage/test_cverr_method.vb 
b/basic/qa/basic_coverage/test_cverr_method.vb
index f74445c20c6a..9bc8b4f953f1 100644
--- a/basic/qa/basic_coverage/test_cverr_method.vb
+++ b/basic/qa/basic_coverage/test_cverr_method.vb
@@ -7,26 +7,18 @@
 '
 
 Function doUnitTest as Integer
-' CVERR
-If (CVerr(100) <> 100) Then
-doUnitTest = 0
-Else
-doUnitTest = 1
-End If
 
-' tdf#79426 - passing an error object to a function
-if ( TestCVErr( CVErr( 2 ) ) <> 2 ) Then
-doUnitTest = 0
-Else
-doUnitTest = 1
-End If
+doUnitTest = 0
 
+' CVERR
+If (CVerr(100) <> 100) Then Exit Function
+' tdf#79426 - passing an error object to a function
+If (TestCVErr(CVErr(2)) <> 2) Then Exit Function
 ' tdf#79426 - test with Error-Code 448 ( ERRCODE_BASIC_NAMED_NOT_FOUND )
-if ( TestCVErr( CVErr( 448 ) ) <> 448 ) Then
-doUnitTest = 0
-Else
-doUnitTest = 1
-End If
+If (TestCVErr(CVErr(448)) <> 448) Then Exit Function
+
+doUnitTest = 1
+
 End Function
 
 Function TestCVErr(vErr As Variant)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source cui/source dbaccess/source desktop/source formula/source include/vcl sc/source sd/source sfx2/source starmath/source svtools/source svx/source sw/source v

2020-10-06 Thread Caolán McNamara (via logerrit)

 chart2/source/controller/dialogs/tp_ChartType.cxx   |2 +-
 chart2/source/controller/sidebar/ChartTypePanel.cxx |2 +-
 cui/source/customize/cfg.cxx|2 +-
 cui/source/dialogs/cuicharmap.cxx   |4 ++--
 cui/source/dialogs/hangulhanjadlg.cxx   |6 ++
 cui/source/options/optchart.cxx |2 +-
 cui/source/tabpages/labdlg.cxx  |2 +-
 cui/source/tabpages/numpages.cxx|2 +-
 cui/source/tabpages/tpbitmap.cxx|2 +-
 cui/source/tabpages/tpcolor.cxx |2 +-
 cui/source/tabpages/tpgradnt.cxx|2 +-
 cui/source/tabpages/tphatch.cxx |2 +-
 cui/source/tabpages/tppattern.cxx   |2 +-
 dbaccess/source/ui/app/AppSwapWindow.cxx|2 +-
 desktop/source/deployment/gui/dp_gui_dialog2.cxx|4 ++--
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |1 -
 formula/source/ui/dlg/parawin.cxx   |3 +--
 include/vcl/weld.hxx|9 ++---
 sc/source/ui/dbgui/csvtablebox.cxx  |3 +--
 sc/source/ui/dbgui/filtdlg.cxx  |3 +--
 sc/source/ui/miscdlgs/datafdlg.cxx  |4 +---
 sc/source/ui/miscdlgs/optsolver.cxx |3 +--
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx |2 +-
 sd/source/filter/html/pubdlg.cxx|2 +-
 sd/source/ui/animations/SlideTransitionPane.cxx |2 +-
 sd/source/ui/dlg/sdpreslt.cxx   |2 +-
 sd/source/ui/table/TableDesignPane.cxx  |2 +-
 sfx2/source/control/emojicontrol.cxx|2 +-
 sfx2/source/control/thumbnailview.cxx   |1 -
 sfx2/source/dialog/dinfdlg.cxx  |3 +--
 sfx2/source/doc/templatedlg.cxx |4 ++--
 starmath/source/ElementsDockingWindow.cxx   |3 +--
 starmath/source/dialog.cxx  |5 ++---
 svtools/source/control/valueset.cxx |3 ---
 svtools/source/dialogs/addresstemplate.cxx  |3 +--
 svx/source/dialog/charmap.cxx   |2 --
 svx/source/dialog/rubydialog.cxx|3 +--
 svx/source/gallery2/galbrws2.cxx|2 +-
 svx/source/tbxctrls/colrctrl.cxx|2 +-
 svx/source/tbxctrls/fontworkgallery.cxx |2 +-
 svx/source/tbxctrls/linectrl.cxx|4 ++--
 svx/source/tbxctrls/tbcontrl.cxx|2 +-
 sw/source/ui/dbui/mmaddressblockpage.cxx|   10 +-
 sw/source/ui/dbui/mmgreetingspage.cxx   |2 +-
 sw/source/uibase/dbui/mailmergehelper.cxx   |1 -
 vcl/inc/salvtables.hxx  |3 ++-
 vcl/source/app/salvtables.cxx   |   15 +--
 vcl/unx/gtk3/gtk3gtkinst.cxx|   10 ++
 48 files changed, 68 insertions(+), 88 deletions(-)

New commits:
commit f1f33b332a0b4ada8ac8ff885fc2efee768091a6
Author: Caolán McNamara 
AuthorDate: Tue Oct 6 11:23:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 6 16:47:04 2020 +0200

move set_user_managed_scrolling to an initial weld argument

gtk is creating a11y objects on widgets changing parents so manage when that
can happen to avoid premature creation of custom widget a11y objects

Change-Id: I4879a93a897b2e4084cf6af0c9c0b0f0c1062254
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104025
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx 
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 271d4721cbe4..e209f508e3cc 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -53,7 +53,7 @@ ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, 
weld::DialogControlle
 , m_aTimerTriggeredControllerLock( m_xChartModel )
 , m_xFT_ChooseType(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
 , m_xMainTypeList(m_xBuilder->weld_tree_view("charttype"))
-, m_xSubTypeList(new 
ValueSet(m_xBuilder->weld_scrolled_window("subtypewin")))
+, m_xSubTypeList(new 
ValueSet(m_xBuilder->weld_scrolled_window("subtypewin", true)))
 , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, "subtype", 
*m_xSubTypeList))
 {
 Size 
aSize(m_xSubTypeList->GetDrawingArea()->get_ref_device().LogicToPixel(Size(150, 
50), MapMode(MapUnit::MapAppFont)));
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx 
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index ceea3b2186b6..2fbe55d3eb10 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -60,

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - sc/source vcl/source

2020-10-06 Thread Szymon Kłos (via logerrit)

 sc/source/ui/drawfunc/drawsh2.cxx |   47 ++
 vcl/source/window/window2.cxx |   20 +++-
 2 files changed, 66 insertions(+), 1 deletion(-)

New commits:
commit 2f20c1ac4e8fac51f23340f14d2e1a22258a12f1
Author: Szymon Kłos 
AuthorDate: Tue Sep 29 11:19:33 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 16:16:08 2020 +0200

Set correct color for chart background in sidebar

Change-Id: Id41fba75133e3473dcb834c72ff2ecfb317ecb79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103603
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104017
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/sc/source/ui/drawfunc/drawsh2.cxx 
b/sc/source/ui/drawfunc/drawsh2.cxx
index 772e2936911a..264f81998af9 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -52,6 +52,11 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+
 #include 
 
 using namespace com::sun::star::drawing;
@@ -307,6 +312,45 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) 
 // disable functions
 svx::FontworkBar::getState( pView, rSet );
 }
 
+static void setupFillColorForChart(SfxViewShell* pShell, SfxItemSet& rSet)
+{
+if (pShell)
+{
+SfxInPlaceClient* pIPClient = pShell->GetIPClient();
+if (pIPClient)
+{
+const css::uno::Reference<::css::embed::XEmbeddedObject>& xEmbObj 
= pIPClient->GetObject();
+if( xEmbObj.is() )
+{
+::css::uno::Reference<::css::chart2::XChartDocument> xChart( 
xEmbObj->getComponent(), uno::UNO_QUERY );
+if( xChart.is() )
+{
+css::uno::Reference 
xPropSet(xChart->getPageBackground(), uno::UNO_QUERY);
+if (xPropSet.is())
+{
+css::uno::Reference 
xInfo(xPropSet->getPropertySetInfo());
+if (xInfo.is())
+{
+if (xInfo->hasPropertyByName("FillColor"))
+{
+sal_uInt32 nFillColor = 0;
+xPropSet->getPropertyValue("FillColor") >>= 
nFillColor;
+
+XFillColorItem aFillColorItem("", 
Color(nFillColor));
+rSet.Put(aFillColorItem);
+
+if (comphelper::LibreOfficeKit::isActive())
+
pShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
+(".uno:FillColor=" + 
std::to_string(nFillColor)).c_str());
+}
+}
+}
+}
+}
+}
+}
+}
+
 //  Attributes for Drawing-Objects
 
 void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
@@ -369,6 +413,9 @@ void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
 rSet.Put( SvxSizeItem( SID_ATTR_SIZE, Size( 0, 0 ) ) );
 }
 }
+
+// Set correct colors for charts in sidebar
+setupFillColorForChart(pDrView->GetSfxViewShell(), rSet);
 }
 }
 
commit e290cd189e4d3814820ee8509bdbf45a9d01e995
Author: Szymon Kłos 
AuthorDate: Wed Sep 30 19:09:32 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 16:16:01 2020 +0200

Allow invalidate after queue_resize for lok in sidebar

This is a fix for regression introduced by
61a35560cb412d7ab0e3d0574eec4a790e3b9dfd

Sidebar wasn't properly refreshed in Online eg.
in Impress change 'Background' in sidebar 'Slide' deck
to 'Color' -> resulted in overlapping content

Change-Id: Id64f5d8694908d28cf5fa9787b65e555fb317e35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103724
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104015
Reviewed-by: Szymon Kłos 

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 37e34d91c00a..7a5437dee1d8 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1306,6 +1306,19 @@ void Window::InvalidateSizeCache()
 pWindowImpl->mnOptimalHeightCache = -1;
 }
 
+static bool HasParentDockingWindow(const vcl::Window* pWindow)
+{
+while( pWindow )
+{
+if( pWindow->IsDockingWindow() )
+return true;
+
+pWindow = pWindow->GetParent();
+}
+
+return pWindow && pWindow->IsDockingWindow();
+}
+
 void Window::queue_resize(StateChangedType eReason)
 {
 if (IsDisposed())
@@ -1341,7 +1354,12 @@ void Window::queue_resize(StateChangedType eReason)
 if (VclPtr pParent = GetParentWithLOKNotifier())
 {
 Size aSize = GetSizePixel();
-if (aSize.getWidth() > 0 &&

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sd/source

2020-10-06 Thread Szymon Kłos (via logerrit)

 sd/source/ui/view/drviewse.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 4941dced3db465d7e2e88db0864fd785a4574882
Author: Szymon Kłos 
AuthorDate: Wed Sep 30 11:28:02 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 16:16:21 2020 +0200

Don't insert hyperlink outside the page

Change-Id: Ida562bdf4eab479b4df2bba7917466d5da788a6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103673
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104024
Reviewed-by: Szymon Kłos 

diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 5b41c8093289..fbb6edf50085 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1505,8 +1505,11 @@ void DrawViewShell::InsertURLField(const OUString& rURL, 
const OUString& rText,
 ::tools::Rectangle aRect(aPos, GetActiveWindow()->GetOutputSizePixel() 
);
 aPos = aRect.Center();
 aPos = GetActiveWindow()->PixelToLogic(aPos);
-aPos.AdjustX( -(aSize.Width() / 2) );
-aPos.AdjustY( -(aSize.Height() / 2) );
+
+if (aPos.getX() - (aSize.Width() / 2) >= 0)
+aPos.AdjustX( -(aSize.Width() / 2) );
+if (aPos.getY() - (aSize.Height() / 2) >= 0)
+aPos.AdjustY( -(aSize.Height() / 2) );
 
 ::tools::Rectangle aLogicRect(aPos, aSize);
 pRectObj->SetLogicRect(aLogicRect);
___
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' - chart2/source

2020-10-06 Thread Balazs Varga (via logerrit)

 chart2/source/controller/main/ChartController_Position.cxx |   16 ++---
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 7f0d347eb879cd5859ee13a4c79d185a88b12fcc
Author: Balazs Varga 
AuthorDate: Thu Oct 1 11:29:26 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 6 16:02:33 2020 +0200

tdf#137165 chart2: fix label position in Position and Size

dialog window.

Follow-up of commit 4223ff2be69f03e571464b0b09ad0d278918631b
(tdf#48436 Chart: add CustomLabelPosition UNO API property).

Change-Id: Ie676af7b9438b928041a404fb1efac6919b30030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103750
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 17b0eb43ac23cd82a06d54432a0ec22cffa5b3c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103794
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/chart2/source/controller/main/ChartController_Position.cxx 
b/chart2/source/controller/main/ChartController_Position.cxx
index 32c4bd78522e..52664c356257 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -114,11 +114,6 @@ void 
ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence
 if( aCID.isEmpty() )
 return;
 
-awt::Size aSelectedSize;
-ExplicitValueProvider* pProvider( 
comphelper::getUnoTunnelImplementation( m_xChartView ) );
-if( pProvider )
-aSelectedSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
-
 ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID );
 
 UndoGuard aUndoGuard(
@@ -181,8 +176,13 @@ void 
ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence
 
 if(pOutItemSet || pArgs)
 {
-awt::Rectangle aObjectRect;
-lcl_getPositionAndSizeFromItemSet( aItemSet, aObjectRect, 
aSelectedSize );
+awt::Rectangle aOldObjectRect;
+ExplicitValueProvider* 
pProvider(comphelper::getUnoTunnelImplementation( 
m_xChartView ));
+if( pProvider )
+aOldObjectRect = pProvider->getRectangleOfObject(aCID);
+
+awt::Rectangle aNewObjectRect;
+lcl_getPositionAndSizeFromItemSet( aItemSet, aNewObjectRect, 
ToSize(aOldObjectRect) );
 awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
 awt::Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height );
 
@@ -194,7 +194,7 @@ void ChartController::executeDispatch_PositionAndSize(const 
::css::uno::Sequence
 }
 
 bool bMoved = PositionAndSizeHelper::moveObject( 
m_aSelection.getSelectedCID(), getModel()
-, aObjectRect, awt::Rectangle(), aPageRect );
+, aNewObjectRect, aOldObjectRect, aPageRect );
 if( bMoved || bChanged )
 aUndoGuard.commit();
 }
___
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-7' - sc/qa sc/source vcl/source

2020-10-06 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/autofilter/autofilter.py |   28 
 sc/source/ui/view/gridwin.cxx |   19 ---
 vcl/source/treelist/uiobject.cxx  |1 +
 3 files changed, 41 insertions(+), 7 deletions(-)

New commits:
commit f68922349ee78a6a64c575e21fe323c442faa5da
Author: Xisco Fauli 
AuthorDate: Thu Sep 24 21:16:05 2020 +0200
Commit: Michael Weghorn 
CommitDate: Tue Oct 6 15:56:01 2020 +0200

tdf#134351: do not apply autofilter if all entries are selected

Change-Id: I33cdfe07cc53b579bbe16486f302daf7bd3da841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103352
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103569
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 0d7bba4df1ebd80fa033116d73cbe8c6d3807d15)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103806
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/sc/qa/uitest/autofilter/autofilter.py 
b/sc/qa/uitest/autofilter/autofilter.py
index 57504e66e8e9..e1aea9c1e303 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -8,6 +8,7 @@
 from uitest.framework import UITestCase
 from uitest.path import get_srcdir_url
 
+from uitest.uihelper.common import get_state_as_dict
 from libreoffice.uno.propertyvalue import mkPropertyValues
 from libreoffice.calc.document import get_row
 
@@ -70,4 +71,31 @@ class AutofilterTest(UITestCase):
 self.assertTrue(is_row_hidden(doc, 3))
 self.assertFalse(is_row_hidden(doc, 4))
 
+def test_tdf134351(self):
+doc = self.ui_test.load_file(get_url_for_data_file("autofilter.ods"))
+
+xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
+xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", 
"COL": "0", "ROW": "0"}))
+
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+
+xTreeList = xCheckListMenu.getChild("check_list_box")
+
+self.assertEqual(2, len(xTreeList.getChildren()))
+
self.assertTrue(get_state_as_dict(xTreeList.getChild('0'))['IsSelected'])
+
self.assertTrue(get_state_as_dict(xTreeList.getChild('1'))['IsSelected'])
+
+xOkBtn = xFloatWindow.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.assertFalse(is_row_hidden(doc, 0))
+# Without the fix in place, this test would have failed here
+self.assertFalse(is_row_hidden(doc, 1))
+self.assertFalse(is_row_hidden(doc, 2))
+self.assertFalse(is_row_hidden(doc, 3))
+self.assertFalse(is_row_hidden(doc, 4))
+
+self.ui_test.close_doc()
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index efe3054cdaef..6d2c4ea19106 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -804,13 +804,18 @@ void 
ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
 if (aResult == aSaveAutoFilterResult)
 {
 SAL_INFO("sc.ui", "Apply autofilter to data when entries are the 
same");
-// Apply autofilter to data
-ScQueryEntry* pEntry = aParam.FindEntryByField(rPos.Col(), true);
-pEntry->bDoQuery = true;
-pEntry->nField = rPos.Col();
-pEntry->eConnect = SC_AND;
-pEntry->eOp = SC_EQUAL;
-pViewData->GetView()->Query(aParam, nullptr, true);
+
+if (!mpAutoFilterPopup->isAllSelected())
+{
+// Apply autofilter to data
+ScQueryEntry* pEntry = aParam.FindEntryByField(rPos.Col(), 
true);
+pEntry->bDoQuery = true;
+pEntry->nField = rPos.Col();
+pEntry->eConnect = SC_AND;
+pEntry->eOp = SC_EQUAL;
+pViewData->GetView()->Query(aParam, nullptr, true);
+}
+
 return;
 }
 }
diff --git a/vcl/source/treelist/uiobject.cxx b/vcl/source/treelist/uiobject.cxx
index e5f166e8f1ce..6c4a4e15bda2 100644
--- a/vcl/source/treelist/uiobject.cxx
+++ b/vcl/source/treelist/uiobject.cxx
@@ -106,6 +106,7 @@ StringMap TreeListEntryUIObject::get_state()
 aMap["Text"] = mxTreeList->GetEntryText(mpEntry);
 aMap["Children"] = 
OUString::number(mxTreeList->GetLevelChildCount(mpEntry));
 aMap["VisibleChildCount"] = 
OUString::number(mxTreeList->GetVisibleChildCount(mpEntry));
+aMap["IsSelected"] = OUString::boolean(mxTreeList->IsSelected(mpEntry));
 
 return aMap;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/chart/chartDataLabels.py |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit d15aa807be1c595dad9abc1dea04bb922570015a
Author: Xisco Fauli 
AuthorDate: Fri Oct 2 16:58:27 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 6 15:44:40 2020 +0200

tdf#137165: sc: Add UItest

Change-Id: Id5c777d5c85cda53924c9b8efae7a6cfa55de839
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103866
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/chart/chartDataLabels.py 
b/sc/qa/uitest/chart/chartDataLabels.py
index 13709a01c6ed..08397611e268 100644
--- a/sc/qa/uitest/chart/chartDataLabels.py
+++ b/sc/qa/uitest/chart/chartDataLabels.py
@@ -343,8 +343,9 @@ class chartDataLabels(UITestCase):
 self.assertEqual("0.5", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
 self.assertEqual("2.89", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
 
-xCanBtn = xDialog.getChild("cancel")
-xCanBtn.executeAction("CLICK", tuple())
+# Use OK button in order to test tdf#137165
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
 
 xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
 xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "LEFT"}))
@@ -356,8 +357,8 @@ class chartDataLabels(UITestCase):
 self.assertEqual("0.4", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
 self.assertEqual("2.79", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
 
-xCanBtn = xDialog.getChild("ok")
-xCanBtn.executeAction("CLICK", tuple())
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
 
 self.ui_test.close_doc()
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source extensions/source i18npool/source include/sfx2 include/svtools include/svx sdext/source sfx2/inc sfx2/source svtools/source svx/inc svx/source vcl/inc vc

2020-10-06 Thread Noel (via logerrit)

 editeng/source/editeng/impedit.cxx   |2 -
 editeng/source/editeng/impedit.hxx   |2 -
 extensions/source/bibliography/datman.cxx|4 +--
 i18npool/source/textconversion/textconversion_ko.cxx |2 -
 include/sfx2/objface.hxx |2 -
 include/sfx2/objsh.hxx   |   10 -
 include/sfx2/shell.hxx   |4 +--
 include/svtools/ctrlbox.hxx  |2 -
 include/svx/gallerybinaryengine.hxx  |9 
 sdext/source/presenter/PresenterToolBar.cxx  |4 +--
 sfx2/inc/emojicontrol.hxx|2 -
 sfx2/source/appl/newhelp.cxx |2 -
 sfx2/source/appl/newhelp.hxx |2 -
 sfx2/source/control/emojicontrol.cxx |2 -
 sfx2/source/control/objface.cxx  |2 -
 sfx2/source/dialog/templdlg.cxx  |4 +--
 sfx2/source/doc/objmisc.cxx  |   10 -
 svtools/source/control/ctrlbox.cxx   |2 -
 svx/inc/galbrws2.hxx |2 -
 svx/source/gallery2/galbrws2.cxx |2 -
 svx/source/gallery2/gallerybinaryengine.cxx  |   12 +--
 vcl/inc/unx/gtk/gtkframe.hxx |2 -
 vcl/unx/gtk3/gtk3gtkframe.cxx|2 -
 vcl/unx/gtk3/gtk3gtkinst.cxx |   20 +--
 24 files changed, 54 insertions(+), 53 deletions(-)

New commits:
commit 7cd179df80957b7daefab028cf35aebb1083b014
Author: Noel 
AuthorDate: Tue Oct 6 12:27:39 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 6 15:30:42 2020 +0200

loplugin:const& make some params and methods const

Change-Id: I2973128a9c6c53187e1da400d1a5df763d515596
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104020
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 55d1239acb60..2fc7252c5f23 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -312,7 +312,7 @@ void ImpEditView::SelectionChanged()
 }
 
 // This function is also called when a text's font || size is changed. Because 
its highlight rectangle must be updated.
-void ImpEditView::lokSelectionCallback(std::unique_ptr 
&pPolyPoly, bool bStartHandleVisible, bool bEndHandleVisible) {
+void ImpEditView::lokSelectionCallback(const 
std::unique_ptr &pPolyPoly, bool bStartHandleVisible, bool 
bEndHandleVisible) {
 VclPtr pParent = pOutWin->GetParentWithLOKNotifier();
 vcl::Region aRegion( *pPolyPoly );
 
diff --git a/editeng/source/editeng/impedit.hxx 
b/editeng/source/editeng/impedit.hxx
index 0efc9d552074..59db76fea44d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -305,7 +305,7 @@ private:
 return mpEditViewCallbacks;
 }
 
-void lokSelectionCallback(std::unique_ptr &pPolyPoly, 
bool bStartHandleVisible, bool bEndHandleVisible);
+void lokSelectionCallback(const std::unique_ptr 
&pPolyPoly, bool bStartHandleVisible, bool bEndHandleVisible);
 
 void setEditViewCallbacks(EditViewCallbacks* pEditViewCallbacks)
 {
diff --git a/extensions/source/bibliography/datman.cxx 
b/extensions/source/bibliography/datman.cxx
index 4c4855ca7461..23f8e464f1ce 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -410,14 +410,14 @@ class DBChangeDialog_Impl : public 
weld::GenericDialogController
 
 DECL_LINK(DoubleClickHdl, weld::TreeView&, bool);
 public:
-DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pMan);
+DBChangeDialog_Impl(weld::Window* pParent, const BibDataManager* pMan);
 
 OUString GetCurrentURL()const;
 };
 
 }
 
-DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, 
BibDataManager* pDatMan )
+DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, const 
BibDataManager* pDatMan )
 : GenericDialogController(pParent, 
"modules/sbibliography/ui/choosedatasourcedialog.ui", "ChooseDataSourceDialog")
 , m_xSelectionLB(m_xBuilder->weld_tree_view("treeview"))
 {
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx 
b/i18npool/source/textconversion/textconversion_ko.cxx
index cfcb08d6deb6..d57495a546f1 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -188,7 +188,7 @@ TextConversion_ko::getCharConversions(const OUString& 
aText, sal_Int32 nStartPos
 return output;
 }
 
-static Sequence< OUString >& operator += (Sequence< OUString > &rSeq1, 
Sequence< OUString > &rSeq2 )
+static Sequence< OUString >& operator += (Sequence< OUString > &rSeq1, const 
Sequence< OUString > &rSeq2 )
 {
 if (! rSeq1.hasElement

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

2020-10-06 Thread Luboš Luňák (via logerrit)

 vcl/skia/x11/gdiimpl.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e1482daecff877e3b0e22f1fc864e614376cb6b1
Author: Luboš Luňák 
AuthorDate: Tue Oct 6 14:51:21 2020 +0200
Commit: Luboš Luňák 
CommitDate: Tue Oct 6 14:51:56 2020 +0200

add missing null pointer check

It's possible to trigger this case, and the windows variant already
has the check.

Change-Id: I465fbccb8910bd1b529a2639f34249c18289baa8

diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx
index 9b93a603dc38..d993cf61d8d7 100644
--- a/vcl/skia/x11/gdiimpl.cxx
+++ b/vcl/skia/x11/gdiimpl.cxx
@@ -140,7 +140,8 @@ void X11SkiaSalGraphicsImpl::performFlush()
 SkiaZone zone;
 flushDrawing();
 // TODO XPutImage() is somewhat inefficient, XShmPutImage() should be 
preferred.
-mWindowContext->swapBuffers();
+if (mWindowContext)
+mWindowContext->swapBuffers();
 }
 
 std::unique_ptr createVulkanWindowContext(bool 
temporary)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 include/vcl/weld.hxx |  107 +++--
 vcl/inc/jsdialog/jsdialogbuilder.hxx |   37 ++-
 vcl/inc/salvtables.hxx   |  104 +++-
 vcl/jsdialog/jsdialogbuilder.cxx |   68 +
 vcl/source/app/salvtables.cxx|  175 ++-
 vcl/unx/gtk3/gtk3gtkinst.cxx |  147 ++---
 6 files changed, 261 insertions(+), 377 deletions(-)

New commits:
commit 66ce7a7bcae0e0e38fc56f6780eec86e06acfd90
Author: Caolán McNamara 
AuthorDate: Tue Oct 6 09:45:54 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 6 14:43:09 2020 +0200

drop ownership argument

we have never needed to diverge from the defaults of true for toplevels
and false for non-toplevels

Change-Id: I884b1e221d0ec44895214363d391c27e3e1707f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104019
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 6f227c7cbb6a..db1b6d519d1f 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2238,80 +2238,49 @@ public:
 class VCL_DLLPUBLIC Builder
 {
 public:
-virtual std::unique_ptr weld_message_dialog(const OString& 
id,
-   bool 
bTakeOwnership = true)
-= 0;
-virtual std::unique_ptr weld_dialog(const OString& id, bool 
bTakeOwnership = true) = 0;
-virtual std::unique_ptr weld_assistant(const OString& id, bool 
bTakeOwnership = true)
-= 0;
-virtual std::unique_ptr weld_widget(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_container(const OString& id,
-  bool bTakeOwnership = 
false)
-= 0;
-virtual std::unique_ptr weld_box(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_paned(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_button(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_menu_button(const OString& id,
- bool bTakeOwnership = 
false)
-= 0;
-virtual std::unique_ptr weld_frame(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_scrolled_window(const 
OString& id,
- bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_notebook(const OString& id, bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_toggle_button(const OString& id,
- bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_radio_button(const OString& id,
-   bool bTakeOwnership 
= false)
-= 0;
-virtual std::unique_ptr weld_check_button(const OString& id,
-   bool bTakeOwnership 
= false)
-= 0;
-virtual std::unique_ptr weld_link_button(const OString& id,
- bool bTakeOwnership = 
false)
-= 0;
-virtual std::unique_ptr weld_spin_button(const OString& id,
- bool bTakeOwnership = 
false)
-= 0;
-virtual std::unique_ptr
-weld_metric_spin_button(const OString& id, FieldUnit eUnit, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr
-weld_formatted_spin_button(const OString& id, bool bTakeOwnership = false) 
= 0;
-virtual std::unique_ptr weld_combo_box(const OString& id, bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_tree_view(const OString& id, bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_icon_view(const OString& id, bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_label(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_text_view(const OString& id, bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_expander(const OString& id, bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_entry(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_scale(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_progress_bar(const OString& id,
-   bool bTakeOwnership 
= false)
-= 0;
-virtual std::unique_ptr weld_spinner(const OString& id, bool 
bTakeOwnership = false)
-= 0;
-virtual std::unique_ptr weld_image(const OString& id, bool 
bTakeOwnership = false) = 0;
-virtual std::unique_ptr weld_calendar(const OStr

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 sc/source/ui/dbgui/sortkeydlg.cxx |8 +++-
 sc/source/ui/inc/sortkeydlg.hxx   |2 ++
 sw/source/ui/index/cnttab.cxx |   14 --
 3 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 19f331ca6aa87a438b1eeabef72978ddbfb0e747
Author: Caolán McNamara 
AuthorDate: Tue Oct 6 10:40:38 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 6 14:42:48 2020 +0200

reparent to nothing to break gtk ownership cycle

which is our usual solution, instead of using less common flag

Change-Id: I9dd54a161df53a5b6ffb0b7655e510a6cc4c4824
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104018
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx 
b/sc/source/ui/dbgui/sortkeydlg.cxx
index db218cf8678f..ec81bda34fc1 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -13,13 +13,19 @@
 
 ScSortKeyItem::ScSortKeyItem(weld::Container* pParent)
 : m_xBuilder(Application::CreateBuilder(pParent, 
"modules/scalc/ui/sortkey.ui"))
-, m_xFrame(m_xBuilder->weld_frame("SortKeyFrame", true))
+, m_xFrame(m_xBuilder->weld_frame("SortKeyFrame"))
 , m_xLbSort(m_xBuilder->weld_combo_box("sortlb"))
 , m_xBtnUp(m_xBuilder->weld_radio_button("up"))
 , m_xBtnDown(m_xBuilder->weld_radio_button("down"))
+, m_pParent(pParent)
 {
 }
 
+ScSortKeyItem::~ScSortKeyItem()
+{
+m_pParent->move(m_xFrame.get(), nullptr);
+}
+
 void ScSortKeyItem::DisableField()
 {
 m_xFrame->set_sensitive(false);
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index 1ac699970d4c..85b6da332e20 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -23,8 +23,10 @@ struct ScSortKeyItem
 std::unique_ptr m_xLbSort;
 std::unique_ptr m_xBtnUp;
 std::unique_ptr m_xBtnDown;
+weld::Container* m_pParent;
 
 ScSortKeyItem(weld::Container* pParent);
+~ScSortKeyItem();
 
 void DisableField();
 void EnableField();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 8fa6ae0e21d6..0d7454f2410a 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1393,7 +1393,7 @@ public:
 , aFormToken(rToken)
 , bNextControl(false)
 , m_pParent(pTokenWin)
-, m_xEntry(m_xBuilder->weld_entry("entry", true))
+, m_xEntry(m_xBuilder->weld_entry("entry"))
 {
 m_xEntry->connect_changed(LINK(this, SwTOXEdit, ModifyHdl));
 m_xEntry->connect_key_press(LINK(this, SwTOXEdit, KeyInputHdl));
@@ -1401,6 +1401,11 @@ public:
 m_xEntry->set_tooltip_text(m_pParent->CreateQuickHelp(rToken));
 }
 
+virtual ~SwTOXEdit() override
+{
+m_pParent->get_child_container()->move(m_xEntry.get(), nullptr);
+}
+
 virtual WindowType GetType() const override
 {
 return WindowType::EDIT;
@@ -1549,13 +1554,18 @@ public:
 , aFormToken(rToken)
 , bNextControl(false)
 , m_pParent(pTokenWin)
-, m_xButton(m_xBuilder->weld_toggle_button("button", true))
+, m_xButton(m_xBuilder->weld_toggle_button("button"))
 {
 m_xButton->connect_key_press(LINK(this, SwTOXButton, KeyInputHdl));
 m_xButton->connect_focus_in(LINK(this, SwTOXButton, FocusInHdl));
 m_xButton->set_tooltip_text(m_pParent->CreateQuickHelp(rToken));
 }
 
+virtual ~SwTOXButton() override
+{
+m_pParent->get_child_container()->move(m_xButton.get(), nullptr);
+}
+
 virtual WindowType GetType() const override
 {
 return WindowType::PUSHBUTTON;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - cui/source svx/source sw/source

2020-10-06 Thread Szymon Kłos (via logerrit)

 cui/source/dialogs/splitcelldlg.cxx  |   35 ++-
 cui/source/factory/dlgfact.cxx   |2 +-
 cui/source/inc/splitcelldlg.hxx  |   20 ++--
 svx/source/table/tablecontroller.cxx |9 +
 sw/source/uibase/shells/tabsh.cxx|   33 +++--
 5 files changed, 73 insertions(+), 26 deletions(-)

New commits:
commit ca189b78bc9bfb0e6fad72e3374bf8e8408093f0
Author: Szymon Kłos 
AuthorDate: Wed Sep 30 10:49:12 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 13:33:45 2020 +0200

Make Split Table Cell dialog async

Change-Id: I4efbb24f721aa50cc4dbbe78ae1e7e6087f8c876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103670
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/cui/source/dialogs/splitcelldlg.cxx 
b/cui/source/dialogs/splitcelldlg.cxx
index 40b798b7c2c9..3de8082c939a 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -74,15 +74,40 @@ long SvxSplitTableDlg::GetCount() const
 return m_xCountEdit->get_value();
 }
 
-short SvxSplitTableDlg::Execute()
-{
-return run();
-}
-
 void SvxSplitTableDlg::SetSplitVerticalByDefault()
 {
 if( mnMaxVertical >= 2 )
 m_xVertBox->set_active(true); // tdf#60242
 }
 
+bool SvxAbstractSplitTableDialog_Impl::IsHorizontal() const
+{
+return m_xDlg->IsHorizontal();
+}
+
+bool SvxAbstractSplitTableDialog_Impl::IsProportional() const
+{
+return m_xDlg->IsProportional();
+}
+
+long SvxAbstractSplitTableDialog_Impl::GetCount() const
+{
+return m_xDlg->GetCount();
+}
+
+void SvxAbstractSplitTableDialog_Impl::SetSplitVerticalByDefault()
+{
+m_xDlg->SetSplitVerticalByDefault();
+}
+
+short SvxAbstractSplitTableDialog_Impl::Execute()
+{
+return m_xDlg->run();
+}
+
+bool SvxAbstractSplitTableDialog_Impl::StartExecuteAsync(AsyncContext& 
rContext)
+{
+return weld::DialogController::runAsync(m_xDlg, rContext.maEndDialogFn);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 46180fc4435c..be6351d04b8b 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1619,7 +1619,7 @@ std::shared_ptr 
AbstractDialogFactory_Impl::CreateSvxForm
 
 VclPtr 
AbstractDialogFactory_Impl::CreateSvxSplitTableDialog(weld::Window* pParent, 
bool bIsTableVertical, long nMaxVertical)
 {
-return VclPtr::Create( pParent, bIsTableVertical, 
nMaxVertical, 99 );
+return VclPtr::Create( 
std::make_shared(pParent, bIsTableVertical, nMaxVertical, 99 
));
 }
 
 std::shared_ptr 
AbstractDialogFactory_Impl::CreateSvxNewTableDialog(weld::Window* pParent)
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index b0c2fddae3c7..44df027d3a93 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -22,7 +22,7 @@
 #include 
 #include 
 
-class SvxSplitTableDlg : public SvxAbstractSplitTableDialog, public 
weld::GenericDialogController
+class SvxSplitTableDlg : public weld::GenericDialogController
 {
 private:
 std::unique_ptr m_xCountEdit;
@@ -38,12 +38,28 @@ public:
 
 DECL_LINK(ClickHdl, weld::Button&, void);
 
+virtual bool IsHorizontal() const;
+virtual bool IsProportional() const;
+virtual long GetCount() const;
+
+virtual void SetSplitVerticalByDefault();
+};
+
+class SvxAbstractSplitTableDialog_Impl : public SvxAbstractSplitTableDialog
+{
+std::shared_ptr m_xDlg;
+
+public:
+SvxAbstractSplitTableDialog_Impl(std::shared_ptr pDlg) : 
m_xDlg(std::move(pDlg)) {}
+
 virtual bool IsHorizontal() const override;
 virtual bool IsProportional() const override;
 virtual long GetCount() const override;
 
-virtual short Execute() override;
 virtual void SetSplitVerticalByDefault() override;
+
+virtual short Execute() override;
+virtual bool StartExecuteAsync(AsyncContext& rContext) override;
 };
 
 #endif
diff --git a/svx/source/table/tablecontroller.cxx 
b/svx/source/table/tablecontroller.cxx
index 48a73e528143..d6541073be6e 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1279,10 +1279,9 @@ void SvxTableController::SplitMarkedCells(const 
SfxRequest& rReq)
 return;
 
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-ScopedVclPtr 
xDlg(pFact->CreateSvxSplitTableDialog(rReq.GetFrameWeld(), false, 99));
+VclPtr 
xDlg(pFact->CreateSvxSplitTableDialog(rReq.GetFrameWeld(), false, 99));
 
-if( xDlg->Execute() )
-{
+xDlg->StartExecuteAsync([xDlg, this](int) {
 const sal_Int32 nCount = xDlg->GetCount() - 1;
 
 if( nCount < 1 )
@@ -1324,7 +1323,9 @@ void SvxTableController::SplitMarkedCells(const 
SfxRequest& rReq)
 aEnd.mnCol += mxTable->getColumnCount() - nColCount;
 
 setSelectedCells( aStart, aEnd );
-}
+
+xDlg->disposeO

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

2020-10-06 Thread Szymon Kłos (via logerrit)

 vcl/source/app/help.cxx |   29 ++---
 1 file changed, 14 insertions(+), 15 deletions(-)

New commits:
commit e1486b3d6658596e9dd27e712f5161553df08b1d
Author: Szymon Kłos 
AuthorDate: Mon Oct 5 16:38:15 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 13:32:33 2020 +0200

Don't reuse tooltip window in different context

This causes interference to other views due to usage
of global references in Online.

Change-Id: Ib9346881d4e48ac1ce3456d386806582ade82255
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103994
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index b5a7cb4cc057..b54213ed1501 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -498,21 +498,10 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 
nHelpWinStyle, QuickHe
 {
 SAL_WARN_IF( pHelpWin == pParent, "vcl", "HelpInHelp ?!" );
 
-if  (   (   rHelpText.isEmpty()
-||  ( pHelpWin->GetWinStyle() != nHelpWinStyle )
-)
-&&  aHelpData.mbRequestingHelp
-)
-{
-// remove help window if no HelpText or
-// other help mode. but keep it if we are scrolling, ie not 
requesting help
-bool bWasVisible = pHelpWin->IsVisible();
-if ( bWasVisible )
-bNoDelay = true; // display it quickly if we were already in 
quick help mode
-pHelpWin = nullptr;
-ImplDestroyHelpWindow( bWasVisible );
-}
-else
+bool bRemoveHelp = (rHelpText.isEmpty() || (pHelpWin->GetWinStyle() != 
nHelpWinStyle))
+&& aHelpData.mbRequestingHelp;
+
+if (!bRemoveHelp && pHelpWin->GetParent() == pParent)
 {
 bool const bUpdate = (pHelpWin->GetHelpText() != rHelpText) ||
 ((pHelpWin->GetHelpArea() != rHelpArea) && 
aHelpData.mbRequestingHelp);
@@ -530,6 +519,16 @@ void ImplShowHelpWindow( vcl::Window* pParent, sal_uInt16 
nHelpWinStyle, QuickHe
 pHelpWin->Invalidate();
 }
 }
+else
+{
+// remove help window if no HelpText or
+// other help mode. but keep it if we are scrolling, ie not 
requesting help
+bool bWasVisible = pHelpWin->IsVisible();
+if ( bWasVisible )
+bNoDelay = true; // display it quickly if we were already in 
quick help mode
+pHelpWin = nullptr;
+ImplDestroyHelpWindow( bWasVisible );
+}
 }
 
 if (pHelpWin || rHelpText.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - chart2/source desktop/source

2020-10-06 Thread Szymon Kłos (via logerrit)

 chart2/source/controller/inc/ChartController.hxx|1 
 chart2/source/controller/main/ChartController.cxx   |9 +++
 chart2/source/controller/main/ChartController_Tools.cxx |   20 
 desktop/source/lib/init.cxx |2 -
 4 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit c43393135a6cd0f748433fc39ff45938b82e0464
Author: Szymon Kłos 
AuthorDate: Mon Sep 21 11:16:35 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 13:29:31 2020 +0200

Allow to save file if chart editing is active

This helps in online where autosave after user
closed view with chart editing active caused
document to be broken and not allowing to open again.

Change-Id: Iab6a9bfe2c5f67c155ee97726e752c83fc47af5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103091
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104011
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e3c4d8ae7d2f..0d94f67cea11 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3972,7 +3972,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 bool bResult = false;
 LokChartHelper aChartHelper(SfxViewShell::Current());
 
-if (aChartHelper.GetWindow() )
+if (aChartHelper.GetWindow() && aCommand != ".uno:Save" )
 {
 util::URL aCommandURL;
 aCommandURL.Path = aCommand.copy(5);
commit 72f36d5e7a982b1a8b58dd73da4db580bf5124f1
Author: Szymon Kłos 
AuthorDate: Thu Sep 17 13:27:53 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 13:29:24 2020 +0200

lok: Add posibility to change chart fill color

Change-Id: I519a0fe15c4983803109aed7eef840d36a5e7b21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102920
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103141
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/chart2/source/controller/inc/ChartController.hxx 
b/chart2/source/controller/inc/ChartController.hxx
index e464786bc217..293e1b732774 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -497,6 +497,7 @@ private:
 
 void executeDispatch_LOKSetTextSelection(int nType, int nX, int nY);
 void executeDispatch_LOKPieSegmentDragging(int nOffset);
+void executeDispatch_FillColor(sal_uInt32 nColor);
 
 void sendPopupRequest(OUString const & rCID, tools::Rectangle aRectangle);
 
diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index f81b261182fa..df58f924189a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1104,6 +1104,15 @@ void SAL_CALL ChartController::dispatch(
 this->executeDispatch_PositionAndSize(&rArgs);
 }
 }
+else if(aCommand == "FillColor")
+{
+if (rArgs.getLength() > 0)
+{
+sal_uInt32 nColor;
+rArgs[0].Value >>= nColor;
+this->executeDispatch_FillColor(nColor);
+}
+}
 else if(aCommand == "Paste")
 this->executeDispatch_Paste();
 else if(aCommand == "Copy" )
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index d72a629757a1..0b6401456c9a 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -920,6 +920,26 @@ void ChartController::executeDispatch_ToggleGridVertical()
 aUndoGuard.commit();
 }
 
+void ChartController::executeDispatch_FillColor(sal_uInt32 nColor)
+{
+try
+{
+OUString aCID( m_aSelection.getSelectedCID() );
+const uno::Reference< frame::XModel >& xChartModel = getModel();
+if( xChartModel.is() )
+{
+Reference< beans::XPropertySet > xPointProperties(
+ObjectIdentifier::getObjectPropertySet( aCID, xChartModel ) );
+if( xPointProperties.is() )
+xPointProperties->setPropertyValue( "FillColor", uno::Any( 
nColor ) );
+}
+}
+catch( const uno::Exception& )
+{
+DBG_UNHANDLED_EXCEPTION( "chart2" );
+}
+}
+
 void ChartController::executeDispatch_LOKSetTextSelection(int nType, int nX, 
int nY)
 {
 if (!m_pDrawViewWrapper)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - chart2/source desktop/source

2020-10-06 Thread Szymon Kłos (via logerrit)

 chart2/source/controller/sidebar/ChartAreaPanel.cxx |   15 ++-
 desktop/source/lib/init.cxx |2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 49a1c4c649d062160765520f0a1c82925030a644
Author: Szymon Kłos 
AuthorDate: Wed Sep 23 15:28:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 13:21:59 2020 +0200

Use default diagram page selection for charts

Change-Id: I0bf0e5d2d1ef43a61c1bb723b25bafa30b5ad5c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103602
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104016
Reviewed-by: Szymon Kłos 

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 61e72318043c..64fce618760c 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -45,7 +45,20 @@ OUString getCID(const 
css::uno::Reference& xModel)
 
 css::uno::Any aAny = xSelectionSupplier->getSelection();
 if (!aAny.hasValue())
-return OUString();
+{
+// if no selection, default to diagram wall so sidebar can show some 
editable properties
+ChartController* pController = 
dynamic_cast(xController.get());
+if (pController)
+{
+pController->select( css::uno::Any( 
ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
+xSelectionSupplier = 
css::uno::Reference(xController, 
css::uno::UNO_QUERY);
+if (xSelectionSupplier.is())
+aAny = xSelectionSupplier->getSelection();
+}
+
+if (!aAny.hasValue())
+return OUString();
+}
 
 OUString aCID;
 aAny >>= aCID;
commit 6684a11703432da748f8a725b05d0e5edcc90568
Author: Szymon Kłos 
AuthorDate: Mon Sep 21 11:16:35 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 13:21:47 2020 +0200

Allow to save file if chart editing is active

This helps in online where autosave after user
closed view with chart editing active caused
document to be broken and not allowing to open again.

Change-Id: Iab6a9bfe2c5f67c155ee97726e752c83fc47af5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103091
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104014
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d6cd2f3fb9ce..abde59b9b5c6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3986,7 +3986,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 bool bResult = false;
 LokChartHelper aChartHelper(SfxViewShell::Current());
 
-if (aChartHelper.GetWindow() )
+if (aChartHelper.GetWindow() && aCommand != ".uno:Save" )
 {
 util::URL aCommandURL;
 aCommandURL.Path = aCommand.copy(5);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Szymon Kłos (via logerrit)

 chart2/source/controller/sidebar/ChartAreaPanel.cxx |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 5e7518c980855c51049cf1ca5e8b77363bd1ec19
Author: Szymon Kłos 
AuthorDate: Wed Sep 23 15:28:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 6 13:22:25 2020 +0200

Use default diagram page selection for charts

Change-Id: I0bf0e5d2d1ef43a61c1bb723b25bafa30b5ad5c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103602
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104013
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx 
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index de1c21af679a..c5db392cf34f 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -46,7 +46,20 @@ OUString getCID(const 
css::uno::Reference& xModel)
 
 css::uno::Any aAny = xSelectionSupplier->getSelection();
 if (!aAny.hasValue())
-return OUString();
+{
+// if no selection, default to diagram wall so sidebar can show some 
editable properties
+ChartController* pController = 
dynamic_cast(xController.get());
+if (pController)
+{
+pController->select( css::uno::Any( 
ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) ) );
+xSelectionSupplier = 
css::uno::Reference(xController, 
css::uno::UNO_QUERY);
+if (xSelectionSupplier.is())
+aAny = xSelectionSupplier->getSelection();
+}
+
+if (!aAny.hasValue())
+return OUString();
+}
 
 OUString aCID;
 aAny >>= aCID;
___
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' - oox/qa oox/source sd/qa

2020-10-06 Thread Miklos Vajna (via logerrit)

 oox/qa/unit/data/shape-text-adjust-left.pptx   |binary
 oox/qa/unit/drawingml.cxx  |   19 +++
 oox/source/drawingml/shape.cxx |   16 ++
 oox/source/drawingml/textbodypropertiescontext.cxx |5 
 sd/qa/unit/data/xml/n762695_0.xml  |6 -
 sd/qa/unit/data/xml/n762695_1.xml  |   10 -
 sd/qa/unit/data/xml/n819614_0.xml  |  114 ++---
 sd/qa/unit/data/xml/n820786_0.xml  |  102 +-
 sd/qa/unit/data/xml/tdf109317_0.xml|   12 +-
 sd/qa/unit/import-tests.cxx|7 -
 10 files changed, 160 insertions(+), 131 deletions(-)

New commits:
commit 0e5e3434d23fff4e5ae8cd4d3201be3903bcae06
Author: Miklos Vajna 
AuthorDate: Mon Oct 5 21:06:01 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 6 13:14:12 2020 +0200

tdf#137023 PPTX import: fix unexpected center alignment of shape text, 2nd 
try

Regression from commit 10bb02efd8afd42e633e370480104e2575546d8e
(tdf#129685 PPTX import: fix unexpected centering of shape text,
2020-09-18), now the problem was that some text should be left aligned,
but was centered.

Fix the problem by reverting most of the above commit: XML changes,
changes to SdImportTest::testTdf113198() (manual testing show that this
change is not needed after all) and changes to the
TextBodyPropertiesContext ctor in oox/ (but not the testcase itself).

Fix tdf#113198 again, this time in Shape::createAndInsert(), which is
meant to be closer to what the binary PPT import does.

With this, all cases from tdf#104722, tdf#113198, tdf#129685 and
tdf#137023 are meant to be handled correctly at the same time.

(cherry picked from commit dfa1856cdb4c69985ef1e809d33055427b6fbd76)

Change-Id: Id785252c26fc407cd74c9cfb55624091798d7773
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104006
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/oox/qa/unit/data/shape-text-adjust-left.pptx 
b/oox/qa/unit/data/shape-text-adjust-left.pptx
new file mode 100644
index ..d197425b9703
Binary files /dev/null and b/oox/qa/unit/data/shape-text-adjust-left.pptx differ
diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx
index 43609435c468..7fcee1756a6f 100644
--- a/oox/qa/unit/drawingml.cxx
+++ b/oox/qa/unit/drawingml.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -246,6 +247,24 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, 
testShapeTextAlignment)
  static_cast(nParaAdjust));
 }
 
+CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testShapeTextAdjustLeft)
+{
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"shape-text-adjust-left.pptx";
+load(aURL);
+
+uno::Reference 
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+drawing::TextHorizontalAdjust eAdjust;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 3 (center)
+// - Actual  : 1 (block)
+// i.e. text was center-adjusted, not default-adjusted (~left).
+CPPUNIT_ASSERT(xShape->getPropertyValue("TextHorizontalAdjust") >>= 
eAdjust);
+CPPUNIT_ASSERT_EQUAL(drawing::TextHorizontalAdjust_BLOCK, eAdjust);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 0973a0790e33..8e6897564fae 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1473,6 +1473,22 @@ Reference< XShape > const & Shape::createAndInsert(
 xText->setString("");
 Reference < XTextCursor > xAt = xText->createTextCursor();
 getTextBody()->insertAt( rFilterBase, xText, xAt, 
aCharStyleProperties, mpMasterTextListStyle );
+
+const TextParagraphVector& rParagraphs = 
getTextBody()->getParagraphs();
+if (!rParagraphs.empty())
+{
+const std::shared_ptr& pParagraph = 
rParagraphs[0];
+if (pParagraph->getProperties().getParaAdjust())
+{
+style::ParagraphAdjust eAdjust = 
*pParagraph->getProperties().getParaAdjust();
+if (eAdjust == style::ParagraphAdjust_CENTER)
+{
+// If the first paragraph is centered, then set 
the para adjustment of
+// the shape itself to centered as well.
+aPropertySet.setAnyProperty(PROP_ParaAdjust, 
uno::makeAny(eAdjust));
+}
+

Re: Failing testTdf107020 - crop size mismatch after load & reload

2020-10-06 Thread Mark Hung

Hi Noel,

I reset the font scaling to 100% and the unit test pass.
Thank you!

Noel Grandin  於 2020年10月6日 週二 下午3:19寫道：

> Do you have any kind of font-scaling active?
>
> Because then the unit tests won't work on Windows.
>
> On 2020/10/05 11:21 pm, Mark Hung wrote:
> >
> >
> > Caolán McNamara mailto:caol...@redhat.com>> 於
> 2020年10月6日 週二 03:05 寫道：
> >
> > On Tue, 2020-10-06 at 00:10 +0800, Mark Hung wrote:
> >  > Test name: testTdf107020::Load_Reload_Verify
> >  > equality assertion failed
> >  > - Expected: 27183
> >  > - Actual  : 27187
> >
> > What's your platform, windows ?
> >
> >
> > Yes. I'm using Windows10.
>


-- 
Mark Hung
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: basegfx/source comphelper/source include/registry include/svl include/vcl svl/source tools/source vcl/backendtest vcl/inc vcl/skia vcl/source vcl/unx

2020-10-06 Thread Noel (via logerrit)

 basegfx/source/polygon/b2dpolygontools.cxx|4 +-
 basegfx/source/polygon/b3dpolygontools.cxx|4 +-
 comphelper/source/misc/lok.cxx|4 +-
 include/registry/registry.hxx |2 -
 include/svl/zformat.hxx   |2 -
 include/vcl/GraphicObject.hxx |2 -
 include/vcl/WeldedTabbedNotebookbar.hxx   |3 +-
 include/vcl/animate/Animation.hxx |2 -
 include/vcl/filter/PDFiumLibrary.hxx  |   10 +++---
 include/vcl/graph.hxx |2 -
 include/vcl/layout.hxx|4 +-
 include/vcl/notebookbar.hxx   |4 +-
 include/vcl/toolkit/treelistbox.hxx   |8 ++---
 include/vcl/weld.hxx  |2 -
 include/vcl/weldutils.hxx |2 -
 svl/source/numbers/zformat.cxx|2 -
 tools/source/stream/strmunx.cxx   |2 -
 vcl/backendtest/outputdevice/bitmap.cxx   |2 -
 vcl/inc/impgraph.hxx  |4 +-
 vcl/inc/sft.hxx   |2 -
 vcl/inc/skia/utils.hxx|2 -
 vcl/inc/svimpbox.hxx  |2 -
 vcl/inc/test/outputdevice.hxx |2 -
 vcl/inc/unx/glyphcache.hxx|2 -
 vcl/inc/unx/saldisp.hxx   |2 -
 vcl/skia/SkiaHelper.cxx   |2 -
 vcl/source/animate/Animation.cxx  |2 -
 vcl/source/app/salvtables.cxx |2 -
 vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx |6 ++--
 vcl/source/bitmap/BitmapFilterStackBlur.cxx   |   33 --
 vcl/source/control/WeldedTabbedNotebookbar.cxx|2 -
 vcl/source/control/field2.cxx |2 -
 vcl/source/filter/ipdf/pdfread.cxx|4 +-
 vcl/source/fontsubset/sft.cxx |2 -
 vcl/source/gdi/graph.cxx  |2 -
 vcl/source/gdi/impgraph.cxx   |   10 +++---
 vcl/source/graphic/GraphicObject.cxx  |2 -
 vcl/source/pdf/PDFiumLibrary.cxx  |6 ++--
 vcl/source/treelist/svimpbox.cxx  |2 -
 vcl/source/treelist/treelistbox.cxx   |8 ++---
 vcl/source/window/layout.cxx  |2 -
 vcl/unx/generic/app/saldisp.cxx   |2 -
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx|2 -
 43 files changed, 87 insertions(+), 81 deletions(-)

New commits:
commit 22d94ce0abef7cdd5e344a28e1b1ee4caf6cd8f8
Author: Noel 
AuthorDate: Tue Oct 6 11:17:13 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 6 12:57:25 2020 +0200

loplugin:const* make some params and methods const

Change-Id: If7fbb25037343e18081a8ee7064840d75e9a45a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104010
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index 720fb7a10e23..12401ac9756a 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -1150,7 +1150,7 @@ namespace basegfx::utils
 
 static void implHandleSnippet(
 const B2DPolygon& rSnippet,
-std::function& 
rTargetCallback,
+const std::function& 
rTargetCallback,
 B2DPolygon& rFirst,
 B2DPolygon& rLast)
 {
@@ -1177,7 +1177,7 @@ namespace basegfx::utils
 }
 
 static void implHandleFirstLast(
-std::function& 
rTargetCallback,
+const std::function& 
rTargetCallback,
 B2DPolygon& rFirst,
 B2DPolygon& rLast)
 {
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx 
b/basegfx/source/polygon/b3dpolygontools.cxx
index bf982f9c3e22..ac1f3a5a8d7e 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -119,7 +119,7 @@ namespace basegfx::utils
 
 static void implHandleSnippet(
 const B3DPolygon& rSnippet,
-std::function& 
rTargetCallback,
+const std::function& 
rTargetCallback,
 B3DPolygon& rFirst,
 B3DPolygon& rLast)
 {
@@ -146,7 +146,7 @@ namespace basegfx::utils
 }
 
 static void implHandleFirstLast(
-std::function& 
rTargetCallback,
+const std::function& 
rTargetCallback,
 B3DPolygon& rFirst,
 B3DPolygon& rLast)
 {
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 8f26be08c49d..c0e0726b7440 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -51,7 +51,7 @@ public:
 , maLocaleLanguage

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

2020-10-06 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/chart/chartDataLabels.py |   41 ++
 1 file changed, 41 insertions(+)

New commits:
commit d34e969c888219bd3739fc4a8ef330c77f7e7adf
Author: Xisco Fauli 
AuthorDate: Mon Oct 5 16:19:28 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 6 12:53:33 2020 +0200

tdf#136430, tdf#136573: sc: Add UItest (take 2)

Take 1 was submitted in 647958099600923d9ba3a57101891f62de326f4b
and later reverted in 5872f0c0d206466ad78e92be3d7d551b7ff4dbf1
The reason why jenkins hung was that the position of the label
changed from 0.43,2.84 to 0.5,2.89 in
a91ac466e2a996a07248ec4a2518d5ba9bdf3d61

For some reason, jenkins didn't fail and the builds were just
aborted after some time.

Change-Id: If325d74e19b8fe6d8ad06700bfb05620c9d321cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103992
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/chart/chartDataLabels.py 
b/sc/qa/uitest/chart/chartDataLabels.py
index 378670faec51..13709a01c6ed 100644
--- a/sc/qa/uitest/chart/chartDataLabels.py
+++ b/sc/qa/uitest/chart/chartDataLabels.py
@@ -7,6 +7,7 @@
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict
 from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
 from uitest.uihelper.calc import enter_text_to_cell
 from libreoffice.calc.document import get_cell_by_position
 from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -320,4 +321,44 @@ class chartDataLabels(UITestCase):
 self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
 self.ui_test.close_doc()
 
+   def test_tdf136573(self):
+calc_doc = self.ui_test.load_file(get_url_for_data_file("dataLabels.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+change_measurement_unit(self, "Centimeter")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+gridwin.executeAction("ACTIVATE", tuple())
+xChartMainTop = self.xUITest.getTopFocusWindow()
+xChartMain = xChartMainTop.getChild("chart_window")
+
+# Select the first label
+xDataLabel = 
xChartMain.getChild("CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0")
+xDataLabel.executeAction("SELECT", tuple())
+
+self.ui_test.execute_dialog_through_action(xDataLabel, "COMMAND", 
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("0.5", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("2.89", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xCanBtn = xDialog.getChild("cancel")
+xCanBtn.executeAction("CLICK", tuple())
+
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "LEFT"}))
+
+self.ui_test.execute_dialog_through_action(xDataLabel, "COMMAND", 
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+# Check the position has changed after moving the label using the arrows 
keys
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("0.4", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("2.79", 
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xCanBtn = xDialog.getChild("ok")
+xCanBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Mike Kaganski (via logerrit)

 oox/source/ole/vbaexport.cxx |   16 ++--
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 97c03dfe6c946236c3b385879f3bb2594dc4602f
Author: Mike Kaganski 
AuthorDate: Tue Oct 6 11:20:08 2020 +0300
Commit: Mike Kaganski 
CommitDate: Tue Oct 6 12:49:51 2020 +0200

Drop unused code

... a leftover in commit 3187eeab10df77a6c0dd6397be993a68276d7141,
copypasted in commit 4f4a668e04bdd68655a0f574027f486cea953857.

Change-Id: I7a634ba432cb4736ec85a420b0f77288cd1e0802
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104004
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index 7833beae83cd..b699da60697a 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -762,20 +762,13 @@ void exportDirStream(SvStream& rStrm, const 
css::uno::Referencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 editeng/source/editeng/impedit2.cxx |   11 -
 include/editeng/editview.hxx|3 
 include/svx/svdedxv.hxx |1 
 include/svx/weldeditview.hxx|9 +
 include/vcl/customweld.hxx  |7 
 include/vcl/layout.hxx  |7 
 include/vcl/weld.hxx|   27 +++
 svx/source/dialog/weldeditview.cxx  |   23 +++
 svx/source/svdraw/svdedxv.cxx   |7 
 vcl/source/app/customweld.cxx   |6 
 vcl/source/app/salvtables.cxx   |   14 +
 vcl/source/window/layout.cxx|   17 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx|  261 +++-
 13 files changed, 383 insertions(+), 10 deletions(-)

New commits:
commit 046a43559ba3c5ff53c364a69c99e70357c22e60
Author: Caolán McNamara 
AuthorDate: Wed Sep 30 14:42:10 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Oct 6 12:43:27 2020 +0200

tdf#134566 gtk IM support for custom widgets

Change-Id: I5c731161768d09d021db5c353de816e173159096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103764
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103991
Reviewed-by: Miklos Vajna 

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index eb9ef5eca2c3..0cf19653e0d1 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -478,11 +478,12 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt, 
EditView* pView )
 if ( nInputEnd > rLine.GetEnd() )
 nInputEnd = rLine.GetEnd();
 tools::Rectangle aR2 = PaMtoEditCursor( EditPaM( 
aPaM.GetNode(), nInputEnd ), GetCursorFlags::EndOfLine );
-if (vcl::Window* pWindow = pView->GetWindow())
-{
-tools::Rectangle aRect = 
pView->GetImpEditView()->GetWindowPos( aR1 );
-pWindow->SetCursorRect( &aRect, aR2.Left()-aR1.Right() );
-}
+tools::Rectangle aRect = 
pView->GetImpEditView()->GetWindowPos( aR1 );
+auto nExtTextInputWidth = aR2.Left() - aR1.Right();
+if (EditViewCallbacks* pEditViewCallbacks = 
pView->getEditViewCallbacks())
+pEditViewCallbacks->EditViewCursorRect(aRect, 
nExtTextInputWidth);
+else if (vcl::Window* pWindow = pView->GetWindow())
+pWindow->SetCursorRect(&aRect, nExtTextInputWidth);
 }
 }
 else
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 41d707127258..c750dcef9254 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -111,6 +111,9 @@ public:
 // Triggered to update InputEngine context information
 virtual void EditViewInputContext(const InputContext& rInputContext) = 0;
 
+// Triggered to update InputEngine cursor position
+virtual void EditViewCursorRect(const tools::Rectangle& rRect, int 
nExtTextInputWidth) = 0;
+
 // implemented if drag and drop support is wanted
 virtual css::uno::Reference 
GetDropTarget()
 {
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index feb27e347057..4684cd4318c5 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -69,6 +69,7 @@ class SVXCORE_DLLPUBLIC SdrObjEditView : public 
SdrGlueEditView, public EditView
 virtual void EditViewSelectionChange() override;
 virtual OutputDevice& EditViewOutputDevice() const override;
 virtual void EditViewInputContext(const InputContext& rInputContext) 
override;
+virtual void EditViewCursorRect(const tools::Rectangle& rRect, int 
nExtTextInputWidth) override;
 
 // The OverlayObjects used for visualizing active TextEdit (currently
 // using TextEditOverlayObject, but not limited to it
diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx
index 3a96014628c4..4edda521b9b1 100644
--- a/include/svx/weldeditview.hxx
+++ b/include/svx/weldeditview.hxx
@@ -25,6 +25,8 @@ class SVX_DLLPUBLIC WeldEditView : public 
weld::CustomWidgetController, public E
 public:
 WeldEditView();
 virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
+virtual int GetSurroundingText(OUString& rSurrounding) override;
+virtual bool DeleteSurroundingText(const Selection& rRange) override;
 
 void SetText(const OUString& rStr) { m_xEditEngine->SetText(rStr); }
 
@@ -71,6 +73,13 @@ protected:
 {
 SetInputContext(rInputContext);
 }
+
+virtual void EditViewCursorRect(const tools::Rectangle& rRect, int 
nExtTextInputWidth) override
+{
+OutputDevice& rRefDevice = EditViewOutputDevice();
+SetCursorRect(rRefDevice.LogicToPixel(rRect),
+  rRefDevice.LogicToPixel(Size(nExtTextInputWidth, 
0)).Width());
+}
 };
 
 #endif // INCLUDED_SVX_WELDEDITVIEW_HXX
diff --git a/include/vcl/customweld.hxx b/include/vcl/customw

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 vcl/inc/unx/gtk/gtkframe.hxx  |1 
 vcl/unx/gtk3/gtk3gtkframe.cxx |   74 +++---
 2 files changed, 42 insertions(+), 33 deletions(-)

New commits:
commit a49a0165bbc7fce216256bc8ee8ca8b0db757c1c
Author: Caolán McNamara 
AuthorDate: Thu Oct 1 12:30:51 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Oct 6 12:42:22 2020 +0200

Related: tdf#134566 split signalIMPreeditChanged to extract a reusable piece

Change-Id: Iff979921629a0e1c8d2b3fbd51a9f2f7270a3d53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103763
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 5f0492debf068c62604b936e68191257656ecbde)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103990
Reviewed-by: Miklos Vajna 

diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index aad22afa85e2..e42e1649a618 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -526,6 +526,7 @@ public:
 static SalWheelMouseEvent   GetWheelEvent(GdkEventScroll& rEvent);
 static gboolean NativeWidgetHelpPressed(GtkAccelGroup*, 
GObject*, guint,
 GdkModifierType, gpointer pFrame);
+static OUString GetPreeditDetails(GtkIMContext* pIMContext, 
std::vector& rInputFlags, sal_Int32& rCursorPos, sal_uInt8& 
rCursorFlags);
 };
 
 #define OOO_TYPE_FIXED ooo_fixed_get_type()
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 803ae198de2e..d818ec137096 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -4112,45 +4112,27 @@ void GtkSalFrame::IMHandler::signalIMCommit( 
GtkIMContext* /*pContext*/, gchar*
 }
 }
 
-void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer 
im_handler )
+OUString GtkSalFrame::GetPreeditDetails(GtkIMContext* pIMContext, 
std::vector& rInputFlags, sal_Int32& rCursorPos, sal_uInt8& 
rCursorFlags)
 {
-GtkSalFrame::IMHandler* pThis = 
static_cast(im_handler);
-
 char*   pText   = nullptr;
 PangoAttrList*  pAttrs  = nullptr;
 gintnCursorPos  = 0;
 
-gtk_im_context_get_preedit_string( pThis->m_pIMContext,
+gtk_im_context_get_preedit_string( pIMContext,
&pText,
&pAttrs,
&nCursorPos );
-if( pText && ! *pText ) // empty string
-{
-// change from nothing to nothing -> do not start preedit
-// e.g. this will activate input into a calc cell without
-// user input
-if( pThis->m_aInputEvent.maText.getLength() == 0 )
-{
-g_free( pText );
-pango_attr_list_unref( pAttrs );
-return;
-}
-}
-
-pThis->m_bPreeditJustChanged = true;
 
-bool bEndPreedit = (!pText || !*pText) && pThis->m_aInputEvent.mpTextAttr 
!= nullptr;
 gint nUtf8Len = pText ? strlen(pText) : 0;
-pThis->m_aInputEvent.maText = pText ? OUString(pText, 
nUtf8Len, RTL_TEXTENCODING_UTF8) : OUString();
-const OUString& rText = pThis->m_aInputEvent.maText;
+OUString sText = pText ? OUString(pText, nUtf8Len, RTL_TEXTENCODING_UTF8) 
: OUString();
 
 std::vector aUtf16Offsets;
-for (sal_Int32 nUtf16Offset = 0; nUtf16Offset < rText.getLength(); 
rText.iterateCodePoints(&nUtf16Offset))
+for (sal_Int32 nUtf16Offset = 0; nUtf16Offset < sText.getLength(); 
sText.iterateCodePoints(&nUtf16Offset))
 aUtf16Offsets.push_back(nUtf16Offset);
 
 sal_Int32 nUtf32Len = aUtf16Offsets.size();
 // from the above loop filling aUtf16Offsets, we know that its size() 
fits into sal_Int32
-aUtf16Offsets.push_back(rText.getLength());
+aUtf16Offsets.push_back(sText.getLength());
 
 // sanitize the CurPos which is in utf-32
 if (nCursorPos < 0)
@@ -4158,10 +4140,10 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( 
GtkIMContext*, gpointer im_
 else if (nCursorPos > nUtf32Len)
 nCursorPos = nUtf32Len;
 
-pThis->m_aInputEvent.mnCursorPos = aUtf16Offsets[nCursorPos];
-pThis->m_aInputEvent.mnCursorFlags = 0;
+rCursorPos = aUtf16Offsets[nCursorPos];
+rCursorFlags = 0;
 
-pThis->m_aInputFlags = std::vector( std::max( 1, 
static_cast(rText.getLength()) ), ExtTextInputAttr::NONE );
+rInputFlags.resize(std::max(1, static_cast(sText.getLength())), 
ExtTextInputAttr::NONE);
 
 PangoAttrIterator *iter = pango_attr_list_get_iterator(pAttrs);
 do
@@ -4204,7 +4186,7 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( 
GtkIMContext*, gpointer im_
 {
 case PANGO_ATTR_BACKGROUND:
 sal_attr |= ExtTextInputAttr::Highlight;
-pThis->m_aInputEvent.mnCursorFlags |= 
EXTTEXTINPUT_CURSOR_INVISIBLE;
+rCursorFlags |= EXTTEXTINPUT_CURSOR_INVISIBLE;
 break;

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 sw/source/ui/dbui/createaddresslistdialog.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit a9291f02c6eb9aa97a287dd5a99ad4b4d9448572
Author: Caolán McNamara 
AuthorDate: Fri Oct 2 16:21:02 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Oct 6 12:41:02 2020 +0200

tdf#137209 unparent widgets in fragment dtor

Change-Id: I819514fd2b97e2cc8daad71a7f3b0b27afe6136d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103795
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx 
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index d7c9ca8c9b6d..4f0a49acd88c 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -47,11 +47,13 @@ struct SwAddressFragment
 std::unique_ptr m_xBuilder;
 std::unique_ptr m_xLabel;
 std::unique_ptr m_xEntry;
+weld::Container* m_pGrid;
 
 SwAddressFragment(weld::Container* pGrid, int nLine)
 : m_xBuilder(Application::CreateBuilder(pGrid, 
"modules/swriter/ui/addressfragment.ui"))
 , m_xLabel(m_xBuilder->weld_label("label"))
 , m_xEntry(m_xBuilder->weld_entry("entry"))
+, m_pGrid(pGrid)
 {
 m_xLabel->set_grid_left_attach(0);
 m_xLabel->set_grid_top_attach(nLine);
@@ -59,6 +61,12 @@ struct SwAddressFragment
 m_xEntry->set_grid_left_attach(1);
 m_xEntry->set_grid_top_attach(nLine);
 }
+
+virtual ~SwAddressFragment()
+{
+m_pGrid->move(m_xEntry.get(), nullptr);
+m_pGrid->move(m_xLabel.get(), nullptr);
+}
 };
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 sc/source/ui/app/inputwin.cxx |6 +++---
 sc/source/ui/inc/inputwin.hxx |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 084a230a15e22abada48f73d6e2efc66d208f933
Author: Caolán McNamara 
AuthorDate: Mon Oct 5 14:24:29 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 6 12:40:42 2020 +0200

pRuntimeWindow is always a ScInputBarGroup

so the dynamic cast isn't needed

Change-Id: I38d55ba782425383969a3da06df81c51a146a338
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104005
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 5255e17e3c31..62bcc1a6446b 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -148,7 +148,7 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
 }
 
 
-static VclPtr lcl_chooseRuntimeImpl( vcl::Window* pParent, 
const SfxBindings* pBind )
+static VclPtr lcl_chooseRuntimeImpl( vcl::Window* pParent, 
const SfxBindings* pBind )
 {
 ScTabViewShell* pViewSh = nullptr;
 SfxDispatcher* pDisp = pBind->GetDispatcher();
@@ -494,7 +494,7 @@ void ScInputWindow::Resize()
 aTextWindow.Resize();
 Size aSize = GetSizePixel();
 aSize.setHeight(CalcWindowSizePixel().Height() + 1);
-ScInputBarGroup* pGroupBar = 
dynamic_cast(pRuntimeWindow.get());
+ScInputBarGroup* pGroupBar = pRuntimeWindow.get();
 if (pGroupBar)
 {
 // To ensure smooth display and prevent the items in the toolbar being
@@ -745,7 +745,7 @@ void ScInputWindow::MouseMove( const MouseEvent& rMEvt )
 {
 Point aPosPixel = GetPointerPosPixel();
 
-ScInputBarGroup* pGroupBar = 
dynamic_cast(pRuntimeWindow.get());
+ScInputBarGroup* pGroupBar = pRuntimeWindow.get();
 
 if (bInResize || IsPointerAtResizePos())
 SetPointer(PointerStyle::WindowSSize);
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 1fe62fedca21..63308fc97f3d 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -315,7 +315,7 @@ private:
 bool IsPointerAtResizePos();
 
 VclPtr  aWndPos;
-VclPtr pRuntimeWindow;
+VclPtr pRuntimeWindow;
 ScTextWndBase&  aTextWindow;
 ScInputHandler* pInputHdl;
 ScTabViewShell* mpViewShell;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - comphelper/CppunitTest_comphelper_threadpool_test.mk comphelper/qa comphelper/source include/comphelper

2020-10-06 Thread Luboš Luňák (via logerrit)

 comphelper/CppunitTest_comphelper_threadpool_test.mk |1 
 comphelper/qa/unit/threadpooltest.cxx|   50 +++
 comphelper/source/misc/threadpool.cxx|   24 -
 include/comphelper/threadpool.hxx|7 +-
 4 files changed, 78 insertions(+), 4 deletions(-)

New commits:
commit 1400114a69ef4b946f66e0b9af2ab20299478a3e
Author: Luboš Luňák 
AuthorDate: Mon Oct 5 12:14:34 2020 +0200
Commit: Michael Meeks 
CommitDate: Tue Oct 6 12:37:17 2020 +0200

fix allocating thread pool workers

Tasks are removed from the queue before a worker starts working
on it, which means that maTasks.size() is not the number of tasks
to do, because the worked on tasks are not included there.
This means the code could spawn only a smaller number of workers
than were needed (and than CPU cores that are available).

Change-Id: Ic6e6a79316cf48d82f2b80be7ad477b723b2c4e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103955
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 2ad4e77a0f266ae6e6fccaebb1d080d2880bdac3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103972
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/comphelper/CppunitTest_comphelper_threadpool_test.mk 
b/comphelper/CppunitTest_comphelper_threadpool_test.mk
index 16bbd6fff69b..24467c898f80 100644
--- a/comphelper/CppunitTest_comphelper_threadpool_test.mk
+++ b/comphelper/CppunitTest_comphelper_threadpool_test.mk
@@ -24,6 +24,7 @@ $(eval $(call 
gb_CppunitTest_use_libraries,comphelper_threadpool_test, \
 cppuhelper \
 cppu \
 sal \
+tl \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/comphelper/qa/unit/threadpooltest.cxx 
b/comphelper/qa/unit/threadpooltest.cxx
index 8148cce941e8..141b91d03634 100644
--- a/comphelper/qa/unit/threadpooltest.cxx
+++ b/comphelper/qa/unit/threadpooltest.cxx
@@ -12,17 +12,22 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
+#include 
 
 class ThreadPoolTest : public CppUnit::TestFixture
 {
 public:
 void testPreferredConcurrency();
+void testWorkerUsage();
 
 CPPUNIT_TEST_SUITE(ThreadPoolTest);
 CPPUNIT_TEST(testPreferredConcurrency);
+CPPUNIT_TEST(testWorkerUsage);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -48,6 +53,51 @@ void ThreadPoolTest::testPreferredConcurrency() {
 #endif
 }
 
+namespace
+{
+class UsageTask : public comphelper::ThreadTask
+{
+public:
+UsageTask(const std::shared_ptr& pTag)
+: ThreadTask(pTag)
+{
+}
+virtual void doWork()
+{
+++count;
+mutex.lock();
+mutex.unlock();
+}
+static inline int count = 0;
+static inline std::mutex mutex;
+};
+} // namespace
+
+void ThreadPoolTest::testWorkerUsage()
+{
+// Create tasks for each available worker. Lock a shared mutex before that 
to make all
+// tasks block on it. And check that all workers have started, i.e. that 
the full
+// thread pool capacity is used.
+comphelper::ThreadPool& rSharedPool = 
comphelper::ThreadPool::getSharedOptimalPool();
+std::shared_ptr pTag = 
comphelper::ThreadPool::createThreadTaskTag();
+UsageTask::mutex.lock();
+for (int i = 0; i < rSharedPool.getWorkerCount(); ++i)
+{
+rSharedPool.pushTask(std::make_unique(pTag));
+osl::Thread::wait(std::chrono::milliseconds(10)); // give it a time to 
start
+}
+sal_uInt64 startTicks = tools::Time::GetSystemTicks();
+while (UsageTask::count != rSharedPool.getWorkerCount())
+{
+// Wait at most 5 seconds, that should do even on slow systems.
+CPPUNIT_ASSERT_MESSAGE("Thread pool does not use all worker threads.",
+   startTicks + 5000 > 
tools::Time::GetSystemTicks());
+osl::Thread::wait(std::chrono::milliseconds(10));
+}
+UsageTask::mutex.unlock();
+rSharedPool.waitUntilDone(pTag);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ThreadPoolTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/comphelper/source/misc/threadpool.cxx 
b/comphelper/source/misc/threadpool.cxx
index 95b6f2dff091..3de17925a4e3 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -78,12 +78,14 @@ public:
 std::unique_ptr pTask = mpPool->popWorkLocked( aGuard, 
true );
 if( pTask )
 {
+mpPool->incBusyWorker();
 aGuard.unlock();
 
 pTask->exec();
 pTask.reset();
 
 aGuard.lock();
+mpPool->decBusyWorker();
 }
 }
 }
@@ -91,7 +93,8 @@ public:
 
 ThreadPool::ThreadPool(sal_Int32 nWorkers)
 : mbTerminate(true)
-, mnWorkers(nWorkers)
+, mnMaxWorkers(nWorkers)
+, mnBusyWorkers(0)
 {
 }
 
@@ -103,6 +106,7 @@ ThreadPool::~ThreadPool()
 // still 0, but hopefully they will be more helpful on non-WNT p

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

2020-10-06 Thread Daniel Arato (NISZ) (via logerrit)

 sw/source/core/unocore/unoframe.cxx|   17 +
 writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx |   21 +++
 writerfilter/qa/cppunittests/dmapper/data/frame-direction.docx |binary
 writerfilter/source/dmapper/DomainMapper.cxx   |   30 
++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |6 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |   21 +++
 6 files changed, 94 insertions(+), 1 deletion(-)

New commits:
commit af4e5ee0f93c1ff442d08caed5c875f2b2c1fd43
Author: Daniel Arato (NISZ) 
AuthorDate: Wed Sep 16 08:48:32 2020 +0200
Commit: László Németh 
CommitDate: Tue Oct 6 12:31:04 2020 +0200

tdf#97128 DOCX import: fix frame direction

Frames used to be imported with zero rotation even if a w:textDirection
tag explicitly called for a non-default orientation.

I found no other solution to pass the incoming frame direction property
on to the SwXFrame about to be created.

1. If you put the property into the GetSectionContext(), it gets
overwritten when the next w:pPr tag is parsed, so all three frames will
end up having the same direction.

2. If you put the property into the GetTopContextOfType(CONTEXT_PARAGRAPH)
that context gets popped off the stack before control even gets to
CheckUnregisteredFrameConversion().

3. If you use PushStyleSheetProperties (which is bad in and of itself),
the order will be messed up because the frames are not necessarily
created in the same order as they are described in the file, so each
frame gets a wrong frame direction in the end.

Follow-up of commit 5a5597655a4bf12e4ca07c9c2b6f6221e217f080
(tentative fix for fdo#30474# [DOCX rotated text import failure]).

Change-Id: I6e3d68fe60c6e2a5b6684c65a964dd86d0168181
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103553
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index e8461393ea6f..a73b8e74fa95 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1402,6 +1402,23 @@ void SwXFrame::setPropertyValue(const OUString& 
rPropertyName, const ::uno::Any&
 {
 SolarMutexGuard aGuard;
 SwFrameFormat* pFormat = GetFrameFormat();
+
+// Hack to support hidden property to transfer textDirection
+if(rPropertyName == "FRMDirection")
+{
+if (pFormat)
+{
+SvxFrameDirectionItem aItem(SvxFrameDirection::Environment, 
RES_FRAMEDIR);
+aItem.PutValue(_rValue, 0);
+GetFrameFormat()->SetFormatAttr(aItem);
+}
+else if(IsDescriptor())
+{
+m_pProps->SetProperty(static_cast(RES_FRAMEDIR), 0, 
_rValue);
+}
+return;
+}
+
 const ::SfxItemPropertySimpleEntry* pEntry = 
m_pPropSet->getPropertyMap().getByName(rPropertyName);
 
 if (!pEntry)
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
index 893db1607112..de63ec4084d9 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -14,6 +14,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -104,6 +106,25 @@ CPPUNIT_TEST_FIXTURE(Test, testNumberingRestartStyleParent)
 xPara.set(xParaEnum->nextElement(), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(OUString("2."), 
xPara->getPropertyValue(aProp).get());
 }
+
+CPPUNIT_TEST_FIXTURE(Test, testFrameDirection)
+{
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"frame-direction.docx";
+getComponent() = loadFromDesktop(aURL);
+
+uno::Reference 
xDrawPageSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+uno::Reference xFrame0(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xFrame1(xDrawPage->getByIndex(1), 
uno::UNO_QUERY);
+uno::Reference xFrame2(xDrawPage->getByIndex(2), 
uno::UNO_QUERY);
+// Without the accompanying fix in place, all of the following values 
would be text::WritingMode2::CONTEXT
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::CONTEXT,
+ 
xFrame0->getPropertyValue("WritingMode").get());
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::BT_LR,
+ 
xFrame1->getPropertyValue("WritingMode").get());
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::TB_RL,
+ 
xFrame2->getPropertyValue("WritingMode").get());
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/qa/cppunittests/dmapper/data/frame-direction.docx 
b/writerfilter/qa/cppunittests/dmapper/data/frame-direction.docx
new file mode 100644
index ..33f191e80350
Binary files /de

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

2020-10-06 Thread Thorsten Behrens (via logerrit)

 include/vcl/tabpage.hxx  |   26 ++
 toolkit/source/awt/vclxcontainer.cxx |   16 ++-
 toolkit/source/awt/vclxtoolkit.cxx   |3 
 toolkit/source/controls/tabpagemodel.cxx |6 +
 vcl/source/window/tabpage.cxx|  130 +++
 5 files changed, 175 insertions(+), 6 deletions(-)

New commits:
commit 27a3f9772c050c2d788703a07082dde4ba929c13
Author: Thorsten Behrens 
AuthorDate: Fri Oct 2 23:38:46 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Oct 6 12:18:07 2020 +0200

Permit scrollable AWT tab pages a la scrolled Dialog

UNO dialogs since LibreOffice 4.0 permitted setting HScroll /
VScroll properties to enable scrolling for too large a content.
Conceptually clone this code over to TabPage as well, and register
necessary UNO properties in the toolkit UNO wrappers.

Add missing API documentation also to UnoControlDialogModel,
plus the new properties to the UnoControlTabPageModel.

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

diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 17270d9b6c0f..10fe3d588ee3 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -25,6 +25,9 @@
 #include 
 #include 
 
+class ScrollBar;
+class ScrollBarBox;
+
 class VCL_DLLPUBLIC TabPage
 : public vcl::Window
 , public VclBuilderContainer
@@ -34,6 +37,19 @@ private:
 using Window::ImplInit;
 SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
 SAL_DLLPRIVATE void ImplInitSettings();
+voidlcl_Scroll( long nX, long nY );
+DECL_LINK( ScrollBarHdl, ScrollBar*, void );
+
+VclPtrm_pVScroll;
+VclPtrm_pHScroll;
+VclPtr m_aScrollBarBox;
+Size maScrollArea;
+bool mbHasHoriBar;
+bool mbHasVertBar;
+PointmnScrollPos;
+long mnScrWidth;
+enum ScrollBarVisibility { None, Vert, Hori, Both };
+ScrollBarVisibility  maScrollVis;
 
 public:
 explicitTabPage( vcl::Window* pParent, WinBits nStyle = 0 );
@@ -54,6 +70,16 @@ public:
 virtual voidSetPosPixel(const Point& rNewPos) override;
 virtual voidSetSizePixel(const Size& rNewSize) override;
 virtual SizeGetOptimalSize() const override;
+
+// for scrollable tabpage
+virtual void Resize() override;
+
+voidSetScrollWidth( long nWidth );
+voidSetScrollHeight( long nHeight );
+voidSetScrollLeft( long nLeft );
+voidSetScrollTop( long Top );
+voidsetScrollVisibility( ScrollBarVisibility rState );
+voidResetScrollBars();
 };
 
 #endif // INCLUDED_VCL_TABPAGE_HXX
diff --git a/toolkit/source/awt/vclxcontainer.cxx 
b/toolkit/source/awt/vclxcontainer.cxx
index 4aeaf48791ed..9c54da4b47a6 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -26,6 +26,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -252,7 +253,8 @@ void SAL_CALL VCLXContainer::setProperty(
 VclPtr pWindow = GetWindow();
 MapMode aMode( MapUnit::MapAppFont );
 toolkit::ScrollableDialog* pScrollable = dynamic_cast< 
toolkit::ScrollableDialog* >( pWindow.get() );
-if ( pWindow && pScrollable )
+TabPage* pScrollTabPage = dynamic_cast< TabPage* >( pWindow.get() 
);
+if ( pWindow && (pScrollable || pScrollTabPage) )
 {
 OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( 
getGraphics() );
 if ( !pDev )
@@ -266,16 +268,20 @@ void SAL_CALL VCLXContainer::setProperty(
 switch ( nPropType )
 {
 case BASEPROPERTY_SCROLLHEIGHT:
-pScrollable->SetScrollHeight( aSize.Height() );
+pScrollable ? pScrollable->SetScrollHeight( 
aSize.Height() ) : (void)0;
+pScrollTabPage ? pScrollTabPage->SetScrollHeight( 
aSize.Height() ) : (void)0;
 break;
 case BASEPROPERTY_SCROLLWIDTH:
-pScrollable->SetScrollWidth( aSize.Width() );
+pScrollable ? pScrollable->SetScrollWidth( 
aSize.Width() ) : (void)0;
+pScrollTabPage ? pScrollTabPage->SetScrollWidth( 
aSize.Width() ) : (void)0;
 break;
 case BASEPROPERTY_SCROLLTOP:
-pScrollable->SetScrollTop( aSize.Height() );
+pScrollable ? pScrollable->SetScrollTop( 
aSize.Height() ) : (void)0;
+pScrollTabPage ? pScrollTabPage->SetScrollTop( 
aSize.Height() ) : (void)0;
 break;
 case BASEPROPERTY_SCROLLLEFT:
-

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 svx/source/dialog/weldeditview.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 94b73fb5e206a8718e5127cf58c826099ae92f5a
Author: Caolán McNamara 
AuthorDate: Mon Oct 5 20:27:30 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 6 12:01:26 2020 +0200

let a subclass defer creating its EditView

Change-Id: I0d182db0658ff5e0ab3d7164de000ed76460eef5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104008
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/dialog/weldeditview.cxx 
b/svx/source/dialog/weldeditview.cxx
index 12c6a94cd740..d29316f9c9a9 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -75,11 +75,14 @@ void WeldEditView::makeEditEngine()
 
 void WeldEditView::Resize()
 {
-OutputDevice& rDevice = GetDrawingArea()->get_ref_device();
-Size aOutputSize(rDevice.PixelToLogic(GetOutputSizePixel()));
-Size aSize(aOutputSize);
-m_xEditEngine->SetPaperSize(aSize);
-m_xEditView->SetOutputArea(tools::Rectangle(Point(0, 0), aOutputSize));
+if (m_xEditView)
+{
+OutputDevice& rDevice = GetDrawingArea()->get_ref_device();
+Size aOutputSize(rDevice.PixelToLogic(GetOutputSizePixel()));
+Size aSize(aOutputSize);
+m_xEditEngine->SetPaperSize(aSize);
+m_xEditView->SetOutputArea(tools::Rectangle(Point(0, 0), aOutputSize));
+}
 weld::CustomWidgetController::Resize();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Caolán McNamara (via logerrit)

 comphelper/source/misc/threadpool.cxx |2 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx  |6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 197c91c45a0ff691af5089b2603737c1320880c1
Author: Caolán McNamara 
AuthorDate: Mon Oct 5 20:45:12 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 6 12:01:06 2020 +0200

avoid calling gtk_widget_add_events when not needed

because it triggers premature creation of a11y objects
for custom widgets

Change-Id: I17eddd2856767c7da9c3a8c8ad0e11ba1a92e4d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104007
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index c16099ad7432..8404a7f7dff1 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13258,13 +13258,15 @@ public:
 
 virtual void connect_mouse_press(const Link& 
rLink) override
 {
-gtk_widget_add_events(m_pWidget, GDK_BUTTON_PRESS_MASK);
+if (!(gtk_widget_get_events(m_pWidget) & GDK_BUTTON_PRESS_MASK))
+gtk_widget_add_events(m_pWidget, GDK_BUTTON_PRESS_MASK);
 GtkInstanceWidget::connect_mouse_press(rLink);
 }
 
 virtual void connect_mouse_release(const Link& 
rLink) override
 {
-gtk_widget_add_events(m_pWidget, GDK_BUTTON_RELEASE_MASK);
+if (!(gtk_widget_get_events(m_pWidget) & GDK_BUTTON_RELEASE_MASK))
+gtk_widget_add_events(m_pWidget, GDK_BUTTON_RELEASE_MASK);
 GtkInstanceWidget::connect_mouse_release(rLink);
 }
 
commit 3a6a7f71ec1f5423fcd0bcea20f6831eaafb9c86
Author: Luboš Luňák 
AuthorDate: Mon Oct 5 21:06:39 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 6 12:00:54 2020 +0200

fix possible >= 0 warning

Change-Id: I7b5595265d00a33e933a1768d8c80a7ffd25c8a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103997
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/comphelper/source/misc/threadpool.cxx 
b/comphelper/source/misc/threadpool.cxx
index 906189202cdd..044362eef055 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -242,8 +242,8 @@ void ThreadPool::incBusyWorker()
 
 void ThreadPool::decBusyWorker()
 {
+assert(mnBusyWorkers >= 1);
 --mnBusyWorkers;
-assert(mnBusyWorkers >= 0);
 }
 
 void ThreadPool::waitUntilDone(const std::shared_ptr& rTag, 
bool bJoinAll)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Regényi Balázs (via logerrit)

 oox/source/vml/vmlshape.cxx   |   26 
---
 sw/qa/extras/ooxmlexport/data/tdf105875_VmlShapeRotationWithFlip.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx|   34 
++
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |4 -
 4 files changed, 51 insertions(+), 13 deletions(-)

New commits:
commit 3b6de95a0d59cf5942af5ecf4a402c224b76f8a3
Author: Regényi Balázs 
AuthorDate: Wed Sep 30 15:19:36 2020 +0200
Commit: László Németh 
CommitDate: Tue Oct 6 11:22:17 2020 +0200

tdf#105875 DOCX VML shape import: fix missing rotation

Also to avoid bad resizing of the rotated
shape, remove obsolete(?) code part from
commit 0423a6741fc08a35b123556f9b10219d090ee42a
(Import bezier curves from .docx.).

Co-authored-by: Szabolcs Toth

Change-Id: I77266ba65e558cf9e6dd0e1c37fad85abd038819
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103693
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 6cd5aff9110d..d70a9563e106 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1129,6 +1129,21 @@ Reference< XShape > BezierShape::implConvertAndInsert( 
const Reference< XShapes
 aPropSet.setProperty( PROP_PolyPolygonBezier, aBezierCoords );
 }
 
+// tdf#105875 handle rotation
+// Note: must rotate before flip!
+if (!maTypeModel.maRotation.isEmpty())
+{
+if (SdrObject* pShape = GetSdrObjectFromXShape(xShape))
+{
+// -1 is required because the direction of MSO rotation is the 
opposite of ours
+// 100 is required because in this part of the code the angle is 
in a hundredth of
+// degrees.
+auto nAngle = -1 * 100.0 * maTypeModel.maRotation.toDouble();
+double nHRad = nAngle * F_PI18000;
+pShape->NbcRotate(pShape->GetSnapRect().Center(), nAngle, 
sin(nHRad), cos(nHRad));
+}
+}
+
 // Handle horizontal and vertical flip.
 if (!maTypeModel.maFlip.isEmpty())
 {
@@ -1151,17 +1166,6 @@ Reference< XShape > BezierShape::implConvertAndInsert( 
const Reference< XShapes
 }
 }
 
-// Hacky way of ensuring the shape is correctly sized/positioned
-try
-{
-// E.g. SwXFrame::setPosition() unconditionally throws
-xShape->setSize( awt::Size( rShapeRect.Width, rShapeRect.Height ) );
-xShape->setPosition( awt::Point( rShapeRect.X, rShapeRect.Y ) );
-}
-catch (const ::css::uno::Exception&)
-{
-// TODO: try some other way to ensure size/position
-}
 return xShape;
 }
 
diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf105875_VmlShapeRotationWithFlip.docx 
b/sw/qa/extras/ooxmlexport/data/tdf105875_VmlShapeRotationWithFlip.docx
new file mode 100644
index ..e6512e075c21
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf105875_VmlShapeRotationWithFlip.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 4f77681d2eaf..27a651d2dde7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1347,6 +1347,40 @@ DECLARE_OOXMLEXPORT_TEST(testTdf77236_MissingSolidFill, 
"tdf77236_MissingSolidFi
 assertXPath(pXmlDoc, 
"//mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:solidFill",
 1);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf105875_VmlShapeRotationWithFlip, 
"tdf105875_VmlShapeRotationWithFlip.docx")
+{
+// tdf#105875: check whether the rotation of the VML bezier shape is ok 
(with flip too)
+// TODO: fix export too
+if (mbExported)
+return;
+
+{
+uno::Reference xPropertySet(getShape(1), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), 
xPropertySet->getPropertyValue("RotateAngle").get());
+}
+
+{
+uno::Reference xPropertySet(getShape(2), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(220 * 100), 
xPropertySet->getPropertyValue("RotateAngle").get(), 1);
+}
+
+{
+uno::Reference xPropertySet(getShape(3), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(320 * 100), 
xPropertySet->getPropertyValue("RotateAngle").get(), 1);
+}
+
+{
+uno::Reference xPropertySet(getShape(4), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(140 * 100), 
xPropertySet->getPropertyValue("RotateAngle").get(), 1);
+}
+
+{
+uno::Reference xPropertySet(getShape(5), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(sal_Int32(40 * 100), 
xPropertySet->getPropertyValue("RotateAngle").get(), 1);
+}
+
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extr

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - editeng/source include/editeng include/svx include/vcl svx/source sw/source vcl/source vcl/unx

2020-10-06 Thread Caolán McNamara (via logerrit)

 editeng/source/editeng/editview.cxx  |6 +++---
 editeng/source/editeng/impedit.cxx   |   27 ++-
 editeng/source/editeng/impedit.hxx   |6 +++---
 include/editeng/editview.hxx |   14 +-
 include/svx/svdedxv.hxx  |7 ---
 include/svx/weldeditview.hxx |   18 +++---
 include/vcl/customweld.hxx   |6 ++
 include/vcl/weld.hxx |3 +++
 svx/source/svdraw/svdedxv.cxx|   13 ++---
 sw/source/ui/dbui/mmaddressblockpage.cxx |6 +++---
 sw/source/ui/dbui/mmaddressblockpage.hxx |4 ++--
 vcl/source/app/salvtables.cxx|5 +
 vcl/unx/gtk3/gtk3gtkinst.cxx |5 +
 13 files changed, 74 insertions(+), 46 deletions(-)

New commits:
commit 9987804b732b679e0ad969517e8bd49cf1061fa9
Author: Caolán McNamara 
AuthorDate: Wed Sep 30 14:11:54 2020 +0100
Commit: Michael Stahl 
CommitDate: Tue Oct 6 09:50:51 2020 +0200

tdf#134566 accept input engine commands in editview in custom widget

for the generic case first

Change-Id: I10bd707900b54c70c9bda79d5d09532cc159779e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103692
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 31342a1bda26f4e3dd29274dafd306fd0a9e7047)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103720
Reviewed-by: Michael Stahl 

diff --git a/editeng/source/editeng/editview.cxx 
b/editeng/source/editeng/editview.cxx
index 3ea3ac45f5c1..7c6698f7c2c8 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -169,12 +169,12 @@ EditView::~EditView()
 {
 }
 
-void EditView::setEditViewCallbacks(const EditViewCallbacks* 
pEditViewCallbacks)
+void EditView::setEditViewCallbacks(EditViewCallbacks* pEditViewCallbacks)
 {
 pImpEditView->setEditViewCallbacks(pEditViewCallbacks);
 }
 
-const EditViewCallbacks* EditView::getEditViewCallbacks() const
+EditViewCallbacks* EditView::getEditViewCallbacks() const
 {
 return pImpEditView->getEditViewCallbacks();
 }
@@ -207,7 +207,7 @@ tools::Rectangle EditView::GetInvalidateRect() const
 
 void EditView::InvalidateWindow(const tools::Rectangle& rClipRect)
 {
-if (const EditViewCallbacks* pEditViewCallbacks = 
pImpEditView->getEditViewCallbacks())
+if (EditViewCallbacks* pEditViewCallbacks = 
pImpEditView->getEditViewCallbacks())
 {
 // do not invalidate and trigger a global repaint, but forward
 // the need for change to the applied EditViewCallback, can e.g.
diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index e087305effd1..3d138af94ef3 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -190,10 +190,10 @@ static void lcl_translateTwips(vcl::Window const & 
rParent, vcl::Window& rChild)
 // change/update the Selection visualization for enhanced mechanisms
 void ImpEditView::SelectionChanged()
 {
-if (getEditViewCallbacks())
+if (EditViewCallbacks* pCallbacks = getEditViewCallbacks())
 {
 // use callback to tell about change in selection visualisation
-getEditViewCallbacks()->EditViewSelectionChange();
+pCallbacks->EditViewSelectionChange();
 }
 }
 
@@ -701,12 +701,12 @@ void ImpEditView::SetOutputArea( const tools::Rectangle& 
rRect )
 
 void ImpEditView::InvalidateAtWindow(const tools::Rectangle& rRect)
 {
-if (getEditViewCallbacks())
+if (EditViewCallbacks* pCallbacks = getEditViewCallbacks())
 {
 // do not invalidate and trigger a global repaint, but forward
 // the need for change to the applied EditViewCallback, can e.g.
 // be used to visualize the active edit text in an OverlayObject
-getEditViewCallbacks()->EditViewInvalidate(rRect);
+pCallbacks->EditViewInvalidate(rRect);
 }
 else
 {
@@ -1247,11 +1247,12 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool 
bForceVisCursor )
 {
 SvxFont aFont;
 pEditEngine->SeekCursor( aPaM.GetNode(), aPaM.GetIndex()+1, aFont 
);
-if (vcl::Window* pWindow = GetWindow())
-{
-InputContextFlags const nContextFlags = 
InputContextFlags::Text | InputContextFlags::ExtText;
-pWindow->SetInputContext( InputContext( aFont, nContextFlags ) 
);
-}
+
+InputContext aInputContext(aFont, InputContextFlags::Text | 
InputContextFlags::ExtText);
+if (EditViewCallbacks* pCallbacks = getEditViewCallbacks())
+pCallbacks->EditViewInputContext(aInputContext);
+else if (auto xWindow = GetWindow())
+xWindow->SetInputContext(aInputContext);
 }
 }
 else
@@ -2416,8 +2417,8 @@ void ImpEditView::AddDragAndDropListeners()
 return;
 
 css::uno::Reference xDropTarget;
-if (getEditV

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

2020-10-06 Thread Szabolcs Toth (via logerrit)

 oox/source/drawingml/shape.cxx |9 ++---
 oox/source/export/drawingml.cxx|   37 +++--
 sc/qa/unit/data/xlsx/tdf137000_export_upright.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx  |   22 
 4 files changed, 61 insertions(+), 7 deletions(-)

New commits:
commit ff5ca4e5fc6a9fb24b0eb6eb629210b024473f67
Author: Szabolcs Toth 
AuthorDate: Thu Sep 17 11:22:09 2020 +0200
Commit: László Németh 
CommitDate: Tue Oct 6 09:45:51 2020 +0200

tdf#137000 XLSX shape export: fix upright

Upright is an XML attribute of xdr:txBody/a:bodyPr. It is set
in MSO when in a textbox menu we choose "Do not rotate this element".
LO import uses a text rotation opposite shape rotation to create
upright text, but when exporting the attribute "upright" we must
make sure that the text rotation in bodyPr is 0, not the temporary
opposite value. Otherwise MSO rotates the text.

Note: integer precision of rotation is enough for interoperability,
because it's possible to rotate the shapes only by whole degrees
in MSO.

Follow-up of commit 8c23be49fb5a9044989532e6e20feb1e3ff64f2b
(tdf#106197 XLSX shape import: keep text upright).

Co-authored-by: Balázs Regényi

Change-Id: I0ffae41f83d3fc3a1fa37f413a8fc9fd8ccd9b6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103094
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f8f65d09f59f..c9ade16f7a1d 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1410,8 +1410,7 @@ Reference< XShape > const & Shape::createAndInsert(
 
 nTextRotateAngle -= mnDiagramRotation;
 
-bool isUpright = getTextBody()->getTextProperties().moUpright;
-if (isUpright)
+if (getTextBody()->getTextProperties().moUpright)
 {
 // When upright is set, we want the text without any 
rotation.
 // But if we set 0 here, the text is still rotated if the
@@ -1419,8 +1418,10 @@ Reference< XShape > const & Shape::createAndInsert(
 // Hence, we rotate the text into the opposite direction of
 // the rotation of the shape, by as much as the shape was 
rotated.
 mpCustomShapePropertiesPtr->setTextRotateAngle(mnRotation 
/ 6);
-// Also put this away in a GrabBag.
-putPropertyToGrabBag("Upright", Any(isUpright));
+// Also put the initial angles away in a GrabBag.
+putPropertyToGrabBag("Upright", Any(true));
+putPropertyToGrabBag("nShapeRotationAtImport", 
Any(mnRotation / 6));
+putPropertyToGrabBag("nTextRotationAtImport", 
Any(mnRotation / 6));
 }
 else
 {
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 01f926c0c90c..4a9ac9f69014 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2954,20 +2954,31 @@ void DrawingML::WriteText(const Reference& 
rXIface, bool bBodyPr, bo
 pWrap = "square";
 }
 
-bool isUpright = false;
 std::optional sHorzOverflow;
 std::optional sVertOverflow;
+sal_Int32 nShapeRotateAngle = 0;
+if (GetProperty(rXPropSet, "RotateAngle"))
+nShapeRotateAngle = 
rXPropSet->getPropertyValue("RotateAngle").get() / 300;
+Reference< XPropertySet > xTextSet(xXText, UNO_QUERY);
+sal_Int32 nShapeTextRotateAngle = 0;
+if (GetProperty(xTextSet, "RotateAngle"))
+nShapeTextRotateAngle = 
rXPropSet->getPropertyValue("RotateAngle").get() / 300;
+std::optional isUpright;
 if (GetProperty(rXPropSet, "InteropGrabBag"))
 {
 if 
(rXPropSet->getPropertySetInfo()->hasPropertyByName("InteropGrabBag"))
 {
+bool bUpright = false;
+sal_Int32 nOldShapeRotation = 0;
+sal_Int32 nOldTextRotation = 0;
 uno::Sequence aGrabBag;
 rXPropSet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
 for (const auto& aProp : std::as_const(aGrabBag))
 {
 if (aProp.Name == "Upright")
 {
-aProp.Value >>= isUpright;
+aProp.Value >>= bUpright;
+isUpright = OString(bUpright ? "1" : "0");
 }
 else if (aProp.Name == "horzOverflow")
 {
@@ -2982,6 +2993,26 @@ void DrawingML::WriteText(const Reference& 
rXIface, bool bBodyPr, bo
 sVertOverflow = sValue;
 }
 }
+

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

2020-10-06 Thread Maxim Monastirsky (via logerrit)

 vcl/unx/gtk3/gtk3gtksalmenu.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf86ac12bef0f24714a3df4ee88fc2f57d827c00
Author: Maxim Monastirsky 
AuthorDate: Wed Sep 30 09:29:48 2020 +0300
Commit: Michael Stahl 
CommitDate: Tue Oct 6 09:43:25 2020 +0200

Restore the fix for tdf#126830

It was lost with 1ae450504cf57457f9702684b1517fda1dd3c481
("drop gtk2 support"), which was based on an older revision
of gtksalmenu.cxx.

In the meantime, the UI for settings icons on was hidden
(see tdf#123265), but this can't be an excuse for carrying
the broken code. The setting is also still available as an
expert config.

Change-Id: Iffc6342bb312230646399f2f85ef0211315f6c8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103660
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 800baa9c60d8fb7b4ed8cf8ae0ba7b6b68c69c9c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103663
Reviewed-by: Caolán McNamara 
(cherry picked from commit fa85f4c9dfdef681dbbcb56845b0c19c6ef1ff52)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103805
Reviewed-by: Xisco Fauli 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index db0480e3040e..bc60db2be80f 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -1032,7 +1032,7 @@ namespace
 void GtkSalMenu::NativeSetItemIcon( unsigned nSection, unsigned nItemPos, 
const Image& rImage )
 {
 #if GLIB_CHECK_VERSION(2,38,0)
-if (!!rImage && mbHasNullItemIcon)
+if (!rImage && mbHasNullItemIcon)
 return;
 
 SolarMutexGuard aGuard;
___
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' - sw/source

2020-10-06 Thread Xisco Fauli (via logerrit)

 sw/source/filter/ww8/ww8atr.cxx |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit c426d851fd7a66f826d08691d19ff288a636a445
Author: Xisco Fauli 
AuthorDate: Fri Oct 2 15:27:46 2020 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 6 09:42:29 2020 +0200

related: tdf#127579: make use of FindCharFormatByName more robust

the same way it's done in WW8AttributeOutput::TextINetFormat

This might fix crashes like

https://crashreport.libreoffice.org/stats/crash_details/3538a470-23d7-4e37-9504-fe6e81da301b
unfortunatelly, I have no steps to reproduce it at the moment

Change-Id: I509ee439643dfbaf6f08477142bbbd171e13eed8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103859
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103934
Reviewed-by: Michael Stahl 

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 04f35eb23aaa..e081b730f037 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -222,11 +222,27 @@ void MSWordExportBase::ExportPoolItemsToCHP( 
ww8::PoolItems &rItems, sal_uInt16
  if (nWhich == RES_TXTATR_CHARFMT)
  {
  const SfxPoolItem* pINetItem = SearchPoolItems(rItems, 
RES_TXTATR_INETFMT);
+
  if (pINetItem)
  {
+ const SwFormatINetFormat& rINet = static_cast(*pINetItem);
+
+ if ( rINet.GetValue().isEmpty() )
+ continue;
+
+ const sal_uInt16 nId = rINet.GetINetFormatId();
+ const OUString& rStr = rINet.GetINetFormat();
+
+ if (rStr.isEmpty())
+ {
+ SAL_WARN("sw.ww8", 
"MSWordExportBase::ExportPoolItemsToCHP(..) - missing unvisited character 
format at hyperlink attribute" );
+ }
+
+ const SwCharFormat* pINetFormat = IsPoolUserFormat( nId )
+? m_pDoc->FindCharFormatByName( rStr )
+: 
m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( nId );
+
  const SwCharFormat* pFormat = static_cast(*pItem).GetCharFormat();
- const SwCharFormat* pINetFormat = 
m_pDoc->FindCharFormatByName(
- static_cast(*pINetItem).GetINetFormat());
  ww8::PoolItems aCharItems, aINetItems;
  GetPoolItems(pFormat->GetAttrSet(), aCharItems, false);
  GetPoolItems(pINetFormat->GetAttrSet(), aINetItems, 
false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract891' - download.lst

2020-10-06 Thread Samuel Mehrbrodt (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09421f477e1277c2f16633276859f9aa95ba50fc
Author: Samuel Mehrbrodt 
AuthorDate: Tue Oct 6 09:37:35 2020 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Oct 6 09:37:35 2020 +0200

Use repacked libxml2 to work with older tar version

Change-Id: Iaef042e651a84557b62d9de07f9d5f2fff693251

diff --git a/download.lst b/download.lst
index 82a49260fb41..3bb30b3e52f5 100644
--- a/download.lst
+++ b/download.lst
@@ -96,9 +96,9 @@ export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.
 export LIBXSLT_MD5SUM := db8765c8d076f1b6caafd9f2542a304a
 export LIBXSLT_VERSION_MICRO := 34
 export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
-export LIBXML_MD5SUM := 10942a1dc23137a8aa07f0639cbfece5
+export LIBXML_MD5SUM := 52f4a18bcdbb167b0dd33c21c4c2094a
 export LIBXML_VERSION_MICRO := 10
-export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
+export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO)_repack.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
 export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2020-10-06 Thread Travis Stewart (via logerrit)

 source/text/swriter/librelogo/LibreLogo.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5494e02b2527f27a8cfbbd0a4a125443f3851715
Author: Travis Stewart 
AuthorDate: Tue Oct 6 08:18:26 2020 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Tue Oct 6 09:33:12 2020 +0200

tdf#96446 Fix Librelogo code example

Change-Id: Iedba4c02f92ed97731902441122731ed725a1813
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103974
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/swriter/librelogo/LibreLogo.xhp 
b/source/text/swriter/librelogo/LibreLogo.xhp
index e4b390769..bab1b0e0e 100644
--- a/source/text/swriter/librelogo/LibreLogo.xhp
+++ b/source/text/swriter/librelogo/LibreLogo.xhp
@@ -314,7 +314,7 @@
 SET
  ; Convert list to 
Python set PRINT SET [4, 5, 6, 6] ; print {4, 5, 6} PRINT SET [4, 5, 
6, 6] | SET [4, 1, 9] ; print {1, 4, 5, 6, 9}, union PRINT SET [4, 5, 6, 
6] & SET [4, 1, 9] ; print {4}, intersection PRINT SET ([4, 5, 6, 6]) 
- SET [4, 1, 9] ; print {5, 6}, difference PRINT SET [4, 5, 6, 6] ^ SET 
[4, 1, 9] ; print {1, 5, 6, 9}, symmetric difference  
 RANGE
- ; Python-like list 
generation PRINT RANGE 10 ; print [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
PRINT RANGE 3 10 ; print [3, 4, 5, 6, 7, 8, 9] PRINT RANGE 3 10 3 ; print 
[3, 6, 9]  FOR i IN RANGE 10 50 10 [ ; loop for [10, 20, 30, 40] 
  FORWARD i   LEFT 90 ]
+ ; Python-like list 
generation PRINT LIST RANGE 10 ; print [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] 
PRINT LIST RANGE 3 10 ; print [3, 4, 5, 6, 7, 8, 9] PRINT LIST RANGE 3 10 
3 ; print [3, 6, 9]  FOR i IN RANGE 10 50 10 [ ; loop for [10, 20, 
30, 40]   FORWARD i   LEFT 90 ]
 LIST
  ; remove the 
repeating elements of a list using set and list conversion PRINT LIST (SET 
[1, 3, 5, 5, 2, 1]) ; print [1, 3, 5, 2]
 TUPLE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-10-06 Thread Miklos Vajna (via logerrit)

 oox/qa/unit/data/shape-text-adjust-left.pptx   |binary
 oox/qa/unit/drawingml.cxx  |   19 +++
 oox/source/drawingml/shape.cxx |   16 ++
 oox/source/drawingml/textbodypropertiescontext.cxx |5 
 sd/qa/unit/data/xml/n762695_0.xml  |6 -
 sd/qa/unit/data/xml/n762695_1.xml  |   10 -
 sd/qa/unit/data/xml/n819614_0.xml  |  114 ++---
 sd/qa/unit/data/xml/n820786_0.xml  |  102 +-
 sd/qa/unit/data/xml/tdf109317_0.xml|   12 +-
 sd/qa/unit/import-tests.cxx|7 -
 10 files changed, 160 insertions(+), 131 deletions(-)

New commits:
commit dfa1856cdb4c69985ef1e809d33055427b6fbd76
Author: Miklos Vajna 
AuthorDate: Mon Oct 5 21:06:01 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 6 09:20:57 2020 +0200

tdf#137023 PPTX import: fix unexpected center alignment of shape text, 2nd 
try

Regression from commit 10bb02efd8afd42e633e370480104e2575546d8e
(tdf#129685 PPTX import: fix unexpected centering of shape text,
2020-09-18), now the problem was that some text should be left aligned,
but was centered.

Fix the problem by reverting most of the above commit: XML changes,
changes to SdImportTest::testTdf113198() (manual testing show that this
change is not needed after all) and changes to the
TextBodyPropertiesContext ctor in oox/ (but not the testcase itself).

Fix tdf#113198 again, this time in Shape::createAndInsert(), which is
meant to be closer to what the binary PPT import does.

With this, all cases from tdf#104722, tdf#113198, tdf#129685 and
tdf#137023 are meant to be handled correctly at the same time.

Change-Id: Id785252c26fc407cd74c9cfb55624091798d7773
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103996
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/oox/qa/unit/data/shape-text-adjust-left.pptx 
b/oox/qa/unit/data/shape-text-adjust-left.pptx
new file mode 100644
index ..d197425b9703
Binary files /dev/null and b/oox/qa/unit/data/shape-text-adjust-left.pptx differ
diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx
index 43609435c468..7fcee1756a6f 100644
--- a/oox/qa/unit/drawingml.cxx
+++ b/oox/qa/unit/drawingml.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -246,6 +247,24 @@ CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, 
testShapeTextAlignment)
  static_cast(nParaAdjust));
 }
 
+CPPUNIT_TEST_FIXTURE(OoxDrawingmlTest, testShapeTextAdjustLeft)
+{
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"shape-text-adjust-left.pptx";
+load(aURL);
+
+uno::Reference 
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+drawing::TextHorizontalAdjust eAdjust;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 3 (center)
+// - Actual  : 1 (block)
+// i.e. text was center-adjusted, not default-adjusted (~left).
+CPPUNIT_ASSERT(xShape->getPropertyValue("TextHorizontalAdjust") >>= 
eAdjust);
+CPPUNIT_ASSERT_EQUAL(drawing::TextHorizontalAdjust_BLOCK, eAdjust);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 5af4d51cbfd4..f8f65d09f59f 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1494,6 +1494,22 @@ Reference< XShape > const & Shape::createAndInsert(
 xText->setString("");
 Reference < XTextCursor > xAt = xText->createTextCursor();
 getTextBody()->insertAt( rFilterBase, xText, xAt, 
aCharStyleProperties, mpMasterTextListStyle );
+
+const TextParagraphVector& rParagraphs = 
getTextBody()->getParagraphs();
+if (!rParagraphs.empty())
+{
+const std::shared_ptr& pParagraph = 
rParagraphs[0];
+if (pParagraph->getProperties().getParaAdjust())
+{
+style::ParagraphAdjust eAdjust = 
*pParagraph->getProperties().getParaAdjust();
+if (eAdjust == style::ParagraphAdjust_CENTER)
+{
+// If the first paragraph is centered, then set 
the para adjustment of
+// the shape itself to centered as well.
+aPropertySet.setAnyProperty(PROP_ParaAdjust, 
uno::makeAny(eAdjust));
+}
+}
+}
 }
 }
 else if (mbTex

Re: Failing testTdf107020 - crop size mismatch after load & reload

2020-10-06 Thread Noel Grandin

Do you have any kind of font-scaling active?

Because then the unit tests won't work on Windows.

On 2020/10/05 11:21 pm, Mark Hung wrote:

Caolán McNamara mailto:caol...@redhat.com>> 於 2020年10月6日 
週二 03:05 寫道：

On Tue, 2020-10-06 at 00:10 +0800, Mark Hung wrote:
 > Test name: testTdf107020::Load_Reload_Verify
 > equality assertion failed
 > - Expected: 27183
 > - Actual  : 27187

What's your platform, windows ?

Yes. I'm using Windows10.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - bin/lint-ui.py uui/uiconfig writerperfect/uiconfig

2020-10-06 Thread Noel (via logerrit)

 bin/lint-ui.py  |   12 +++-
 uui/uiconfig/ui/simplenameclash.ui  |1 +
 writerperfect/uiconfig/ui/wpftencodingdialog.ui |1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit d471c802e8a3a4299e122cc05900bdab6ed67a00
Author: Noel 
AuthorDate: Fri Oct 2 13:22:04 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 6 09:14:12 2020 +0200

lint-ui: validate has_default and can_default

check that if a widget has has_default=='True', then it also
has can_default=='True'

Change-Id: Ie51d9d8fff6d7cc0cc42a09331f59e7ef6d559be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103834
Reviewed-by: Caolán McNamara 
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
(cherry picked from commit 68961653f9af29b332039e50459e29d33c623013)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103989

diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 91c68bb0af60..d9d0784dfb7b 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -49,6 +49,17 @@ def check_top_level_widget(element):
 lint_assert(border_width.text == BORDER_WIDTH,
 "Top level 'border_width' property should be " + 
BORDER_WIDTH)
 
+# check that any widget which has 'has-default' also has 'can-default'
+for widget in element.findall('.//object'):
+if not widget.attrib['class']:
+continue
+widget_type = widget.attrib['class']
+has_defaults = widget.findall("./property[@name='has_default']")
+if len(has_defaults) > 0 and has_defaults[0].text == "True":
+can_defaults = widget.findall("./property[@name='can_default']")
+lint_assert(len(can_defaults)>0 and can_defaults[0].text == "True",
+"has_default without can_default in " + widget_type + " with 
id = '" + widget.attrib['id'] + "'", widget)
+
 def check_button_box_spacing(element):
 spacing = element.findall("property[@name='spacing']")[0]
 lint_assert(spacing.text == BUTTON_BOX_SPACING,
@@ -75,7 +86,6 @@ def check_check_buttons(root):
 if len(radio_underlines) < 1:
 lint_assert(False, "No use_underline in GtkCheckButton with id = 
'" + radio.attrib['id'] + "'")
 
-
 def check_frames(root):
 frames = [element for element in root.findall('.//object') if 
element.attrib['class'] == 'GtkFrame']
 for frame in frames:
diff --git a/uui/uiconfig/ui/simplenameclash.ui 
b/uui/uiconfig/ui/simplenameclash.ui
index 9c5f39213e0c..04d0bb16ef8f 100644
--- a/uui/uiconfig/ui/simplenameclash.ui
+++ b/uui/uiconfig/ui/simplenameclash.ui
@@ -56,6 +56,7 @@
 True
 True
 True
+True
 True
   
   
diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui 
b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
index 067cfb72bad3..d0aff9435ac2 100644
--- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
+++ b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
@@ -28,6 +28,7 @@
 True
 True
 True
+True
 True
 True
 0.6200476837158
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.2-25'

2020-10-06 Thread Andras Timar (via logerrit)

Tag 'cp-6.2-25' created by Andras Timar  at 
2020-10-06 07:01 +

cp-6.2-25

Changes since cp-6.2-24-22:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

2020-10-06 Thread Andras Timar (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 845650b678df4af7ae99a258f17afcec139f6df5
Author: Andras Timar 
AuthorDate: Tue Oct 6 09:01:02 2020 +0200
Commit: Andras Timar 
CommitDate: Tue Oct 6 09:01:02 2020 +0200

Bump version to 6.2-25

Change-Id: Id5ba7c81ec55042260c6d1f2c9dc00c56b68d252

diff --git a/configure.ac b/configure.ac
index 69fd79dd687b..4963620e569e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.2.10.24],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.2.10.25],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.2-25'

2020-10-06 Thread Andras Timar (via logerrit)

Tag 'cp-6.2-25' created by Andras Timar  at 
2020-10-06 07:01 +

cp-6.2-25

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.2-25'

2020-10-06 Thread Andras Timar (via logerrit)

Tag 'cp-6.2-25' created by Andras Timar  at 
2020-10-06 07:01 +

cp-6.2-25

Changes since CODE-4.2.2-2:
Andras Timar (1):
  [cp] add info about xapian omega search and the cp-query template

---
 xapian/cp-query   |  141 ++
 xapian/xapian.txt |  109 +
 2 files changed, 250 insertions(+)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-25'

2020-10-06 Thread Andras Timar (via logerrit)

Tag 'cp-6.2-25' created by Andras Timar  at 
2020-10-06 07:01 +

cp-6.2-25

Changes since cp-6.2-23:
Andras Timar (1):
  Update mobile Word Count dialog translations and some more

---
 source/ar/sw/messages.po  | 1364 +++-
 source/as/sw/messages.po  | 1364 +++-
 source/ast/sw/messages.po | 1426 --
 source/bg/sw/messages.po  | 1374 +++--
 source/bn-IN/sw/messages.po   | 1364 +++-
 source/br/sw/messages.po  | 1364 +++-
 source/ca-valencia/sw/messages.po | 1794 --
 source/ca/sw/messages.po  | 1374 +++--
 source/cs/sw/messages.po  | 1374 +++--
 source/cy/sw/messages.po  | 1374 +++--
 source/da/sw/messages.po  | 1374 +++--
 source/de/sw/messages.po  | 1370 +++--
 source/el/sw/messages.po  | 1374 +++--
 source/es/sw/messages.po  |  113 +-
 source/et/sw/messages.po  | 1410 +++--
 source/eu/sw/messages.po  | 1374 +++--
 source/fi/sw/messages.po  | 1384 +++--
 source/fr/sw/messages.po  | 1374 +++--
 source/ga/sw/messages.po  | 1364 +++-
 source/gd/sw/messages.po  | 1364 +++-
 source/gl/sw/messages.po  | 1374 +++--
 source/gu/sw/messages.po  | 1364 +++-
 source/he/sw/messages.po  | 1374 +++--
 source/hi/sw/messages.po  | 1364 +++-
 source/hr/sw/messages.po  | 1374 +++--
 source/hu/sw/messages.po  | 1364 +++-
 source/id/sw/messages.po  | 1390 +++--
 source/is/sw/messages.po  | 1368 +++-
 source/it/sw/messages.po  | 1374 +++--
 source/ja/sw/messages.po  | 1404 +++--
 source/km/sw/messages.po  | 1364 +++-
 source/kn/sw/messages.po  | 1364 +++-
 source/ko/sw/messages.po  | 1364 +++-
 source/lt/sw/messages.po  | 1388 +++--
 source/lv/sw/messages.po  | 1374 +++--
 source/ml/sw/messages.po  | 1364 +++-
 source/mr/sw/messages.po  | 1364 +++-
 source/nb/sw/messages.po  | 1374 +++--
 source/nl/sw/messages.po  | 1374 +++--
 source/nn/sw/messages.po  | 1374 +++--
 source/oc/sw/messages.po  | 1364 +++-
 source/or/sw/messages.po  | 1364 +++-
 source/pa-IN/sw/messages.po   | 1366 +++-
 source/pl/sw/messages.po  | 1400 +++--
 source/pt-BR/sw/messages.po   |  121 +-
 source/pt/sw/messages.po  | 1374 +++--
 source/ro/sw/messages.po  | 1364 +++-
 source/ru/sw/messages.po  | 1374 +++--
 source/sk/sw/messages.po  | 1374 +++--
 source/sl/sw/messages.po  | 1374 +++--
 source/sr-Latn/sw/messages.po | 1363 +++-
 source/sr/sw/messages.po  | 1378 +++--
 source/sv/sw/messages.po  | 1404 +++--
 source/ta/sw/messages.po  | 1364 +++-
 source/te/sw/messages.po  | 1364 +++-
 source/tr/sw/messages.po  | 1387 +++--
 source/uk/sw/messages.po  | 1376 +++--
 source/vi/sw/messages.po  | 1364 +++-
 source/zh-CN/sw/messages.po   | 1374 +++--
 source/zh-TW/sw/messages.po   | 1376 +++--
 60 files changed, 43140 insertions(+), 37212 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

71 matches

Mail list logo