[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/tools/emfphelperdata.cxx | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 12e23067fd0acad3e06df50cefaa0a2cd73df3b5
Author: Bartosz Kosiorek
AuthorDate: Mon Apr 24 05:08:00 2023 +0200
Commit: Bartosz Kosiorek
CommitDate: Mon Apr 24 08:24:09 2023 +0200
EMF+ Minor optimization and clean up code of DrawBeziers
Change-Id: Id560b3d3a6182270853fd05a6f2d1e44452c0013
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150894
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 94c4c32f026f..a1e9b3b7adce 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1340,7 +1340,6 @@ namespace emfplushelper
{
sal_uInt32 aCount;
float x1, y1, x2, y2, x3, y3, x4, y4;
-::basegfx::B2DPoint aStartPoint, aControlPointA,
aControlPointB, aEndPoint;
::basegfx::B2DPolygon aPolygon;
rMS.ReadUInt32(aCount);
SAL_INFO("drawinglayer.emf", "EMF+\t DrawBeziers slot:
" << (flags & 0xff));
@@ -1359,8 +1358,7 @@ namespace emfplushelper
ReadPoint(rMS, x1, y1, flags);
// We need to add first starting point
-aStartPoint = Map(x1, y1);
-aPolygon.append(aStartPoint);
+aPolygon.append(Map(x1, y1));
SAL_INFO("drawinglayer.emf",
"EMF+\t Bezier starting point: " << x1 << ","
<< y1);
for (sal_uInt32 i = 4; i <= aCount; i += 3)
@@ -1372,13 +1370,7 @@ namespace emfplushelper
SAL_INFO("drawinglayer.emf",
"EMF+\t Bezier points: " << x2 << "," <<
y2 << " " << x3 << ","
<< y3 << " " <<
x4 << "," << y4);
-
-aControlPointA = Map(x2, y2);
-aControlPointB = Map(x3, y3);
-aEndPoint = Map(x4, y4);
-aPolygon.appendBezierSegment(aControlPointA,
aControlPointB, aEndPoint);
-// The ending coordinate of one Bezier curve is
the starting coordinate of the next.
-aStartPoint = aEndPoint;
+aPolygon.appendBezierSegment(Map(x2, y2), Map(x3,
y3), Map(x4, y4));
}
EMFPPlusDrawPolygon(::basegfx::B2DPolyPolygon(aPolygon), flags & 0xff);
break;
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg
icon-themes/colibre/vcl/res/autoscroll_e.png|binary icon-themes/colibre/vcl/res/autoscroll_n.png|binary icon-themes/colibre/vcl/res/autoscroll_ne.png |binary icon-themes/colibre/vcl/res/autoscroll_ns.png |binary icon-themes/colibre/vcl/res/autoscroll_nswe.png |binary icon-themes/colibre/vcl/res/autoscroll_nw.png |binary icon-themes/colibre/vcl/res/autoscroll_s.png|binary icon-themes/colibre/vcl/res/autoscroll_se.png |binary icon-themes/colibre/vcl/res/autoscroll_sw.png |binary icon-themes/colibre/vcl/res/autoscroll_w.png|binary icon-themes/colibre/vcl/res/autoscroll_we.png |binary icon-themes/colibre/vcl/res/chain.png |binary icon-themes/colibre/vcl/res/chain_not_allowed.png |binary icon-themes/colibre/vcl/res/chart.png |binary icon-themes/colibre/vcl/res/copy_data.png |binary icon-themes/colibre/vcl/res/copy_data_link.png |binary icon-themes/colibre/vcl/res/copy_file.png |binary icon-themes/colibre/vcl/res/copy_file_link.png |binary icon-themes/colibre/vcl/res/copy_files.png |binary icon-themes/colibre/vcl/res/crook.png |binary icon-themes/colibre/vcl/res/crop.png|binary icon-themes/colibre/vcl/res/detective.png |binary icon-themes/colibre/vcl/res/draw_arc.png|binary icon-themes/colibre/vcl/res/draw_bezier.png |binary icon-themes/colibre/vcl/res/draw_caption.png|binary icon-themes/colibre/vcl/res/draw_circle_cut.png |binary icon-themes/colibre/vcl/res/draw_connect.png|binary icon-themes/colibre/vcl/res/draw_ellipse.png|binary icon-themes/colibre/vcl/res/draw_freehand.png |binary icon-themes/colibre/vcl/res/draw_line.png |binary icon-themes/colibre/vcl/res/draw_pie.png|binary icon-themes/colibre/vcl/res/draw_polygon.png|binary icon-themes/colibre/vcl/res/draw_rect.png |binary icon-themes/colibre/vcl/res/draw_text.png |binary icon-themes/colibre/vcl/res/fatcross.png|binary icon-themes/colibre/vcl/res/fill.png|binary icon-themes/colibre/vcl/res/h_shear.png |binary icon-themes/colibre/vcl/res/help.png|binary icon-themes/colibre/vcl/res/hide_whitespace.png |binary icon-themes/colibre/vcl/res/link_data.png |binary icon-themes/colibre/vcl/res/link_file.png |binary icon-themes/colibre/vcl/res/magnify.png |binary icon-themes/colibre/vcl/res/mirror.png |binary icon-themes/colibre/vcl/res/move_bezier_weight.png |binary icon-themes/colibre/vcl/res/move_data.png |binary icon-themes/colibre/vcl/res/move_data_link.png |binary icon-themes/colibre/vcl/res/move_file.png |binary icon-themes/colibre/vcl/res/move_file_link.png |binary icon-themes/colibre/vcl/res/move_files.png |binary icon-themes/colibre/vcl/res/move_point.png |binary icon-themes/colibre/vcl/res/nesize.png |binary icon-themes/colibre/vcl/res/neswsize.png|binary icon-themes/colibre/vcl/res/not_allowed.png |binary icon-themes/colibre/vcl/res/nwsesize.png|binary icon-themes/colibre/vcl/res/nwsize.png |binary icon-themes/colibre/vcl/res/pen.png |binary icon-themes/colibre/vcl/res/pivot_column.png|binary icon-themes/colibre/vcl/res/pivot_delete.png|binary icon-themes/colibre/vcl/res/pivot_field.png |binary icon-themes/colibre/vcl/res/pivot_row.png |binary icon-themes/colibre/vcl/res/rotate.png |binary icon-themes/colibre/vcl/res/sesize.png |binary icon-themes/colibre/vcl/res/show_whitespace.png |binary icon-themes/colibre/vcl/res/swsize.png |binary icon-themes/colibre/vcl/res/text_vertical.png |binary icon-themes/colibre/vcl/res/v_shear.png |binary icon-themes/colibre/vcl/res/wait.png|binary icon-themes/colibre/vcl/res/window_nesize.png |binary icon-themes/colibre/vcl/res/window_nwsize.png |binary icon-themes/colibre/vcl/res/window_sesize.png |binary icon-themes/colibre/vcl/res/window_swsize.png |binary icon-themes/colibre_dark/vcl/res/autoscroll_e.png |binary icon-themes/colibre_dark/vcl/r
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg
icon-themes/colibre/vcl/res/autoscroll_e.png|binary icon-themes/colibre/vcl/res/autoscroll_n.png|binary icon-themes/colibre/vcl/res/autoscroll_ne.png |binary icon-themes/colibre/vcl/res/autoscroll_ns.png |binary icon-themes/colibre/vcl/res/autoscroll_nswe.png |binary icon-themes/colibre/vcl/res/autoscroll_nw.png |binary icon-themes/colibre/vcl/res/autoscroll_s.png|binary icon-themes/colibre/vcl/res/autoscroll_se.png |binary icon-themes/colibre/vcl/res/autoscroll_sw.png |binary icon-themes/colibre/vcl/res/autoscroll_w.png|binary icon-themes/colibre/vcl/res/autoscroll_we.png |binary icon-themes/colibre/vcl/res/chain.png |binary icon-themes/colibre/vcl/res/chain_not_allowed.png |binary icon-themes/colibre/vcl/res/chart.png |binary icon-themes/colibre/vcl/res/copy_data.png |binary icon-themes/colibre/vcl/res/copy_data_link.png |binary icon-themes/colibre/vcl/res/copy_file.png |binary icon-themes/colibre/vcl/res/copy_file_link.png |binary icon-themes/colibre/vcl/res/copy_files.png |binary icon-themes/colibre/vcl/res/crook.png |binary icon-themes/colibre/vcl/res/crop.png|binary icon-themes/colibre/vcl/res/detective.png |binary icon-themes/colibre/vcl/res/draw_arc.png|binary icon-themes/colibre/vcl/res/draw_bezier.png |binary icon-themes/colibre/vcl/res/draw_caption.png|binary icon-themes/colibre/vcl/res/draw_circle_cut.png |binary icon-themes/colibre/vcl/res/draw_connect.png|binary icon-themes/colibre/vcl/res/draw_ellipse.png|binary icon-themes/colibre/vcl/res/draw_freehand.png |binary icon-themes/colibre/vcl/res/draw_line.png |binary icon-themes/colibre/vcl/res/draw_pie.png|binary icon-themes/colibre/vcl/res/draw_polygon.png|binary icon-themes/colibre/vcl/res/draw_rect.png |binary icon-themes/colibre/vcl/res/draw_text.png |binary icon-themes/colibre/vcl/res/fatcross.png|binary icon-themes/colibre/vcl/res/fill.png|binary icon-themes/colibre/vcl/res/h_shear.png |binary icon-themes/colibre/vcl/res/help.png|binary icon-themes/colibre/vcl/res/hide_whitespace.png |binary icon-themes/colibre/vcl/res/link_data.png |binary icon-themes/colibre/vcl/res/link_file.png |binary icon-themes/colibre/vcl/res/magnify.png |binary icon-themes/colibre/vcl/res/mirror.png |binary icon-themes/colibre/vcl/res/move_bezier_weight.png |binary icon-themes/colibre/vcl/res/move_data.png |binary icon-themes/colibre/vcl/res/move_data_link.png |binary icon-themes/colibre/vcl/res/move_file.png |binary icon-themes/colibre/vcl/res/move_file_link.png |binary icon-themes/colibre/vcl/res/move_files.png |binary icon-themes/colibre/vcl/res/move_point.png |binary icon-themes/colibre/vcl/res/nesize.png |binary icon-themes/colibre/vcl/res/neswsize.png|binary icon-themes/colibre/vcl/res/not_allowed.png |binary icon-themes/colibre/vcl/res/nwsesize.png|binary icon-themes/colibre/vcl/res/nwsize.png |binary icon-themes/colibre/vcl/res/pen.png |binary icon-themes/colibre/vcl/res/pivot_column.png|binary icon-themes/colibre/vcl/res/pivot_delete.png|binary icon-themes/colibre/vcl/res/pivot_field.png |binary icon-themes/colibre/vcl/res/pivot_row.png |binary icon-themes/colibre/vcl/res/rotate.png |binary icon-themes/colibre/vcl/res/sesize.png |binary icon-themes/colibre/vcl/res/show_whitespace.png |binary icon-themes/colibre/vcl/res/swsize.png |binary icon-themes/colibre/vcl/res/text_vertical.png |binary icon-themes/colibre/vcl/res/v_shear.png |binary icon-themes/colibre/vcl/res/wait.png|binary icon-themes/colibre/vcl/res/window_nesize.png |binary icon-themes/colibre/vcl/res/window_nwsize.png |binary icon-themes/colibre/vcl/res/window_sesize.png |binary icon-themes/colibre/vcl/res/window_swsize.png |binary icon-themes/colibre_dark/vcl/res/autoscroll_e.png |binary icon-themes/colibre_dark/vcl/r
[Libreoffice-commits] core.git: editeng/source include/basegfx vcl/unx
editeng/source/misc/txtrange.cxx |7 ---
include/basegfx/color/bcolor.hxx |2 +-
vcl/unx/generic/app/saldisp.cxx |5 +
3 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit c6755955aeaddb14bd3ad231f78cda47a0a5aeaa
Author: buldi
AuthorDate: Sun Apr 2 18:16:10 2023 +0200
Commit: Hossein
CommitDate: Mon Apr 24 00:52:19 2023 +0200
tdf#147906 Use std::hypot for Pythagorean addition
Change-Id: I47611e1bffed814294bd2c7b23b26e1878151464
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149939
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 6374747be3c9..2f02a1150f91 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -192,11 +192,12 @@ tools::Long SvxBoundArgs::CalcMax( const Point& rPt1,
const Point& rPt2,
}
else
nB = nStart;
-nB *= nB;
-nB += nDa * nDa;
-nB = sqrt( nB );
+
+nB = std::hypot(nB, nDa);
+
if (nB == 0) // avoid div / 0
return 0;
+
nB = nRange + nDa * ( nFarRange - nRange ) / nB;
bool bNote;
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index d8788b1cfef1..de3452fad128 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -136,7 +136,7 @@ namespace basegfx
const double fDistG(getDistanceGreen(rColor));
const double fDistB(getDistanceBlue(rColor));
-return sqrt(fDistR * fDistR + fDistG * fDistG + fDistB * fDistB);
+return std::hypot(fDistR, fDistG, fDistB);
}
double getMaximumDistance(const BColor& rColor) const
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 6d7737cb3224..3e2e58d9c319 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -80,9 +80,6 @@ static const char *KeyStr( KeySym n ) { return Null(
XKeysymToString( n ) ); }
static const char *GetAtomName( Display *d, Atom a )
{ return Null( XGetAtomName( d, a ) ); }
-
-static double Hypothenuse( tools::Long w, tools::Long h )
-{ return sqrt( static_cast((w*w)+(h*h)) ); }
#endif
static int ColorDiff( int r, int g, int b )
@@ -2207,7 +2204,7 @@ void SalDisplay::PrintInfo() const
SAL_INFO( "vcl", "Screen" );
SAL_INFO( "vcl", "\tResolution/Size \t" << aResolution_.A() << "*" <<
aResolution_.B()
<< " " <<
m_aScreens[m_nXDefaultScreen.getXScreen()].m_aSize.Width() << "*" <<
m_aScreens[m_nXDefaultScreen.getXScreen()].m_aSize.Height()
-<< " " << (Hypothenuse( DisplayWidthMM ( pDisp_,
m_nXDefaultScreen.getXScreen() ),
+<< " " << (std::hypot( DisplayWidthMM ( pDisp_,
m_nXDefaultScreen.getXScreen() ),
DisplayHeightMM( pDisp_,
m_nXDefaultScreen.getXScreen() ) ) / 25.4 ) << "\"" );
SAL_INFO( "vcl", "\tBlack&White \t" <<
GetColormap(m_nXDefaultScreen).GetBlackPixel() << " "
<< GetColormap(m_nXDefaultScreen).GetWhitePixel() );
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg
icon-themes/colibre/vcl/res/tab_select_e.png |binary icon-themes/colibre/vcl/res/tab_select_s.png |binary icon-themes/colibre/vcl/res/tab_select_se.png |binary icon-themes/colibre/vcl/res/tab_select_sw.png |binary icon-themes/colibre/vcl/res/tab_select_w.png |binary icon-themes/colibre_dark/vcl/res/tab_select_e.png |binary icon-themes/colibre_dark/vcl/res/tab_select_s.png |binary icon-themes/colibre_dark/vcl/res/tab_select_se.png |binary icon-themes/colibre_dark/vcl/res/tab_select_sw.png |binary icon-themes/colibre_dark/vcl/res/tab_select_w.png |binary icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_s.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_se.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_sw.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_w.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_e.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_s.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_se.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_sw.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_w.svg |4 +--- 20 files changed, 10 insertions(+), 30 deletions(-) New commits: commit 29760e24cbebd64137caa90a0ea1c34a9ae19846 Author: Rizal Muttaqin AuthorDate: Sun Apr 23 23:47:29 2023 +0700 Commit: Rizal Muttaqin CommitDate: Mon Apr 24 00:17:43 2023 +0200 tdf#152625 Revise Colibre's tab_select* icons Change-Id: Ic5a92b98ddcbfa970643bf54fb406673c9108c2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150790 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/vcl/res/tab_select_e.png b/icon-themes/colibre/vcl/res/tab_select_e.png index 6c343c3ebd75..9c36615e7b77 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_e.png and b/icon-themes/colibre/vcl/res/tab_select_e.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_s.png b/icon-themes/colibre/vcl/res/tab_select_s.png index 645f267686fc..fdf0ed9d1456 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_s.png and b/icon-themes/colibre/vcl/res/tab_select_s.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_se.png b/icon-themes/colibre/vcl/res/tab_select_se.png index 1a3715846308..ffb52b11bac9 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_se.png and b/icon-themes/colibre/vcl/res/tab_select_se.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_sw.png b/icon-themes/colibre/vcl/res/tab_select_sw.png index 73c1d9910b16..e3dea58a1001 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_sw.png and b/icon-themes/colibre/vcl/res/tab_select_sw.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_w.png b/icon-themes/colibre/vcl/res/tab_select_w.png index 9e3b6fa86a97..ca11a8aba35c 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_w.png and b/icon-themes/colibre/vcl/res/tab_select_w.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_e.png b/icon-themes/colibre_dark/vcl/res/tab_select_e.png index 6c343c3ebd75..a496fc13ddf9 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_e.png and b/icon-themes/colibre_dark/vcl/res/tab_select_e.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_s.png b/icon-themes/colibre_dark/vcl/res/tab_select_s.png index 645f267686fc..b23037b3e495 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_s.png and b/icon-themes/colibre_dark/vcl/res/tab_select_s.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_se.png b/icon-themes/colibre_dark/vcl/res/tab_select_se.png index 1a3715846308..2b802cab0d4c 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_se.png and b/icon-themes/colibre_dark/vcl/res/tab_select_se.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_sw.png b/icon-themes/colibre_dark/vcl/res/tab_select_sw.png index 73c1d9910b16..a12a06d42e54 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_sw.png and b/icon-themes/colibre_dark/vcl/res/tab_select_sw.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_w.png b/icon-themes/colibre_dark/vcl/res/tab_select_w.png index 9e3b6fa86a97..8feed7fd3d43 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_w.png and b/icon-themes/colibre_dark/vcl/res/tab_select_w.png differ diff --git a/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg b/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg index 214bee2125bd..1a190bf27fd8 100644 --- a/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg +++ b/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg @@ -1,3 +1 @@ -http://www.w3.org/2000/svg";> - - +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colib
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg
icon-themes/colibre/vcl/res/tab_select_e.png |binary icon-themes/colibre/vcl/res/tab_select_s.png |binary icon-themes/colibre/vcl/res/tab_select_se.png |binary icon-themes/colibre/vcl/res/tab_select_sw.png |binary icon-themes/colibre/vcl/res/tab_select_w.png |binary icon-themes/colibre_dark/vcl/res/tab_select_e.png |binary icon-themes/colibre_dark/vcl/res/tab_select_s.png |binary icon-themes/colibre_dark/vcl/res/tab_select_se.png |binary icon-themes/colibre_dark/vcl/res/tab_select_sw.png |binary icon-themes/colibre_dark/vcl/res/tab_select_w.png |binary icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_s.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_se.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_sw.svg |4 +--- icon-themes/colibre_dark_svg/vcl/res/tab_select_w.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_e.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_s.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_se.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_sw.svg |4 +--- icon-themes/colibre_svg/vcl/res/tab_select_w.svg |4 +--- 20 files changed, 10 insertions(+), 30 deletions(-) New commits: commit 14a23ef47c8ceaa1fc6dc4a7a942fb8360ea4bfd Author: Rizal Muttaqin AuthorDate: Sun Apr 23 23:47:29 2023 +0700 Commit: Rizal Muttaqin CommitDate: Mon Apr 24 00:17:27 2023 +0200 tdf#152625 Revise Colibre's tab_select* icons Change-Id: Ic5a92b98ddcbfa970643bf54fb406673c9108c2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150829 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/vcl/res/tab_select_e.png b/icon-themes/colibre/vcl/res/tab_select_e.png index 6c343c3ebd75..9c36615e7b77 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_e.png and b/icon-themes/colibre/vcl/res/tab_select_e.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_s.png b/icon-themes/colibre/vcl/res/tab_select_s.png index 645f267686fc..fdf0ed9d1456 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_s.png and b/icon-themes/colibre/vcl/res/tab_select_s.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_se.png b/icon-themes/colibre/vcl/res/tab_select_se.png index 1a3715846308..ffb52b11bac9 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_se.png and b/icon-themes/colibre/vcl/res/tab_select_se.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_sw.png b/icon-themes/colibre/vcl/res/tab_select_sw.png index 73c1d9910b16..e3dea58a1001 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_sw.png and b/icon-themes/colibre/vcl/res/tab_select_sw.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_w.png b/icon-themes/colibre/vcl/res/tab_select_w.png index 9e3b6fa86a97..ca11a8aba35c 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_w.png and b/icon-themes/colibre/vcl/res/tab_select_w.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_e.png b/icon-themes/colibre_dark/vcl/res/tab_select_e.png index 6c343c3ebd75..a496fc13ddf9 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_e.png and b/icon-themes/colibre_dark/vcl/res/tab_select_e.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_s.png b/icon-themes/colibre_dark/vcl/res/tab_select_s.png index 645f267686fc..b23037b3e495 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_s.png and b/icon-themes/colibre_dark/vcl/res/tab_select_s.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_se.png b/icon-themes/colibre_dark/vcl/res/tab_select_se.png index 1a3715846308..2b802cab0d4c 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_se.png and b/icon-themes/colibre_dark/vcl/res/tab_select_se.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_sw.png b/icon-themes/colibre_dark/vcl/res/tab_select_sw.png index 73c1d9910b16..a12a06d42e54 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_sw.png and b/icon-themes/colibre_dark/vcl/res/tab_select_sw.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_w.png b/icon-themes/colibre_dark/vcl/res/tab_select_w.png index 9e3b6fa86a97..8feed7fd3d43 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_w.png and b/icon-themes/colibre_dark/vcl/res/tab_select_w.png differ diff --git a/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg b/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg index 214bee2125bd..1a190bf27fd8 100644 --- a/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg +++ b/icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg @@ -1,3 +1 @@ -http://www.w3.org/2000/svg";> - - +http://www.w3.org/2000/svg";> \ No newline at end of file diff --git a/icon-themes/colib
[Libreoffice-commits] core.git: i18npool/inc
i18npool/inc/indexentrysupplier_ja_phonetic.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 898cf0b7d9e3198cb17f68ef6e6cf6d80ae03780
Author: Stephan Bergmann
AuthorDate: Fri Apr 21 13:59:29 2023 +0200
Commit: Stephan Bergmann
CommitDate: Mon Apr 24 00:09:25 2023 +0200
Fix some getImplementationName
...to match the corresponding .component entries,
> com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric first)
(grouped by consonant)
etc. rather than
> com.sun.star.i18n.IndexEntrySupplier_"(alphanumeric first) (grouped by
consonant)"
etc.
Change-Id: I7fa0f9c7615b5cb1b7c0c6a8908cad27f0ac5712
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150760
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 97c10df538fe..ea19dcb12aee 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -45,7 +45,7 @@ public:
class IndexEntrySupplier_##algorithm final : public
IndexEntrySupplier_ja_phonetic {\
public:\
IndexEntrySupplier_##algorithm (const css::uno::Reference <
css::uno::XComponentContext >& rxContext) : IndexEntrySupplier_ja_phonetic
(rxContext) {\
-implementationName =
"com.sun.star.i18n.IndexEntrySupplier_"#algo_descr;\
+implementationName =
"com.sun.star.i18n.IndexEntrySupplier_ja_phonetic" algo_descr;\
};\
virtual sal_Bool SAL_CALL loadAlgorithm(\
const css::lang::Locale& rLocale,\
[Libreoffice-commits] core.git: i18npool/inc
i18npool/inc/transliteration_Ignore.hxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 503242381527d8d916ae705f240a10a0c291182d
Author: Stephan Bergmann
AuthorDate: Fri Apr 21 14:05:07 2023 +0200
Commit: Stephan Bergmann
CommitDate: Sun Apr 23 22:59:07 2023 +0200
Fix some getImplementationName
...to match the corresponding .component entries
Change-Id: I1f32d4533a49f0988a2d5c2b8d20198baab515a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150761
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/i18npool/inc/transliteration_Ignore.hxx
b/i18npool/inc/transliteration_Ignore.hxx
index 3ce28f5c682a..ba685c8e4548 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -126,7 +126,7 @@ TRANSLITERATION_IGNORE(ProlongedSoundMark_ja_JP)
#undef TRANSLITERATION_IGNORE
-#define TRANSLITERATION_IGNORE( name ) \
+#define TRANSLITERATION_IGNORE( name, implname ) \
class ignore##name final : public transliteration_Ignore {\
public:\
ignore##name () {\
@@ -134,7 +134,7 @@ public:\
table = nullptr;\
map = nullptr;\
transliterationName = "ignore"#name;\
-implementationName =
"com.sun.star.i18n.Transliteration.ignore"#name;\
+implementationName = "com.sun.star.i18n.Transliteration."
implname;\
};\
OUString foldingImpl( const OUString& inStr, sal_Int32 startPos,
sal_Int32 nCount, \
css::uno::Sequence< sal_Int32 >* pOffset) override; \
@@ -146,9 +146,9 @@ public:\
override;\
};
-TRANSLITERATION_IGNORE(Kana)
-TRANSLITERATION_IGNORE(Width)
-TRANSLITERATION_IGNORE(Size_ja_JP)
+TRANSLITERATION_IGNORE(Kana, "IGNORE_KANA")
+TRANSLITERATION_IGNORE(Width, "IGNORE_WIDTH")
+TRANSLITERATION_IGNORE(Size_ja_JP, "ignoreSize_ja_JP")
#undef TRANSLITERATION_IGNORE
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - oox/source sd/qa
oox/source/drawingml/table/tablecell.cxx | 37 +++
sd/qa/unit/layout-tests.cxx | 21 +
2 files changed, 40 insertions(+), 18 deletions(-)
New commits:
commit fa0312aaa687366168ed9ead00bb78eedcd054cf
Author: Sarper Akdemir
AuthorDate: Thu Apr 20 23:31:20 2023 +0300
Commit: Andras Timar
CommitDate: Sun Apr 23 22:09:30 2023 +0200
related tdf#154501: pptx import: push cell's RotateAngle after text
It appears to matter whether "RotateAngle" property is set
before or after insertion of the text for cells.
It only renders correctly when it is pushed after the text insertion.
RotateAngle appears to end up in the property set either way with
correct values, so I don't really know why this is the case.
Adds a unit test that covers rendering of vertical text in table cells
on import from an example pptx file.
Change-Id: Ifb8caa0b74920758fea2815b16dae7fd60587cc7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150734
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index 37408aaf4ba5..8692e3ffb33f 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -553,7 +553,24 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, cons
{
xPropSet->setPropertyValue("TextWritingMode",
Any(css::text::WritingMode_TB_RL));
}
-else if ( getVertToken() == XML_vert )
+
+getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps,
pMasterTextListStyle );
+
+// tdf#144092 For empty cells push character styles & endParaRPr to the
Cell's properties
+const TextParagraphVector& rParagraphs = getTextBody()->getParagraphs();
+if (rParagraphs.size() == 1)
+{
+const auto pFirstParagraph = rParagraphs.at(0);
+if (pFirstParagraph->getRuns().empty())
+{
+TextCharacterProperties aTextCharacterProps{
pFirstParagraph->getCharacterStyle(
+aTextStyleProps, *pMasterTextListStyle,
getTextBody()->getTextListStyle()) };
+
aTextCharacterProps.assignUsed(pFirstParagraph->getEndProperties());
+aTextCharacterProps.pushToPropSet(aPropSet, rFilterBase);
+}
+}
+
+if ( getVertToken() == XML_vert )
{
xPropSet->setPropertyValue("RotateAngle", Any(short(27000)));
}
@@ -561,7 +578,7 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, cons
{
xPropSet->setPropertyValue("RotateAngle", Any(short(9000)));
}
-else if ( getVertToken() != XML_horz )
+else if ( getVertToken() != XML_horz && getVertToken() != XML_eaVert )
{
// put the vert value in the grab bag for roundtrip
const Sequence& aTokenNameSeq =
StaticTokenMap().getUtf8TokenName(getVertToken());
@@ -583,22 +600,6 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, cons
}
xPropSet->setPropertyValue("CellInteropGrabBag", Any(aGrabBag));
}
-
-getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps,
pMasterTextListStyle );
-
-// tdf#144092 For empty cells push character styles & endParaRPr to the
Cell's properties
-const TextParagraphVector& rParagraphs = getTextBody()->getParagraphs();
-if (rParagraphs.size() == 1)
-{
-const auto pFirstParagraph = rParagraphs.at(0);
-if (pFirstParagraph->getRuns().empty())
-{
-TextCharacterProperties aTextCharacterProps{
pFirstParagraph->getCharacterStyle(
-aTextStyleProps, *pMasterTextListStyle,
getTextBody()->getTextListStyle()) };
-
aTextCharacterProps.assignUsed(pFirstParagraph->getEndProperties());
-aTextCharacterProps.pushToPropSet(aPropSet, rFilterBase);
-}
-}
}
}
diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx
index 25366afedc0f..afd3e5210027 100644
--- a/sd/qa/unit/layout-tests.cxx
+++ b/sd/qa/unit/layout-tests.cxx
@@ -320,6 +320,27 @@ CPPUNIT_TEST_FIXTURE(SdLayoutTest,
testFitToFrameTextFitting)
#endif
}
+CPPUNIT_TEST_FIXTURE(SdLayoutTest, testTableVerticalText)
+{
+sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc(u"/sd/qa/unit/data/pptx/tcPr-vert-roundtrip.pptx"),
PPTX);
+
+std::shared_ptr xMetaFile = xDocShRef->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+
+xmlDocUniquePtr pXmlDoc = XmlTestTools::dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Without the accompanying fix, would fail with:
+// - Expected: -900
+// - Actual : 0
+// - In <>, attribute 'orientation' of '//font[1]' incorrect value.
+// i.e. table cell text that was supposed to be vertical (rotated 90
+// degrees) was not vertical.
+assertXPath(pXmlDoc, "
[Libreoffice-commits] core.git: sw/source
sw/source/ui/fldui/fldvar.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5dc2b5277f4d18533c5fe4d43b016f12da52ed36
Author: Andrea Gelmini
AuthorDate: Mon Apr 10 09:15:22 2023 +0200
Commit: Julien Nabet
CommitDate: Sun Apr 23 19:01:57 2023 +0200
Translate remnant "Kalkulator" into "calculator"
Change-Id: I3c72342d07eabb3b618cd0c36d0606d81baad423
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150173
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index ae3af154f0b5..13265523ba17 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1029,7 +1029,7 @@ IMPL_LINK(SwFieldVarPage, TBClickHdl, weld::Button&,
rBox, void)
bool bText = false;
sal_uInt32 nNumberFormat = lcl_getUsedNumFormat(
*m_xNumFormatLB, bText);
if (nNumberFormat && nNumberFormat != SAL_MAX_UINT32)
-{ // Switch language to office-language because
Kalkulator expects
+{ // Switch language to office-language because
calculator expects
// String in office format and it should be fed
into dialog like
// that
nNumberFormat =
SwValueField::GetSystemFormat(pSh->GetNumberFormatter(), nNumberFormat);
@@ -1151,7 +1151,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
if (nFormat && nFormat != NUMBERFORMAT_ENTRY_NOT_FOUND &&
m_xNumFormatLB->IsAutomaticLanguage())
{
-// Switch language to office language because Kalkulator expects
+// Switch language to office language because calculator expects
// String in office format and it should be fed into the dialog
// like that
SwWrtShell *pSh = GetWrtShell();
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b102852bd67fb08e08c02cc733d3682db3969ce1 Author: Andrea Gelmini AuthorDate: Sun Apr 16 21:11:56 2023 +0200 Commit: Julien Nabet CommitDate: Sun Apr 23 18:56:35 2023 +0200 Fix typo Change-Id: Ie8c702436d3efbaf2ca1573193100974a42f93a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150459 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 87446d03c786..6a2b62904325 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -927,7 +927,7 @@ void DocxAttributeOutput::PopulateFrameProperties(const SwFrameFormat* pFrameFor // So now at export time we have to assume that none of this has been changed by the user. // 620 (31pt) is the maximum paragraph border spacing allowed in MS Formats, -// so if the value is greater than that, avoid adjusting the size - the user has interferred. +// so if the value is greater than that, avoid adjusting the size - the user has interfered. const sal_uInt32 nLeftBorderSpacing = pFrameFormat->GetBox().GetDistance(SvxBoxItemLine::LEFT); const sal_uInt32 nRighttBorderSpacing = pFrameFormat->GetBox().GetDistance(SvxBoxItemLine::RIGHT); sal_uInt32 nAdjustedWidth = rSize.Width();
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_dark ic
icon-themes/breeze/links.txt |5 - icon-themes/breeze/sw/res/re01.png|binary icon-themes/breeze/sw/res/re02.png|binary icon-themes/breeze/sw/res/re03.png|binary icon-themes/breeze/sw/res/re04.png|binary icon-themes/breeze_dark/links.txt |5 - icon-themes/breeze_dark/sw/res/re01.png |binary icon-themes/breeze_dark/sw/res/re02.png |binary icon-themes/breeze_dark/sw/res/re03.png |binary icon-themes/breeze_dark/sw/res/re04.png |binary icon-themes/breeze_dark_svg/sw/res/re01.svg |1 + icon-themes/breeze_dark_svg/sw/res/re02.svg |1 + icon-themes/breeze_dark_svg/sw/res/re03.svg |1 + icon-themes/breeze_dark_svg/sw/res/re04.svg |1 + icon-themes/breeze_svg/sw/res/re01.svg|1 + icon-themes/breeze_svg/sw/res/re02.svg|1 + icon-themes/breeze_svg/sw/res/re03.svg|1 + icon-themes/breeze_svg/sw/res/re04.svg|1 + icon-themes/colibre/links.txt |4 icon-themes/colibre_dark/links.txt|4 icon-themes/colibre_dark_svg/sw/res/re01.svg |6 ++ icon-themes/colibre_dark_svg/sw/res/re02.svg |6 ++ icon-themes/colibre_dark_svg/sw/res/re03.svg |5 + icon-themes/colibre_dark_svg/sw/res/re04.svg |6 ++ icon-themes/colibre_svg/sw/res/re01.svg |6 ++ icon-themes/colibre_svg/sw/res/re02.svg |5 + icon-themes/colibre_svg/sw/res/re03.svg |5 + icon-themes/colibre_svg/sw/res/re04.svg |5 + icon-themes/elementary/links.txt |5 - icon-themes/elementary/sw/res/re01.png|binary icon-themes/elementary/sw/res/re02.png|binary icon-themes/elementary/sw/res/re03.png|binary icon-themes/elementary/sw/res/re04.png|binary icon-themes/elementary_svg/sw/res/re01.svg|1 + icon-themes/elementary_svg/sw/res/re02.svg|1 + icon-themes/elementary_svg/sw/res/re03.svg|1 + icon-themes/elementary_svg/sw/res/re04.svg|1 + icon-themes/karasa_jaga/sw/res/re01.png |binary icon-themes/karasa_jaga/sw/res/re02.png |binary icon-themes/karasa_jaga/sw/res/re03.png |binary icon-themes/karasa_jaga/sw/res/re04.png |binary icon-themes/karasa_jaga_svg/sw/res/re01.svg |1 + icon-themes/karasa_jaga_svg/sw/res/re02.svg |1 + icon-themes/karasa_jaga_svg/sw/res/re03.svg |1 + icon-themes/karasa_jaga_svg/sw/res/re04.svg |1 + icon-themes/sifr/links.txt|4 icon-themes/sifr/sw/res/re01.png |binary icon-themes/sifr/sw/res/re02.png |binary icon-themes/sifr/sw/res/re03.png |binary icon-themes/sifr/sw/res/re04.png |binary icon-themes/sifr_dark/links.txt |4 icon-themes/sifr_dark/sw/res/re01.png |binary icon-themes/sifr_dark/sw/res/re02.png |binary icon-themes/sifr_dark/sw/res/re03.png |binary icon-themes/sifr_dark/sw/res/re04.png |binary icon-themes/sifr_dark_svg/sw/res/re01.svg |1 + icon-themes/sifr_dark_svg/sw/res/re02.svg |1 + icon-themes/sifr_dark_svg/sw/res/re03.svg |1 + icon-themes/sifr_dark_svg/sw/res/re04.svg |1 + icon-themes/sifr_svg/sw/res/re01.svg |1 + icon-themes/sifr_svg/sw/res/re02.svg |1 + icon-themes/sifr_svg/sw/res/re03.svg |1 + icon-themes/sifr_svg/sw/res/re04.svg |1 + icon-themes/sukapura/sw/res/re01.png |binary icon-themes/sukapura/sw/res/re02.png |binary icon-themes/sukapura/sw/res/re03.png |binary icon-themes/sukapura/sw/res/re04.png |binary icon-themes/sukapura_dark/sw/res/re01.png |binary icon-themes/sukapura_dark/sw/res/re02.png |binary icon-themes/sukapura_dark/sw/res/re03.png |binary icon-themes/sukapura_dark/sw/res/re04.png |binary icon-themes/sukapura_dark_svg/sw/res/re01.svg |3 ++- icon-themes/sukapura_dark_svg/sw/res/re02.svg |3 ++- icon-themes/sukapura_dark_svg/sw/res/re03.svg |3 ++- icon-themes/sukapura_dark_svg/sw/res/re04.svg |3 ++- icon-themes/sukapura_svg/sw/res/re01.svg |3 ++- icon-themes/sukapura_svg/sw/res/re02.svg |3 ++- icon-themes/sukapura_svg/sw/res/re03.svg |3 ++- icon-themes/sukapura_svg/sw/res/re04.svg |3 ++- 79 files changed, 84 insertions(+), 39 deletions(-) New commits: commit e58f64301122f71abf8260bbe5bbcd5846269351 Author: Rizal Muttaqin AuthorDate: Sun Apr 23 17:53:45 2023 +0700 Commit: Rizal Muttaqin CommitDate: Sun Apr 23 18:46:11 2023 +0200 tdf#154825 All icon themes: add/update section editor Change-Id: I9b59c4c99d623aab1a46898e732f45d5b22261ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150825 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 4e
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg
icon-themes/colibre/cmd/32/insertindexesentry.png |binary icon-themes/colibre/cmd/32/insertmultiindex.png|binary icon-themes/colibre/cmd/32/updatecurindex.png |binary icon-themes/colibre/cmd/lc_insertindexesentry.png |binary icon-themes/colibre/cmd/lc_insertmultiindex.png|binary icon-themes/colibre/cmd/lc_updatecurindex.png |binary icon-themes/colibre/cmd/sc_insertindexesentry.png |binary icon-themes/colibre/cmd/sc_insertmultiindex.png|binary icon-themes/colibre/cmd/sc_updatecurindex.png |binary icon-themes/colibre_dark/cmd/32/insertindexesentry.png |binary icon-themes/colibre_dark/cmd/32/insertmultiindex.png |binary icon-themes/colibre_dark/cmd/32/updatecurindex.png |binary icon-themes/colibre_dark/cmd/lc_insertindexesentry.png |binary icon-themes/colibre_dark/cmd/lc_insertmultiindex.png |binary icon-themes/colibre_dark/cmd/lc_updatecurindex.png |binary icon-themes/colibre_dark/cmd/sc_insertindexesentry.png |binary icon-themes/colibre_dark/cmd/sc_insertmultiindex.png |binary icon-themes/colibre_dark/cmd/sc_updatecurindex.png |binary icon-themes/colibre_dark_svg/cmd/32/insertindexesentry.svg |2 +- icon-themes/colibre_dark_svg/cmd/32/insertmultiindex.svg |2 +- icon-themes/colibre_dark_svg/cmd/32/updatecurindex.svg |2 +- icon-themes/colibre_dark_svg/cmd/lc_insertindexesentry.svg |2 +- icon-themes/colibre_dark_svg/cmd/lc_insertmultiindex.svg |2 +- icon-themes/colibre_dark_svg/cmd/lc_updatecurindex.svg |2 +- icon-themes/colibre_dark_svg/cmd/sc_insertindexesentry.svg |2 +- icon-themes/colibre_dark_svg/cmd/sc_insertmultiindex.svg |2 +- icon-themes/colibre_dark_svg/cmd/sc_updatecurindex.svg |2 +- icon-themes/colibre_svg/cmd/32/insertindexesentry.svg |2 +- icon-themes/colibre_svg/cmd/32/insertmultiindex.svg|2 +- icon-themes/colibre_svg/cmd/32/updatecurindex.svg |2 +- icon-themes/colibre_svg/cmd/lc_insertindexesentry.svg |2 +- icon-themes/colibre_svg/cmd/lc_insertmultiindex.svg|2 +- icon-themes/colibre_svg/cmd/lc_updatecurindex.svg |2 +- icon-themes/colibre_svg/cmd/sc_insertindexesentry.svg |2 +- icon-themes/colibre_svg/cmd/sc_insertmultiindex.svg|2 +- icon-themes/colibre_svg/cmd/sc_updatecurindex.svg |2 +- 36 files changed, 18 insertions(+), 18 deletions(-) New commits: commit d494b80b158bb3ead90f62072b7a50225e382f42 Author: Rizal Muttaqin AuthorDate: Sun Apr 23 20:00:01 2023 +0700 Commit: Rizal Muttaqin CommitDate: Sun Apr 23 18:14:14 2023 +0200 tdf#153892 Colibre Differentiate two Index icons Change-Id: Icafd532f4a5cc18d7bdfe9fe545d678286081b52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150827 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/insertindexesentry.png b/icon-themes/colibre/cmd/32/insertindexesentry.png index 1d9c1a37dce6..46007240cd21 100644 Binary files a/icon-themes/colibre/cmd/32/insertindexesentry.png and b/icon-themes/colibre/cmd/32/insertindexesentry.png differ diff --git a/icon-themes/colibre/cmd/32/insertmultiindex.png b/icon-themes/colibre/cmd/32/insertmultiindex.png index 1d9c1a37dce6..3b42124301bd 100644 Binary files a/icon-themes/colibre/cmd/32/insertmultiindex.png and b/icon-themes/colibre/cmd/32/insertmultiindex.png differ diff --git a/icon-themes/colibre/cmd/32/updatecurindex.png b/icon-themes/colibre/cmd/32/updatecurindex.png index 8e53f38535d1..4069fbbbe15c 100644 Binary files a/icon-themes/colibre/cmd/32/updatecurindex.png and b/icon-themes/colibre/cmd/32/updatecurindex.png differ diff --git a/icon-themes/colibre/cmd/lc_insertindexesentry.png b/icon-themes/colibre/cmd/lc_insertindexesentry.png index 74f386710086..5eb0e3a7d24a 100644 Binary files a/icon-themes/colibre/cmd/lc_insertindexesentry.png and b/icon-themes/colibre/cmd/lc_insertindexesentry.png differ diff --git a/icon-themes/colibre/cmd/lc_insertmultiindex.png b/icon-themes/colibre/cmd/lc_insertmultiindex.png index 74f386710086..81e414ff6515 100644 Binary files a/icon-themes/colibre/cmd/lc_insertmultiindex.png and b/icon-themes/colibre/cmd/lc_insertmultiindex.png differ diff --git a/icon-themes/colibre/cmd/lc_updatecurindex.png b/icon-themes/colibre/cmd/lc_updatecurindex.png index 47cab018eaed..48f8f32ff1f3 100644 Binary files a/icon-themes/colibre/cmd/lc_updatecurindex.png and b/icon-themes/colibre/cmd/lc_updatecurindex.png differ diff --git a/icon-themes/colibre/cmd/sc_insertindexesentry.png b/icon-themes/colibre/cmd/sc_insertindexesentry.png index a46585725f04..7853e3cd4e48 100644 Binary files a/icon-themes/colibre/cmd/sc_insertindexesentry.png and b/icon-themes/colibre/cmd/sc_insertindexesentry.png differ diff --git a/icon-themes/colibre/cmd/sc_insertmultiindex.png b/icon-theme
[Libreoffice-commits] core.git: chart2/source
chart2/source/tools/InternalData.cxx |8 ++--
chart2/source/view/charttypes/BarChart.cxx |4 +---
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 52522f4772806d9e74ab7df9cc3e8046f68c5809
Author: Nabeel Siddiqui
AuthorDate: Sun Mar 19 14:39:25 2023 +0530
Commit: Hossein
CommitDate: Sun Apr 23 17:51:21 2023 +0200
tdf#148251 Use std::swap instead of using temporary values
Change-Id: I7733ba595634f41ef0a0902ea37d694276417871
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149087
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/chart2/source/tools/InternalData.cxx
b/chart2/source/tools/InternalData.cxx
index 375e639c7879..38eb848815db 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -258,9 +258,7 @@ void InternalData::swapRowWithNext( sal_Int32 nRowIndex )
{
size_t nIndex1 = nColIdx + nRowIndex*m_nColumnCount;
size_t nIndex2 = nIndex1 + m_nColumnCount;
-double fTemp = m_aData[nIndex1];
-m_aData[nIndex1] = m_aData[nIndex2];
-m_aData[nIndex2] = fTemp;
+std::swap(m_aData[nIndex1], m_aData[nIndex2]);
}
std::vector< uno::Any > aTemp( m_aRowLabels[nRowIndex] );
@@ -278,9 +276,7 @@ void InternalData::swapColumnWithNext( sal_Int32
nColumnIndex )
{
size_t nIndex1 = nColumnIndex + nRowIdx*m_nColumnCount;
size_t nIndex2 = nIndex1 + 1;
-double fTemp = m_aData[nIndex1];
-m_aData[nIndex1] = m_aData[nIndex2];
-m_aData[nIndex2] = fTemp;
+std::swap(m_aData[nIndex1], m_aData[nIndex2]);
}
std::vector< uno::Any > aTemp( m_aColumnLabels[nColumnIndex] );
diff --git a/chart2/source/view/charttypes/BarChart.cxx
b/chart2/source/view/charttypes/BarChart.cxx
index d265f9aa3dd1..eeb30266351b 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -123,9 +123,7 @@ drawing::Direction3D
BarChart::getPreferredDiagramAspectRatio() const
}
if( m_pMainPosHelper && m_pMainPosHelper->isSwapXAndY() )
{
-double fTemp = aRet.DirectionX;
-aRet.DirectionX = aRet.DirectionY;
-aRet.DirectionY = fTemp;
+std::swap(aRet.DirectionX, aRet.DirectionY);
}
}
else
[Libreoffice-commits] core.git: drawinglayer/source emfio/qa
drawinglayer/source/tools/emfphelperdata.cxx | 27 +-
emfio/qa/cppunit/emf/EmfImportTest.cxx | 28 +++
emfio/qa/cppunit/emf/data/TestEmfPlusDrawBeziers.emf |binary
3 files changed, 42 insertions(+), 13 deletions(-)
New commits:
commit ce008fa9d8f2752bdfeaeff763aafc774a4b4fb2
Author: Bartosz Kosiorek
AuthorDate: Sun Apr 23 01:37:20 2023 +0200
Commit: Bartosz Kosiorek
CommitDate: Sun Apr 23 17:42:21 2023 +0200
tdf#154789 EMF+ Performance boost of the EmfPlusRecordTypeDrawBeziers
There is several benefits of such performance optimization:
1. We are drawing single curve instead of hundreds of small curves.
In the loop we are creating single Polygon and outside
of the loop we are invoking EMFPPlusDrawPolygon drawing method only
once. As https://bugs.documentfoundation.org/attachment.cgi?id=186725
image is using single EmfPlusRecordTypeDrawBeziers EMF+ record with
hundreds of curves, with using single EMFPPlusDrawPolygon call,
there is no lnger need for individual line creation (e.g. line
color, weight, line caps, line joints, line dashes, etc.)
- The PDF export performance without optimizations of the
https://bugs.documentfoundation.org/attachment.cgi?id=186725:
time ./instdir/program/soffice --headless --convert-to
"pdf:writer_pdf_Export" --outdir ~ ~/Pobrane/problem.docx
real 24m18,471s
user 2m56,004s
sys 1m37,816
- The PDF export performance with optimizations:
real 0m37,527s
user 0m37,004s
sys 0m0,531s
- With Libreoffice 7.5.2 from Ubuntu 22.04, the conversion was
crashed.
2. The PDF export for document:
https://bugs.documentfoundation.org/attachment.cgi?id=186725
was not working correctly for me. The original image is containing
chart. Without optimization, the exported chart was empty.
Current export is working correctly, and graph is visible.
3. The standard opening of the document from
https://bugs.documentfoundation.org/attachment.cgi?id=186725
is now much faster. The zooming in, move image operations are also
noticible faster.
Change-Id: Ic77d4c20a462587bb5da4a4df757e30c5ca04fc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150821
Tested-by: Jenkins
Reviewed-by: Noel Grandin
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index b8a3abb2bac1..94c4c32f026f 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -1345,11 +1345,15 @@ namespace emfplushelper
rMS.ReadUInt32(aCount);
SAL_INFO("drawinglayer.emf", "EMF+\t DrawBeziers slot:
" << (flags & 0xff));
SAL_INFO("drawinglayer.emf", "EMF+\t Number of points:
" << aCount);
-SAL_WARN_IF((aCount - 1) % 3 != 0, "drawinglayer.emf",
"EMF+\t Bezier Draw not support number of points other than 4, 7, 10, 13,
16...");
+SAL_WARN_IF((aCount - 1) % 3 != 0, "drawinglayer.emf",
+"EMF+\t Bezier Draw not support number of
points other than 4, 7, "
+"10, 13, 16...");
if (aCount < 4)
{
-SAL_WARN("drawinglayer.emf", "EMF+\t Bezier Draw
does not support less than 4 points. Number of points: " << aCount);
+SAL_WARN("drawinglayer.emf", "EMF+\t Bezier Draw
does not support less "
+ "than 4 points.
Number of points: "
+ << aCount);
break;
}
@@ -1357,29 +1361,26 @@ namespace emfplushelper
// We need to add first starting point
aStartPoint = Map(x1, y1);
aPolygon.append(aStartPoint);
-
+SAL_INFO("drawinglayer.emf",
+ "EMF+\t Bezier starting point: " << x1 << ","
<< y1);
for (sal_uInt32 i = 4; i <= aCount; i += 3)
{
ReadPoint(rMS, x2, y2, flags);
ReadPoint(rMS, x3, y3, flags);
ReadPoint(rMS, x4, y4, flags);
-SAL_INFO("drawinglayer.emf", "EMF+\t Bezier
points: " << x1 << "," << y1 << " " << x2 << "," << y2 << " " << x3 << "," <<
y3 << " " << x4 << "," << y4);
+SAL_INFO("drawinglayer.emf",
+ "EMF+\t Bezier points: " << x2 << "," <<
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/api/ReportComponent.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 2b87376d7e8cc9d5973a8ccd4c9fdf398ebbd2a0
Author: Julien Nabet
AuthorDate: Sun Apr 23 14:24:52 2023 +0200
Commit: Noel Grandin
CommitDate: Sun Apr 23 16:32:42 2023 +0200
tdf#154886: fix Report builder mutex assertion
Thank you Noel for the hint!
Change-Id: Icb1f63deaffc454e0dcc3b736c9214d93b6871df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150826
Reviewed-by: Ilmari Lauhakangas
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/core/api/ReportComponent.cxx
b/reportdesign/source/core/api/ReportComponent.cxx
index 5c036b5d6bdf..adfee3596914 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
@@ -41,6 +42,7 @@ namespace reportdesign
static void lcl_getDefaultFonts( vcl::Font& rLatinFont, vcl::Font& rCJKFont,
vcl::Font& rCTLFont, LanguageType _eLatin, LanguageType _eCJK, LanguageType
_eCTL )
{
+SolarMutexGuard g;
LanguageType eLatin = _eLatin;
// If the UI language is Korean, the default Latin font has to
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg
icon-themes/breeze/links.txt |5 - icon-themes/breeze/sw/res/re01.png|binary icon-themes/breeze/sw/res/re02.png|binary icon-themes/breeze/sw/res/re03.png|binary icon-themes/breeze/sw/res/re04.png|binary icon-themes/breeze_dark/links.txt |5 - icon-themes/breeze_dark/sw/res/re01.png |binary icon-themes/breeze_dark/sw/res/re02.png |binary icon-themes/breeze_dark/sw/res/re03.png |binary icon-themes/breeze_dark/sw/res/re04.png |binary icon-themes/breeze_dark_svg/sw/res/re01.svg |1 + icon-themes/breeze_dark_svg/sw/res/re02.svg |1 + icon-themes/breeze_dark_svg/sw/res/re03.svg |1 + icon-themes/breeze_dark_svg/sw/res/re04.svg |1 + icon-themes/breeze_svg/sw/res/re01.svg|1 + icon-themes/breeze_svg/sw/res/re02.svg|1 + icon-themes/breeze_svg/sw/res/re03.svg|1 + icon-themes/breeze_svg/sw/res/re04.svg|1 + icon-themes/colibre/sw/res/re01.png |binary icon-themes/colibre/sw/res/re02.png |binary icon-themes/colibre/sw/res/re03.png |binary icon-themes/colibre/sw/res/re04.png |binary icon-themes/colibre_dark/sw/res/re01.png |binary icon-themes/colibre_dark/sw/res/re02.png |binary icon-themes/colibre_dark/sw/res/re03.png |binary icon-themes/colibre_dark/sw/res/re04.png |binary icon-themes/colibre_dark_svg/sw/res/re01.svg |4 +++- icon-themes/colibre_dark_svg/sw/res/re02.svg |5 +++-- icon-themes/colibre_dark_svg/sw/res/re03.svg |3 ++- icon-themes/colibre_dark_svg/sw/res/re04.svg |5 +++-- icon-themes/colibre_svg/sw/res/re01.svg |4 +++- icon-themes/colibre_svg/sw/res/re02.svg |3 ++- icon-themes/colibre_svg/sw/res/re03.svg |3 ++- icon-themes/colibre_svg/sw/res/re04.svg |3 ++- icon-themes/elementary/links.txt |5 - icon-themes/elementary/sw/res/re01.png|binary icon-themes/elementary/sw/res/re02.png|binary icon-themes/elementary/sw/res/re03.png|binary icon-themes/elementary/sw/res/re04.png|binary icon-themes/elementary_svg/sw/res/re01.svg|1 + icon-themes/elementary_svg/sw/res/re02.svg|1 + icon-themes/elementary_svg/sw/res/re03.svg|1 + icon-themes/elementary_svg/sw/res/re04.svg|1 + icon-themes/karasa_jaga/sw/res/re01.png |binary icon-themes/karasa_jaga/sw/res/re02.png |binary icon-themes/karasa_jaga/sw/res/re03.png |binary icon-themes/karasa_jaga/sw/res/re04.png |binary icon-themes/karasa_jaga_svg/sw/res/re01.svg |1 + icon-themes/karasa_jaga_svg/sw/res/re02.svg |1 + icon-themes/karasa_jaga_svg/sw/res/re03.svg |1 + icon-themes/karasa_jaga_svg/sw/res/re04.svg |1 + icon-themes/sifr/links.txt|4 icon-themes/sifr/sw/res/re01.png |binary icon-themes/sifr/sw/res/re02.png |binary icon-themes/sifr/sw/res/re03.png |binary icon-themes/sifr/sw/res/re04.png |binary icon-themes/sifr_dark/links.txt |4 icon-themes/sifr_dark/sw/res/re01.png |binary icon-themes/sifr_dark/sw/res/re02.png |binary icon-themes/sifr_dark/sw/res/re03.png |binary icon-themes/sifr_dark/sw/res/re04.png |binary icon-themes/sifr_dark_svg/sw/res/re01.svg |1 + icon-themes/sifr_dark_svg/sw/res/re02.svg |1 + icon-themes/sifr_dark_svg/sw/res/re03.svg |1 + icon-themes/sifr_dark_svg/sw/res/re04.svg |1 + icon-themes/sifr_svg/sw/res/re01.svg |1 + icon-themes/sifr_svg/sw/res/re02.svg |1 + icon-themes/sifr_svg/sw/res/re03.svg |1 + icon-themes/sifr_svg/sw/res/re04.svg |1 + icon-themes/sukapura/sw/res/re01.png |binary icon-themes/sukapura/sw/res/re02.png |binary icon-themes/sukapura/sw/res/re03.png |binary icon-themes/sukapura/sw/res/re04.png |binary icon-themes/sukapura_dark/sw/res/re01.png |binary icon-themes/sukapura_dark/sw/res/re02.png |binary icon-themes/sukapura_dark/sw/res/re03.png |binary icon-themes/sukapura_dark/sw/res/re04.png |binary icon-themes/sukapura_dark_svg/sw/res/re01.svg |3 ++- icon-themes/sukapura_dark_svg/sw/res/re02.svg |3 ++- icon-themes/sukapura_dark_svg/sw/res/re03.svg |3 ++- icon-themes/sukapura_dark_svg/sw/res/re04.svg |3 ++- icon-themes/sukapura_svg/sw/res/re01.svg |3 ++- icon-themes/sukapura_svg/sw/res/re02.svg |3 ++- icon-themes/sukapura_svg/sw/res/re03.svg |3 ++- icon-themes/sukapura_svg/sw/res/re04.svg |3 ++- 85 files changed, 60 insertions(+), 41 deletions(-) New commits: commit 4ee01c29a3794e1e0dee300d0f2aa150ce07b3c0 Author: Rizal Muttaqin AuthorDate: Sun Apr 23 17:53:45 2023 +0700 Commit: Rizal Muttaqin CommitDat
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 3 commits - desktop/source include/rtl sd/source sw/source vcl/source
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 36
--
include/rtl/xmlencode.hxx | 55
++
sd/source/filter/html/htmlex.cxx |5
sw/source/filter/html/css1atr.cxx |3
sw/source/filter/html/htmlfldw.cxx|3
sw/source/ui/dialog/uiregionsw.cxx| 29
+
vcl/source/gdi/pdfwriter_impl.cxx | 50
+
7 files changed, 100 insertions(+), 81 deletions(-)
New commits:
commit 1a5423d3b04ba540229f8532d386cca637f5ce57
Author: Szymon Kłos
AuthorDate: Fri Apr 7 19:03:55 2023 +0200
Commit: Szymon Kłos
CommitDate: Fri Apr 7 19:59:14 2023 +0200
lok: Hide file linking in section
this is followup for 6f56317
Change-Id: I87227b3e665a6d15378ee294556bcd2f95801e6b
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 8480ba52b680..44ce60cd531f 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -402,6 +402,19 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent,
SwWrtShell& rWrtSh)
m_xTree->show();
bDontCheckPasswd = false;
+
+if(comphelper::LibreOfficeKit::isActive())
+{
+m_xBuilder->weld_label("label8")->hide(); // Link
+m_xFileCB->hide();
+m_xDDECB->hide();
+m_xDDECommandFT->hide();
+m_xFileNameFT->hide();
+m_xFileNameED->hide();
+m_xFilePB->hide();
+m_xSubRegionFT->hide();
+m_xSubRegionED->hide();
+}
}
bool SwEditRegionDlg::CheckPasswd(weld::ToggleButton* pBox)
commit d6d5b73af9bc353bbacda51943b4cbb66ee7baba
Author: Andras Timar
AuthorDate: Thu Nov 24 13:37:36 2022 +0100
Commit: Szymon Kłos
CommitDate: Fri Apr 7 19:59:00 2023 +0200
Disallow linking files as Writer sections in Online
Change-Id: I9e4971c72db44ca8216ac468240dd52d46e0b680
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143225
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index e4147262859e..8480ba52b680 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1509,6 +1510,21 @@
SwInsertSectionTabPage::SwInsertSectionTabPage(weld::Container* pPage, weld::Dia
m_xDDECB->connect_toggled( LINK( this, SwInsertSectionTabPage, DDEHdl ));
ChangeProtectHdl(*m_xProtectCB);
m_xSubRegionED->set_entry_completion(true, true);
+
+// Hide Link section. In general it makes no sense to insert a file from
the jail,
+// because it does not contain any usable files (documents).
+if(comphelper::LibreOfficeKit::isActive())
+{
+m_xBuilder->weld_label("label1")->hide(); // Link
+m_xFileCB->hide();
+m_xDDECB->hide();
+m_xDDECommandFT->hide();
+m_xFileNameFT->hide();
+m_xFileNameED->hide();
+m_xFilePB->hide();
+m_xSubRegionFT->hide();
+m_xSubRegionED->hide();
+}
}
SwInsertSectionTabPage::~SwInsertSectionTabPage()
commit ba096ccb16f7b0e801dd7dc2d0910f3e25c6977f
Author: Szymon Kłos
AuthorDate: Fri Apr 7 09:48:41 2023 +0200
Commit: Szymon Kłos
CommitDate: Fri Apr 7 19:51:32 2023 +0200
Make encodeForXml accessible for other modules
and share similar code
Change-Id: I7729a46d40845893f577c273c1ab340f69ebb51b
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 40d0ee9c8b3c..241d466c5fd9 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -554,39 +555,6 @@ BackendImpl::PackageImpl::isRegistered_(
}
-OUString encodeForXml( OUString const & text )
-{
-// encode conforming xml:
-sal_Int32 len = text.getLength();
-OUStringBuffer buf;
-for ( sal_Int32 pos = 0; pos < len; ++pos )
-{
-sal_Unicode c = text[ pos ];
-switch (c) {
-case '<':
-buf.append( "<" );
-break;
-case '>':
-buf.append( ">" );
-break;
-case '&':
-buf.append( "&" );
-break;
-case '\'':
-buf.append( "'" );
-break;
-case '\"':
-buf.append( """ );
-break;
-default:
-buf.append( c );
-break;
-}
-}
-return buf.makeStringAndClear();
-}
-
-
OUString replaceOrigin(
OUString cons
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 3 commits - desktop/source include/rtl sd/source sw/source vcl/source
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 36
--
include/rtl/xmlencode.hxx | 55
++
sd/source/filter/html/htmlex.cxx |5
sw/source/filter/html/css1atr.cxx |3
sw/source/filter/html/htmlfldw.cxx|3
sw/source/ui/dialog/uiregionsw.cxx| 29
+
vcl/source/gdi/pdfwriter_impl.cxx | 39
---
7 files changed, 97 insertions(+), 73 deletions(-)
New commits:
commit 809030c497d9c8280a14e4b5915228a329b323c6
Author: Szymon Kłos
AuthorDate: Fri Apr 7 19:03:55 2023 +0200
Commit: Szymon Kłos
CommitDate: Fri Apr 7 19:37:47 2023 +0200
lok: Hide file linking in section
this is followup for 6f56317
Change-Id: I87227b3e665a6d15378ee294556bcd2f95801e6b
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index a5492545d74a..a7e10e44d364 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -395,6 +395,19 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent,
SwWrtShell& rWrtSh)
m_xTree->show();
bDontCheckPasswd = false;
+
+if(comphelper::LibreOfficeKit::isActive())
+{
+m_xBuilder->weld_label("label8")->hide(); // Link
+m_xFileCB->hide();
+m_xDDECB->hide();
+m_xDDECommandFT->hide();
+m_xFileNameFT->hide();
+m_xFileNameED->hide();
+m_xFilePB->hide();
+m_xSubRegionFT->hide();
+m_xSubRegionED->hide();
+}
}
bool SwEditRegionDlg::CheckPasswd(weld::ToggleButton* pBox)
commit 47e000b9289e0e37e1c2f5064064932ecd320152
Author: Andras Timar
AuthorDate: Thu Nov 24 13:37:36 2022 +0100
Commit: Szymon Kłos
CommitDate: Fri Apr 7 19:37:17 2023 +0200
Disallow linking files as Writer sections in Online
Change-Id: I9e4971c72db44ca8216ac468240dd52d46e0b680
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143225
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index d9ba3fcbb9ab..a5492545d74a 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1478,6 +1479,21 @@
SwInsertSectionTabPage::SwInsertSectionTabPage(weld::Container* pPage, weld::Dia
m_xDDECB->connect_toggled( LINK( this, SwInsertSectionTabPage, DDEHdl ));
ChangeProtectHdl(*m_xProtectCB);
m_xSubRegionED->set_entry_completion(true, true);
+
+// Hide Link section. In general it makes no sense to insert a file from
the jail,
+// because it does not contain any usable files (documents).
+if(comphelper::LibreOfficeKit::isActive())
+{
+m_xBuilder->weld_label("label1")->hide(); // Link
+m_xFileCB->hide();
+m_xDDECB->hide();
+m_xDDECommandFT->hide();
+m_xFileNameFT->hide();
+m_xFileNameED->hide();
+m_xFilePB->hide();
+m_xSubRegionFT->hide();
+m_xSubRegionED->hide();
+}
}
SwInsertSectionTabPage::~SwInsertSectionTabPage()
commit cb00ec7cbfc7900c3a31e7fdc4916668a1fa4c11
Author: Szymon Kłos
AuthorDate: Fri Apr 7 09:48:41 2023 +0200
Commit: Szymon Kłos
CommitDate: Fri Apr 7 19:33:46 2023 +0200
Make encodeForXml accessible for other modules
and share similar code
Change-Id: I7729a46d40845893f577c273c1ab340f69ebb51b
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 578e164f13b7..ae9aaae51138 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -566,39 +567,6 @@ BackendImpl::PackageImpl::isRegistered_(
}
-OUString encodeForXml( OUString const & text )
-{
-// encode conforming xml:
-sal_Int32 len = text.getLength();
-OUStringBuffer buf;
-for ( sal_Int32 pos = 0; pos < len; ++pos )
-{
-sal_Unicode c = text[ pos ];
-switch (c) {
-case '<':
-buf.append( "<" );
-break;
-case '>':
-buf.append( ">" );
-break;
-case '&':
-buf.append( "&" );
-break;
-case '\'':
-buf.append( "'" );
-break;
-case '\"':
-buf.append( """ );
-break;
-default:
-buf.append( c );
-break;
-}
-}
-return buf.makeStringAndClear();
-}
-
-
OUString replaceOrigin(
OUString const &
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - 3 commits - configure.ac desktop/source include/rtl include/vcl sd/source sw/source vcl/source
configure.ac |2
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 36
--
include/rtl/xmlencode.hxx | 55
++
include/vcl/pdfwriter.hxx |2
sd/source/filter/html/htmlex.cxx |5
sw/source/filter/html/css1atr.cxx |3
sw/source/filter/html/htmlfldw.cxx|3
sw/source/ui/dialog/uiregionsw.cxx| 13 ++
vcl/source/gdi/pdfwriter_impl.cxx | 39
---
9 files changed, 82 insertions(+), 76 deletions(-)
New commits:
commit 127e685b66bdfd79c186ac79a66b92ccef3bef07
Author: Andras Timar
AuthorDate: Wed Apr 12 23:30:37 2023 +0200
Commit: Andras Timar
CommitDate: Sun Apr 23 16:29:24 2023 +0200
Bump version to 22.05.13.1
Change-Id: I72a5b6418812c74ac47e4ccc4e82ff2238ad7eb6
diff --git a/configure.ac b/configure.ac
index ebc592b173bb..89f1710abd16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([Collabora Office],[22.05.12.3],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[22.05.13.1],[],[],[https://collaboraoffice.com/])
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
commit 80c423520baa94cd3546e02cb383946a7d448ce9
Author: Szymon Kłos
AuthorDate: Fri Apr 7 19:03:55 2023 +0200
Commit: Andras Timar
CommitDate: Sun Apr 23 16:29:23 2023 +0200
lok: Hide file linking in section
this is followup for 6f56317
Change-Id: I87227b3e665a6d15378ee294556bcd2f95801e6b
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 94ed8bf40a8e..bcc821a9973b 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -397,6 +397,19 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent,
SwWrtShell& rWrtSh)
m_xTree->show();
bDontCheckPasswd = false;
+
+if(comphelper::LibreOfficeKit::isActive())
+{
+m_xBuilder->weld_label("label8")->hide(); // Link
+m_xFileCB->hide();
+m_xDDECB->hide();
+m_xDDECommandFT->hide();
+m_xFileNameFT->hide();
+m_xFileNameED->hide();
+m_xFilePB->hide();
+m_xSubRegionFT->hide();
+m_xSubRegionED->hide();
+}
}
bool SwEditRegionDlg::CheckPasswd(weld::Toggleable* pBox)
commit 4cb0100ae7ad6850276b96ca9d6a4f6074db1d2f
Author: Szymon Kłos
AuthorDate: Fri Apr 7 09:48:41 2023 +0200
Commit: Andras Timar
CommitDate: Sun Apr 23 16:29:23 2023 +0200
Make encodeForXml accessible for other modules
and share similar code
Change-Id: I7729a46d40845893f577c273c1ab340f69ebb51b
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 4b388414a778..d049b6e92833 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -564,39 +565,6 @@ BackendImpl::PackageImpl::isRegistered_(
}
-OUString encodeForXml( OUString const & text )
-{
-// encode conforming xml:
-sal_Int32 len = text.getLength();
-OUStringBuffer buf;
-for ( sal_Int32 pos = 0; pos < len; ++pos )
-{
-sal_Unicode c = text[ pos ];
-switch (c) {
-case '<':
-buf.append( "<" );
-break;
-case '>':
-buf.append( ">" );
-break;
-case '&':
-buf.append( "&" );
-break;
-case '\'':
-buf.append( "'" );
-break;
-case '\"':
-buf.append( """ );
-break;
-default:
-buf.append( c );
-break;
-}
-}
-return buf.makeStringAndClear();
-}
-
-
OUString replaceOrigin(
OUString const & url, std::u16string_view destFolder, Reference<
XCommandEnvironment > const & xCmdEnv, Reference< XComponentContext > const &
xContext, bool & out_replaced)
{
@@ -649,7 +617,7 @@ OUString replaceOrigin(
if (origin.isEmpty()) {
// encode only once
origin = OUStringToOString(
-encodeForXml( url.copy( 0, url.lastIndexOf( '/' ) ) ),
+rtl::encodeForXml( url.subView( 0,
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/python/scriptforge.py |6 +-
wizards/source/sfdialogs/SF_DialogControl.xba| 47 ++-
wizards/source/sfdialogs/SF_DialogUtils.xba |2
3 files changed, 41 insertions(+), 14 deletions(-)
New commits:
commit a58017d99c3cea52fe7b37f2379c5306bfa59807
Author: Jean-Pierre Ledure
AuthorDate: Sun Apr 23 12:57:11 2023 +0200
Commit: Jean-Pierre Ledure
CommitDate: Sun Apr 23 14:54:49 2023 +0200
ScriptForge (SFDialogs) support hyperlink control types
Controls designated in english as "Hyperlink controls"
in the Basic IDE are from now on accepted as instances
of the SF_DialogControl service.
All generic properties are accepted.
The supported specific properties are:
- Caption (the text that appears in the dialog box)
- URL (the URL to activate when clicked)
The new control type is supported in Basic and Python
user scripts.
The SFDialogs.DialogControl help page needs to be updated.
Change-Id: I4827834ad8ef336c084ee51b5285b85745ceb1b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150824
Tested-by: Jean-Pierre Ledure
Reviewed-by: Jean-Pierre Ledure
Tested-by: Jenkins
diff --git a/wizards/source/scriptforge/python/scriptforge.py
b/wizards/source/scriptforge/python/scriptforge.py
index 09d796aa161c..ff5a3ef8b6ee 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -1913,9 +1913,9 @@ class SFDialogs:
OnMouseReleased = True, OnNodeExpanded =
True, OnNodeSelected = True,
OnTextChanged = True, Page = True, Parent =
False, Picture = True,
RootNode = False, RowSource = True, Text =
False, TipText = True,
- TripleState = True, Value = True, Visible =
True, Width = True, X = True, Y = True,
- XControlModel = False, XControlView = False,
XGridColumnModel = False,
- XGridDataModel = False, XTreeDataModel =
False)
+ TripleState = True, URL = True, Value = True,
Visible = True, Width = True,
+ X = True, Y = True, XControlModel = False,
XControlView = False,
+ XGridColumnModel = False, XGridDataModel =
False, XTreeDataModel = False)
# Root related properties do not start with X and, nevertheless,
return a UNO object
@property
diff --git a/wizards/source/sfdialogs/SF_DialogControl.xba
b/wizards/source/sfdialogs/SF_DialogControl.xba
index e7c415f0ba52..ddcd7f4aab99 100644
--- a/wizards/source/sfdialogs/SF_DialogControl.xba
+++ b/wizards/source/sfdialogs/SF_DialogControl.xba
@@ -142,6 +142,7 @@ Private Const CTLFIXEDLINE = "FixedLine"
Private Const CTLFIXEDTEXT = "FixedText"
Private Const CTLFORMATTEDFIELD= "FormattedField"
Private Const CTLGROUPBOX = "GroupBox"
+Private Const CTLHYPERLINK = "Hyperlink"
Private Const CTLIMAGECONTROL = "ImageControl"
Private Const CTLLISTBOX = "ListBox"
Private Const CTLNUMERICFIELD = "NumericField"
@@ -648,6 +649,18 @@ Property Let TripleState(Optional ByVal pvTripleState As
Variant)
_PropertySet("TripleState", pvTripleState)
End Property ' SFDialogs.SF_DialogControl.TripleState (let)
+REM
-
+Property Get URL() As Variant
+''' The URL property refers to the URL to open when the
control is clicked
+ URL = _PropertyGet("URL", "")
+End Property ' SFDialogs.SF_DialogControl.URL (get)
+
+REM
-
+Property Let URL(Optional ByVal pvURL As Variant)
+''' Set the updatable property URL
+ _PropertySet("URL", pvURL)
+End Property ' SFDialogs.SF_DialogControl.URL (let)
+
REM
-
Property Get Value() As Variant
''' The Value property specifies the data contained in the
control
@@ -1132,6 +1145,7 @@ Public Function Properties() As Variant
, "Text" _
, "TipText" _
, "TripleState" _
+ , "URL" _
, "Value" _
, "Visible" _
, "Width" _
@@ -1673,7 +1687,6 @@ Public Sub _Initialize()
Dim vServiceName As Variant' Split service name
Dim sType As String' Last component of
service name
-Dim oPosSize As Object ' com.sun.star.awt.Rectangle
Try:
_ImplementationName = _ControlMod
[Libreoffice-commits] core.git: include/vcl
include/vcl/vclptr.hxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f7307c6366196940dcdbf6d2bfc23b69b18acb85
Author: Caolán McNamara
AuthorDate: Sat Apr 22 21:53:25 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 23 14:12:49 2023 +0200
cid#1524746 silence Using a moved object
Change-Id: I82728c481c721aeb0d70f6bbdf6f0f1b49ea7b8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150819
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 326881edd105..ea2fffe41790 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -201,7 +201,8 @@ public:
{
// hold it alive for the lifetime of this method
::rtl::Reference aTmp(std::move(m_rInnerRef));
-assert(!m_rInnerRef); // the move ctor above must take care of it
+// coverity[use_after_move : SUPPRESS] - the move ctor above must take
care of it
+assert(!m_rInnerRef);
if (aTmp.get()) {
aTmp->disposeOnce();
}
[Libreoffice-commits] core.git: 2 commits - oox/source svx/source sw/source
oox/source/drawingml/fillproperties.cxx |1 +
svx/source/unodraw/XPropertyTable.cxx |1 +
sw/source/uibase/dochdl/swdtflvr.cxx|5 +
3 files changed, 7 insertions(+)
New commits:
commit e03603bcedf236c050173b921ab51db9aa8ce274
Author: Caolán McNamara
AuthorDate: Sat Apr 22 21:48:38 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 23 14:12:41 2023 +0200
cid#1524676 try to convince coverity of the error of its ways
and
cid#1524745 Explicit null dereferenced
Change-Id: Id2fb9cf6d0a71712533e14981a33490c578db597
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 963d5f6e449d..026a341e2c4d 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -613,6 +613,7 @@ void FillProperties::pushToPropMap(ShapePropertyMap&
rPropMap, const GraphicHelp
sal_Int32 nEndTrans = 0;
sal_Int32 nStartTrans = 0;
awt::Gradient2 aGradient;
+assert(aGradient.ColorStops.get() && "cid#1524676
aGradient.ColorStops._pSequence won't be null here");
aGradient.Angle = 900;
aGradient.StartIntensity = 100;
aGradient.EndIntensity = 100;
diff --git a/svx/source/unodraw/XPropertyTable.cxx
b/svx/source/unodraw/XPropertyTable.cxx
index a66f7e37b8f7..45b0cd39c1ed 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -534,6 +534,7 @@ uno::Any SvxUnoXGradientTable::getAny( const
XPropertyEntry* pEntry ) const noex
{
const XGradient& aXGradient = static_cast(pEntry)->GetGradient();
awt::Gradient2 aGradient;
+assert(aGradient.ColorStops.get() && "cid#1524745
aGradient.ColorStops._pSequence won't be null here");
// standard values
aGradient.Style = aXGradient.GetGradientStyle();
commit 1597f3cf16aa6747c878a23f64669805d18e9c46
Author: Caolán McNamara
AuthorDate: Sat Apr 22 21:46:53 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 23 14:12:33 2023 +0200
cid#1524747 Dereference null return value
Change-Id: I08a3382287dd30a6cee84e93b3aa8a97db4c3a76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150817
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 8966e6eebb15..201b7fa1b5d2 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -3978,6 +3978,11 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const
Point& rDragPt,
// up to down, if the cursor is there in its last table row
const SwSelBoxes& rBoxes =
rSrcSh.GetTableCursor()->GetSelectedBoxes();
const SwTableNode* pTableNd = rSh.IsCursorInTable();
+if (!pTableNd)
+{
+SAL_WARN("sw", "presumably this case can't arise in practice");
+return false;
+}
const SwTableLines& rLines = pTableNd->GetTable().GetTabLines();
const SwStartNode& rDelPos = rBoxes.back()
? *rBoxes.front()->GetSttNd()
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/AccessibilityIssue.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6ca3b441a9e32d80be8e6ebf3246b5e2de36e1ef
Author: Caolán McNamara
AuthorDate: Sat Apr 22 21:42:40 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 23 14:08:47 2023 +0200
cid#1524750 Dereference null return value
Change-Id: I2f0aa7c190e6f4c18340a75fcc2eb5b635d686e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150816
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/source/core/access/AccessibilityIssue.cxx
b/sw/source/core/access/AccessibilityIssue.cxx
index 628a77e4f2ff..3555e0ae2b41 100644
--- a/sw/source/core/access/AccessibilityIssue.cxx
+++ b/sw/source/core/access/AccessibilityIssue.cxx
@@ -108,7 +108,8 @@ void AccessibilityIssue::quickFixIssue() const
{
SwFlyFrameFormat* pFlyFormat
=
const_cast(m_pDoc->FindFlyByName(m_sObjectID));
-m_pDoc->SetFlyFrameTitle(*pFlyFormat, aNameDialog.GetName());
+if (pFlyFormat)
+m_pDoc->SetFlyFrameTitle(*pFlyFormat,
aNameDialog.GetName());
}
}
break;
[Libreoffice-commits] core.git: 2 commits - sd/source vcl/source
sd/source/ui/view/FormShellManager.cxx |2 +-
vcl/source/graphic/BinaryDataContainer.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2281c182e181fcfccf526a4ca2364295c7eaa1ee
Author: Caolán McNamara
AuthorDate: Sat Apr 22 21:41:12 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 23 14:08:20 2023 +0200
cid#1524751 Dereference after null check
Change-Id: I3543b7e251fe6076ad1875bc49abfbe747f45999
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150813
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/graphic/BinaryDataContainer.cxx
b/vcl/source/graphic/BinaryDataContainer.cxx
index 72d9bac27940..b35195b7d27e 100644
--- a/vcl/source/graphic/BinaryDataContainer.cxx
+++ b/vcl/source/graphic/BinaryDataContainer.cxx
@@ -54,7 +54,8 @@ class ReferencedMemoryStream : public SvMemoryStream
public:
ReferencedMemoryStream(const std::shared_ptr>&
rData)
-: SvMemoryStream(rData ? rData->data() : nullptr, rData->size(),
StreamMode::READ)
+: SvMemoryStream(rData ? rData->data() : nullptr, rData ?
rData->size() : 0,
+ StreamMode::READ)
, mpData(rData)
{
}
commit ed93d660953cb4d15321ee7529a07cd0c8af0ba9
Author: Caolán McNamara
AuthorDate: Sat Apr 22 21:38:26 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 23 14:08:10 2023 +0200
cid#1401342 Uncaught exception
Change-Id: I16dd5b9adf6f6e87c11bd1cfcbb823c4f683bedd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150812
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/view/FormShellManager.cxx
b/sd/source/ui/view/FormShellManager.cxx
index 3efa9bed71bb..bfd1808342ab 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -66,7 +66,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase)
FormShellManager::~FormShellManager()
{
-SetFormShell(nullptr);
+suppress_fun_call_w_exception(SetFormShell(nullptr));
UnregisterAtCenterPane();
// Unregister from the EventMultiplexer.
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/accessibility/AccessibilityIssue.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 8ce01e886db5c9968909eda0cab93b5f41634f34
Author: Caolán McNamara
AuthorDate: Sat Apr 22 21:36:24 2023 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 23 14:07:29 2023 +0200
cid#1524748 Uninitialized pointer field
Change-Id: I50becae790146538b5996df15301456d83af2ffd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150811
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sfx2/source/accessibility/AccessibilityIssue.cxx
b/sfx2/source/accessibility/AccessibilityIssue.cxx
index aa58c3924476..eba2c1931d85 100644
--- a/sfx2/source/accessibility/AccessibilityIssue.cxx
+++ b/sfx2/source/accessibility/AccessibilityIssue.cxx
@@ -14,6 +14,7 @@ namespace sfx
{
AccessibilityIssue::AccessibilityIssue(AccessibilityIssueID eIssueID)
: m_eIssueID(eIssueID)
+, m_pParent(nullptr)
{
}
[Libreoffice-commits] core.git: comphelper/source connectivity/source sc/source sfx2/source svx/source toolkit/source writerfilter/source xmloff/source
comphelper/source/misc/storagehelper.cxx |3 ++-
connectivity/source/drivers/postgresql/pq_xcontainer.cxx |5 +++--
sc/source/ui/view/drawvie4.cxx |3 ++-
sfx2/source/appl/appmisc.cxx |3 ++-
sfx2/source/sidebar/ContextChangeBroadcaster.cxx |3 ++-
svx/source/svdraw/charthelper.cxx|2 +-
toolkit/source/controls/dialogcontrol.cxx|2 +-
writerfilter/source/dmapper/SdtHelper.cxx|4 +++-
xmloff/source/style/xmlexppr.cxx |5 +++--
xmloff/source/text/XMLTextMarkImportContext.cxx |3 ++-
10 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit b6c617c3d69d6b2cf209bd7cfe4b9565b58e87c0
Author: Noel Grandin
AuthorDate: Fri Apr 21 12:14:01 2023 +0200
Commit: Noel Grandin
CommitDate: Sun Apr 23 13:35:46 2023 +0200
use more TOOLS_WARN_EXCEPTION
so we get more complete information when something goes wrong
Change-Id: Ia73623f748b0779cf80b0086bd8258791590e9ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150754
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/misc/storagehelper.cxx
b/comphelper/source/misc/storagehelper.cxx
index 8244a1a1654a..9d3dbcd22732 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -50,6 +50,7 @@
#include
#include
+#include
#include
#include
#include
@@ -388,7 +389,7 @@ uno::Sequence< beans::NamedValue >
OStorageHelper::CreatePackageEncryptionData(
}
catch ( uno::Exception& )
{
-OSL_ENSURE( false, "Can not create SHA256 digest!" );
+TOOLS_WARN_EXCEPTION("comphelper", "Can not create SHA256 digest!"
);
}
// MS_1252 encoding was used for SO60 document format password
encoding,
diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
index 5c0567b2dc3a..9d594280065d 100644
--- a/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcontainer.cxx
@@ -36,6 +36,7 @@
#include
#include
+#include
#include
#include
#include
@@ -392,13 +393,13 @@ void Container::fire( const EventBroadcastHelper &helper )
}
catch ( css::uno::RuntimeException & )
{
-OSL_ENSURE( false, "exception caught" );
+TOOLS_WARN_EXCEPTION( "connectivity.postgresql", "exception
caught" );
// loose coupling, a runtime exception shall not break anything
// TODO: log away as warning !
}
catch( css::uno::Exception & )
{
-OSL_ENSURE( false, "exception from listener flying through" );
+TOOLS_WARN_EXCEPTION( "connectivity.postgresql", "exception from
listener flying through" );
throw;
}
}
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index f720ecd76d33..5cc1655b83c4 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -50,6 +50,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -468,7 +469,7 @@ void ScDrawView::SetMarkedOriginalSize()
bDo = true;
} catch( embed::NoVisualAreaSizeException& )
{
-OSL_ENSURE( false, "Can't get the original size of the
object!" );
+TOOLS_WARN_EXCEPTION("sc.ui", "Can't get the original
size of the object!" );
}
}
}
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index dc1f26a969b3..3b748ddebd04 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -194,7 +195,7 @@ bool SfxApplication::loadBrandSvg(const char *pName,
BitmapEx &rBitmap, int nWid
}
catch(const uno::Exception&)
{
-OSL_ENSURE(false, "Got no graphic::XPrimitive2DRenderer (!)" );
+TOOLS_WARN_EXCEPTION("sfx.appl", "Got no graphic::XPrimitive2DRenderer
(!)" );
}
return false;
}
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index d2d55b700fbc..4c1cf2c16a6d 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -116,7 +117,7 @@ OUString ContextChangeBroadcaster::GetModuleName (const
css::uno::Reference
#include
#include
+#include
#include
#include
#include
@@ -388,7 +389,8 @@ void SdtHelper::createDateContentControl()
}
catch (uno::Exceptio
[Libreoffice-commits] core.git: sc/qa sc/source sd/source sfx2/source shell/source svx/source sw/source toolkit/source
sc/qa/unit/helper/debughelper.hxx|4
sc/qa/unit/helper/qahelper.cxx |3 +++
sc/qa/unit/pivottable_filters_test.cxx |3 +++
sc/qa/unit/subsequent_export_test3.cxx |2 ++
sc/qa/unit/ucalc.cxx |2 ++
sc/qa/unit/ucalc_copypaste.cxx |3 +++
sc/qa/unit/ucalc_formula.cxx |2 ++
sc/qa/unit/ucalc_formula2.cxx|3 +++
sc/qa/unit/ucalc_sharedformula.cxx |3 +++
sc/qa/unit/ucalc_sort.cxx|3 +++
sc/source/filter/excel/xeescher.cxx |1 -
sc/source/filter/excel/xltracer.cxx |3 ---
sc/source/filter/xml/XMLStylesImportHelper.cxx |1 -
sc/source/filter/xml/XMLTableShapeResizer.cxx|1 -
sc/source/filter/xml/xmltabi.cxx |1 -
sc/source/ui/undo/undorangename.cxx |2 --
sd/source/core/drawdoc.cxx |1 -
sd/source/ui/framework/module/ModuleController.cxx |1 -
sfx2/source/doc/docmacromode.cxx |1 -
shell/source/win32/simplemail/smplmailmsg.cxx|2 --
svx/source/accessibility/AccessibleFrameSelector.cxx |2 --
sw/source/core/access/accpara.cxx|1 -
sw/source/filter/xml/XMLRedlineImportHelper.cxx |1 -
sw/source/filter/xml/xmlitmpr.cxx|3 ---
sw/source/uibase/inc/mailmergewizard.hxx |1 -
toolkit/source/awt/vclxtopwindow.cxx |1 -
toolkit/source/controls/unocontroltablemodel.cxx |1 -
27 files changed, 24 insertions(+), 28 deletions(-)
New commits:
commit d7e0247ed43091172c2cc3827399bb111416d617
Author: Gabor Kelemen
AuthorDate: Wed Apr 12 00:27:47 2023 +0200
Commit: Gabor Kelemen
CommitDate: Sun Apr 23 13:05:21 2023 +0200
Run clang-tidy with misc-unused-using-decls on modules [s-t]*
To remove unneeded using declarations.
Via the simple script:
for i in $(find $dirname -name "*cxx" -o -name "*hxx" ); do
clang-tidy-12 --checks="-*,misc-unused-using-decls" "$i";
done
Change-Id: I596299084471b2904548d23875866f1583b00b2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150610
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen
diff --git a/sc/qa/unit/helper/debughelper.hxx
b/sc/qa/unit/helper/debughelper.hxx
index af7a11a65fdd..47d0e25e0842 100644
--- a/sc/qa/unit/helper/debughelper.hxx
+++ b/sc/qa/unit/helper/debughelper.hxx
@@ -28,9 +28,5 @@
#include
using namespace ::com::sun::star;
-using ::std::cout;
-using ::std::cerr;
-using ::std::endl;
-using ::std::vector;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index dbfb6af398f2..af8e5ad8dca1 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -48,6 +48,9 @@
using namespace com::sun::star;
using namespace ::com::sun::star::uno;
+using ::std::cout;
+using ::std::cerr;
+using ::std::endl;
FormulaGrammarSwitch::FormulaGrammarSwitch(ScDocument* pDoc,
formula::FormulaGrammar::Grammar eGrammar) :
mpDoc(pDoc), meOldGrammar(pDoc->GetGrammar())
diff --git a/sc/qa/unit/pivottable_filters_test.cxx
b/sc/qa/unit/pivottable_filters_test.cxx
index b9c92e252db5..372d81b83ec0 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -34,6 +34,9 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+using ::std::cerr;
+using ::std::cout;
+using ::std::endl;
class ScPivotTableFiltersTest : public ScModelTestBase
{
diff --git a/sc/qa/unit/subsequent_export_test3.cxx
b/sc/qa/unit/subsequent_export_test3.cxx
index 4039f54547ef..b1ce4c1a6125 100644
--- a/sc/qa/unit/subsequent_export_test3.cxx
+++ b/sc/qa/unit/subsequent_export_test3.cxx
@@ -37,6 +37,8 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+using ::std::cerr;
+using ::std::endl;
class ScExportTest3 : public ScModelTestBase
{
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6ca40d64582e..a1951cdc5b95 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -69,6 +69,8 @@
class ScUndoPaste;
class ScUndoCut;
+using ::std::cerr;
+using ::std::endl;
namespace {
diff --git a/sc/qa/unit/ucalc_copypaste.cxx b/sc/qa/unit/ucalc_copypaste.cxx
index c54107e08998..43f9272a13c0 100644
--- a/sc/qa/unit/ucalc_copypaste.cxx
+++ b/sc/qa/unit/ucalc_copypaste.cxx
@@ -32,6 +32,9 @@
#include
+using ::std::cerr;
+using ::std::endl;
+
class TestCopyPaste : public ScUcalcTestBase
{
protected:
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 0c0c5d4481ad..feb0e8fef22a 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -30
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - icon-themes/colibre icon-themes/colibre_dark icon-themes/colibre_dark_svg icon-themes/colibre_svg icon-themes/karasa_jaga icon-themes/karasa_
icon-themes/colibre/vcl/res/tab_select_e.png |binary icon-themes/colibre/vcl/res/tab_select_s.png |binary icon-themes/colibre/vcl/res/tab_select_se.png |binary icon-themes/colibre/vcl/res/tab_select_sw.png |binary icon-themes/colibre/vcl/res/tab_select_w.png |binary icon-themes/colibre_dark/vcl/res/tab_select_e.png |binary icon-themes/colibre_dark/vcl/res/tab_select_s.png |binary icon-themes/colibre_dark/vcl/res/tab_select_se.png |binary icon-themes/colibre_dark/vcl/res/tab_select_sw.png |binary icon-themes/colibre_dark/vcl/res/tab_select_w.png |binary icon-themes/colibre_dark_svg/vcl/res/tab_select_e.svg |4 +++- icon-themes/colibre_dark_svg/vcl/res/tab_select_s.svg |4 +++- icon-themes/colibre_dark_svg/vcl/res/tab_select_se.svg |4 +++- icon-themes/colibre_dark_svg/vcl/res/tab_select_sw.svg |4 +++- icon-themes/colibre_dark_svg/vcl/res/tab_select_w.svg |4 +++- icon-themes/colibre_svg/vcl/res/tab_select_e.svg |4 +++- icon-themes/colibre_svg/vcl/res/tab_select_s.svg |4 +++- icon-themes/colibre_svg/vcl/res/tab_select_se.svg |4 +++- icon-themes/colibre_svg/vcl/res/tab_select_sw.svg |4 +++- icon-themes/colibre_svg/vcl/res/tab_select_w.svg |4 +++- icon-themes/karasa_jaga/vcl/res/tab_select_e.png |binary icon-themes/karasa_jaga/vcl/res/tab_select_s.png |binary icon-themes/karasa_jaga/vcl/res/tab_select_se.png |binary icon-themes/karasa_jaga/vcl/res/tab_select_sw.png |binary icon-themes/karasa_jaga/vcl/res/tab_select_w.png |binary icon-themes/karasa_jaga_svg/vcl/res/tab_select_e.svg |4 +++- icon-themes/karasa_jaga_svg/vcl/res/tab_select_s.svg |4 +++- icon-themes/karasa_jaga_svg/vcl/res/tab_select_se.svg |4 +++- icon-themes/karasa_jaga_svg/vcl/res/tab_select_sw.svg |4 +++- icon-themes/karasa_jaga_svg/vcl/res/tab_select_w.svg |4 +++- 30 files changed, 45 insertions(+), 15 deletions(-) New commits: commit c2fc9a2548b723407802d320502b881a8dff5ac3 Author: Caolán McNamara AuthorDate: Thu Apr 20 11:58:33 2023 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sun Apr 23 11:01:57 2023 +0200 Resolves: tdf#152625 add a border around the tab_select_* icons so they are visible against a black background used inkscape and kept the existing black arrows are they were but put a larger one behind them with the light fill color I see in the other cursor icons and cleaned the resulting svg to match our current ones. created the pngs with, e.g.: inkscape icon-themes/colibre_svg/vcl/res/tab_select_sw.svg -o icon-themes/colibre/vcl/res/tab_select_sw.png then copied the svgs and pngs over their duplicates in icon-themes/colibre_dark[_svg] icon-themes/karasa_jaga[_svg] I'm a graphic artist now. Change-Id: Ic32db3cd5604c263de83f26143ee778218a80bda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150631 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/colibre/vcl/res/tab_select_e.png b/icon-themes/colibre/vcl/res/tab_select_e.png index 0ccd45474428..6c343c3ebd75 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_e.png and b/icon-themes/colibre/vcl/res/tab_select_e.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_s.png b/icon-themes/colibre/vcl/res/tab_select_s.png index 6ffe3c086b45..645f267686fc 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_s.png and b/icon-themes/colibre/vcl/res/tab_select_s.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_se.png b/icon-themes/colibre/vcl/res/tab_select_se.png index 45f0ff1e2ad6..1a3715846308 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_se.png and b/icon-themes/colibre/vcl/res/tab_select_se.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_sw.png b/icon-themes/colibre/vcl/res/tab_select_sw.png index fa67a8882270..73c1d9910b16 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_sw.png and b/icon-themes/colibre/vcl/res/tab_select_sw.png differ diff --git a/icon-themes/colibre/vcl/res/tab_select_w.png b/icon-themes/colibre/vcl/res/tab_select_w.png index 85b83fa276d7..9e3b6fa86a97 100644 Binary files a/icon-themes/colibre/vcl/res/tab_select_w.png and b/icon-themes/colibre/vcl/res/tab_select_w.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_e.png b/icon-themes/colibre_dark/vcl/res/tab_select_e.png index 0ccd45474428..6c343c3ebd75 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_e.png and b/icon-themes/colibre_dark/vcl/res/tab_select_e.png differ diff --git a/icon-themes/colibre_dark/vcl/res/tab_select_s.png b/icon-themes/colibre_dark/vcl/res/tab_select_s.png index 6ffe3c086b45..645f267686fc 100644 Binary files a/icon-themes/colibre_dark/vcl/res/tab_select_s.png and b/icon-themes/colibre_dark/vcl/res/tab_select_s.
