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

[Julien Nabet (via logerrit)]

 reportdesign/source/filter/xml/xmlExport.cxx |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

New commits:
commit db43de861f7b5b66993245ab9e7719fdce61caf8
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Oct 22 18:21:13 2021 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Oct 22 19:17:27 2021 +0200

    Revert "Simplify vector initialization in reportdesign"
    
    since it needs 2 allocations instead of one
    
    This reverts commit ac10792ed4ca8d92f60c95ab4acd5b911e42cec7.
    
    Change-Id: I5b07664b7930ae1a04a6f755ddbe5ef56a880f56
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124071
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index df89720fe7c5..d9a673e81250 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <memory>
-#include <o3tl/safeint.hxx>
 #include "xmlExport.hxx"
 #include "xmlAutoStyle.hxx"
 #include <xmloff/xmltoken.hxx>
@@ -498,19 +497,15 @@ void ORptExport::exportSectionAutoStyle(const 
Reference<XSection>& _xProp)
     const sal_Int32 nOffset = 
rptui::getStyleProperty<sal_Int32>(xReport,PROPERTY_LEFTMARGIN);
     const sal_Int32 nCount  = _xProp->getCount();
 
-    ::std::vector<sal_Int32> aColumnPos
-    {
-        nOffset,
-        aSize.Width - 
rptui::getStyleProperty<sal_Int32>(xReport,PROPERTY_RIGHTMARGIN)
-    };
+    ::std::vector<sal_Int32> aColumnPos;
     aColumnPos.reserve(2*(nCount + 1));
+    aColumnPos.push_back(nOffset);
+    aColumnPos.push_back(aSize.Width - 
rptui::getStyleProperty<sal_Int32>(xReport,PROPERTY_RIGHTMARGIN));
 
-    ::std::vector<sal_Int32> aRowPos
-    {
-        0,
-        o3tl::narrowing<sal_Int32>(_xProp->getHeight())
-    };
+    ::std::vector<sal_Int32> aRowPos;
     aRowPos.reserve(2*(nCount + 1));
+    aRowPos.push_back(0);
+    aRowPos.push_back(_xProp->getHeight());
 
 
     ::std::vector<sal_Int32> aRowPosAutoGrow;