[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/dialogs/res_DataLabel.cxx |6
chart2/source/controller/dialogs/res_DataLabel.hxx |3
chart2/uiconfig/ui/dlg_DataLabel.ui| 831 ++---
chart2/uiconfig/ui/tp_DataLabel.ui | 806 ++--
4 files changed, 854 insertions(+), 792 deletions(-)
New commits:
commit b53232033ed528d0e2c0f9b074c6853d7a3f0ddd
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 18 13:02:13 2021 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 22 08:52:18 2021 +0100
Update Data Label dlg according to UX mockup
Change-Id: Ia9855a4bc9c5211b4510aa1053faac9e65346818
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/18
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 57a0d3c9565a..857d2b5295db 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -106,9 +106,7 @@ DataLabelResources::DataLabelResources(weld::Builder*
pBuilder, weld::Window* pP
, m_xCBSymbol(pBuilder->weld_check_button("CB_SYMBOL"))
, m_xCBDataSeries(pBuilder->weld_check_button("CB_DATA_SERIES_NAME"))
, m_xCBWrapText(pBuilder->weld_check_button("CB_WRAP_TEXT"))
-, m_xSeparatorResources(pBuilder->weld_widget("boxSEPARATOR"))
, m_xLB_Separator(pBuilder->weld_combo_box("LB_TEXT_SEPARATOR"))
-, m_xBxLabelPlacement(pBuilder->weld_widget("boxPLACEMENT"))
, m_xLB_LabelPlacement(pBuilder->weld_combo_box("LB_LABEL_PLACEMENT"))
, m_xBxOrientation(pBuilder->weld_widget("boxORIENTATION"))
, m_xFT_Dial(pBuilder->weld_label("CT_LABEL_DIAL"))
@@ -249,12 +247,12 @@ void DataLabelResources::EnableControls()
if (m_xCBDataSeries->get_state() != TRISTATE_FALSE)
++nNumberOfCheckedLabelParts;
-m_xSeparatorResources->set_sensitive( nNumberOfCheckedLabelParts > 1 );
+m_xLB_Separator->set_sensitive( nNumberOfCheckedLabelParts > 1 );
bool bEnableTextDir = nNumberOfCheckedLabelParts > 0;
m_xBxTextDirection->set_sensitive( bEnableTextDir );
bool bEnablePlacement = nNumberOfCheckedLabelParts > 0 &&
m_xLB_LabelPlacement->get_count()>1;
-m_xBxLabelPlacement->set_sensitive( bEnablePlacement );
+m_xLB_LabelPlacement->set_sensitive( bEnablePlacement );
}
m_xPB_NumberFormatForValue->set_sensitive( m_pNumberFormatter &&
m_xCBNumber->get_active() );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 1f832a4881a3..dde594b620d6 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -68,10 +68,7 @@ private:
std::unique_ptr m_xCBDataSeries;
std::unique_ptr m_xCBWrapText;
-std::unique_ptr m_xSeparatorResources;
std::unique_ptr m_xLB_Separator;
-
-std::unique_ptr m_xBxLabelPlacement;
std::unique_ptr m_xLB_LabelPlacement;
std::unique_ptr m_xBxOrientation;
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui
b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 1851a4f9c7d7..4826c2ee6943 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -1,34 +1,34 @@
-
+
359
-1
-10
+1
+10
-False
-6
+False
+6
Data Labels for all Data
Series
-dialog
+dialog
-False
+False
vertical
12
-False
-end
+False
+end
_OK
True
-True
-True
-True
-True
+True
+True
+True
+True
True
@@ -41,8 +41,8 @@
_Cancel
True
-True
-True
+True
+True
True
@@ -55,8 +55,8 @@
_Help
True
-True
-True
+True
+True
True
@@ -70,249 +70,270 @@
False
True
-end
+end
0
-
+
True
-False
-6
-vertical
+False
+6
12
-
+
+box_left
True
-False
-0
-none
+False
+vertical
-
+
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 23 --- 1 file changed, 23 deletions(-) New commits: commit f06380c1eb24aebc73c3ee48a353de9119305c87 Author: Samuel Mehrbrodt AuthorDate: Wed Feb 17 16:28:21 2021 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 22 08:46:30 2021 +0100 No such thing as ChartTrendlinePanel Makes LO crash when opening trendline dlg Change-Id: Ib9a1d5b4cb19b4ba27e9d1759a6817ad183cdc6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111076 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index ce273e192e59..5df1db5c1b95 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -1496,29 +1496,6 @@ - - - Trendline - - - ChartTrendlinePanel - - - ChartDeck - - - -Chart, Trendline, visible ; - - - - private:resource/toolpanel/ChartPanelFactory/TrendlinePanel - - - 3 - - - Error Bar ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a9ad8e54f5cecc7087cc20e1dfe6fc047da05b6 Author: Gabor Kelemen AuthorDate: Mon Feb 22 08:11:29 2021 +0100 Commit: Gabor Kelemen CommitDate: Mon Feb 22 08:12:38 2021 +0100 Weekly version bump Change-Id: Ica49fe9e28caa1529b699041336e9c37b778e91b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111296 Tested-by: Gabor Kelemen Reviewed-by: Gabor Kelemen diff --git a/configure.ac b/configure.ac index d8be43ef31f7..771c61a8ed3f 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],[7.0.4.2-N1],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.0.4.2.N2],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/source drawinglayer/source
dbaccess/source/core/api/RowSet.cxx| 19 +++ dbaccess/source/core/api/RowSetCache.cxx |4 - dbaccess/source/core/api/SingleSelectQueryComposer.cxx |2 dbaccess/source/core/api/TableDeco.cxx |8 +-- dbaccess/source/core/api/preparedstatement.cxx |4 - dbaccess/source/core/api/query.cxx |9 +-- dbaccess/source/core/api/query.hxx |2 dbaccess/source/core/api/querycontainer.cxx|2 dbaccess/source/core/api/querydescriptor.cxx |2 dbaccess/source/core/api/querydescriptor.hxx |2 dbaccess/source/core/api/resultset.cxx |4 - dbaccess/source/core/api/table.cxx |8 --- dbaccess/source/core/api/tablecontainer.cxx|8 +-- dbaccess/source/core/dataaccess/ComponentDefinition.cxx|2 dbaccess/source/core/dataaccess/ComponentDefinition.hxx|2 dbaccess/source/core/dataaccess/databasedocument.cxx |8 +-- dbaccess/source/core/dataaccess/datasource.cxx | 15 +++--- dbaccess/source/core/dataaccess/documentdefinition.cxx | 24 -- dbaccess/source/core/inc/TableDeco.hxx |2 dbaccess/source/core/inc/column.hxx|2 dbaccess/source/core/inc/table.hxx |2 dbaccess/source/filter/xml/xmlExport.cxx | 10 +--- dbaccess/source/ui/browser/brwctrlr.cxx| 21 +++- dbaccess/source/ui/browser/exsrcbrw.cxx|1 dbaccess/source/ui/browser/genericcontroller.cxx |4 - dbaccess/source/ui/browser/sbagrid.cxx |2 dbaccess/source/ui/dlg/CollectionView.cxx |7 +- dbaccess/source/ui/dlg/ConnectionHelper.cxx|2 dbaccess/source/ui/dlg/DbAdminImpl.cxx |5 -- dbaccess/source/ui/dlg/dbwizsetup.cxx | 10 +--- dbaccess/source/ui/inc/JoinTableView.hxx |2 dbaccess/source/ui/inc/brwctrlr.hxx|3 - dbaccess/source/ui/inc/exsrcbrw.hxx|2 dbaccess/source/ui/misc/TableCopyHelper.cxx|4 - dbaccess/source/ui/querydesign/JoinTableView.cxx |1 dbaccess/source/ui/querydesign/QueryDesignView.cxx |2 dbaccess/source/ui/uno/ColumnControl.cxx |2 drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx |6 +- drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx|6 +- drawinglayer/source/primitive2d/helplineprimitive2d.cxx|9 +-- drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 15 ++ drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx|3 - drawinglayer/source/processor3d/shadow3dextractor.cxx |6 +- drawinglayer/source/tools/emfphelperdata.cxx |4 - drawinglayer/source/tools/wmfemfhelper.cxx |4 - 45 files changed, 118 insertions(+), 144 deletions(-) New commits: commit eac1daddf376f44b55b5d592cdada2b7775f2910 Author: Noel AuthorDate: Sun Feb 21 20:03:52 2021 +0200 Commit: Noel Grandin CommitDate: Mon Feb 22 08:08:40 2021 +0100 loplugin:refcounting in dbaccess Change-Id: I8d8b33b5488dd1568f0105425d033da42578b4e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111289 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 80e5206b4dd6..613a69fdecb2 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -1853,7 +1853,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi } sName = sAlias; } -ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), +rtl::Reference pColumn = new ORowSetDataColumn( getMetaData(), this, this, i+1, @@ -1867,7 +1867,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi aColumns->emplace_back(pColumn);
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 82ad4289933141d7b11fc6f54703545ae400de36 Author: Samuel Mehrbrodt AuthorDate: Mon Feb 22 08:07:44 2021 +0100 Commit: Gerrit Code Review CommitDate: Mon Feb 22 08:07:44 2021 +0100 Update git submodules * Update translations from branch 'distro/cib/libreoffice-6-4' to de07c1850b12a25ee83babfdad51f44410d57381 - Add translation for "Improve macro checks" commit Change-Id: I3c0374e03ae1381168b90b8afbb326b8b67309f0 diff --git a/translations b/translations index a98a81ee9754..de07c1850b12 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit a98a81ee9754921c9e3d306481e5db92514d7435 +Subproject commit de07c1850b12a25ee83babfdad51f44410d57381 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'distro/cib/libreoffice-6-4' - source/de
source/de/svtools/messages.po |4 1 file changed, 4 insertions(+) New commits: commit de07c1850b12a25ee83babfdad51f44410d57381 Author: Samuel Mehrbrodt AuthorDate: Wed Feb 3 13:57:24 2021 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 22 08:07:38 2021 +0100 Add translation for "Improve macro checks" commit Change-Id: I3c0374e03ae1381168b90b8afbb326b8b67309f0 diff --git a/source/de/svtools/messages.po b/source/de/svtools/messages.po index 16bdbc9d5a5..68ee384c1a8 100644 --- a/source/de/svtools/messages.po +++ b/source/de/svtools/messages.po @@ -2369,6 +2369,10 @@ msgstr "" "Es wurde versucht, ein Makro auszuführen.\n" "Die Makrounterstützung ist aus Sicherheitsgründen deaktiviert." +msgctxt "RID_ERRHDL" +msgid "Execution of macros is disabled. Macros are signed, but the document (containing document events) is not signed." +msgstr "Die Makrountersützung wurde deaktiviert. Die Makros sind signiert, aber das Dokument (welches Dokumentenereignisse enthält) ist nicht signiert." + #. 24FhM #: svtools/inc/errtxt.hrc:123 msgctxt "RID_ERRHDL" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig
chart2/uiconfig/ui/tp_Trendline.ui | 637 ++--- 1 file changed, 318 insertions(+), 319 deletions(-) New commits: commit 795ac4b5b6ba2c55ca73859fbc9bd4116120fe29 Author: Samuel Mehrbrodt AuthorDate: Thu Feb 18 10:34:42 2021 +0100 Commit: Samuel Mehrbrodt CommitDate: Mon Feb 22 07:49:02 2021 +0100 Update trendline dlg according to UX mockup Change-Id: I0b544f15776a641b39704bbe2ec848c687ae55bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/03 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/chart2/uiconfig/ui/tp_Trendline.ui b/chart2/uiconfig/ui/tp_Trendline.ui index 486d67e57994..9b16231f7b46 100644 --- a/chart2/uiconfig/ui/tp_Trendline.ui +++ b/chart2/uiconfig/ui/tp_Trendline.ui @@ -1,87 +1,65 @@ - + + 2 10 -1 -10 +1 +10 -1 1 -1 -10 +1 +10 -1 1 -1 -10 +1 +10 -1 1 -1 -10 - - -2 -100 -1 -10 - - - - - - - - -Prior - - -Central - - -Averaged Abscissa - - +1 +10 True -False +False True True -6 -vertical +6 12 True -False -0 -none +False +0 +none + True -False +False start -12 -6 -6 -6 -True +12 +6 +6 +6 +True _Linear True -True -False -True +True +False +True True -True +True A linear trend line is shown. @@ -89,19 +67,19 @@ -1 -0 +1 +0 L_ogarithmic True -True -False -True +True +False +True True -True +True linear @@ -110,19 +88,19 @@ -1 -1 +1 +1 _Exponential True -True -False -True +True +False +True True -True +True linear @@ -131,19 +109,19 @@ -1 -2 +1 +2 Po_wer True -True -False -True +True +False +True True -True +True linear @@ -152,19 +130,73 @@ -1 -3 +1 +3 + + + + +True +False +missing-image + + +0 +0 + + + + +True +False +missing-image + + +0 +1 + + + + +True +False +missing-image + + +0 +2 + + + + +True +False +missing-image + + +0 +3 + + + + +True +False +missing-image + + +0 +4 _Polynomial True -True -False -True -
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/chart/tdf93506_trendline.py |4
1 file changed, 4 insertions(+)
New commits:
commit e4037a34f784cc54fba08bdac48f1660f7c2ec5f
Author: Samuel Mehrbrodt
AuthorDate: Wed Feb 17 16:27:38 2021 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 22 07:39:12 2021 +0100
tdf#133423 Add UITest
Change-Id: Ifddcb283073796a890a374f6b5100ddc5909a23b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111075
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sc/qa/uitest/chart/tdf93506_trendline.py
b/sc/qa/uitest/chart/tdf93506_trendline.py
index 99660e76a552..5b80202d2c98 100644
--- a/sc/qa/uitest/chart/tdf93506_trendline.py
+++ b/sc/qa/uitest/chart/tdf93506_trendline.py
@@ -388,6 +388,7 @@ class tdf93506(UITestCase):
exponential = xDialog.getChild("exponential") #type regression exponential
power = xDialog.getChild("exponential") #type regression power
movingAverage = xDialog.getChild("movingAverage") #type regression Moving
average
+movingAverageType = xDialog.getChild("combo_moving_type") #type
regression Moving average type
period = xDialog.getChild("period")
xentryname = xDialog.getChild("entry_name") #add name
extrapolateForward = xDialog.getChild("extrapolateForward")
@@ -400,6 +401,7 @@ class tdf93506(UITestCase):
yVarName = xDialog.getChild("entry_Yname")
movingAverage.executeAction("CLICK", tuple()) #set polynomial
+movingAverageType.executeAction("SELECT", mkPropertyValues({"TEXT":
"Averaged Abscissa"}))
period.executeAction("UP", tuple())
#Click on tab "Line".
@@ -430,6 +432,7 @@ class tdf93506(UITestCase):
power = xDialog.getChild("exponential") #type regression power
polynomial = xDialog.getChild("polynomial") #type regression polynomial
movingAverage = xDialog.getChild("movingAverage") #type regression Moving
average
+movingAverageType = xDialog.getChild("combo_moving_type") #type
regression Moving average type
degree = xDialog.getChild("degree")
period = xDialog.getChild("period")
xentryname = xDialog.getChild("entry_name") #add name
@@ -443,6 +446,7 @@ class tdf93506(UITestCase):
yVarName = xDialog.getChild("entry_Yname")
self.assertEqual(get_state_as_dict(movingAverage)["Checked"], "true")
+self.assertEqual(get_state_as_dict(movingAverageType)["SelectEntryText"],
"Averaged Abscissa")
self.assertEqual(get_state_as_dict(period)["Text"], "3")
self.assertEqual(get_state_as_dict(xentryname)["Text"], "Name")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx | 32 ++
chart2/qa/extras/data/ods/moving-type.ods |binary
2 files changed, 32 insertions(+)
New commits:
commit 33a193130f7643f5bab2c9369f5d700114c6fbee
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 18 09:33:35 2021 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 22 07:38:37 2021 +0100
tdf#133423 Add ODF import/export test
Change-Id: I147c0cbd0b19d13ba86c3aa42cfe03de5d24de88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111099
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 309381d80224..bb9b04e559c3 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -45,6 +46,7 @@ public:
void testTrendline();
void testTrendlineOOXML();
void testTrendlineXLS();
+void testMovingAverage();
void testStockChart();
void testBarChart();
void testCrosses();
@@ -194,6 +196,7 @@ public:
CPPUNIT_TEST(testTrendline);
CPPUNIT_TEST(testTrendlineOOXML);
CPPUNIT_TEST(testTrendlineXLS);
+CPPUNIT_TEST(testMovingAverage);
CPPUNIT_TEST(testStockChart);
CPPUNIT_TEST(testBarChart);
CPPUNIT_TEST(testCrosses);
@@ -661,6 +664,35 @@ void Chart2ExportTest::testTrendlineXLS()
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
}
+void Chart2ExportTest::testMovingAverage()
+{
+mbSkipValidation = true;
+load(u"/chart2/qa/extras/data/ods/", "moving-type.ods");
+reload("calc8");
+
+uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc(
xChartDoc, 0 );
+CPPUNIT_ASSERT( xDataSeries.is() );
+
+Reference< chart2::XRegressionCurveContainer > xRegressionCurveContainer(
xDataSeries, UNO_QUERY );
+CPPUNIT_ASSERT( xRegressionCurveContainer.is() );
+
+Sequence< Reference< chart2::XRegressionCurve > > xRegressionCurveSequence
= xRegressionCurveContainer->getRegressionCurves();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xRegressionCurveSequence.getLength());
+
+Reference xCurve = xRegressionCurveSequence[0];
+CPPUNIT_ASSERT(xCurve.is());
+
+Reference xProperties( xCurve , uno::UNO_QUERY );
+CPPUNIT_ASSERT(xProperties.is());
+
+sal_Int32 nMovingAverageType = 0;
+xProperties->getPropertyValue("MovingAverageType") >>= nMovingAverageType;
+CPPUNIT_ASSERT_EQUAL(chart2::MovingAverageType::Central,
nMovingAverageType);
+}
+
void Chart2ExportTest::testStockChart()
{
/* For attached file Stock_Chart.docx, in chart1.xml,
diff --git a/chart2/qa/extras/data/ods/moving-type.ods
b/chart2/qa/extras/data/ods/moving-type.ods
new file mode 100644
index ..8a8568cfa741
Binary files /dev/null and b/chart2/qa/extras/data/ods/moving-type.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa chart2/source chart2/uiconfig include/xmloff offapi/com offapi/UnoApi_offapi.mk xmloff/source
chart2/qa/extras/chart2_trendcalculators.cxx |
12 -
chart2/source/controller/dialogs/ObjectNameProvider.cxx |
5
chart2/source/controller/dialogs/res_Trendline.cxx |
32 +++
chart2/source/controller/dialogs/res_Trendline.hxx |
2
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |
13 +
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |
14 +
chart2/source/inc/LinearRegressionCurveCalculator.hxx|
3
chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx |
4
chart2/source/inc/RegressionCurveCalculator.hxx |
4
chart2/source/inc/chartview/ChartSfxItemIds.hxx |
3
chart2/source/tools/LinearRegressionCurveCalculator.cxx |
6
chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx |
55 -
chart2/source/tools/RegressionCurveCalculator.cxx|
4
chart2/source/tools/RegressionCurveModel.cxx |
9
chart2/source/view/charttypes/VSeriesPlotter.cxx |
8
chart2/source/view/main/ChartItemPool.cxx|
2
chart2/uiconfig/ui/tp_Trendline.ui |
95 +++---
include/xmloff/xmltoken.hxx |
3
offapi/UnoApi_offapi.mk |
1
offapi/com/sun/star/chart2/MovingAverageType.idl |
35 +++
offapi/com/sun/star/chart2/RegressionCurve.idl |
2
offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl|
7
xmloff/source/chart/PropertyMap.hxx |
5
xmloff/source/chart/PropertyMaps.cxx |
29 +++
xmloff/source/core/xmltoken.cxx |
3
xmloff/source/token/tokens.txt |
3
26 files changed, 305 insertions(+), 54 deletions(-)
New commits:
commit 4141533a3fb984fbaefe87b15fceeda7f2082061
Author: Samuel Mehrbrodt
AuthorDate: Thu Feb 11 07:53:15 2021 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Feb 22 07:36:21 2021 +0100
[API CHANGE] tdf#133423 Implement chart:regression-moving-type
Change-Id: Icb967367fbf12e5a1566b7f18ebe5e3d8a3534f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110748
Tested-by: Jenkins
Reviewed-by: Michael Stahl
Reviewed-by: Samuel Mehrbrodt
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx
b/chart2/qa/extras/chart2_trendcalculators.cxx
index b8eb367524bb..1eeea5d12e23 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -110,7 +110,7 @@ void Chart2TrendCalculators::checkCalculator(
void Chart2TrendCalculators::testPotentialRegression1()
{
loadCalculatorFromSheet( SHEET_POTENTIAL1 );
-m_xRegressionCurveCalculator->setRegressionProperties( 0, false, 0, 0 );
+m_xRegressionCurveCalculator->setRegressionProperties( 0, false, 0, 0, 0 );
Sequence< double > xValues( 7 );
Sequence< double > yValues( 7 );
for (int i=0; i<7; i++)
@@ -126,7 +126,7 @@ void Chart2TrendCalculators::testPotentialRegression1()
void Chart2TrendCalculators::testPotentialRegression2()
{
loadCalculatorFromSheet( SHEET_POTENTIAL2 );
-m_xRegressionCurveCalculator->setRegressionProperties( 0, false, 0, 0 );
+m_xRegressionCurveCalculator->setRegressionProperties( 0, false, 0, 0, 0 );
Sequence< double > xValues( 7 );
Sequence< double > yValues( 7 );
for (int i=0; i<7; i++)
@@ -142,7 +142,7 @@ void Chart2TrendCalculators::testPotentialRegression2()
void Chart2TrendCalculators::testLinearRegression1()
{
loadCalculatorFromSheet( SHEET_LINEAR1 );
-m_xRegressionCurveCalculator->setRegressionProperties( 1, false, 0, 0 );
+m_xRegressionCurveCalculator->setRegressionProperties( 1, false, 0, 0, 0 );
Sequence< double > xValues( 7 );
Sequence< double > yValues( 7 );
for (int i=0; i<7; i++)
@@ -158,7 +158,7 @@ void Chart2TrendCalculators::testLinearRegression1()
void Chart2TrendCalculators::testPolynomialRegression1()
{
loadCalculatorFromSheet( SHEET_POLYNOMIAL1 );
-m_xRegressionCurveCalculator->setRegressionProperties( 2, false, 0, 0 );
+m_xRegressionCurveCalculator->setRegressionProperties( 2, false, 0, 0, 0 );
Sequence< double > xValues( 7 );
Sequence< double > yValues( 7 );
for (int i=0; i<7; i++)
@@ -174,7 +174,7 @@ void Chart2TrendCalculators::testPolynomialRegression1()
void Chart2TrendCalculators::testExponentialRegression1()
{
loadCalculatorFromSheet( SHEET_EXPONENTIAL1 );
-m_xRegressionCurveCalculator->setRegress
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/es/bold.png|binary icon-themes/colibre/cmd/32/es/underline.png |binary icon-themes/colibre/cmd/32/es/underlinedouble.png |binary icon-themes/colibre/cmd/32/it/italic.png |binary icon-themes/colibre/links.txt | 144 +- 5 files changed, 63 insertions(+), 81 deletions(-) New commits: commit c40ce0c542b46d45a00561a926953df2fe9a9762 Author: Rizal Muttaqin AuthorDate: Sun Feb 21 15:27:33 2021 +0700 Commit: Adolfo Jayme Barrientos CommitDate: Mon Feb 22 07:05:53 2021 +0100 Colibre: tdf#133038 change some formatting icons for Catalan Change-Id: I7a56ad91c3f23a0b2a33d732c885dedb06eacd87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111270 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/colibre/cmd/32/es/bold.png b/icon-themes/colibre/cmd/32/es/bold.png new file mode 100644 index ..59f9cd8ac065 Binary files /dev/null and b/icon-themes/colibre/cmd/32/es/bold.png differ diff --git a/icon-themes/colibre/cmd/32/es/underline.png b/icon-themes/colibre/cmd/32/es/underline.png new file mode 100644 index ..baddbdada28d Binary files /dev/null and b/icon-themes/colibre/cmd/32/es/underline.png differ diff --git a/icon-themes/colibre/cmd/32/es/underlinedouble.png b/icon-themes/colibre/cmd/32/es/underlinedouble.png new file mode 100644 index ..6bf006e40b98 Binary files /dev/null and b/icon-themes/colibre/cmd/32/es/underlinedouble.png differ diff --git a/icon-themes/colibre/cmd/32/it/italic.png b/icon-themes/colibre/cmd/32/it/italic.png new file mode 100644 index ..0f1ab5c8276c Binary files /dev/null and b/icon-themes/colibre/cmd/32/it/italic.png differ diff --git a/icon-themes/colibre/cmd/ca/lc_bold.png b/icon-themes/colibre/cmd/es/lc_bold.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_bold.png rename to icon-themes/colibre/cmd/es/lc_bold.png diff --git a/icon-themes/colibre/cmd/ca/lc_underline.png b/icon-themes/colibre/cmd/es/lc_underline.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_underline.png rename to icon-themes/colibre/cmd/es/lc_underline.png diff --git a/icon-themes/colibre/cmd/ca/lc_underlinedouble.png b/icon-themes/colibre/cmd/es/lc_underlinedouble.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_underlinedouble.png rename to icon-themes/colibre/cmd/es/lc_underlinedouble.png diff --git a/icon-themes/colibre/cmd/ca/sc_bold.png b/icon-themes/colibre/cmd/es/sc_bold.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_bold.png rename to icon-themes/colibre/cmd/es/sc_bold.png diff --git a/icon-themes/colibre/cmd/ca/sc_underline.png b/icon-themes/colibre/cmd/es/sc_underline.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_underline.png rename to icon-themes/colibre/cmd/es/sc_underline.png diff --git a/icon-themes/colibre/cmd/ca/sc_underlinedouble.png b/icon-themes/colibre/cmd/es/sc_underlinedouble.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_underlinedouble.png rename to icon-themes/colibre/cmd/es/sc_underlinedouble.png diff --git a/icon-themes/colibre/cmd/ca/lc_italic.png b/icon-themes/colibre/cmd/it/lc_italic.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_italic.png rename to icon-themes/colibre/cmd/it/lc_italic.png diff --git a/icon-themes/colibre/cmd/ca/sc_italic.png b/icon-themes/colibre/cmd/it/sc_italic.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_italic.png rename to icon-themes/colibre/cmd/it/sc_italic.png diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 6ac7a68f0abe..4e729952ba5c 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -395,18 +395,13 @@ cmd/32/ar/numberliststyle.png cmd/32/ar/defaultnumbering.png cmd/32/ar/recundo.png cmd/32/redo.png cmd/32/ar/redo.png cmd/32/undo.png cmd/32/ar/undo.png cmd/32/redo.png -cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png -cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png -cmd/32/es/bold.png cmd/32/ca/bold.png cmd/32/es/italic.png cmd/32/de/italic.png cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png -cmd/32/es/underline.png cmd/32/ca/underline.png -cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png -cmd/32/es/underlinesimple.png cmd/32/ca/underline.png -cmd/32/es/underlinesingle.png cmd/32/ca/underline.png +cmd/32/es/underlinesimple.png cmd/32/es/underline.png +cmd/32/es/underlinesingle.png cmd/32/es/underline.png cmd/32/fa/absoluterecord.png cmd/32/ar/absoluterecord.png cmd/32/fa/alphaliststyle.png cmd/32/ar/alphaliststyle.png cmd/32/fa/alphalowlis
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
sfx2/source/devtools/ObjectInspectorTreeHandler.cxx |6 --
sfx2/uiconfig/ui/developmenttool.ui | 14 ++
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 460c778bd483fb0a61c4b0d46f5f876ce80dff26
Author: Tomaž Vajngerl
AuthorDate: Mon Feb 22 09:15:39 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Mon Feb 22 06:29:27 2021 +0100
devtools: add implementation class to the methods category
Implementation class is the class where the method is implemented
on.
Change-Id: Ia415ce96a821b4335e1f378b6b7773548fd3e705
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111293
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index 39f2d70eb06a..e672d256fbe6 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -301,12 +301,11 @@ public:
std::vector> getColumnValues() override
{
-OUString aInString;
OUString aOutString;
-
auto xClass = mxMethod->getReturnType();
aOutString = simpleTypeName(xClass);
+OUString aInString;
const auto aParameters = mxMethod->getParameterInfos();
bool bFirst = true;
for (auto const& rParameterInfo : aParameters)
@@ -334,9 +333,12 @@ public:
aInString += rParameterInfo.aName + " : " +
simpleTypeName(rParameterInfo.aType);
}
+OUString aImplementationClass =
mxMethod->getDeclaringClass()->getName();
+
return {
{ 1, aOutString },
{ 2, aInString },
+{ 3, aImplementationClass },
};
}
diff --git a/sfx2/uiconfig/ui/developmenttool.ui
b/sfx2/uiconfig/ui/developmenttool.ui
index 9dd110804991..3eeb94859885 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -26,6 +26,8 @@
+
+
@@ -407,6 +409,18 @@
+
+
+True
+Implementation Class
+
+
+
+3
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 81 +++-
1 file changed, 79 insertions(+), 2 deletions(-)
New commits:
commit fed778b1cf85b100d5744ceffabb08a3d1243271
Author: Tomaž Vajngerl
AuthorDate: Thu Feb 18 12:02:06 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Mon Feb 22 06:29:00 2021 +0100
devtools: add MethodNode to show the column values for methods
This adds the MethodNode, which uses reflection to get the info
for a perticular method - mainly the return type and input/output
parameters. The types have been simplified for this view.
Change-Id: I81f895d3cdf1472ae4b21227572b7ccfad607018
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111094
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index 6ea018564865..39f2d70eb06a 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -268,6 +268,84 @@ public:
OUString getObjectName() override { return msName; }
};
+class MethodNode : public ObjectInspectorNodeInterface
+{
+private:
+uno::Reference mxMethod;
+
+public:
+MethodNode(uno::Reference const& xMethod)
+: mxMethod(xMethod)
+{
+}
+
+OUString getObjectName() override { return mxMethod->getName(); }
+
+static OUString simpleTypeName(uno::Reference
const& xClass)
+{
+switch (xClass->getTypeClass())
+{
+case uno::TypeClass_INTERFACE:
+return "object";
+case uno::TypeClass_STRUCT:
+return "struct";
+case uno::TypeClass_ENUM:
+return "enum";
+case uno::TypeClass_SEQUENCE:
+return "sequence";
+default:
+break;
+}
+return xClass->getName();
+}
+
+std::vector> getColumnValues() override
+{
+OUString aInString;
+OUString aOutString;
+
+auto xClass = mxMethod->getReturnType();
+aOutString = simpleTypeName(xClass);
+
+const auto aParameters = mxMethod->getParameterInfos();
+bool bFirst = true;
+for (auto const& rParameterInfo : aParameters)
+{
+if (!bFirst)
+aInString += ", ";
+else
+bFirst = false;
+
+switch (rParameterInfo.aMode)
+{
+case reflection::ParamMode_IN:
+aInString += "[in] ";
+break;
+case reflection::ParamMode_OUT:
+aInString += "[out] ";
+break;
+case reflection::ParamMode_INOUT:
+aInString += "[in&out] ";
+break;
+default:
+break;
+}
+
+aInString += rParameterInfo.aName + " : " +
simpleTypeName(rParameterInfo.aType);
+}
+
+return {
+{ 1, aOutString },
+{ 2, aInString },
+};
+}
+
+void fillChildren(std::unique_ptr& /*rTree*/,
+ const weld::TreeIter* /*pParent*/) override
+{
+}
+};
+
class BasicValueNode : public SimpleStringNode
{
protected:
@@ -626,8 +704,7 @@ void
ObjectInspectorTreeHandler::appendMethods(uno::Reference c
const auto xMethods =
xIntrospectionAccess->getMethods(beans::MethodConcept::ALL);
for (auto const& xMethod : xMethods)
{
-OUString aMethodName = xMethod->getName();
-lclAppendNode(mpMethodsTreeView, new SimpleStringNode(aMethodName));
+lclAppendNode(mpMethodsTreeView, new MethodNode(xMethod));
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/developmenttool.ui | 73 1 file changed, 9 insertions(+), 64 deletions(-) New commits: commit 883607d55154eadbc4fa8d1920500af1060ee69e Author: Tomaž Vajngerl AuthorDate: Thu Feb 18 11:58:15 2021 +0900 Commit: Tomaž Vajngerl CommitDate: Mon Feb 22 06:28:23 2021 +0100 devtools: rework columns for all categories in the inspector The columns for services and interfaces has been simplified to just "Name" column. For methods the columns have been changed to "Method", "Return Type" and "Parameters". The properties tree view remained unchanged. Change-Id: Ie8db69e11a3ea5aa289305017ed024d2d0d627da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111093 Tested-by: Tomaž Vajngerl Reviewed-by: Tomaž Vajngerl diff --git a/sfx2/uiconfig/ui/developmenttool.ui b/sfx2/uiconfig/ui/developmenttool.ui index 32423886558c..9dd110804991 100644 --- a/sfx2/uiconfig/ui/developmenttool.ui +++ b/sfx2/uiconfig/ui/developmenttool.ui @@ -14,10 +14,6 @@ - - - - @@ -26,9 +22,9 @@ - + - + @@ -50,10 +46,6 @@ - - - - @@ -104,7 +96,7 @@ True -Object +Object @@ -204,6 +196,7 @@ True object_inspector_interfaces_liststore 0 +False True @@ -211,7 +204,7 @@ True -Object +Name @@ -220,30 +213,6 @@ - - -True -Value - - - -1 - - - - - - -True -Type - - - -2 - - - - @@ -281,7 +250,7 @@ True -Object +Name @@ -290,30 +259,6 @@ - - -True -Value - - - -1 - - - - - - -True -Type - - - -2 - - - - @@ -429,7 +374,7 @@ True -Object +Method @@ -441,7 +386,7 @@ True -Value +Return Type @@ -453,7 +398,7 @@ True -Type +Parameters
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/devtools/DevelopmentToolDockingWindow.hxx |5
include/sfx2/devtools/ObjectInspectorTreeHandler.hxx | 27 +
sfx2/source/devtools/DevelopmentToolDockingWindow.cxx | 13
sfx2/source/devtools/ObjectInspectorTreeHandler.cxx| 325 +++-
sfx2/uiconfig/ui/developmenttool.ui| 338 +++--
5 files changed, 502 insertions(+), 206 deletions(-)
New commits:
commit 28115cec387e4a548844a7402be798d6ff47f9ac
Author: Tomaž Vajngerl
AuthorDate: Wed Feb 17 11:49:56 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Mon Feb 22 06:28:00 2021 +0100
devtools: change the object inspector view to tabs
Until now we had only one tree view with top-level nodes for
services, interfaces, properties and methods. The problem with
this is that each one category has it's own distinct columns
(especially methods) so they can't fit well into just one tree
view. Services and interfaces categories are very simple so they
can be presented in a simpler way.
This change adds a tab-bar on top, for all the categories and each
one is now presented in its own tree view, which makes it possible
to modify the tree view to the specific category. Tree views are
currently copies, but they will be modified in the future into
what is more appropriate for the category.
Change-Id: Ib532df9bb7b9e0920fff57085d6ec4f1031b3ed8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111092
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
index 987bc053a878..f3633189c9b6 100644
--- a/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
+++ b/include/sfx2/devtools/DevelopmentToolDockingWindow.hxx
@@ -30,7 +30,10 @@ class SFX2_DLLPUBLIC DevelopmentToolDockingWindow final :
public SfxDockingWindo
{
private:
std::unique_ptr mpClassNameLabel;
-std::unique_ptr mpClassListBox;
+std::unique_ptr mpInterfacesTreeView;
+std::unique_ptr mpServicesTreeView;
+std::unique_ptr mpPropertiesTreeView;
+std::unique_ptr mpMethodsTreeView;
std::unique_ptr mpDocumentModelTreeView;
std::unique_ptr mpSelectionToggle;
diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
index 69769cc261d9..9bb27e4a72cc 100644
--- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
+++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
@@ -19,16 +19,35 @@
class ObjectInspectorTreeHandler
{
private:
-std::unique_ptr& mpObjectInspectorTree;
+std::unique_ptr& mpInterfacesTreeView;
+std::unique_ptr& mpServicesTreeView;
+std::unique_ptr& mpPropertiesTreeView;
+std::unique_ptr& mpMethodsTreeView;
+
std::unique_ptr& mpClassNameLabel;
-void clearObjectInspectorChildren(weld::TreeIter const& rParent);
+static void clearObjectInspectorChildren(std::unique_ptr&
pTreeView,
+ weld::TreeIter const& rParent);
+static void handleExpanding(std::unique_ptr& pTreeView,
+weld::TreeIter const& rParent);
+static void clearAll(std::unique_ptr& pTreeView);
+
+void appendInterfaces(css::uno::Reference const&
xInterface);
+void appendServices(css::uno::Reference const&
xInterface);
+void appendProperties(css::uno::Reference const&
xInterface);
+void appendMethods(css::uno::Reference const&
xInterface);
public:
-ObjectInspectorTreeHandler(std::unique_ptr&
pObjectInspectorTree,
+ObjectInspectorTreeHandler(std::unique_ptr&
pInterfacesTreeView,
+ std::unique_ptr&
pServicesTreeView,
+ std::unique_ptr&
pPropertiesTreeView,
+ std::unique_ptr&
pMethodsTreeView,
std::unique_ptr& pClassNameLabel);
-DECL_LINK(ExpandingHandler, const weld::TreeIter&, bool);
+DECL_LINK(ExpandingHandlerInterfaces, const weld::TreeIter&, bool);
+DECL_LINK(ExpandingHandlerServices, const weld::TreeIter&, bool);
+DECL_LINK(ExpandingHandlerProperties, const weld::TreeIter&, bool);
+DECL_LINK(ExpandingHandlerMethods, const weld::TreeIter&, bool);
void introspect(css::uno::Reference const&
xInterface);
diff --git a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
index 5a5134548f11..6bd92f17256d 100644
--- a/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
+++ b/sfx2/source/devtools/DevelopmentToolDockingWindow.cxx
@@ -28,13 +28,17 @@
DevelopmentToolDockingWindow::DevelopmentToolDockingWindow(SfxBindings* pInputBi
: SfxDockingWindow(pInputBindings, pChildWindow, pParent,
"DevelopmentTool",
"sfx/ui/developmenttool.ui")
, mpClassNameLabel(m_xBuilder->weld_label("cl
Re: dependency-confusion
Am 21.02.21 um 23:08 schrieb Andrew Udvare: On 21/02/2021 16:43, Rene Engelhard wrote: And LibreOffice Online *does* use npm. So while LibreOffice itself shouldn't be affected, conceptually by using npm LibreOffce Online is. I think if you use 'npm install' (or 'yarn install'), the manager should be pulling in the correct version and then hash checking based on the contents of the .lock file. Running `npm update`, `npm install package>` or similar may be affected. It's not a bug in a package manager. It your insecure setup for internal packages / repositories. The real issue is when a new dependency gets added or updated but everything seems normal, in that the replacement dependency has stubs to not make the code crash, but also does nefarious things in the background. There would be no way to know without deep inspection, and npm dependency trees are usually huge. No. Hiding would be a bonus, but at this point the attacker already had RCE, which would compromise you, even if you detect it. This is all about hijacking (optional) known / public dependencies. But there are mitigations available. The attacked companies used some optional internal package. Normally they get this from an internal repo, but now someone hijacked the name in the official repo with a huge version number, so it would be preferred over the internal package. Result: pwned. The linked https://azure.microsoft.com/de-de/resources/3-ways-to-mitigate-risk-using-private-package-feeds/ is a good summary of mitigation strategies. But you need to provide a secure setup. That document omits Linux package managers and repositories, but the same attack and mitigations would apply to them. But since you normally can't just register a package in Linux distros, that risk is much lower. OTOH just imagine a malicious postinst script in a deb in some PPA. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/es/bold.png|binary icon-themes/colibre/cmd/32/es/underline.png |binary icon-themes/colibre/cmd/32/es/underlinedouble.png |binary icon-themes/colibre/cmd/32/it/italic.png |binary icon-themes/colibre/links.txt | 144 +- 5 files changed, 63 insertions(+), 81 deletions(-) New commits: commit 44e809d887f5c694ebf9ba9a184ee748771abfdc Author: Rizal Muttaqin AuthorDate: Sun Feb 21 15:27:33 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Feb 21 23:27:52 2021 +0100 Colibre: tdf#133038 change some formatting icons for Catalan Change-Id: I7a56ad91c3f23a0b2a33d732c885dedb06eacd87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/es/bold.png b/icon-themes/colibre/cmd/32/es/bold.png new file mode 100644 index ..59f9cd8ac065 Binary files /dev/null and b/icon-themes/colibre/cmd/32/es/bold.png differ diff --git a/icon-themes/colibre/cmd/32/es/underline.png b/icon-themes/colibre/cmd/32/es/underline.png new file mode 100644 index ..baddbdada28d Binary files /dev/null and b/icon-themes/colibre/cmd/32/es/underline.png differ diff --git a/icon-themes/colibre/cmd/32/es/underlinedouble.png b/icon-themes/colibre/cmd/32/es/underlinedouble.png new file mode 100644 index ..6bf006e40b98 Binary files /dev/null and b/icon-themes/colibre/cmd/32/es/underlinedouble.png differ diff --git a/icon-themes/colibre/cmd/32/it/italic.png b/icon-themes/colibre/cmd/32/it/italic.png new file mode 100644 index ..0f1ab5c8276c Binary files /dev/null and b/icon-themes/colibre/cmd/32/it/italic.png differ diff --git a/icon-themes/colibre/cmd/ca/lc_bold.png b/icon-themes/colibre/cmd/es/lc_bold.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_bold.png rename to icon-themes/colibre/cmd/es/lc_bold.png diff --git a/icon-themes/colibre/cmd/ca/lc_underline.png b/icon-themes/colibre/cmd/es/lc_underline.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_underline.png rename to icon-themes/colibre/cmd/es/lc_underline.png diff --git a/icon-themes/colibre/cmd/ca/lc_underlinedouble.png b/icon-themes/colibre/cmd/es/lc_underlinedouble.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_underlinedouble.png rename to icon-themes/colibre/cmd/es/lc_underlinedouble.png diff --git a/icon-themes/colibre/cmd/ca/sc_bold.png b/icon-themes/colibre/cmd/es/sc_bold.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_bold.png rename to icon-themes/colibre/cmd/es/sc_bold.png diff --git a/icon-themes/colibre/cmd/ca/sc_underline.png b/icon-themes/colibre/cmd/es/sc_underline.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_underline.png rename to icon-themes/colibre/cmd/es/sc_underline.png diff --git a/icon-themes/colibre/cmd/ca/sc_underlinedouble.png b/icon-themes/colibre/cmd/es/sc_underlinedouble.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_underlinedouble.png rename to icon-themes/colibre/cmd/es/sc_underlinedouble.png diff --git a/icon-themes/colibre/cmd/ca/lc_italic.png b/icon-themes/colibre/cmd/it/lc_italic.png similarity index 100% rename from icon-themes/colibre/cmd/ca/lc_italic.png rename to icon-themes/colibre/cmd/it/lc_italic.png diff --git a/icon-themes/colibre/cmd/ca/sc_italic.png b/icon-themes/colibre/cmd/it/sc_italic.png similarity index 100% rename from icon-themes/colibre/cmd/ca/sc_italic.png rename to icon-themes/colibre/cmd/it/sc_italic.png diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 7aa77f52bae7..0e0c3f0dae1f 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -395,18 +395,13 @@ cmd/32/ar/numberliststyle.png cmd/32/ar/defaultnumbering.png cmd/32/ar/recundo.png cmd/32/redo.png cmd/32/ar/redo.png cmd/32/undo.png cmd/32/ar/undo.png cmd/32/redo.png -cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png -cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png -cmd/32/es/bold.png cmd/32/ca/bold.png cmd/32/es/italic.png cmd/32/de/italic.png cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png -cmd/32/es/underline.png cmd/32/ca/underline.png -cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png -cmd/32/es/underlinesimple.png cmd/32/ca/underline.png -cmd/32/es/underlinesingle.png cmd/32/ca/underline.png +cmd/32/es/underlinesimple.png cmd/32/es/underline.png +cmd/32/es/underlinesingle.png cmd/32/es/underline.png cmd/32/fa/absoluterecord.png cmd/32/ar/absoluterecord.png cmd/32/fa/alphaliststyle.png cmd/32/ar/alphaliststyle.png cmd/32/fa/alphalowliststyle.png cmd/32/
Re: dependency-confusion
On 21/02/2021 16:43, Rene Engelhard wrote: And LibreOffice Online *does* use npm. So while LibreOffice itself shouldn't be affected, conceptually by using npm LibreOffce Online is. I think if you use 'npm install' (or 'yarn install'), the manager should be pulling in the correct version and then hash checking based on the contents of the .lock file. Running `npm update`, `npm install package>` or similar may be affected. The real issue is when a new dependency gets added or updated but everything seems normal, in that the replacement dependency has stubs to not make the code crash, but also does nefarious things in the background. There would be no way to know without deep inspection, and npm dependency trees are usually huge. -- Andrew OpenPGP_signature Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: dependency-confusion
Hi, Am 21.02.21 um 09:43 schrieb Andrew Udvare: >> On 2021-02-20, at 16:48, Jean-Baptiste Faure wrote: >> >> Hi, >> >> I certainly did not understand everything in >> https://medium.com/@alex.birsan/dependency-confusion-4a5d60fec610, but I >> wonder if LibreOffice could be subject to this kind of vulnerability? > As far as I can tell, the dependencies that LibreOffice uses in distributions > are gathered manually and updated manually. So, not really. It's not that easy. The question indeed doesn't make sense for LibreOffice itself. Still anything which uses those "get your dependencies randomly from some random place in random versions and save them into your tree" thingy like npm, pip etc. is a problem. And LibreOffice Online *does* use npm. So while LibreOffice itself shouldn't be affected, conceptually by using npm LibreOffce Online is. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/source
sw/source/uibase/uno/unotxdoc.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 70f778657d90fa974281233628e1006740d4d698
Author: Aron Budea
AuthorDate: Mon Feb 15 21:46:45 2021 +0100
Commit: Aron Budea
CommitDate: Sun Feb 21 22:33:34 2021 +0100
Avoid crash in online on a document with comments
Crashed on a specific doc with the following backtrace:
Thread 1 "kitbroker_001" received signal SIGSEGV, Segmentation fault.
0x7f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField
(this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
71 const SwPostItField* GetPostItField() const { return
mpField; }
0 0x7f4807c76d44 in sw::annotation::SwAnnotationWin::GetPostItField()
const (this=0x0)
at /.../libreoffice/sw/inc/AnnotationWin.hxx:71
1 0x7f4807f0641b in SwXTextDocument::getPostIts(tools::JsonWriter&)
(this=0x557e1d985a10, rJsonWriter=...)
at /.../libreoffice/sw/source/uibase/uno/unotxdoc.cxx:3337
2 0x7f4823216534 in getPostIts(LibreOfficeKitDocument*)
(pThis=0x557e1d93c890)
at /.../libreoffice/desktop/source/lib/init.cxx:3425
...
Change-Id: Ib97fd33fda936cad0c9ed3a29564fc0a49ff20c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110917
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
(cherry picked from commit 934ed8d888abe231c014ce179e5256933b0562ed)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/79
Reviewed-by: Aron Budea
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index 3ab7e4a8c8d8..1a746f65f7d1 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3368,6 +3368,11 @@ OUString SwXTextDocument::getPostIts()
{
sw::annotation::SwAnnotationWin* pWin = sidebarItem->pPostIt.get();
+if (!pWin)
+{
+continue;
+}
+
const SwPostItField* pField = pWin->GetPostItField();
const SwRect& aRect = pWin->GetAnchorRect();
tools::Rectangle aSVRect(aRect.Pos().getX(),
___
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' - sfx2/source
sfx2/source/view/viewsh.cxx |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit c17748472edb005a30a71cfafd24f705591113fd
Author: Andras Timar
AuthorDate: Sun Feb 21 20:59:52 2021 +0100
Commit: Andras Timar
CommitDate: Sun Feb 21 21:03:17 2021 +0100
[cp-6.2 only] Fix SfxViewShell::SetLOKLanguageTag, as in cp-6.4 and higher
Change-Id: I93dcd4d540350262c687164edb4e32ea43165102
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index cae5f15fe4b7..144be3acfbca 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1541,22 +1541,17 @@ vcl::Window*
SfxViewShell::GetEditWindowForActiveOLEObj() const
void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag)
{
-#ifdef IOS
-LanguageTag aTag = LanguageTag(rBcp47LanguageTag, true);
+LanguageTag aTag(rBcp47LanguageTag, true);
css::uno::Sequence
inst(officecfg::Setup::Office::InstalledLocales::get()->getElementNames());
LanguageTag aFallbackTag =
LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /*
bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback();
// If we want de-CH, and the de localisation is available, we don't want
to use de-DE as then
// the magic in Translate::get() won't turn ess-zet into double s.
Possibly other similar cases?
-if (aTag.getLanguage() == aFallbackTag.getLanguage())
+if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() ==
aFallbackTag.getLanguage())
maLOKLanguageTag = aTag;
else
maLOKLanguageTag = aFallbackTag;
-#else
-css::uno::Sequence
inst(officecfg::Setup::Office::InstalledLocales::get()->getElementNames());
-maLOKLanguageTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst,
/* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback();
-#endif
}
void SfxViewShell::SetLOKLocale(const OUString& rBcp47LanguageTag)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source svx/source sw/source
dbaccess/source/ui/inc/JoinTableView.hxx |4 +-
dbaccess/source/ui/inc/QueryTableView.hxx |2 -
dbaccess/source/ui/querydesign/JoinTableView.cxx |8 ++---
dbaccess/source/ui/querydesign/QueryTableView.cxx |2 -
svx/source/dialog/framelinkarray.cxx |6 ++--
sw/source/filter/ww8/ww8scan.cxx | 32 +++---
sw/source/filter/ww8/ww8scan.hxx |8 ++---
7 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 385808a2dff7300ec0120fdd5e8acfad8f86e50d
Author: Tor Lillqvist
AuthorDate: Sun Feb 21 12:46:27 2021 +0200
Commit: Tor Lillqvist
CommitDate: Sun Feb 21 20:25:48 2021 +0100
Typo fix: supress -> suppress
Change-Id: I72aeaff1bc8ac67253265ea99de91b9b9906e5d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111275
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx
b/dbaccess/source/ui/inc/JoinTableView.hxx
index 5c7c6e91fcf1..ec2c6e420080 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -196,7 +196,7 @@ namespace dbaui
*/
sal_Int32 getConnectionCount(const OTableWindow* _pFromWin) const;
-OTableConnection* GetTabConn(const OTableWindow* pLhs,const
OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin = false) const;
+OTableConnection* GetTabConn(const OTableWindow* pLhs,const
OTableWindow* pRhs,bool _bSuppressCrossOrNaturalJoin = false) const;
/** clear the window map and connection vector without destroying it
@@ -299,7 +299,7 @@ namespace dbaui
Expected to throw. */
virtual void onNoColumns_throw();
-virtual bool supressCrossNaturalJoin(const
TTableConnectionData::value_type& _pData) const;
+virtual bool suppressCrossNaturalJoin(const
TTableConnectionData::value_type& _pData) const;
private:
void InitColors();
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx
b/dbaccess/source/ui/inc/QueryTableView.hxx
index c192c5fac664..26133d2cca42 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.hxx
@@ -40,7 +40,7 @@ namespace dbaui
Expected to throw. */
virtual voidonNoColumns_throw() override;
-virtual bool supressCrossNaturalJoin(const
TTableConnectionData::value_type& _pData) const override;
+virtual bool suppressCrossNaturalJoin(const
TTableConnectionData::value_type& _pData) const override;
public:
OQueryTableView(vcl::Window* pParent,OQueryDesignView* pView);
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 0190b36c7c77..84a4f1549e34 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1179,7 +1179,7 @@ void OJoinTableView::Command(const CommandEvent& rEvt)
Window::Command(rEvt);
}
-OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const
OTableWindow* pRhs,bool _bSupressCrossOrNaturalJoin) const
+OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const
OTableWindow* pRhs,bool _bSuppressCrossOrNaturalJoin) const
{
OTableConnection* pConn = nullptr;
OSL_ENSURE(pRhs || pLhs, "OJoinTableView::GetTabConn : invalid args !");
@@ -1201,9 +1201,9 @@ OTableConnection* OJoinTableView::GetTabConn(const
OTableWindow* pLhs,const OTab
)
)
{
-if ( _bSupressCrossOrNaturalJoin )
+if ( _bSuppressCrossOrNaturalJoin )
{
-if ( supressCrossNaturalJoin(pData->GetData()) )
+if ( suppressCrossNaturalJoin(pData->GetData()) )
continue;
}
pConn = pData;
@@ -1560,7 +1560,7 @@ void OJoinTableView::onNoColumns_throw()
throw SQLException();
}
-bool OJoinTableView::supressCrossNaturalJoin(const
TTableConnectionData::value_type& ) const
+bool OJoinTableView::suppressCrossNaturalJoin(const
TTableConnectionData::value_type& ) const
{
return false;
}
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx
b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 77ca793e5077..9b252dbf8b1e 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -880,7 +880,7 @@ void OQueryTableView::onNoColumns_throw()
::dbtools::throwSQLException( sError,
::dbtools::StandardSQLState::GENERAL_ERROR, nullptr );
}
-bool OQueryTableView::supressCrossNaturalJoin(const
TTableConnectionData::value_type& _pData) const
+bool OQueryTableView::suppressCrossNaturalJoin(const
TTableConnectionData::value_type& _pData) const
{
OQueryTableConnectionData* pQueryData =
static_cast(_pData.get());
retu
[Libreoffice-commits] core.git: package/source pyuno/source reportdesign/source sax/source
package/source/manifest/ManifestExport.cxx | 31
package/source/xstor/owriteablestream.cxx | 30 ---
package/source/xstor/xstorage.cxx | 12 +---
package/source/xstor/xstorage.hxx |2
package/source/zippackage/ZipPackage.cxx| 16 ++
package/source/zippackage/ZipPackageStream.cxx |7 --
pyuno/source/module/pyuno_runtime.cxx |3 -
reportdesign/source/core/api/ReportDefinition.cxx |8 +--
reportdesign/source/core/api/Section.cxx|4 -
reportdesign/source/core/sdr/ReportDrawPage.cxx | 13 ++---
reportdesign/source/filter/xml/xmlColumn.cxx|4 -
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 20 +++
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx |3 -
reportdesign/source/ui/misc/statusbarcontroller.cxx |2
sax/source/expatwrap/sax_expat.cxx |4 -
15 files changed, 66 insertions(+), 93 deletions(-)
New commits:
commit e150c78cdfbe112bd880107b476ac42e72d4643c
Author: Noel
AuthorDate: Sun Feb 21 12:34:46 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Feb 21 19:00:26 2021 +0100
loplugin:refcounting in package..sax
Change-Id: I83618f54a4117cd81d8626307716129a761e14c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111274
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/package/source/manifest/ManifestExport.cxx
b/package/source/manifest/ManifestExport.cxx
index 2f6f1ea0d913..c3c4be339646 100644
--- a/package/source/manifest/ManifestExport.cxx
+++ b/package/source/manifest/ManifestExport.cxx
@@ -32,6 +32,7 @@
#include
#include
+#include
#include
#include
#include
@@ -119,7 +120,7 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
const OUString sPBKDF2_Name ( PBKDF2_NAME );
const OUString sPGP_Name( PGP_NAME );
-::comphelper::AttributeList * pRootAttrList = new
::comphelper::AttributeList;
+rtl::Reference<::comphelper::AttributeList> pRootAttrList = new
::comphelper::AttributeList;
// find the mediatype of the document if any
OUString aDocMediaType;
@@ -211,8 +212,6 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
}
}
-uno::Reference < xml::sax::XAttributeList > xRootAttrList (pRootAttrList);
-
xHandler->startDocument();
uno::Reference < xml::sax::XExtendedDocumentHandler > xExtHandler (
xHandler, uno::UNO_QUERY );
if ( xExtHandler.is() && bProvideDTD )
@@ -220,7 +219,7 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
xExtHandler->unknown ( MANIFEST_DOCTYPE );
xHandler->ignorableWhitespace ( sWhiteSpace );
}
-xHandler->startElement( sManifestElement, xRootAttrList );
+xHandler->startElement( sManifestElement, pRootAttrList );
const uno::Any *pKeyInfoProperty = nullptr;
if ( pRootFolderPropSeq )
@@ -271,14 +270,13 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
xHandler->startElement(isODF13 ? sEncryptedKeyElement13 :
sEncryptedKeyElement, nullptr);
xHandler->ignorableWhitespace ( sWhiteSpace );
-::comphelper::AttributeList * pNewAttrList = new
::comphelper::AttributeList;
-uno::Reference < xml::sax::XAttributeList > xNewAttrList
(pNewAttrList);
+rtl::Reference<::comphelper::AttributeList> pNewAttrList =
new ::comphelper::AttributeList;
// TODO: the algorithm should rather be configurable
pNewAttrList->AddAttribute(
isODF13 ? sAlgorithmAttribute13 : sAlgorithmAttribute,
sCdataAttribute,
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"; );
-xHandler->startElement(isODF13 ?
sEncryptionMethodElement13 : sEncryptionMethodElement, xNewAttrList);
+xHandler->startElement(isODF13 ?
sEncryptionMethodElement13 : sEncryptionMethodElement, pNewAttrList);
xHandler->endElement(isODF13 ? sEncryptionMethodElement13
: sEncryptionMethodElement);
xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -339,7 +337,7 @@ ManifestExport::ManifestExport( uno::Reference<
xml::sax::XDocumentHandler > con
// now write individual file entries
for (const uno::Sequence& rSequence : rManList)
{
-::comphelper::AttributeList *pAttrList = new
::comphelper::AttributeList;
+rtl::Reference<::comphelper::AttributeList> pAttrList = new
::comphelper::AttributeList;
OUString aString;
const uno::Any *pVector
[Libreoffice-commits] core.git: lotuswordpro/README
lotuswordpro/README | 32 +++- 1 file changed, 31 insertions(+), 1 deletion(-) New commits: commit bb8fb3237c9d1b9516f5803d476c1db09570c2dc Author: David Tardon AuthorDate: Sun Feb 21 18:24:21 2021 +0100 Commit: David Tardon CommitDate: Sun Feb 21 18:26:04 2021 +0100 expand lotuswordpro README a bit Change-Id: Ibe5e5b1bef43049065915f80aae5037a782ed698 diff --git a/lotuswordpro/README b/lotuswordpro/README index 4ec710488b31..a1e3c20e0167 100644 --- a/lotuswordpro/README +++ b/lotuswordpro/README @@ -1 +1,31 @@ -Filter for file format of Lotus Word Pro. +Import filter for file format of Lotus Word Pro. + +== Description == + +The import is not direct, but via an intermediate format: StarOffice +XML, the predecessor of ODF (yes, the code is old). The entry point to +the filter is class LotusWordProImportFilter (refer to Source code +section), but that just hooks up the necessary machinery for processing +StarOffice XML produced by the filter. The real fun starts in function +ReadWordproFile() (source/filter/lwpfilter.cxx); this function +initializes the parser (class Lwp9Reader) and the SAX XML handler that +produces the output (class XFSaxStream). The Lwp9Reader class then does +the actual parsing. + +If the module is built with debug level greater than 0, it is possible +to examine the intermediate XML: set environment variable +DBG_LWPIMPORT_DIR= to an existing directory and, on opening an lwp +document, a file named lwpimport.xml will be created in that directory. + +== Source code == + +=== Module contents === +* inc: module-global headers (can be included by any file in source) +* qa: cppunit tests +* source: the filter itself +* util: UNO passive registration config + +=== Source contents === +* filter: lwp document format parser +* filter/LotusWordProImportFilter.cxx: the entry point to the filter +* filter/xfilter: export to StarOffice XML ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_Platform.xba | 24 -
wizards/source/scriptforge/python/ScriptForgeHelper.py |5 +++
2 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 4b448758a98670efe259965829e5ce0861392caf
Author: Jean-Pierre Ledure
AuthorDate: Sun Feb 21 15:48:01 2021 +0100
Commit: Jean-Pierre Ledure
CommitDate: Sun Feb 21 17:06:18 2021 +0100
ScriptForge - (SF_Platform) new Locale and PythonVersion properties
- 'Locale' returns a la-CO (language-COUNTRY) string
derived from com.sun.star.lang.Locale
- 'PythonVersion' returns Python major.minor.patchlevel
supplied by ScriptForgeHelper.py platform class
Change-Id: I2b8495c03253b17c5e4ba14765b1f359eee67813
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111284
Tested-by: Jean-Pierre Ledure
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/scriptforge/SF_Platform.xba
b/wizards/source/scriptforge/SF_Platform.xba
index 80f3ab97a182..69045404b5ba 100644
--- a/wizards/source/scriptforge/SF_Platform.xba
+++ b/wizards/source/scriptforge/SF_Platform.xba
@@ -70,6 +70,14 @@ Property Get CurrentUser() As String
CurrentUser = _PropertyGet("CurrentUser")
End Property ' ScriptForge.SF_Platform.CurrentUser (get)
+REM
-
+Property Get Locale() As String
+''' Returns the locale combining language-COUNTRY (la-CO)
+''' Example:
+''' MsgBox platform.Locale
+ Locale = _PropertyGet("Locale")
+End Property ' ScriptForge.SF_Platform.Locale (get)
+
REM
-
Property Get Machine() As String
''' Returns the machine type like 'i386' or
'x86_64'
@@ -138,6 +146,14 @@ Property Get Processor() As String
Processor = _PropertyGet("Processor")
End Property ' ScriptForge.SF_Platform.Processor (get)
+REM
-
+Property Get PythonVersion() As String
+''' Returns the Python version as string 'Python
major.minor.patchlevel'
+''' Example:
+''' MsgBox platform.PythonVersion ' Python
3.7.7
+ PythonVersion = _PropertyGet("PythonVersion")
+End Property ' ScriptForge.SF_Platform.PythonVersion (get)
+
REM =
METHODS
REM
-
@@ -190,6 +206,7 @@ Public Function Properties() As Variant
, "ComputerName" _
, "CPUCount" _
, "CurrentUser" _
+ , "Locale" _
, "Machine" _
, "OfficeVersion" _
, "OSName" _
@@ -197,6 +214,7 @@ Public Function Properties() As Variant
, "OSRelease" _
, "OSVersion" _
, "Processor" _
+ , "PythonVersion" _
)
End Function ' ScriptForge.SF_Platform.Properties
@@ -238,6 +256,7 @@ Private Function _PropertyGet(Optional ByVal psProperty As
String) As Variant
''' psProperty: the name of the property
Dim sOSName As String ' Operating system
+Dim oLocale As Object ' com.sun.star.lang.Locale
Const cstPyHelper = "$" & "_SF_Platform"
Dim cstThisSub As String
@@ -248,10 +267,13 @@ Const cstSubArgs = ""
Select Case psProperty
Case "Architecture", "ComputerName",
"CPUCount", "CurrentUser", "Machine" _
- , "OSPlatform",
"OSRelease", "OSVersion", "Processor"
+ , "OSPlatform",
"OSRelease", "OSVersion", "Processor",
"PythonVersion"
With ScriptForge.SF_Session
_PropertyGet =
.ExecutePythonScript(.SCRIPTISSHARED, _SF_.PythonHelper & cstPyHelper,
psProperty)
End With
+ Case "Locale"
+ Set oLocale =
SF_Utils._GetUNOService("Locale")
+ _PropertyGet = oLocale.Language & "-"
& oLocale.Country
Case "OfficeVersion"
_PropertyGet = _GetProductName()
Case "OSName"
diff --git a/wizards/source/scriptforge/python/ScriptForgeHelper.py
b/wizards/source/scriptforge/python/ScriptForgeHelper.py
index ca520434a2a9..aec9311a3f3f 100644
--- a/wizards/source/scriptforge/python/ScriptForgeHelper.py
+++ b/wizards/source/scriptforge/python/ScriptForgeHelper.py
@@ -171,6 +171,8 @@ def _SF_Platform(property
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 131
1 file changed, 131 insertions(+)
New commits:
commit 301b09f0c4fef6fca52fa0b28827a6576b39
Author: David Tardon
AuthorDate: Sat Feb 13 15:51:20 2021 +0100
Commit: David Tardon
CommitDate: Sun Feb 21 16:23:39 2021 +0100
lotuswordpro: allow to dump intermediate XML into file
If env. variable DBG_LWPIMPORT_DIR= is set to an existing directory, a
formatted representation of the intermediate XML format is dumped into a
file named lwpimport.xml in that directory. This makes debugging of
Lotus Word Pro import a lot easier.
Change-Id: I872c388c2b378d55f476973890a073ec932e1b4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111283
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 73335e0bab88..296561bcc375 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -30,6 +30,19 @@
#include "LotusWordProImportFilter.hxx"
#include "lwpfilter.hxx"
+#if OSL_DEBUG_LEVEL > 0
+#include
+
+#include
+#include
+
+#include
+
+#include
+
+#include
+#endif
+
using namespace com::sun::star;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Any;
@@ -41,6 +54,100 @@ using com::sun::star::ucb::XCommandEnvironment;
using com::sun::star::document::XImporter;
using com::sun::star::xml::sax::XDocumentHandler;
+#if OSL_DEBUG_LEVEL > 0
+namespace
+{
+
+class DebugDocumentHandler final : public cppu::WeakImplHelper<
XDocumentHandler >
+{
+public:
+DebugDocumentHandler(const uno::Reference< XDocumentHandler >& handler,
const uno::Reference< XDocumentHandler >& debug)
+: m_handler(handler)
+, m_debug(debug)
+{
+}
+
+// XDocumentHandler
+
+virtual void SAL_CALL
+startDocument() override
+{
+m_handler->startDocument();
+m_debug->startDocument();
+}
+
+virtual void SAL_CALL
+endDocument() override
+{
+m_handler->endDocument();
+m_debug->endDocument();
+}
+
+virtual void SAL_CALL
+startElement(
+const OUString& aName,
+const uno::Reference< xml::sax::XAttributeList > & xAttribs)
override
+{
+m_handler->startElement(aName, xAttribs);
+m_debug->ignorableWhitespace(" "); // NOTE: needed for pretty-printing
+m_debug->startElement(aName, xAttribs);
+}
+
+virtual void SAL_CALL
+endElement(const OUString& aName) override
+{
+m_handler->endElement(aName);
+m_debug->ignorableWhitespace(" "); // NOTE: needed for pretty-printing
+m_debug->endElement(aName);
+}
+
+virtual void SAL_CALL
+characters(const OUString& aChars) override
+{
+m_handler->characters(aChars);
+m_debug->characters(aChars);
+}
+
+virtual void SAL_CALL
+ignorableWhitespace(const OUString& aWhitespaces) override
+{
+m_handler->ignorableWhitespace(aWhitespaces);
+m_debug->ignorableWhitespace(aWhitespaces);
+}
+
+virtual void SAL_CALL
+processingInstruction(const OUString& aTarget, const OUString& aData)
override
+{
+m_handler->processingInstruction(aTarget, aData);
+m_debug->processingInstruction(aTarget, aData);
+}
+
+virtual void SAL_CALL
+setDocumentLocator(const uno::Reference< xml::sax::XLocator >& xLocator)
override
+{
+m_handler->setDocumentLocator(xLocator);
+m_debug->setDocumentLocator(xLocator);
+}
+
+// XInterface
+
+virtual uno::Any SAL_CALL queryInterface(const uno::Type & rType) override
+{
+uno::Any aIface = cppu::WeakImplHelper< XDocumentHandler
>::queryInterface(rType);
+// delegate all queries we cannot satisfy ourselves to the real handler
+if (!aIface.has< uno::Reference< uno::XInterface > >())
+aIface = m_handler->queryInterface(rType);
+return aIface;
+}
+
+private:
+uno::Reference< XDocumentHandler > m_handler;
+uno::Reference< XDocumentHandler > m_debug;
+};
+
+}
+#endif
+
// W o r d P r o
const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
@@ -61,6 +168,30 @@ bool LotusWordProImportFilter::importImpl( const Sequence<
css::beans::PropertyV
// An XML import service: what we push sax messages to...
uno::Reference< XDocumentHandler > xInternalHandler(
mxContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.Writer.XMLImporter", mxContext ), UNO_QUERY );
+
+#if OSL_DEBUG_LEVEL > 0
+std::unique_ptr pDebugFile;
+const char* pDir = getenv("DBG_LWPIMPORT_DIR");
+if (pDir)
+{
+OUString aStr(OStringToOUString(pDir, RTL_TEXTENCODING_UTF8));
+OUString aFi
[Libreoffice-commits] core.git: include/unotools sc/inc sc/source
include/unotools/weakref.hxx | 132 +++
sc/inc/cellsuno.hxx |4
sc/source/core/data/dpobject.cxx |3
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 15 -
sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx |4
sc/source/filter/xml/xmlexprt.cxx|8
sc/source/ui/Accessibility/AccessibleCell.cxx|8
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 14 -
sc/source/ui/Accessibility/AccessibleDocument.cxx| 15 -
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |2
sc/source/ui/Accessibility/AccessibleEditObject.cxx |7
sc/source/ui/Accessibility/AccessiblePageHeader.cxx |2
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx |2
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx |2
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx |2
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx|2
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 10
sc/source/ui/app/drwtrans.cxx|2
sc/source/ui/app/inputwin.cxx|1
sc/source/ui/app/seltrans.cxx|4
sc/source/ui/drawfunc/fuins2.cxx |5
sc/source/ui/inc/AccessibleCsvControl.hxx|2
sc/source/ui/inc/AccessibleDocument.hxx |4
sc/source/ui/inc/inputwin.hxx|2
sc/source/ui/inc/seltrans.hxx|2
sc/source/ui/inc/tphfedit.hxx|4
sc/source/ui/inc/viewfunc.hxx|2
sc/source/ui/pagedlg/tphfedit.cxx| 39 +--
sc/source/ui/unoobj/cellsuno.cxx | 17 -
sc/source/ui/unoobj/chart2uno.cxx|2
sc/source/ui/unoobj/docuno.cxx |9
sc/source/ui/unoobj/fmtuno.cxx |2
sc/source/ui/unoobj/shapeuno.cxx |7
sc/source/ui/unoobj/textuno.cxx | 30 +-
sc/source/ui/unoobj/viewuno.cxx | 10
sc/source/ui/vba/vbaworkbooks.cxx|4
sc/source/ui/view/drawvie4.cxx |5
sc/source/ui/view/gridwin5.cxx |2
sc/source/ui/view/hintwin.cxx| 11
sc/source/ui/view/preview.cxx|2
sc/source/ui/view/viewfun3.cxx |5
41 files changed, 247 insertions(+), 158 deletions(-)
New commits:
commit 78040af9acea0ab681aa54ff23844b647bc9b4f3
Author: Noel
AuthorDate: Sun Feb 21 12:33:10 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Feb 21 16:13:31 2021 +0100
loplugin:refcounting in sc
Change-Id: Id0ba24985aab36b931fa74b266dc5bf0bef62bb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111273
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/unotools/weakref.hxx b/include/unotools/weakref.hxx
new file mode 100644
index ..7fdf5acba698
--- /dev/null
+++ b/include/unotools/weakref.hxx
@@ -0,0 +1,132 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+/*
+ * This file is part of LibreOffice published API.
+ */
+#pragma once
+
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+
+namespace cppu
+{
+class OWeakObject;
+}
+
+namespace unotools
+{
+/** The WeakReference<> holds a weak reference to an object.
+
+That object must implement the css::uno::XWeak interface.
+
+The WeakReference itself is *not* thread safe, just as
+Reference itself isn't, but the implementation of the listeners etc.
+behind it *is* thread-safe, so multiple threads can ha
[Libreoffice-commits] core.git: sdext/source sd/source
sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |2
sd/source/ui/accessibility/AccessibleSlideSorterView.cxx|2
sd/source/ui/framework/configuration/Configuration.cxx |4 -
sd/source/ui/slidesorter/controller/SlsClipboard.cxx|8 +--
sd/source/ui/slidesorter/controller/SlsTransferableData.cxx |4 -
sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx |2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx |6 --
sd/source/ui/unoidl/unopage.cxx | 16 +++---
sd/source/ui/unoidl/unosrch.cxx |2
sd/source/ui/view/drviews5.cxx |6 --
sd/source/ui/view/outlnvsh.cxx |6 --
sd/source/ui/view/sdview2.cxx | 23
--
sdext/source/pdfimport/pdfiadaptor.cxx | 13 +++--
13 files changed, 41 insertions(+), 53 deletions(-)
New commits:
commit 8f231fc5df201c45d16bce0b4b17f727842b2121
Author: Noel
AuthorDate: Sun Feb 21 12:32:12 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Feb 21 16:13:06 2021 +0100
loplugin:refcounting in sd
Change-Id: Ic95aa7a3c1fdab1baef744ec85ffc9c98dee5f1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111272
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index a8c81225130b..fde0cd953677 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -188,7 +188,7 @@ Reference SAL_CALL
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
-::utl::AccessibleStateSetHelper* pStateSet = new
::utl::AccessibleStateSetHelper();
+rtl::Reference<::utl::AccessibleStateSetHelper> pStateSet = new
::utl::AccessibleStateSetHelper();
if (mxParent.is())
{
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index ee663f2fbb1a..3ce13b899ef9 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -285,7 +285,7 @@ Reference SAL_CALL
{
ThrowIfDisposed();
const SolarMutexGuard aSolarGuard;
-::utl::AccessibleStateSetHelper* pStateSet = new
::utl::AccessibleStateSetHelper();
+rtl::Reference<::utl::AccessibleStateSetHelper> pStateSet = new
::utl::AccessibleStateSetHelper();
pStateSet->AddState(AccessibleStateType::FOCUSABLE);
pStateSet->AddState(AccessibleStateType::SELECTABLE);
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx
b/sd/source/ui/framework/configuration/Configuration.cxx
index 53bbaa339316..f155e0992e68 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -182,12 +182,10 @@ Reference SAL_CALL
Configuration::createClone()
::osl::MutexGuard aGuard (maMutex);
ThrowIfDisposed();
-Configuration* pConfiguration = new Configuration(
+return new Configuration(
mxBroadcaster,
mbBroadcastRequestEvents,
*mpResourceContainer);
-
-return Reference(pConfiguration);
}
//- XNamed
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 25e2aaea7b56..c7f333a5f0b9 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -429,17 +429,17 @@ void Clipboard::CreateSlideTransferable (
return;
mrSlideSorter.GetView().BrkAction();
-SdTransferable* pTransferable = TransferableData::CreateTransferable (
+rtl::Reference pTransferable =
TransferableData::CreateTransferable (
pDocument,
dynamic_cast(mrSlideSorter.GetViewShell()),
aRepresentatives);
if (bDrag)
-SD_MOD()->pTransferDrag = pTransferable;
+SD_MOD()->pTransferDrag = pTransferable.get();
else
-SD_MOD()->pTransferClip = pTransferable;
+SD_MOD()->pTransferClip = pTransferable.get();
-pDocument->CreatingDataObj (pTransferable);
+pDocument->CreatingDataObj (pTransferable.get());
pTransferable->SetWorkDocument(pDocument->AllocSdDrawDocument());
std::unique_ptr pObjDesc(new
TransferableObjectDescriptor);
pTransferable->GetWorkDocument()->GetDocSh()
diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
index b340642553cc..2aac76fe0600 100644
--- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
+++ b/sd/source/ui/slidesorter/controller
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/ppt/timenodelistcontext.hxx |2 +-
oox/source/drawingml/shape.cxx |2 +-
oox/source/ppt/timenodelistcontext.cxx |6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 98173f6222cec22170b53c7d9c94c6ce5b08b4d9
Author: Noel
AuthorDate: Sun Feb 21 13:30:45 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Feb 21 16:12:44 2021 +0100
loplugin:refcounting in oox..i18npool
Change-Id: Iff904a7ac887fa9b77bea87dbb1012281848a540
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111278
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/oox/ppt/timenodelistcontext.hxx
b/include/oox/ppt/timenodelistcontext.hxx
index 8bc76b3c185d..cd98d06b15fd 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -40,7 +40,7 @@ namespace oox::ppt {
public:
virtual ~TimeNodeContext() throw() override;
-static TimeNodeContext * makeContext( ::oox::core::FragmentHandler2
const & rParent, sal_Int32 aElement, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
+static rtl::Reference makeContext(
::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const
css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const
TimeNodePtr & pNode );
protected:
TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent,
sal_Int32 aElement, const TimeNodePtr & pNode ) throw();
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 22cacec6eaa6..469dc7c30c17 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1840,7 +1840,7 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const
Reference< XShapes >&
// load the chart data from the XML fragment
bool bMSO2007Doc = rFilter.isMSO2007Document();
chart::ChartSpaceModel aModel(bMSO2007Doc);
-chart::ChartSpaceFragment *pChartSpaceFragment = new
chart::ChartSpaceFragment(
+rtl::Reference pChartSpaceFragment
= new chart::ChartSpaceFragment(
rFilter, mxChartShapeInfo->maFragmentPath, aModel );
const OUString aThemeOverrideFragmentPath(
pChartSpaceFragment->
getFragmentPathFromFirstTypeFromOfficeDoc(u"themeOverride") );
diff --git a/oox/source/ppt/timenodelistcontext.cxx
b/oox/source/ppt/timenodelistcontext.cxx
index 6ecd0985cd0a..93525ae4879a 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -909,12 +909,12 @@ namespace oox::ppt {
}
-TimeNodeContext * TimeNodeContext::makeContext(
+rtl::Reference TimeNodeContext::makeContext(
FragmentHandler2 const & rParent, sal_Int32 aElement,
const Reference< XFastAttributeList >& xAttribs,
const TimeNodePtr & pNode )
{
-TimeNodeContext *pCtx = nullptr;
+rtl::Reference pCtx;
switch( aElement )
{
case PPT_TOKEN( animClr ):
@@ -1039,7 +1039,7 @@ namespace oox::ppt {
TimeNodePtr pNode = std::make_shared(nNodeType);
maList.push_back( pNode );
-FragmentHandler2 * pContext = TimeNodeContext::makeContext( *this,
aElementToken, rAttribs.getFastAttributeList(), pNode );
+rtl::Reference pContext =
TimeNodeContext::makeContext( *this, aElementToken,
rAttribs.getFastAttributeList(), pNode );
return pContext ? pContext : this;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/uielement/toolbarmerger.hxx |2 framework/source/accelerators/acceleratorconfiguration.cxx |8 -- framework/source/accelerators/documentacceleratorconfiguration.cxx |4 - framework/source/accelerators/moduleacceleratorconfiguration.cxx |4 - framework/source/dispatch/dispatchinformationprovider.cxx |6 - framework/source/dispatch/dispatchprovider.cxx | 30 +--- framework/source/fwe/xml/menudocumenthandler.cxx | 13 +-- framework/source/fwe/xml/saxnamespacefilter.cxx|3 framework/source/fwe/xml/statusbardocumenthandler.cxx |8 -- framework/source/fwe/xml/toolboxdocumenthandler.cxx|8 -- framework/source/fwi/uielement/constitemcontainer.cxx |5 - framework/source/fwi/uielement/itemcontainer.cxx |5 - framework/source/fwi/uielement/rootitemcontainer.cxx |5 - framework/source/helper/ocomponentaccess.cxx |3 framework/source/helper/statusindicatorfactory.cxx |8 -- framework/source/layoutmanager/layoutmanager.cxx |4 - framework/source/loadenv/loadenv.cxx | 16 +--- framework/source/services/desktop.cxx | 17 +--- framework/source/services/frame.cxx| 27 ++- framework/source/services/modulemanager.cxx|5 - framework/source/services/taskcreatorsrv.cxx | 15 +--- framework/source/uiconfiguration/globalsettings.cxx|5 - framework/source/uiconfiguration/imagemanagerimpl.cxx | 35 -- framework/source/uiconfiguration/windowstateconfiguration.cxx |4 - framework/source/uielement/addonstoolbarwrapper.cxx|4 - framework/source/uielement/menubarmanager.cxx |8 +- framework/source/uielement/menubarwrapper.cxx |8 -- framework/source/uielement/progressbarwrapper.cxx |4 - framework/source/uielement/statusbarmanager.cxx| 10 +- framework/source/uielement/statusbarwrapper.cxx|6 - framework/source/uielement/toolbarmanager.cxx |2 framework/source/uielement/toolbarmerger.cxx |4 - framework/source/uielement/toolbarwrapper.cxx |4 - framework/source/uielement/uicommanddescription.cxx|8 -- framework/source/uifactory/addonstoolbarfactory.cxx|7 -- framework/source/xml/acceleratorconfigurationwriter.cxx| 11 +-- framework/source/xml/imagesdocumenthandler.cxx | 13 +-- 37 files changed, 128 insertions(+), 201 deletions(-) New commits: commit 897970cd0b9709258b6b5b5fc05dba2e74a72b7c Author: Noel AuthorDate: Sun Feb 21 13:32:15 2021 +0200 Commit: Noel Grandin CommitDate: Sun Feb 21 16:11:48 2021 +0100 loplugin:refcounting in framework Change-Id: I2d7d14fe0335689e4a338c70587bf33137ed1ddd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111279 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index b62e3be6972c..bd07bb17e7e4 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -115,7 +115,7 @@ class ToolBarMerger ToolBox::ImplToolItems::size_type nPos, const OUString& rMergeCommandParameter ); -static ::cppu::OWeakObject* CreateController( +static rtl::Reference<::cppu::OWeakObject> CreateController( const css::uno::Reference< css::uno::XComponentContext > & rxContext, const css::uno::Reference< css::frame::XFrame > & xFrame, ToolBox*pToolbar, diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 96c0056d35c0..821b1137259c 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -384,14 +384,12 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c // Note: Use special filter object between parser and reader // to get filtered xml with right namespaces ... // Use further a temp cache for reading! -AcceleratorConfigurationReader*pReader = new AcceleratorConfigurationReader(m_aReadCache); -css::uno::Reference< css::xml::sax::XDocumentHandler > xReader (static_cast< ::cppu::OWeakObject* >(pReader), css::uno::UNO_QUERY_THROW); -SaxNamespaceFilter*
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/basecontainer.cxx |6 +--
filter/source/config/cache/filterfactory.cxx |3 -
filter/source/msfilter/eschesdo.cxx |2 -
filter/source/svg/svgexport.cxx | 10 -
filter/source/svg/svgfilter.cxx |1
filter/source/svg/svgfilter.hxx |2 -
filter/source/t602/t602filter.cxx|2 -
filter/source/t602/t602filter.hxx|3 +
filter/source/xsltdialog/typedetectionexport.cxx | 39 ++-
filter/source/xsltdialog/typedetectionimport.cxx |6 +--
filter/source/xsltfilter/XSLTFilter.cxx | 19 +--
11 files changed, 38 insertions(+), 55 deletions(-)
New commits:
commit 6b6f9fb71fa1bfcb438b89596e6f19529cfe1eba
Author: Noel
AuthorDate: Sun Feb 21 13:33:30 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Feb 21 16:11:14 2021 +0100
loplugin:refcounting in filter
Change-Id: I77323376b7a2b04e50bf3017c00a0eea566da37d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111281
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/config/cache/basecontainer.cxx
b/filter/source/config/cache/basecontainer.cxx
index 4f7b4f04ca49..71eb4f931399 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -353,8 +353,7 @@ css::uno::Reference< css::container::XEnumeration >
SAL_CALL BaseContainer::crea
{
OSL_FAIL("not pure virtual ... but not really implemented .-)");
-::comphelper::OEnumerationByName* pEnum = new
::comphelper::OEnumerationByName(this, css::uno::Sequence< OUString >());
-return css::uno::Reference< css::container::XEnumeration >(static_cast<
css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY);
+return new ::comphelper::OEnumerationByName(this, css::uno::Sequence<
OUString >());
}
@@ -398,8 +397,7 @@ css::uno::Reference< css::container::XEnumeration >
SAL_CALL BaseContainer::crea
instead of checking of NULL returns! */
css::uno::Sequence< OUString > lSubSet =
comphelper::containerToSequence(lKeys);
-::comphelper::OEnumerationByName* pEnum = new
::comphelper::OEnumerationByName(this, lSubSet);
-return css::uno::Reference< css::container::XEnumeration >(static_cast<
css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY);
+return new ::comphelper::OEnumerationByName(this, lSubSet);
}
diff --git a/filter/source/config/cache/filterfactory.cxx
b/filter/source/config/cache/filterfactory.cxx
index fa26ee7ba580..e499b4bad633 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -182,8 +182,7 @@ css::uno::Reference< css::container::XEnumeration >
SAL_CALL FilterFactory::crea
// Attention: Do not return empty reference for empty list!
// The outside check "hasMoreElements()" should be enough, to detect this
state :-)
css::uno::Sequence< OUString > lSet =
comphelper::containerToSequence(lEnumSet);
-::comphelper::OEnumerationByName* pEnum = new
::comphelper::OEnumerationByName(this, lSet);
-return css::uno::Reference< css::container::XEnumeration >(static_cast<
css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY);
+return new ::comphelper::OEnumerationByName(this, lSet);
}
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index d2c85672ca05..7df0a58f7aa4 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -861,7 +861,7 @@ ImplEESdrWriter::~ImplEESdrWriter()
bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
{
-SvxDrawPage* pSvxDrawPage;
+rtl::Reference pSvxDrawPage;
if ( mpSdrPage != &rPage || !mXDrawPage.is() )
{
// eventually write SolverContainer of current page, deletes the Solver
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index a33fb46f1980..e35a42746216 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -575,10 +575,6 @@ bool SVGFilter::implExportImpressOrDraw( const Reference<
XOutputStream >& rxOSt
// mpSVGExport = new SVGExport( xDocHandler );
mpSVGExport = new SVGExport( xContext, xDocHandler,
maFilterData );
-// xKeepAlive is set up only to manage the life-time of the
object pointed by mpSVGExport,
-// and in order to prevent that it is destroyed when passed to
AnimationExporter.
-Reference< XInterface > xKeepAlive = static_cast<
css::document::XFilter* >( mpSVGExport );
-
// create an id for each draw page
for( const auto& rPage : mSelectedPages )
implRegisterInterface( rPage );
@@ -664,10 +660,6 @@ bool SVGFilter::implExportWriterOrCalc( const Reference<
XOutputStream >& rxOStm
// mpSVGExpor
[Libreoffice-commits] core.git: forms/source
forms/source/component/DatabaseForm.cxx |4 +---
forms/source/component/FormComponent.cxx |4
forms/source/component/FormattedField.cxx |9 -
forms/source/component/FormattedField.hxx |1 +
forms/source/component/FormattedFieldWrapper.cxx | 19 +++
forms/source/component/FormsCollection.cxx|7 +++
forms/source/component/Grid.cxx |6 ++
forms/source/component/clickableimage.cxx |2 +-
forms/source/component/navigationbar.hxx |1 -
forms/source/inc/FormComponent.hxx|4 ++--
forms/source/richtext/richtextcontrol.cxx |6 +++---
forms/source/richtext/richtextmodel.cxx |2 +-
forms/source/richtext/richtextmodel.hxx |2 --
forms/source/xforms/binding.cxx |5 ++---
forms/source/xforms/model_ui.cxx |6 +++---
forms/source/xforms/submission.cxx| 15 ++-
forms/source/xforms/submission/replace.cxx|5 +++--
forms/source/xforms/submission/submission_get.cxx |4 ++--
18 files changed, 41 insertions(+), 61 deletions(-)
New commits:
commit 7ffb71e759e5d29a505188d1cbf506dd57383a4a
Author: Noel
AuthorDate: Sun Feb 21 13:33:00 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Feb 21 16:10:51 2021 +0100
loplugin:refcounting in forms
Change-Id: I19d67e54f77e354eaddaaa7de1f3e22c2b7cdbf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111280
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 066eeb45e293..7411abf90351 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1373,10 +1373,8 @@ void SAL_CALL ODatabaseForm::clearWarnings( )
Reference< XCloneable > SAL_CALL ODatabaseForm::createClone( )
{
-ODatabaseForm* pClone = new ODatabaseForm( *this );
-osl_atomic_increment( &pClone->m_refCount );
+rtl::Reference pClone = new ODatabaseForm( *this );
pClone->clonedFrom( *this );
-osl_atomic_decrement( &pClone->m_refCount );
return pClone;
}
diff --git a/forms/source/component/FormComponent.cxx
b/forms/source/component/FormComponent.cxx
index 8b3047cc176b..e2a6a582ed31 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1137,7 +1137,6 @@ OBoundControlModel::OBoundControlModel(
,m_aUpdateListeners(m_aMutex)
,m_aFormComponentListeners( m_aMutex )
,m_bInputRequired( false )
-,m_pAggPropMultiplexer( nullptr )
,m_bFormListening( false )
,m_bLoaded(false)
,m_bRequired(false)
@@ -1170,7 +1169,6 @@ OBoundControlModel::OBoundControlModel(
,m_aFormComponentListeners( m_aMutex )
,m_xValidator( _pOriginal->m_xValidator )
,m_bInputRequired( false )
-,m_pAggPropMultiplexer( nullptr )
,m_bFormListening( false )
,m_bLoaded( false )
,m_bRequired( false )
@@ -1214,7 +1212,6 @@ OBoundControlModel::~OBoundControlModel()
if ( m_pAggPropMultiplexer )
{
m_pAggPropMultiplexer->dispose();
-m_pAggPropMultiplexer->release();
m_pAggPropMultiplexer = nullptr;
}
}
@@ -1244,7 +1241,6 @@ void OBoundControlModel::implInitAggMultiplexer( )
if ( m_xAggregateSet.is() )
{
m_pAggPropMultiplexer = new OPropertyChangeMultiplexer( this,
m_xAggregateSet, false );
-m_pAggPropMultiplexer->acquire();
}
osl_atomic_decrement( &m_refCount );
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index ed2f748fb7cd..74e6aaf08e01 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -72,7 +72,7 @@ namespace frm
{
namespace {
-class StandardFormatsSupplier : protected SvNumberFormatsSupplierObj, public
::utl::ITerminationListener
+class StandardFormatsSupplier : public SvNumberFormatsSupplierObj, public
::utl::ITerminationListener
{
protected:
std::unique_ptr m_pMyPrivateFormatter;
@@ -113,8 +113,7 @@ Reference< XNumberFormatsSupplier >
StandardFormatsSupplier::get( const Referenc
// get the Office's locale
eSysLanguage = SvtSysLocale().GetLanguageTag().getLanguageType( false);
}
-StandardFormatsSupplier* pSupplier = new StandardFormatsSupplier( _rxORB,
eSysLanguage );
-Reference< XNumberFormatsSupplier > xNewlyCreatedSupplier( pSupplier );
+rtl::Reference pSupplier = new
StandardFormatsSupplier( _rxORB, eSysLanguage );
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
Reference< XNumberFormatsSupplier > xSupplier =
s_xDefaultFormatsSupplier;
@@ -122,9 +121,9 @@ Reference< XNumberFormatsSupplier >
StandardFormatsSupplier::get( const Referenc
// somebody used the s
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/transobj.cxx|9 +
sc/source/ui/docshell/docsh2.cxx |7 +--
sc/source/ui/docshell/docsh3.cxx |8
3 files changed, 14 insertions(+), 10 deletions(-)
New commits:
commit 6dccc6b54e4bb13f765d494bcdcdd782fa11fe38
Author: Mike Kaganski
AuthorDate: Sun Feb 21 12:03:49 2021 +0300
Commit: Mike Kaganski
CommitDate: Sun Feb 21 15:01:50 2021 +0100
Some more unit conversion unification
Change-Id: Id000613426eb5a0159f44419446cad1f3d7f1845
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111282
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index b83a085d5c08..ad6e01df42e1 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
#include
@@ -769,8 +770,8 @@ void ScTransferObj::InitDocShell(bool bLimitToPageSize)
for (nCol=0; nCol( nPosX * HMM_PER_TWIPS );
-nPosY = static_cast( nPosY * HMM_PER_TWIPS );
+nPosX = o3tl::convert(nPosX, o3tl::Length::twip, o3tl::Length::mm100);
+nPosY = o3tl::convert(nPosY, o3tl::Length::twip, o3tl::Length::mm100);
aPaperSize.setWidth( aPaperSize.Width() * 2 ); // limit OLE object
to double of page size
aPaperSize.setHeight( aPaperSize.Height() * 2 );
@@ -791,8 +792,8 @@ void ScTransferObj::InitDocShell(bool bLimitToPageSize)
break;
nSizeY += nAdd;
}
-nSizeX = static_cast( nSizeX * HMM_PER_TWIPS );
-nSizeY = static_cast( nSizeY * HMM_PER_TWIPS );
+nSizeX = o3tl::convert(nSizeX, o3tl::Length::twip, o3tl::Length::mm100);
+nSizeY = o3tl::convert(nSizeY, o3tl::Length::twip, o3tl::Length::mm100);
// pDocSh->SetVisAreaSize( Size(nSizeX,nSizeY) );
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 0c8da05362b0..e02b815d2181 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
@@ -46,8 +47,10 @@ bool ScDocShell::InitNew( const uno::Reference <
embed::XStorage >& xStor )
// Additional tables are created by the first View, if bIsEmpty is still
sal_True
if( bRet )
{
-Size aSize( tools::Long( STD_COL_WIDTH * HMM_PER_TWIPS *
OLE_STD_CELLS_X ),
-static_cast( ScGlobal::nStdRowHeight *
HMM_PER_TWIPS * OLE_STD_CELLS_Y ) );
+Size aSize(
+o3tl::convert(STD_COL_WIDTH * OLE_STD_CELLS_X, o3tl::Length::twip,
o3tl::Length::mm100),
+o3tl::convert(ScGlobal::nStdRowHeight * OLE_STD_CELLS_Y,
o3tl::Length::twip,
+ o3tl::Length::mm100));
// Also adjust start here
SetVisAreaOrSize( tools::Rectangle( Point(), aSize ) );
}
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index a31d73e5802c..37e1bc773859 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -367,7 +368,6 @@ void ScDocShell::CalcOutputFactor()
OUString aTestString(
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890123456789");
tools::Long nPrinterWidth = 0;
-tools::Long nWindowWidth = 0;
const ScPatternAttr* pPattern =
&m_aDocument.GetPool()->GetDefaultItem(ATTR_PATTERN);
vcl::Font aDefFont;
@@ -386,11 +386,11 @@ void ScDocShell::CalcOutputFactor()
pVirtWindow->SetMapMode(MapMode(MapUnit::MapPixel));
pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, pVirtWindow);// font
color doesn't matter here
pVirtWindow->SetFont(aDefFont);
-nWindowWidth = pVirtWindow->GetTextWidth(aTestString);
-nWindowWidth = static_cast( nWindowWidth /
ScGlobal::nScreenPPTX * HMM_PER_TWIPS );
+double nWindowWidth = pVirtWindow->GetTextWidth(aTestString) /
ScGlobal::nScreenPPTX;
+nWindowWidth = o3tl::convert(nWindowWidth, o3tl::Length::twip,
o3tl::Length::mm100);
if (nPrinterWidth && nWindowWidth)
-m_nPrtToScreenFactor = nPrinterWidth /
static_cast(nWindowWidth);
+m_nPrtToScreenFactor = nPrinterWidth / nWindowWidth;
else
{
OSL_FAIL("GetTextSize returns 0 ??");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
1 new defect(s) introduced to LibreOffice found with Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)
** CID 1473244: Error handling issues (CHECKED_RETURN)
/extensions/source/bibliography/general.cxx: 347 in
BibGeneralPage::LastElementKeyInputHdl(const KeyEvent &)()
*** CID 1473244: Error handling issues (CHECKED_RETURN)
/extensions/source/bibliography/general.cxx: 347 in
BibGeneralPage::LastElementKeyInputHdl(const KeyEvent &)()
341 {
342 uno::Reference
xUpdateCursor(xRowSet, UNO_QUERY);
343 if (xUpdateCursor.is())
344 xUpdateCursor->moveToInsertRow();
345 }
346 else
>>> CID 1473244: Error handling issues (CHECKED_RETURN)
>>> Calling "next" without checking return value (as is done elsewhere 182
>>> out of 188 times).
347 xRowSet->next();
348 }
349 xIdentifierED->grab_focus();
350 xIdentifierED->select_region(0, -1);
351 GainFocusHdl(*xIdentifierED);
352 return true;
To view the defects in Coverity Scan visit,
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3DUP7T_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJi7IwFZ9-2FtTEHkQyuINYc-2FK4zOK-2FFWFtZ3o4NfdIX92Sp1q9FbCPaZjCxTXRsVwk97ka-2B3nUwd-2FNSKqS1HIPGuxPj4caymQz0IM-2FK1PSYl00iTbP7P14TaZOmpM-2Fp4GfxhowNsoRyuWZ1FFYxFte4eCxNFEp9lqyAB44dKTrSunhXmxMsx83Ua-2FopBRRW2Ket-2F
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - comphelper/source
comphelper/source/misc/lok.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d7f70cf801703e675d5283a14a2195338e8678be
Author: Andras Timar
AuthorDate: Sun Feb 21 00:02:08 2021 +0100
Commit: Andras Timar
CommitDate: Sun Feb 21 11:29:49 2021 +0100
fix variable name in SAL_INFO
Change-Id: Ie6da9b1677e60b4e9dfe507e1571cc68610a6cf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111271
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 3527597f6961..c85672b491ea 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -75,7 +75,7 @@ public:
{
if (maLocaleLanguageTag != rLocaleLanguageTag)
{
-SAL_INFO("comphelper.lok", "Setting locale from " <<
maLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
+SAL_INFO("comphelper.lok", "Setting locale from " <<
maLocaleLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
maLocaleLanguageTag = rLocaleLanguageTag;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/misc/lok.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 308a72192036f84340578b7670afbbf4f8377345
Author: Andras Timar
AuthorDate: Sun Feb 21 00:02:08 2021 +0100
Commit: Andras Timar
CommitDate: Sun Feb 21 11:23:07 2021 +0100
fix variable name in SAL_INFO
Change-Id: Ie6da9b1677e60b4e9dfe507e1571cc68610a6cf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 82e5c7aed4f9..c2a44872755f 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -73,7 +73,7 @@ public:
{
if (maLocaleLanguageTag != rLocaleLanguageTag)
{
-SAL_INFO("comphelper.lok", "Setting locale from " <<
maLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
+SAL_INFO("comphelper.lok", "Setting locale from " <<
maLocaleLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
maLocaleLanguageTag = rLocaleLanguageTag;
}
}
___
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/source
comphelper/source/misc/lok.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3f62b71938530fd7e89800fb8fc14634b4fabb56
Author: Andras Timar
AuthorDate: Sun Feb 21 00:02:08 2021 +0100
Commit: Andras Timar
CommitDate: Sun Feb 21 11:21:34 2021 +0100
fix variable name in SAL_INFO
Change-Id: Ie6da9b1677e60b4e9dfe507e1571cc68610a6cf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 0f665f1be202..77c8c13a7e82 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -77,7 +77,7 @@ public:
{
if (maLocaleLanguageTag != rLocaleLanguageTag)
{
-SAL_INFO("comphelper.lok", "Setting locale from " <<
maLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
+SAL_INFO("comphelper.lok", "Setting locale from " <<
maLocaleLanguageTag.getBcp47() << " to " << rLocaleLanguageTag.getBcp47());
maLocaleLanguageTag = rLocaleLanguageTag;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 32cfffbfc0eb0a2b37080bb0936097949b893001
Author: Mike Kaganski
AuthorDate: Sun Feb 21 10:27:36 2021 +0100
Commit: Mike Kaganski
CommitDate: Sun Feb 21 11:09:46 2021 +0100
Use structured binding here for simplicity and clarity
Change-Id: I1da9fe46d72f9b274022d28667b2244cb0824131
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 86199a5b6c4a..49f7765a7b01 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4046,12 +4046,8 @@ Size ToolBox::GetOptimalSize() const
Size aSize(const_cast(this)->ImplCalcSize( mnLines ));
-for (auto const& expandable : aExpandables)
-{
-vcl::Window *pWindow = expandable.first;
-Size aWinSize = expandable.second;
+for (auto const& [pWindow, aWinSize] : aExpandables)
pWindow->SetSizePixel(aWinSize);
-}
return aSize;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/toolbox.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 27c272797b4a90704c4d0b267d042f4d0837a153 Author: Mike Kaganski AuthorDate: Sun Feb 21 10:20:48 2021 +0100 Commit: Mike Kaganski CommitDate: Sun Feb 21 11:09:28 2021 +0100 Missing include (fix --disable-pch build) Change-Id: I0e44c03059f86946f57230bf9786a8fe25e55dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 5f8df0453a20..86199a5b6c4a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -47,6 +47,7 @@ #endif #include +#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column2.cxx | 17 +++--
sc/source/core/data/documen9.cxx|5 +++--
sc/source/core/data/global.cxx |5 +++--
sc/source/core/data/stlsheet.cxx|7 ---
sc/source/core/data/table1.cxx |5 +++--
sc/source/core/data/table2.cxx | 13 -
sc/source/core/tool/detfunc.cxx |5 +++--
sc/source/filter/excel/xechart.cxx |4 ++--
sc/source/filter/excel/xeescher.cxx | 10 +-
sc/source/filter/excel/xichart.cxx |5 +++--
sc/source/filter/excel/xlescher.cxx | 28 +---
sc/source/filter/excel/xlpage.cxx |7 ---
sc/source/filter/excel/xlstyle.cxx |5 +++--
sc/source/filter/excel/xltools.cxx | 16 +---
sc/source/filter/html/htmlexp.cxx |3 ++-
sc/source/filter/inc/xlconst.hxx|5 -
sc/source/filter/rtf/eeimpars.cxx |5 +++--
17 files changed, 71 insertions(+), 74 deletions(-)
New commits:
commit cdc67f6da362cea008a780abe412403eae64d04c
Author: Mike Kaganski
AuthorDate: Sun Feb 21 11:10:22 2021 +0300
Commit: Mike Kaganski
CommitDate: Sun Feb 21 10:02:46 2021 +0100
Some more unit conversion unification
Change-Id: I1a906d918bb4255a75c62c68a57244f59d51d2b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111269
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index d194ab134dd1..e6430758cc6f 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -44,6 +44,7 @@
#include
#include
+#include
#include
#include
#include
@@ -420,7 +421,7 @@ tools::Long ScColumn::GetNeededSize(
// to ensure the exact same paper width (and same line
breaks) as in
// ScEditUtil::GetEditArea, used for output.
-fWidthFactor = HMM_PER_TWIPS;
+fWidthFactor = o3tl::convert(1.0, o3tl::Length::twip,
o3tl::Length::mm100);
}
// use original width for hidden columns:
@@ -438,8 +439,9 @@ tools::Long ScColumn::GetNeededSize(
// space for AutoFilter button: 20 * nZoom/100
constexpr tools::Long nFilterButtonWidthPix = 20; // Autofilter
pixel width at 100% zoom.
if ( pFlag->HasAutoFilter() && !bTextWysiwyg )
-nDocWidth -= bInPrintTwips ?
-(nFilterButtonWidthPix * TWIPS_PER_PIXEL) :
tools::Long(rZoomX * nFilterButtonWidthPix);
+nDocWidth -= bInPrintTwips ?
o3tl::convert(nFilterButtonWidthPix, o3tl::Length::px,
+ o3tl::Length::twip)
+ : tools::Long(rZoomX *
nFilterButtonWidthPix);
aPaper.setWidth( nDocWidth );
@@ -572,7 +574,9 @@ tools::Long ScColumn::GetNeededSize(
{
// add 1pt extra (default margin value) for line breaks
with SetVertical
constexpr tools::Long nDefaultMarginInPoints = 1;
-nValue += conditionalScaleFunc(nDefaultMarginInPoints *
TWIPS_PER_POINT, nPPT);
+nValue += conditionalScaleFunc(
+o3tl::convert(nDefaultMarginInPoints,
o3tl::Length::pt, o3tl::Length::twip),
+nPPT);
}
}
}
@@ -594,8 +598,9 @@ tools::Long ScColumn::GetNeededSize(
constexpr tools::Long nFilterButtonWidthPix = 20; // Autofilter pixel
width at 100% zoom.
ScMF nFlags = pPattern->GetItem(ATTR_MERGE_FLAG).GetValue();
if (nFlags & ScMF::Auto)
-nValue += bInPrintTwips ?
-(nFilterButtonWidthPix * TWIPS_PER_PIXEL) : tools::Long(rZoomX
* nFilterButtonWidthPix);
+nValue += bInPrintTwips ? o3tl::convert(nFilterButtonWidthPix,
o3tl::Length::px,
+o3tl::Length::twip)
+: tools::Long(rZoomX *
nFilterButtonWidthPix);
}
return nValue;
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index f44159d6c436..ff5eb488f858 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -456,8 +457,8 @@ bool ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol,
SCROW nStartRow,
for (i=nStartCol; i<=nEndCol; i++)
nRight += GetColWidth(i,nTab);
-aMMRect.SetLeft( static_cast(nLeft * HMM_PER_TWIPS) );
-aMMRect.SetRight( static_cast(nRight * HMM_PER_TWIPS) );
+aMMRect.SetLeft(o3tl::convert(nLeft, o3tl::Length::twip,
o3tl::Length::mm100));
+aMMRect.SetRight(o3tl::convert(nRight, o3tl::Length::twip,
o3tl::Length::mm100));
}
else
aMMRect = GetMMRect( nStartCol, nStartRow, nEndCol, n
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/frmtypepage.ui | 834 +++--- 1 file changed, 383 insertions(+), 451 deletions(-) New commits: commit eb807e785b6acda1529b2f58ada2c1e84b38f7f5 Author: Heiko Tietze AuthorDate: Fri Feb 19 12:54:21 2021 +0100 Commit: Heiko Tietze CommitDate: Sun Feb 21 10:01:04 2021 +0100 Resolves tdf#140511 - UI glitches Clean-up of nested grids and boxes Change-Id: Iea2aa3d03210c0bbbf15b3eed546795de972b21b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111209 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui index b04c72b94df2..50645550eaa9 100644 --- a/sw/uiconfig/swriter/ui/frmtypepage.ui +++ b/sw/uiconfig/swriter/ui/frmtypepage.ui @@ -1,365 +1,286 @@ - + - -0.05 -99.99 -1 -10 - - --99.99 -99.99 -1 -10 - - -0.05 -99.99 -1 -10 - - --99.99 -99.99 -1 -10 - - + True -False +False start True -6 -18 +6 +18 - + True -False +False True True -3 -18 +3 +18 True -False +False +start start -True -0 -none +0 +none - + True -False -True -12 +False 12 6 +12 +3 - - + True -False -6 -12 +False +center +vertical - + True -True -True -adjustment1 -2 -True - - -Enter the width that you want for the selected object. - - +False +_Width +True +0 -1 -0 +False +True +0 - -AutoSize + True -True -False -12 -True -True - - -Automatically adjusts the width or height of a frame to match the contents of the frame. If you want, you can specify a minimum width or minimum height for the frame. - - +False +_Width (at least) +True +0 -0 -2 -2 +False +True +1 - - - -True -False -center - - -True -False -_Width (at least) -True -width -0 - - -0 -1 - - - - -True -False -_Width -True -width -0 - - -0 -0 - - + + +0 +0 + + + + +True +
Re: dependency-confusion
> On 2021-02-20, at 16:48, Jean-Baptiste Faure wrote: > > Hi, > > I certainly did not understand everything in > https://medium.com/@alex.birsan/dependency-confusion-4a5d60fec610, but I > wonder if LibreOffice could be subject to this kind of vulnerability? As far as I can tell, the dependencies that LibreOffice uses in distributions are gathered manually and updated manually. So, not really. -- Andrew ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
