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

2020-04-22 Thread Xisco Faulí (via logerrit) 
 sw/source/uibase/inc/conttree.hxx|5 -
 sw/source/uibase/uitest/uiobject.cxx |1 -
 uitest/writer_tests5/tdf114724.py|   18 +++---
 3 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit 0b48cee16d459d27ebd090d008ec9398c86fc581
Author: Xisco Faulí 
AuthorDate: Wed Apr 22 12:02:38 2020 +0200
Commit: Xisco Faulí 
CommitDate: Wed Apr 22 13:50:26 2020 +0200

Revert "tdf114724: uitest: make test less time.sleep dependent"

This reverts commit 634ce6f2d87a30b8abd2e8c67668e3bb5d87406b.

See https://gerrit.libreoffice.org/c/core/+/92616

Change-Id: I642843ab16450d1a6b15d5e955495efbbfa7822a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92539
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index 59df0d51c3ea..28ea07a1c1de 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -247,11 +247,6 @@ public:
 m_xTreeView->grab_focus();
 }
 
-OUString get_selected_text() const
-{
-return m_xTreeView->get_selected_text();
-}
-
 int count_selected_rows() const
 {
 return m_xTreeView->count_selected_rows();
diff --git a/sw/source/uibase/uitest/uiobject.cxx 
b/sw/source/uibase/uitest/uiobject.cxx
index baa9e79bafb8..a0b8da9e9d97 100644
--- a/sw/source/uibase/uitest/uiobject.cxx
+++ b/sw/source/uibase/uitest/uiobject.cxx
@@ -139,7 +139,6 @@ StringMap SwNavigationPIUIObject::get_state()
 StringMap aMap = WindowUIObject::get_state();
 
 aMap["selectioncount"] = 
OUString::number(mxSwNavigationPI->m_xContentTree->count_selected_rows());
-aMap["selectedtext"] = 
mxSwNavigationPI->m_xContentTree->get_selected_text();
 
 return aMap;
 }
diff --git a/uitest/writer_tests5/tdf114724.py 
b/uitest/writer_tests5/tdf114724.py
index f5947a21e321..390e53b3ac37 100644
--- a/uitest/writer_tests5/tdf114724.py
+++ b/uitest/writer_tests5/tdf114724.py
@@ -26,28 +26,16 @@ class tdf114724(UITestCase):
 xNavigatorPanel.executeAction("ROOT", tuple())
 
 xWriterEdit.executeAction("FOCUS", tuple())
+time.sleep(2)
 self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectioncount"], 
"1")
-self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectedtext"], 
"Headings")
-
 for _ in range(0,3):
 xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"DOWN"}))
+time.sleep(2)
 
self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectioncount"], "1")
-
-timeout = time.time() + 2
-while get_state_as_dict(xNavigatorPanel)["selectedtext"] != "HEADING 
4" and time.time() < timeout:
-time.sleep(0.1)
-
-self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectedtext"], 
"HEADING 4")
-
 for _ in range(0,3):
 xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"UP"}))
+time.sleep(2)
 
self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectioncount"], "1")
 
-timeout = time.time() + 2
-while get_state_as_dict(xNavigatorPanel)["selectedtext"] != "HEADING 
1" and time.time() < timeout:
-time.sleep(0.1)
-
-self.assertEqual(get_state_as_dict(xNavigatorPanel)["selectedtext"], 
"HEADING 1")
-
 self.xUITest.executeCommand(".uno:Sidebar")
 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: Branch 'libreoffice-6-3' - chart2/source sw/qa

2020-03-16 Thread Xisco Faulí (via logerrit) 
 chart2/source/inc/ChartTypeHelper.hxx|3 ++
 chart2/source/tools/ChartTypeHelper.cxx  |9 +++
 chart2/source/view/charttypes/AreaChart.cxx  |3 +-
 chart2/source/view/charttypes/VSeriesPlotter.cxx |5 +++-
 chart2/source/view/inc/VDataSeries.hxx   |1 
 chart2/source/view/main/ChartView.cxx|   28 +++
 chart2/source/view/main/VDataSeries.cxx  |   16 -
 dev/null |binary
 sw/qa/extras/layout/layout.cxx   |   16 -
 9 files changed, 48 insertions(+), 33 deletions(-)

New commits:
commit 2af4d304992d2a508e0d79cd855b93ca7559ebef
Author: Xisco Faulí 
AuthorDate: Wed Mar 11 17:59:40 2020 +0100
Commit: Xisco Faulí 
CommitDate: Mon Mar 16 10:38:17 2020 +0100

tdf#131291: Revert "tdf#129173 tdf#129175 Fix number format of data labels"

This reverts commit d979eb16b9144c7ed230d7b0a4d0c1474664d7d0.

Revert it only in libreoffice-6-3 branch

Change-Id: Ib73a0344932eeec792935f46e4a86041ed448287
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90284
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/chart2/source/inc/ChartTypeHelper.hxx 
b/chart2/source/inc/ChartTypeHelper.hxx
index b97a256802c3..c2945dfb9380 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -78,6 +78,9 @@ public:
 static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const 
css::uno::Reference<
 css::chart2::XChartType >& xChartType );
 
+static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const 
css::uno::Reference<
+css::chart2::XChartType >& xChartType );
+
 static bool isSupportingOnlyDeepStackingFor3D( const css::uno::Reference< 
css::chart2::XChartType >& xChartType );
 };
 
diff --git a/chart2/source/tools/ChartTypeHelper.cxx 
b/chart2/source/tools/ChartTypeHelper.cxx
index c8efc90b3f0f..78d841755374 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -657,6 +657,15 @@ OUString 
ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( co
 return aRet;
 }
 
+bool ChartTypeHelper::shouldLabelNumberFormatKeyBeDetectedFromYAxis( const 
uno::Reference< XChartType >& xChartType )
+{
+bool bRet = true;
+OUString aChartTypeName = xChartType->getChartType();
+if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
+bRet = false;
+return bRet;
+}
+
 bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference< 
XChartType >& xChartType )
 {
 bool bRet = false;
diff --git a/chart2/source/view/charttypes/AreaChart.cxx 
b/chart2/source/view/charttypes/AreaChart.cxx
index 89ba4db47b2f..2699121ed357 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -724,7 +724,6 @@ void AreaChart::createShapes()
 if( m_nDimension==3 && m_bArea && 
rXSlot.m_aSeriesVector.size()!=1 )
 fLogicY = fabs( fLogicY );
 
-double fLogicValueForLabeDisplay = fLogicY;
 std::map< sal_Int32, double >& rLogicYSumMap = 
aLogicYSumMapByX[nIndex];
 if (rPosHelper.isPercentY() && 
rLogicYSumMap[nAttachedAxisIndex] != 0.0)
 {
@@ -752,6 +751,8 @@ void AreaChart::createShapes()
 if( rLogicYForNextSeriesMap.find(nAttachedAxisIndex) == 
rLogicYForNextSeriesMap.end() )
 rLogicYForNextSeriesMap[nAttachedAxisIndex] = 0.0;
 
+double fLogicValueForLabeDisplay = fLogicY;
+
 fLogicY += rLogicYForNextSeriesMap[nAttachedAxisIndex];
 rLogicYForNextSeriesMap[nAttachedAxisIndex] = fLogicY;
 
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 16fc40428b5a..6a3b142a0ce9 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -367,7 +367,10 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries 
const & rDataSeries
 }
 else
 {
-nNumberFormatKey = rDataSeries.detectNumberFormatKey( nPointIndex 
);
+if( rDataSeries.shouldLabelNumberFormatKeyBeDetectedFromYAxis() && 
m_aAxesNumberFormats.hasFormat(1,rDataSeries.getAttachedAxisIndex()) ) //y-axis
+nNumberFormatKey = 
m_aAxesNumberFormats.getFormat(1,rDataSeries.getAttachedAxisIndex());
+else
+nNumberFormatKey = rDataSeries.detectNumberFormatKey( 
nPointIndex );
 }
 if(nNumberFormatKey<0)
 nNumberFormatKey=0;
diff --git a/chart2/source/view/inc/VDataSeries.hxx 
b/chart2/source/view/inc/VDataSeries.hxx
index b65ea66f1009..4a20eb79bfea 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++

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

2020-02-18 Thread Xisco Faulí (via logerrit) 
 svx/source/svdraw/svdxcgv.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 25937732b9ef881651611f99d4178e90888642a2
Author: Xisco Faulí 
AuthorDate: Wed Feb 12 11:51:34 2020 +0100
Commit: Xisco Faulí 
CommitDate: Tue Feb 18 10:01:48 2020 +0100

tdf#130614: Revert "tdf#125520 Fix OLE objects drag with 'Insert as 
Copy'"

This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.

Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 09e6824bc868990095233825c415556399dd0652)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88500
Reviewed-by: Xisco Faulí 
(cherry picked from commit d3e77bd112c3f7084b0dd92c36ff60f1fd1ddc2f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88502
Reviewed-by: Samuel Mehrbrodt 
Reviewed-by: Mike Kaganski 
Tested-by: Xisco Faulí 

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f18d536b7bf2..8fcd742ec71f 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -744,17 +744,8 @@ std::unique_ptr 
SdrExchangeView::CreateMarkedObjModel() const
 
 if(nullptr == pNewObj)
 {
-// not cloned yet
-if (pObj->GetObjIdentifier() == OBJ_OLE2)
-{
-// tdf#125520
-pNewObj = 
pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject());
-}
-else
-{
-// use default way
-pNewObj = pObj->CloneSdrObject(*pNewModel);
-}
+// not cloned yet, use default way
+pNewObj = pObj->CloneSdrObject(*pNewModel);
 }
 
 if(pNewObj)
___
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' - svx/source

2020-02-12 Thread Xisco Faulí (via logerrit) 
 svx/source/svdraw/svdxcgv.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit d3e77bd112c3f7084b0dd92c36ff60f1fd1ddc2f
Author: Xisco Faulí 
AuthorDate: Wed Feb 12 11:51:34 2020 +0100
Commit: Xisco Faulí 
CommitDate: Thu Feb 13 07:41:21 2020 +0100

tdf#130614: Revert "tdf#125520 Fix OLE objects drag with 'Insert as 
Copy'"

This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.

Change-Id: Ic925cb5660df152208cdc63bfee62d82fe912717
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88493
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 09e6824bc868990095233825c415556399dd0652)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88500
Reviewed-by: Xisco Faulí 

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index f18d536b7bf2..8fcd742ec71f 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -744,17 +744,8 @@ std::unique_ptr 
SdrExchangeView::CreateMarkedObjModel() const
 
 if(nullptr == pNewObj)
 {
-// not cloned yet
-if (pObj->GetObjIdentifier() == OBJ_OLE2)
-{
-// tdf#125520
-pNewObj = 
pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject());
-}
-else
-{
-// use default way
-pNewObj = pObj->CloneSdrObject(*pNewModel);
-}
+// not cloned yet, use default way
+pNewObj = pObj->CloneSdrObject(*pNewModel);
 }
 
 if(pNewObj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-12 Thread Xisco Faulí (via logerrit) 
 svx/source/svdraw/svdxcgv.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 09e6824bc868990095233825c415556399dd0652
Author: Xisco Faulí 
AuthorDate: Wed Feb 12 11:51:34 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Feb 12 22:28:22 2020 +0100

tdf#130614: Revert "tdf#125520 Fix OLE objects drag with 'Insert as 
Copy'"

This reverts commit e4cea049c80f4fd6d2a586e73fe9fa08ebd08371.

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

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 827b0720b69d..f55e964a6223 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -744,17 +744,8 @@ std::unique_ptr 
SdrExchangeView::CreateMarkedObjModel() const
 
 if(nullptr == pNewObj)
 {
-// not cloned yet
-if (pObj->GetObjIdentifier() == OBJ_OLE2)
-{
-// tdf#125520
-pNewObj = 
pObj->CloneSdrObject(pObj->getSdrModelFromSdrObject());
-}
-else
-{
-// use default way
-pNewObj = pObj->CloneSdrObject(*pNewModel);
-}
+// not cloned yet, use default way
+pNewObj = pObj->CloneSdrObject(*pNewModel);
 }
 
 if(pNewObj)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-27 Thread Xisco Faulí (via logerrit) 
 sfx2/source/notebookbar/SfxNotebookBar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b73347194dde360d9e4be4526657efb511e72ef
Author: Xisco Faulí 
AuthorDate: Mon Jan 27 13:32:07 2020 +0100
Commit: Xisco Faulí 
CommitDate: Mon Jan 27 18:37:07 2020 +0100

Revert "tdf#118526 Reload Notebookbar if read mode has switched"

This reverts commit 69310348a6d65a49b406ec5ac2062ad5659bfcf4.

Reason for revert: tdf#130187.
tdf#130187 may give more problems than tdf#118526.
Reverting it in libreoffice-6-3 before 6.3.5 is released

Change-Id: I2b5ce4c54a92153454a1fe394e1757598616950e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87521
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 59eca1bc7e4e..402874ccb4ef 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -289,7 +289,7 @@ bool SfxNotebookBar::StateMethod(SfxBindings& rBindings, 
const OUString& rUIFile
 {
 SfxFrame& rFrame = rBindings.GetDispatcher_Impl()->GetFrame()->GetFrame();
 return StateMethod(rFrame.GetSystemWindow(), rFrame.GetFrameInterface(), 
rUIFile,
-   bReloadNotebookbar || 
rBindings.GetDispatcher_Impl()->IsUpdated_Impl());
+   bReloadNotebookbar);
 }
 
 bool SfxNotebookBar::StateMethod(SystemWindow* pSysWindow,
___
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-0' - sfx2/source

2020-01-21 Thread Xisco Faulí (via logerrit) 
 sfx2/source/control/recentdocsviewitem.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0768fa976bd44f6a9c96720dcc1a0272c0364e8b
Author: Xisco Faulí 
AuthorDate: Fri Jan 17 14:44:21 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Tue Jan 21 23:20:33 2020 +0100

tdf#129788: Revert "no need to use AlphaMask in RecentDocsViewItem"

This reverts commit 31bd8c4a4a4752dcff12ee35636193f79a6d6137.

Similar to 5c54778aad677d6bb6e6687f0f43dffad1aefa1e

Change-Id: Ibb4daa702df1f683888b92b8b8041f28e25e6b04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86998
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit d720e120b6534ff2fdf6cb11f0b46eca454d4e34)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87051
Reviewed-by: Michael Stahl 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index 908a679a5629..85d84ddc699d 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -91,7 +91,8 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView 
, const OUStri
 }
 
 // create empty, and copy the default thumbnail in
-aThumbnail = BitmapEx(aThumbnailSize, 24);
+sal_uInt8 nAlpha = 255;
+aThumbnail = BitmapEx(Bitmap(aThumbnailSize, 24), 
AlphaMask(aThumbnailSize, ));
 
 aThumbnail.CopyPixel(
 ::tools::Rectangle(Point((aThumbnailSize.Width() - 
aExtSize.Width()) / 2, (aThumbnailSize.Height() - aExtSize.Height()) / 2), 
aExtSize),
___
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' - sfx2/source

2020-01-17 Thread Xisco Faulí (via logerrit) 
 sfx2/source/control/recentdocsviewitem.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d720e120b6534ff2fdf6cb11f0b46eca454d4e34
Author: Xisco Faulí 
AuthorDate: Fri Jan 17 14:44:21 2020 +0100
Commit: Noel Grandin 
CommitDate: Fri Jan 17 20:50:26 2020 +0100

tdf#129788: Revert "no need to use AlphaMask in RecentDocsViewItem"

This reverts commit 31bd8c4a4a4752dcff12ee35636193f79a6d6137.

Similar to 5c54778aad677d6bb6e6687f0f43dffad1aefa1e

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

diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index 908a679a5629..85d84ddc699d 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -91,7 +91,8 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView 
, const OUStri
 }
 
 // create empty, and copy the default thumbnail in
-aThumbnail = BitmapEx(aThumbnailSize, 24);
+sal_uInt8 nAlpha = 255;
+aThumbnail = BitmapEx(Bitmap(aThumbnailSize, 24), 
AlphaMask(aThumbnailSize, ));
 
 aThumbnail.CopyPixel(
 ::tools::Rectangle(Point((aThumbnailSize.Width() - 
aExtSize.Width()) / 2, (aThumbnailSize.Height() - aExtSize.Height()) / 2), 
aExtSize),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-17 Thread Xisco Faulí (via logerrit) 
 sfx2/source/control/recentdocsviewitem.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit be638ffb1ed82530162d18784e31c3506575ad7b
Author: Xisco Faulí 
AuthorDate: Fri Jan 17 14:44:21 2020 +0100
Commit: Xisco Faulí 
CommitDate: Fri Jan 17 19:37:12 2020 +0100

tdf#129788: Revert "no need to use AlphaMask in RecentDocsViewItem"

This reverts commit 31bd8c4a4a4752dcff12ee35636193f79a6d6137.

Similar to 5c54778aad677d6bb6e6687f0f43dffad1aefa1e

Change-Id: Ibb4daa702df1f683888b92b8b8041f28e25e6b04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86981
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index 908a679a5629..85d84ddc699d 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -91,7 +91,8 @@ RecentDocsViewItem::RecentDocsViewItem(sfx2::RecentDocsView 
, const OUStri
 }
 
 // create empty, and copy the default thumbnail in
-aThumbnail = BitmapEx(aThumbnailSize, 24);
+sal_uInt8 nAlpha = 255;
+aThumbnail = BitmapEx(Bitmap(aThumbnailSize, 24), 
AlphaMask(aThumbnailSize, ));
 
 aThumbnail.CopyPixel(
 ::tools::Rectangle(Point((aThumbnailSize.Width() - 
aExtSize.Width()) / 2, (aThumbnailSize.Height() - aExtSize.Height()) / 2), 
aExtSize),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-24 Thread Xisco Faulí (via logerrit) 
 dev/null |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   17 -
 sw/source/core/fields/fldbas.cxx |2 +-
 3 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 332a37ebf3eeb7546ef0972035d72c6e836bcc7d
Author: Xisco Faulí 
AuthorDate: Tue Sep 24 18:48:29 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Sep 24 20:59:51 2019 +0200

Revert "tdf#107784: DOCX Import: Show citation's title in fields"

This reverts commit 417d993b8b8a86c019758ee0850e4b42967e2afa.

it breaks the bibliography entries, so it needs more work than I initially 
thought. Reverting for the time being.

Change-Id: Idd75fd6794dedc5f2d4b7f1c262ba8d12aee5036
Reviewed-on: https://gerrit.libreoffice.org/79472
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf107784.docx 
b/sw/qa/extras/ooxmlimport/data/tdf107784.docx
deleted file mode 100644
index 2dc868246ac0..
Binary files a/sw/qa/extras/ooxmlimport/data/tdf107784.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f5c85890e3b2..f90d894b0f1e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -685,23 +685,6 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105975formula, 
"tdf105975.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("25"), 
xEnumerationAccess->getPresentation(false).trim());
 }
 
-DECLARE_OOXMLIMPORT_TEST(testTdf107784, "tdf107784.docx")
-{
-// Make sure the field displays the citation's title and not the identifier
-uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
-uno::Reference 
xFields(xFieldsAccess->createEnumeration());
-
-if( !xFields->hasMoreElements() ) {
-CPPUNIT_ASSERT(false);
-return;
-}
-
-uno::Reference 
xEnumerationAccess(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Bibliography entry"), 
xEnumerationAccess->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("(Smith, 1950)"), 
xEnumerationAccess->getPresentation(false).trim());
-}
-
 DECLARE_OOXMLIMPORT_TEST(testTdf115883, "tdf115883.docx")
 {
 // Import failed due to an unhandled exception when getting the Surround
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 0d8894141506..c46e5bfd3824 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -418,7 +418,7 @@ SwField::ExpandField(bool const bCached, SwRootFrame 
const*const pLayout) const
 if (GetTypeId() == SwFieldTypesEnum::Authority)
 {
 const SwAuthorityField* pAuthorityField = static_cast(this);
-m_Cache = pAuthorityField->ExpandCitation(AUTH_FIELD_TITLE, 
pLayout);
+m_Cache = 
pAuthorityField->ConditionalExpandAuthIdentifier(pLayout);
 }
 else
 m_Cache = ExpandImpl(pLayout);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-24 Thread Xisco Faulí (via logerrit) 
 dev/null |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   17 -
 sw/source/core/fields/fldbas.cxx |2 +-
 3 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit 1d6429fb86d0ba8c03da8621512f3b675d1bcb81
Author: Xisco Faulí 
AuthorDate: Tue Sep 24 16:15:54 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Sep 24 18:00:26 2019 +0200

Revert "tdf#107784: DOCX Import: Show citation's title in fields"

This reverts commit fadce0c9a7ccbd7222df90e41d8fc16d9d67045f.

it needs more work. better not to have it in 6.3

Change-Id: Ia6e0d90cf5e56d87aa83903fd787d548c0514ecd
Reviewed-on: https://gerrit.libreoffice.org/79459
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlimport/data/tdf107784.docx 
b/sw/qa/extras/ooxmlimport/data/tdf107784.docx
deleted file mode 100644
index 2dc868246ac0..
Binary files a/sw/qa/extras/ooxmlimport/data/tdf107784.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4ee66606b7a6..b49583b3b4d0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -687,23 +687,6 @@ DECLARE_OOXMLIMPORT_TEST(testTdf105975formula, 
"tdf105975.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("25"), 
xEnumerationAccess->getPresentation(false).trim());
 }
 
-DECLARE_OOXMLIMPORT_TEST(testTdf107784, "tdf107784.docx")
-{
-// Make sure the field displays the citation's title and not the identifier
-uno::Reference xTextFieldsSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
-uno::Reference 
xFields(xFieldsAccess->createEnumeration());
-
-if( !xFields->hasMoreElements() ) {
-CPPUNIT_ASSERT(false);
-return;
-}
-
-uno::Reference 
xEnumerationAccess(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("Bibliography entry"), 
xEnumerationAccess->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("(Smith, 1950)"), 
xEnumerationAccess->getPresentation(false).trim());
-}
-
 DECLARE_OOXMLIMPORT_TEST(testTdf115883, "tdf115883.docx")
 {
 // Import failed due to an unhandled exception when getting the Surround
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index f24542012707..a5008b4c4e3a 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -418,7 +418,7 @@ SwField::ExpandField(bool const bCached, SwRootFrame 
const*const pLayout) const
 if (GetTypeId() == TYP_AUTHORITY)
 {
 const SwAuthorityField* pAuthorityField = static_cast(this);
-m_Cache = pAuthorityField->ExpandCitation(AUTH_FIELD_TITLE, 
pLayout);
+m_Cache = 
pAuthorityField->ConditionalExpandAuthIdentifier(pLayout);
 }
 else
 m_Cache = ExpandImpl(pLayout);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-04 Thread Xisco Faulí (via logerrit) 
 vcl/source/control/button.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit ab5da884b16aa54aab8e9773a6e8dbf24e752c36
Author: Xisco Faulí 
AuthorDate: Wed Sep 4 16:22:10 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Sep 5 05:08:43 2019 +0200

tdf#125610: Revert "tdf#125088 Make button text white for blue buttons on 
macOS"

This reverts commit 89775fd396e413daaf0e71710211075450bdc0ed.

Change-Id: I0ddbd454e53bcd442fdf2330661136e041c7d260
Reviewed-on: https://gerrit.libreoffice.org/78611
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 15f80be207b6..146b6402a7f4 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -812,16 +812,6 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice* 
pDev, DrawFlags nDrawFl
 
 if ( nDrawFlags & DrawFlags::Mono )
 aColor = COL_BLACK;
-#ifdef MACOSX
-else if ((nButtonFlags & DrawButtonFlags::Default) && !(GetStyle() & 
WB_FLATBUTTON))
-{
-// Make text color white if the button is a default control on macOS.
-// Without this you get a button with a blue background and blue text
-// which stands out as not looking right on macOS where default buttons
-// have white text and a blue background.
-aColor = COL_WHITE;
-}
-#endif
 else if( (nButtonFlags & DrawButtonFlags::Highlight) && 
IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Entire) )
 {
 if (nButtonFlags & DrawButtonFlags::Pressed)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-04 Thread Xisco Faulí (via logerrit) 
 vcl/source/control/button.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit ebd7af9aebb5b76255aa299dd8047cb4266215a4
Author: Xisco Faulí 
AuthorDate: Wed Sep 4 16:22:10 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Sep 5 05:02:52 2019 +0200

tdf#125610: Revert "tdf#125088 Make button text white for blue buttons on 
macOS"

This reverts commit 89775fd396e413daaf0e71710211075450bdc0ed.

Change-Id: I0ddbd454e53bcd442fdf2330661136e041c7d260
Reviewed-on: https://gerrit.libreoffice.org/78605
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 4c18207e0844..91141d35cc4e 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -795,16 +795,6 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice* 
pDev, DrawFlags nDrawFl
 
 if ( nDrawFlags & DrawFlags::Mono )
 aColor = COL_BLACK;
-#ifdef MACOSX
-else if ((nButtonFlags & DrawButtonFlags::Default) && !(GetStyle() & 
WB_FLATBUTTON))
-{
-// Make text color white if the button is a default control on macOS.
-// Without this you get a button with a blue background and blue text
-// which stands out as not looking right on macOS where default buttons
-// have white text and a blue background.
-aColor = COL_WHITE;
-}
-#endif
 else if( (nButtonFlags & DrawButtonFlags::Highlight) && 
IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Entire) )
 {
 if (nButtonFlags & DrawButtonFlags::Pressed)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-29 Thread Xisco Faulí (via logerrit) 
 sfx2/source/control/unoctitm.cxx |2 
 vcl/source/uitest/logger.cxx |   82 ++-
 vcl/source/uitest/uiobject.cxx   |   68 ++--
 vcl/source/window/dialog.cxx |6 +-
 4 files changed, 31 insertions(+), 127 deletions(-)

New commits:
commit 32bf6bec39748e64ca84a03e7488abe755747081
Author: Xisco Faulí 
AuthorDate: Sat Jun 29 23:37:18 2019 +0200
Commit: Xisco Faulí 
CommitDate: Sun Jun 30 01:13:19 2019 +0200

Revert "Rewrite all the logger statements with the new grammar syntax"

This reverts commit 624530549f30572cb7fb137cbadecfab9a75fc8c.

Change-Id: I4bc0216cc12af637ad291f3ba6af090d1d34f107
Reviewed-on: https://gerrit.libreoffice.org/74916
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 71cccb05d4e2..aba1357b0ddc 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -601,7 +601,7 @@ void collectUIInformation(const util::URL& rURL, const 
css::uno::Sequence< css::
 if (!pFile)
 return;
 
-UITestLogger::getInstance().logCommand("Send UNO Command (\"" + 
rURL.Complete + "\") ", rArgs);
+UITestLogger::getInstance().logCommand("CommandSent Name:" + 
rURL.Complete, rArgs);
 }
 
 }
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 742d8f4ab63a..d100d1bbf125 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -213,21 +213,8 @@ void UITestLogger::logKeyInput(VclPtr const & 
xUIElement, const Key
 
 OUString aParentID = pParent->get_id();
 
-OUString aContent;
-
-if(pUIObject->get_type()=="EditUIObject"){
-aContent =  "Type on '" + rID + "' " + aKeyCode + " from " + aParentID 
;
-}
-else if(pUIObject->get_type()=="SwEditWinUIObject" && rID=="writer_edit"){
-aContent = "Type on writer " + aKeyCode ;
-}
-else if(pUIObject->get_type()=="ScGridWinUIObject" && rID=="grid_window"){
-aContent = "Type on current cell " + aKeyCode ;
-}
-else{
-aContent= pUIObject->get_type() + " Action:TYPE Id:" +
-rID + " Parent:"+ aParentID +" " + aKeyCode;
-}
+OUString aContent = pUIObject->get_type() + " Action:TYPE Id:" +
+rID + " Parent:"+ aParentID +" " + aKeyCode;
 maStream.WriteLine(OUStringToOString(aContent, RTL_TEXTENCODING_UTF8));
 }
 
@@ -253,75 +240,16 @@ OUString StringMapToOUString(const std::map& rParameters)
 return aParameterString.makeStringAndClear();
 }
 
-OUString GetValueInMapWithIndex(const std::map& 
rParameters,sal_Int32 index)
-{
-sal_Int32 j=0;
-
-std::map::const_iterator itr = rParameters.begin();
-
-for ( ; itr != rParameters.end() && jsecond;
-}
-
-
-OUString GetKeyInMapWithIndex(const std::map& 
rParameters,sal_Int32 index)
-{
-sal_Int32 j=0;
-
-std::map::const_iterator itr = rParameters.begin();
-
-for ( ; itr != rParameters.end() && jfirst;
-}
-
 }
 
 void UITestLogger::logEvent(const EventDescription& rDescription)
 {
 OUString aParameterString = StringMapToOUString(rDescription.aParameters);
 
-//here we will customize our statments depending on the caller of this 
function
-OUString aLogLine ;
-
-if(rDescription.aID=="writer_edit"){
-
-if(rDescription.aAction=="GOTO"){
-aLogLine = "GOTO page number " + 
GetValueInMapWithIndex(rDescription.aParameters,0);
-}
-else if(rDescription.aAction=="SET"){
-aLogLine =  "Set Zoom to be "  + 
GetValueInMapWithIndex(rDescription.aParameters,0);
-}
-else if(rDescription.aAction=="SELECT"){
-OUString to = GetValueInMapWithIndex(rDescription.aParameters,0);
-OUString from =   
GetValueInMapWithIndex(rDescription.aParameters,1);
-aLogLine =  "Select from Pos "  +  from + " to " + to ;
-}
-}
-else if(rDescription.aID=="grid_window"){
+OUString aLogLine = rDescription.aKeyWord + " Action:" +
+rDescription.aAction + " Id:" + rDescription.aID +
+" Parent:" + rDescription.aParent + aParameterString;
 
-if(rDescription.aAction=="SELECT"){
-OUString type = GetKeyInMapWithIndex(rDescription.aParameters,0);
-if(type=="CELL" || type=="RANGE"){
-aLogLine = "Select from calc" + aParameterString ;
-}
-else if(type=="TABLE")
-{
-aLogLine = "Switch to sheet number " + 
GetValueInMapWithIndex(rDescription.aParameters,0) ;
-}
-}
-else if(rDescription.aAction=="LAUNCH"){
-aLogLine = "Lanuch AutoFilter from Col "+
-GetValueInMapWithIndex(rDescription.aParameters,2) +
-" and Row " + GetValueInMapWithIndex(rDescription.aParameters,1);
-}
-}
-else{
-aLogLine = rDescription.aKeyWord + " Action:" +
-