canvas/workben/canvasdemo.cxx | 40 ++++++++++++++---------------
chart2/source/model/main/Diagram.cxx | 2 -
cui/uiconfig/ui/hyperlinkdocpage.ui | 8 ++---
scripting/source/dlgprov/dlgevtatt.cxx | 2 -
sd/source/ui/unoidl/unocpres.cxx | 2 -
svtools/source/misc/acceleratorexecute.cxx | 2 -
6 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit f1dc4e0d2a0bb3561c539bbdbdf1678d712d5cb3
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jan 12 10:27:13 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jan 12 14:52:08 2024 +0100
cid#1546414 COPY_INSTEAD_OF_MOVE
and
cid#1546408 COPY_INSTEAD_OF_MOVE
cid#1546367 COPY_INSTEAD_OF_MOVE
cid#1546283 COPY_INSTEAD_OF_MOVE
cid#1546268 COPY_INSTEAD_OF_MOVE
Change-Id: I8b6067f70bc0e8cce7117bb3f366227add279887
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161964
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 792fc49c7943..3ec7a3d6df75 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -182,7 +182,7 @@ class DemoRenderer
const double RADIUS = 60.0;
int i, j;
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( center_x, center_y );
for (i = 0; i < VERTICES; i++)
@@ -202,7 +202,7 @@ class DemoRenderer
}
}
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
void drawHilbert( double anchor_x, double anchor_y )
@@ -269,7 +269,7 @@ class DemoRenderer
void drawRectangles()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
drawTitle( "Rectangles"_ostr );
@@ -279,12 +279,12 @@ class DemoRenderer
// color steelblue, filled, no outline
drawRect( tools::Rectangle( 10, 80, 80, 140 ), maColorBlack, 1 );
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
void drawEllipses()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( maBox.Width(), 0.0 );
drawTitle( "Ellipses"_ostr );
@@ -310,12 +310,12 @@ class DemoRenderer
aStrokeAttrs.JoinType = rendering::PathJoinType::MITER;
mxCanvas->strokePolyPolygon( xPoly, maViewState, maRenderState,
aStrokeAttrs );
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
void drawText()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, 0.0 );
drawTitle( "Text"_ostr );
@@ -324,12 +324,12 @@ class DemoRenderer
maBox.Height() * .5 );
drawTitle( "This is lame"_ostr );
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
void drawImages()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( 0.0, maBox.Height() );
drawTitle( "Images"_ostr );
@@ -357,12 +357,12 @@ class DemoRenderer
//bitmapExFromXBitmap(): could not extract bitmap' thrown
// Thorsten says that this is a bug, and Thorsten never lies.
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
void drawLines()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( maBox.Width(), maBox.Height() );
drawTitle( "Lines"_ostr );
@@ -370,12 +370,12 @@ class DemoRenderer
drawPolishDiamond( 70.0, 80.0 );
drawHilbert( 140.0, 140.0 );
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
void drawCurves()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, maBox.Height() );
drawTitle( "Curves"_ostr );
@@ -413,7 +413,7 @@ class DemoRenderer
//you can't draw a BezierPolyPolygon2D with this, even though it
is derived from it
//mxCanvas->drawPolyPolygon( xPoly, maViewState, maRenderState );
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
double gimmerand()
@@ -423,7 +423,7 @@ class DemoRenderer
void drawArcs()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( 0.0, maBox.Height() * 2.0 );
drawTitle( "Arcs"_ostr );
@@ -472,7 +472,7 @@ class DemoRenderer
aEndPoint,
maViewState, maRenderState );
}
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
@@ -501,7 +501,7 @@ class DemoRenderer
void drawPolygons()
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( maBox.Width() * 1.0, maBox.Height() * 2.0 );
drawTitle( "Polygons"_ostr );
@@ -513,17 +513,17 @@ class DemoRenderer
sides++;
}
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
void drawWidgets() // FIXME: prolly makes no sense
{
- rendering::RenderState maOldRenderState = maRenderState; // push
+ rendering::RenderState aOldRenderState = maRenderState; // push
translate( maBox.Width() * 2.0, maBox.Height() * 2.0 );
drawTitle( "Widgets"_ostr );
- maRenderState = maOldRenderState; // pop
+ maRenderState = std::move(aOldRenderState); // pop
}
};
diff --git a/chart2/source/model/main/Diagram.cxx
b/chart2/source/model/main/Diagram.cxx
index db7be686b0c9..99065d8910c5 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -1080,7 +1080,7 @@ static bool lcl_moveSeriesOrCheckIfMoveIsAllowed(
aOtherSeriesList[nOtherSeriesIndex] = xGivenDataSeries;
xFormerChartType->setDataSeries(aOtherSeriesList);
-
aSeriesList[nOldSeriesIndex]=xExchangeSeries;
+ aSeriesList[nOldSeriesIndex] =
std::move(xExchangeSeries);
xCurrentChartType->setDataSeries(aSeriesList);
}
}
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx
b/scripting/source/dlgprov/dlgevtatt.cxx
index d697628c4f01..6facf2e75dbd 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -491,7 +491,7 @@ namespace dlgprov
Any aResult = xScript->invoke( aInParams, aOutParamsIndex,
aOutParams );
if ( pRet )
- *pRet = aResult;
+ *pRet = std::move(aResult);
}
}
}
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index fa329df6f74b..4a58c93d2473 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -233,7 +233,7 @@ void SAL_CALL SdXCustomPresentation::dispose()
std::unique_lock aGuard2(aDisposeContainerMutex);
lang::EventObject aEvt;
- aEvt.Source = xSource;
+ aEvt.Source = std::move(xSource);
aDisposeListeners.disposeAndClear(aGuard2, aEvt);
mpSdCustomShow = nullptr;
diff --git a/svtools/source/misc/acceleratorexecute.cxx
b/svtools/source/misc/acceleratorexecute.cxx
index dfc7335831b0..0d474f058ac0 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -127,7 +127,7 @@ void AcceleratorExecute::init(const css::uno::Reference<
css::uno::XComponentCon
// SAFE -> ------------------------------
aLock.lock();
- m_xDispatcher = xDispatcher;
+ m_xDispatcher = std::move(xDispatcher);
bDesktopIsUsed = true;
}
commit 2da068327d18b7e8d63a17001a7abb4d9e350411
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jan 12 09:57:24 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jan 12 14:52:01 2024 +0100
Resolves: tdf#159138 don't expand dialog to fit excessively long urls
this widget is the one that ends up controlling the insert hyperlink
dialog width
Change-Id: I09aaa32e96c4ddcc3e608cb24e67a669d376120f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161960
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui
b/cui/uiconfig/ui/hyperlinkdocpage.ui
index 64c23c356879..74f7eb409c5c 100644
--- a/cui/uiconfig/ui/hyperlinkdocpage.ui
+++ b/cui/uiconfig/ui/hyperlinkdocpage.ui
@@ -198,18 +198,18 @@
<object class="GtkLabel" id="url">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="halign">start</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes"
context="hyperlinkdocpage|url">Test text</property>
+ <property name="ellipsize">middle</property>
+ <property name="max-width-chars">20</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<child type="label">
