extensions/source/propctrlr/formcomponenthandler.cxx | 49 +++++-----
sdext/source/minimizer/optimizerdialogcontrols.cxx | 86 ++++++++++--------
sdext/source/presenter/PresenterCanvasHelper.cxx | 7 -
sdext/source/presenter/PresenterPaneBorderPainter.cxx | 8 +
sdext/source/presenter/PresenterToolBar.cxx | 14 +-
sdext/source/presenter/PresenterWindowManager.cxx | 6 -
6 files changed, 94 insertions(+), 76 deletions(-)
New commits:
commit 741658c57c9653d58bd9abbe630f469ca7f64a6b
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 16 10:15:13 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Oct 16 18:11:26 2021 +0200
Simplify vector initialization in extensions
Change-Id: Ia83209304a7ed889cdd643c8034420c032ccad6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123685
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx
b/extensions/source/propctrlr/formcomponenthandler.cxx
index bf3feb4acb1a..a783f1e49bd0 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -878,30 +878,31 @@ namespace pcr
Sequence< OUString > SAL_CALL
FormComponentPropertyHandler::getActuatingProperties( )
{
::osl::MutexGuard aGuard( m_aMutex );
- std::vector< OUString > aInterestingProperties;
- aInterestingProperties.push_back( PROPERTY_DATASOURCE );
- aInterestingProperties.push_back( PROPERTY_COMMAND );
- aInterestingProperties.push_back( PROPERTY_COMMANDTYPE );
- aInterestingProperties.push_back( PROPERTY_LISTSOURCE );
- aInterestingProperties.push_back( PROPERTY_LISTSOURCETYPE );
- aInterestingProperties.push_back( PROPERTY_SUBMIT_ENCODING );
- aInterestingProperties.push_back( PROPERTY_REPEAT );
- aInterestingProperties.push_back( PROPERTY_TABSTOP );
- aInterestingProperties.push_back( PROPERTY_BORDER );
- aInterestingProperties.push_back( PROPERTY_CONTROLSOURCE );
- aInterestingProperties.push_back( PROPERTY_DROPDOWN );
- aInterestingProperties.push_back( PROPERTY_IMAGE_URL );
- aInterestingProperties.push_back( PROPERTY_TARGET_URL );
- aInterestingProperties.push_back( PROPERTY_STRINGITEMLIST );
- aInterestingProperties.push_back( PROPERTY_BUTTONTYPE );
- aInterestingProperties.push_back( PROPERTY_ESCAPE_PROCESSING );
- aInterestingProperties.push_back( PROPERTY_TRISTATE );
- aInterestingProperties.push_back( PROPERTY_DECIMAL_ACCURACY );
- aInterestingProperties.push_back( PROPERTY_SHOWTHOUSANDSEP );
- aInterestingProperties.push_back( PROPERTY_FORMATKEY );
- aInterestingProperties.push_back( PROPERTY_EMPTY_IS_NULL );
- aInterestingProperties.push_back( PROPERTY_TOGGLE );
- return comphelper::containerToSequence(aInterestingProperties);
+ return
+ {
+ PROPERTY_DATASOURCE,
+ PROPERTY_COMMAND,
+ PROPERTY_COMMANDTYPE,
+ PROPERTY_LISTSOURCE,
+ PROPERTY_LISTSOURCETYPE,
+ PROPERTY_SUBMIT_ENCODING,
+ PROPERTY_REPEAT,
+ PROPERTY_TABSTOP,
+ PROPERTY_BORDER,
+ PROPERTY_CONTROLSOURCE,
+ PROPERTY_DROPDOWN,
+ PROPERTY_IMAGE_URL,
+ PROPERTY_TARGET_URL,
+ PROPERTY_STRINGITEMLIST,
+ PROPERTY_BUTTONTYPE,
+ PROPERTY_ESCAPE_PROCESSING,
+ PROPERTY_TRISTATE,
+ PROPERTY_DECIMAL_ACCURACY,
+ PROPERTY_SHOWTHOUSANDSEP,
+ PROPERTY_FORMATKEY,
+ PROPERTY_EMPTY_IS_NULL,
+ PROPERTY_TOGGLE
+ };
}
LineDescriptor SAL_CALL
FormComponentPropertyHandler::describePropertyLine( const OUString&
_rPropertyName,
commit d64a6e2245169e5e4a3f8bc5388b4fff4984e5f4
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 16 12:46:10 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Oct 16 18:11:13 2021 +0200
Simplify vector initialization in sdext
Change-Id: If3cebeadff5496ae214614b49116060d24b6082f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123696
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx
b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 79832c36fb2f..23011e50716b 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -419,13 +419,15 @@ void OptimizerDialog::UpdateControlStatesPage0()
void OptimizerDialog::InitPage0()
{
Sequence< OUString > aItemList;
- std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, "FixedText0Pg0",
getString( STR_INTRODUCTION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false,
true, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText1Pg0",
getString( STR_INTRODUCTION_T ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH -
12, 100, true, false, mnTabIndex++ ) );
- aControlList.push_back( InsertSeparator( *this, "Separator1Pg0", 0,
PAGE_POS_X + 6, DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText2Pg0",
getString( STR_CHOSE_SETTINGS ), PAGE_POS_X + 6, DIALOG_HEIGHT - 60, PAGE_WIDTH
- 12, 8, true, false, mnTabIndex++ ) );
- aControlList.push_back( InsertListBox( *this, "ListBox0Pg0",
mxActionListenerListBox0Pg0, true, aItemList, PAGE_POS_X + 6, DIALOG_HEIGHT -
48, ( OD_DIALOG_WIDTH - 50 ) - ( PAGE_POS_X + 6 ), mnTabIndex++ ) );
- aControlList.push_back( InsertButton( *this, "Button0Pg0",
mxActionListener, OD_DIALOG_WIDTH - 46, DIALOG_HEIGHT - 49, 40, mnTabIndex++,
true, STR_REMOVE, PushButtonType_STANDARD ) );
+ std::vector< OUString > aControlList
+ {
+ InsertFixedText( *this, "FixedText0Pg0", getString( STR_INTRODUCTION
), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ),
+ InsertFixedText( *this, "FixedText1Pg0", getString( STR_INTRODUCTION_T
), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 100, true, false,
mnTabIndex++ ),
+ InsertSeparator( *this, "Separator1Pg0", 0, PAGE_POS_X + 6,
DIALOG_HEIGHT - 66, PAGE_WIDTH - 12, 1 ),
+ InsertFixedText( *this, "FixedText2Pg0", getString( STR_CHOSE_SETTINGS
), PAGE_POS_X + 6, DIALOG_HEIGHT - 60, PAGE_WIDTH - 12, 8, true, false,
mnTabIndex++ ),
+ InsertListBox( *this, "ListBox0Pg0", mxActionListenerListBox0Pg0,
true, aItemList, PAGE_POS_X + 6, DIALOG_HEIGHT - 48, ( OD_DIALOG_WIDTH - 50 ) -
( PAGE_POS_X + 6 ), mnTabIndex++ ),
+ InsertButton( *this, "Button0Pg0", mxActionListener, OD_DIALOG_WIDTH -
46, DIALOG_HEIGHT - 49, 40, mnTabIndex++, true, STR_REMOVE,
PushButtonType_STANDARD )
+ };
maControlPages.push_back( aControlList );
DeactivatePage( 0 );
UpdateControlStatesPage0();
@@ -453,13 +455,15 @@ void OptimizerDialog::InitPage1()
if ( aXCont.is() )
aCustomShowList = aXCont->getElementNames();
}
- std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, "FixedText0Pg3",
getString( STR_CHOOSE_SLIDES ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false,
true, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, "CheckBox0Pg3",
mxItemListener, getString( STR_DELETE_MASTER_PAGES ), PAGE_POS_X + 6,
PAGE_POS_Y + 14, PAGE_WIDTH - 12, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, "CheckBox2Pg3",
mxItemListener, getString( STR_DELETE_HIDDEN_SLIDES ), PAGE_POS_X + 6,
PAGE_POS_Y + 28, PAGE_WIDTH - 12, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, "CheckBox3Pg3",
mxItemListener, getString( STR_CUSTOM_SHOW ), PAGE_POS_X + 6, PAGE_POS_Y + 42,
PAGE_WIDTH - 12, mnTabIndex++ ) );
- aControlList.push_back( InsertListBox( *this, "ListBox0Pg3",
mxActionListener, true, aCustomShowList, PAGE_POS_X + 14, PAGE_POS_Y + 54, 150,
mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, "CheckBox1Pg3",
mxItemListener, getString( STR_DELETE_NOTES_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y
+ 70, PAGE_WIDTH - 12, mnTabIndex++ ) );
+ std::vector< OUString > aControlList
+ {
+ InsertFixedText( *this, "FixedText0Pg3", getString( STR_CHOOSE_SLIDES
), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ),
+ InsertCheckBox( *this, "CheckBox0Pg3", mxItemListener, getString(
STR_DELETE_MASTER_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12,
mnTabIndex++ ),
+ InsertCheckBox( *this, "CheckBox2Pg3", mxItemListener, getString(
STR_DELETE_HIDDEN_SLIDES ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH - 12,
mnTabIndex++ ),
+ InsertCheckBox( *this, "CheckBox3Pg3", mxItemListener, getString(
STR_CUSTOM_SHOW ), PAGE_POS_X + 6, PAGE_POS_Y + 42, PAGE_WIDTH - 12,
mnTabIndex++ ),
+ InsertListBox( *this, "ListBox0Pg3", mxActionListener, true,
aCustomShowList, PAGE_POS_X + 14, PAGE_POS_Y + 54, 150, mnTabIndex++ ),
+ InsertCheckBox( *this, "CheckBox1Pg3", mxItemListener, getString(
STR_DELETE_NOTES_PAGES ), PAGE_POS_X + 6, PAGE_POS_Y + 70, PAGE_WIDTH - 12,
mnTabIndex++ )
+ };
maControlPages.push_back( aControlList );
DeactivatePage( 1 );
@@ -519,16 +523,18 @@ void OptimizerDialog::InitPage2()
aResolutionItemList[ 2 ] = getString( STR_IMAGE_RESOLUTION_2 ).getToken(
1, ';' );
aResolutionItemList[ 3 ] = getString( STR_IMAGE_RESOLUTION_3 ).getToken(
1, ';' );
- std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, "FixedText0Pg1",
getString( STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8,
false, true, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg1",
mxItemListener, getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6,
PAGE_POS_Y + 14, PAGE_WIDTH - 12, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg1",
mxItemListener, getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y +
28, PAGE_WIDTH - 12, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText1Pg1",
getString( STR_QUALITY ), PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, false,
false, mnTabIndex++ ) );
- aControlList.push_back( InsertFormattedField( *this, "FormattedField0Pg1",
mxTextListenerFormattedField0Pg1, mxSpinListenerFormattedField0Pg1, PAGE_POS_X
+ 106, PAGE_POS_Y + 38, 0, 100, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText2Pg1",
getString( STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8,
false, false, mnTabIndex++ ) );
- aControlList.push_back( InsertComboBox( *this, "ComboBox0Pg1",
mxTextListenerComboBox0Pg1, true, aResolutionItemList, PAGE_POS_X + 106,
PAGE_POS_Y + 52, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, "CheckBox1Pg1",
mxItemListener, getString( STR_REMOVE_CROP_AREA ), PAGE_POS_X + 6, PAGE_POS_Y +
68, PAGE_WIDTH - 12, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, "CheckBox2Pg1",
mxItemListener, getString( STR_EMBED_LINKED_GRAPHICS ), PAGE_POS_X + 6,
PAGE_POS_Y + 82, PAGE_WIDTH - 12, mnTabIndex++ ) );
+ std::vector< OUString > aControlList
+ {
+ InsertFixedText( *this, "FixedText0Pg1", getString(
STR_GRAPHIC_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true,
mnTabIndex++ ),
+ InsertRadioButton( *this, "RadioButton0Pg1", mxItemListener,
getString( STR_LOSSLESS_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 14,
PAGE_WIDTH - 12, mnTabIndex++ ),
+ InsertRadioButton( *this, "RadioButton1Pg1", mxItemListener,
getString( STR_JPEG_COMPRESSION ), PAGE_POS_X + 6, PAGE_POS_Y + 28, PAGE_WIDTH
- 12, mnTabIndex++ ),
+ InsertFixedText( *this, "FixedText1Pg1", getString( STR_QUALITY ),
PAGE_POS_X + 20, PAGE_POS_Y + 40, 72, 8, false, false, mnTabIndex++ ),
+ InsertFormattedField( *this, "FormattedField0Pg1",
mxTextListenerFormattedField0Pg1, mxSpinListenerFormattedField0Pg1, PAGE_POS_X
+ 106, PAGE_POS_Y + 38, 0, 100, mnTabIndex++ ),
+ InsertFixedText( *this, "FixedText2Pg1", getString(
STR_IMAGE_RESOLUTION ), PAGE_POS_X + 6, PAGE_POS_Y + 54, 94, 8, false, false,
mnTabIndex++ ),
+ InsertComboBox( *this, "ComboBox0Pg1", mxTextListenerComboBox0Pg1,
true, aResolutionItemList, PAGE_POS_X + 106, PAGE_POS_Y + 52, mnTabIndex++ ),
+ InsertCheckBox( *this, "CheckBox1Pg1", mxItemListener, getString(
STR_REMOVE_CROP_AREA ), PAGE_POS_X + 6, PAGE_POS_Y + 68, PAGE_WIDTH - 12,
mnTabIndex++ ),
+ InsertCheckBox( *this, "CheckBox2Pg1", mxItemListener, getString(
STR_EMBED_LINKED_GRAPHICS ), PAGE_POS_X + 6, PAGE_POS_Y + 82, PAGE_WIDTH - 12,
mnTabIndex++ )
+ };
maControlPages.push_back( aControlList );
DeactivatePage( 2 );
UpdateControlStatesPage2();
@@ -563,12 +569,14 @@ void OptimizerDialog::InitPage3()
}
}
- std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, "FixedText0Pg2",
getString( STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8,
false, true, mnTabIndex++ ) );
- aControlList.push_back( InsertCheckBox( *this, "CheckBox0Pg2",
mxItemListener, getString( STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14,
PAGE_WIDTH - 12, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, "RadioButton0Pg2",
mxItemListener, getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y +
28, PAGE_WIDTH - 22, mnTabIndex++ ) );
- aControlList.push_back( InsertRadioButton( *this, "RadioButton1Pg2",
mxItemListener, getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14,
PAGE_POS_Y + 40, PAGE_WIDTH - 22, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText1Pg2", nOLECount
? getString( STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ),
PAGE_POS_X + 6, PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, true, false, mnTabIndex++
) );
+ std::vector< OUString > aControlList
+ {
+ InsertFixedText( *this, "FixedText0Pg2", getString(
STR_OLE_OPTIMIZATION ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true,
mnTabIndex++ ),
+ InsertCheckBox( *this, "CheckBox0Pg2", mxItemListener, getString(
STR_OLE_REPLACE ), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12,
mnTabIndex++ ),
+ InsertRadioButton( *this, "RadioButton0Pg2", mxItemListener,
getString( STR_ALL_OLE_OBJECTS ), PAGE_POS_X + 14, PAGE_POS_Y + 28, PAGE_WIDTH
- 22, mnTabIndex++ ),
+ InsertRadioButton( *this, "RadioButton1Pg2", mxItemListener,
getString( STR_ALIEN_OLE_OBJECTS_ONLY ), PAGE_POS_X + 14, PAGE_POS_Y + 40,
PAGE_WIDTH - 22, mnTabIndex++ ),
+ InsertFixedText( *this, "FixedText1Pg2", nOLECount ? getString(
STR_OLE_OBJECTS_DESC ) : getString( STR_NO_OLE_OBJECTS_DESC ), PAGE_POS_X + 6,
PAGE_POS_Y + 64, PAGE_WIDTH - 22, 50, true, false, mnTabIndex++ )
+ };
maControlPages.push_back( aControlList );
DeactivatePage( 3 );
UpdateControlStatesPage3();
@@ -820,16 +828,18 @@ void OptimizerDialog::InitPage4()
}
Reference< XTextListener > xTextListener;
Sequence< OUString > aItemList;
- std::vector< OUString > aControlList;
- aControlList.push_back( InsertFixedText( *this, "FixedText0Pg4",
getString( STR_SUMMARY_TITLE ), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false,
true, mnTabIndex++ ) );
-// aControlList.push_back( InsertSeparator( *this, "Separator0Pg4", 0,
PAGE_POS_X + 6, PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ) );
+ std::vector< OUString > aControlList
+ {
+ InsertFixedText( *this, "FixedText0Pg4", getString( STR_SUMMARY_TITLE
), PAGE_POS_X, PAGE_POS_Y, PAGE_WIDTH, 8, false, true, mnTabIndex++ ),
+ // InsertSeparator( *this, "Separator0Pg4", 0, PAGE_POS_X + 6,
PAGE_POS_Y + 90, PAGE_WIDTH - 12, 1 ),
- aControlList.push_back( InsertFixedText( *this, "FixedText4Pg4",
OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, false, false,
mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText5Pg4",
OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 22, PAGE_WIDTH - 12, 8, false, false,
mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText6Pg4",
OUString(), PAGE_POS_X + 6, PAGE_POS_Y + 30, PAGE_WIDTH - 12, 8, false, false,
mnTabIndex++ ) );
+ InsertFixedText( *this, "FixedText4Pg4", OUString(), PAGE_POS_X + 6,
PAGE_POS_Y + 14, PAGE_WIDTH - 12, 8, false, false, mnTabIndex++ ),
+ InsertFixedText( *this, "FixedText5Pg4", OUString(), PAGE_POS_X + 6,
PAGE_POS_Y + 22, PAGE_WIDTH - 12, 8, false, false, mnTabIndex++ ),
+ InsertFixedText( *this, "FixedText6Pg4", OUString(), PAGE_POS_X + 6,
PAGE_POS_Y + 30, PAGE_WIDTH - 12, 8, false, false, mnTabIndex++ ),
- aControlList.push_back( InsertFixedText( *this, "FixedText2Pg4",
getString( STR_CURRENT_FILESIZE ), PAGE_POS_X + 6, PAGE_POS_Y + 50, 88, 8,
false, false, mnTabIndex++ ) );
- aControlList.push_back( InsertFixedText( *this, "FixedText7Pg4",
OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 50, 30, 8, false, false,
mnTabIndex++ ) );
+ InsertFixedText( *this, "FixedText2Pg4", getString(
STR_CURRENT_FILESIZE ), PAGE_POS_X + 6, PAGE_POS_Y + 50, 88, 8, false, false,
mnTabIndex++ ),
+ InsertFixedText( *this, "FixedText7Pg4", OUString(), PAGE_POS_X + 100,
PAGE_POS_Y + 50, 30, 8, false, false, mnTabIndex++ )
+ };
setControlProperty( "FixedText7Pg4", "Align", Any( static_cast< short >( 2
) ) );
aControlList.push_back( InsertFixedText( *this, "FixedText3Pg4",
getString( STR_ESTIMATED_FILESIZE ), PAGE_POS_X + 6, PAGE_POS_Y + 58, 88, 8,
false, false, mnTabIndex++ ) );
aControlList.push_back( InsertFixedText( *this, "FixedText8Pg4",
OUString(), PAGE_POS_X + 100, PAGE_POS_Y + 58, 30, 8, false, false,
mnTabIndex++ ) );
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx
b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 8381f8d5aabd..697a84d0a8ec 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -71,10 +71,11 @@ void PresenterCanvasHelper::PaintRectangle (
return;
// Create a clip polypolygon that has the content box as hole.
- ::std::vector<awt::Rectangle> aRectangles;
+ ::std::vector<awt::Rectangle> aRectangles
+ {
+ PresenterGeometryHelper::Intersection(rRepaintBox, rOuterBoundingBox)
+ };
aRectangles.reserve(2);
- aRectangles.push_back(
- PresenterGeometryHelper::Intersection(rRepaintBox, rOuterBoundingBox));
if (rContentBoundingBox.Width > 0 && rContentBoundingBox.Height > 0)
aRectangles.push_back(
PresenterGeometryHelper::Intersection(rRepaintBox,
rContentBoundingBox));
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 8fcc2a61ba30..6c0198c7e76b 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -700,9 +700,11 @@ void PresenterPaneBorderPainter::Renderer::SetupClipping (
{
awt::Rectangle aInnerBox (
pStyle->RemoveBorder(rOuterBox,
drawing::framework::BorderType_TOTAL_BORDER));
- ::std::vector<awt::Rectangle> aRectangles;
-
aRectangles.push_back(PresenterGeometryHelper::Intersection(rUpdateBox,
rOuterBox));
-
aRectangles.push_back(PresenterGeometryHelper::Intersection(rUpdateBox,
aInnerBox));
+ ::std::vector<awt::Rectangle> aRectangles
+ {
+ PresenterGeometryHelper::Intersection(rUpdateBox, rOuterBox),
+ PresenterGeometryHelper::Intersection(rUpdateBox, aInnerBox)
+ };
mxViewStateClip = PresenterGeometryHelper::CreatePolygon(
aRectangles,
mxCanvas->getDevice());
diff --git a/sdext/source/presenter/PresenterToolBar.cxx
b/sdext/source/presenter/PresenterToolBar.cxx
index 291ba59e5e70..75a4b7500550 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1450,12 +1450,14 @@ awt::Size Button::CreateBoundingSize (
geometry::RealRectangle2D aTextBBoxSelected
(mpSelected->maText.GetBoundingBox(rxCanvas));
geometry::RealRectangle2D aTextBBoxDisabled
(mpDisabled->maText.GetBoundingBox(rxCanvas));
geometry::RealRectangle2D aTextBBoxMouseOverSelected
(mpMouseOverSelected->maText.GetBoundingBox(rxCanvas));
- std::vector<sal_Int32> widths;
- widths.push_back(sal::static_int_cast<sal_Int32>(0.5 + aTextBBoxNormal.X2
- aTextBBoxNormal.X1));
- widths.push_back(sal::static_int_cast<sal_Int32>(0.5 +
aTextBBoxMouseOver.X2 - aTextBBoxMouseOver.X1));
- widths.push_back(sal::static_int_cast<sal_Int32>(0.5 +
aTextBBoxSelected.X2 - aTextBBoxSelected.X1));
- widths.push_back(sal::static_int_cast<sal_Int32>(0.5 +
aTextBBoxDisabled.X2 - aTextBBoxDisabled.X1));
- widths.push_back(sal::static_int_cast<sal_Int32>(0.5 +
aTextBBoxMouseOverSelected.X2 - aTextBBoxMouseOverSelected.X1));
+ std::vector<sal_Int32> widths
+ {
+ sal::static_int_cast<sal_Int32>(0.5 + aTextBBoxNormal.X2 -
aTextBBoxNormal.X1),
+ sal::static_int_cast<sal_Int32>(0.5 + aTextBBoxMouseOver.X2 -
aTextBBoxMouseOver.X1),
+ sal::static_int_cast<sal_Int32>(0.5 + aTextBBoxSelected.X2 -
aTextBBoxSelected.X1),
+ sal::static_int_cast<sal_Int32>(0.5 + aTextBBoxDisabled.X2 -
aTextBBoxDisabled.X1),
+ sal::static_int_cast<sal_Int32>(0.5 + aTextBBoxMouseOverSelected.X2 -
aTextBBoxMouseOverSelected.X1)
+ };
sal_Int32 nTextHeight (sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2
- aTextBBox.Y1));
Reference<rendering::XBitmap> xBitmap;
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx
b/sdext/source/presenter/PresenterWindowManager.cxx
index 24115fa52523..9a541842286d 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -989,9 +989,11 @@ Reference<rendering::XPolyPolygon2D>
PresenterWindowManager::CreateClipPolyPolyg
// Create a clip polygon that includes the whole update area but has the
// content windows as holes.
const sal_Int32 nPaneCount (mpPaneContainer->maPanes.size());
- ::std::vector<awt::Rectangle> aRectangles;
+ ::std::vector<awt::Rectangle> aRectangles
+ {
+ mxParentWindow->getPosSize()
+ };
aRectangles.reserve(1+nPaneCount);
- aRectangles.push_back(mxParentWindow->getPosSize());
for (const auto& pDescriptor : mpPaneContainer->maPanes)
{
if ( ! pDescriptor->mbIsActive)
