elide some temporary OUStrings

Change-Id: I93ee61a04dfc1bb3dc758fd83a503f7374824ae8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136999
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 15 insertions, 15 deletions

diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index e3856b3a59c6..193d08359cc2 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -996,8 +996,8 @@ Path2DContext::Path2DContext( ContextHandler2Helper const & rParent, const Attri
 , mrSegments( rSegments )
 , mrCustomShapeProperties( rCustomShapeProperties )
 {
-    rPath2D.w = rAttribs.getString( XML_w, "" ).toInt64();
-    rPath2D.h = rAttribs.getString( XML_h, "" ).toInt64();
+    rPath2D.w = rAttribs.getHyper( XML_w, 0 );
+    rPath2D.h = rAttribs.getHyper( XML_h, 0 );
     rPath2D.fill = rAttribs.getToken( XML_fill, XML_norm );
     rPath2D.stroke = rAttribs.getBool( XML_stroke, true );
     rPath2D.extrusionOk = rAttribs.getBool( XML_extrusionOk, true );
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 17acea153984..10dc25b82c5c 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -78,7 +78,7 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const
     case XML_ph:
         mpShapePtr->setSubType( rAttribs.getToken( XML_type, XML_obj ) );
         if( rAttribs.hasAttribute( XML_idx ) )
-            mpShapePtr->setSubTypeIndex( rAttribs.getStringDefaulted( XML_idx ).toInt32() );
+            mpShapePtr->setSubTypeIndex( rAttribs.getInteger( XML_idx, 0 ) );
         break;
     // nvSpPr CT_ShapeNonVisual end
 
diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx
index 616388a895a6..ebe639162c6a 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -67,7 +67,7 @@ ContextHandlerRef ShapeGroupContext::onCreateContext( sal_Int32 aElementToken, c
     case XML_ph:
         mpGroupShapePtr->setSubType( rAttribs.getToken( XML_type, FastToken::DONTKNOW ) );
         if( rAttribs.hasAttribute( XML_idx ) )
-            mpGroupShapePtr->setSubTypeIndex( rAttribs.getStringDefaulted( XML_idx ).toInt32() );
+            mpGroupShapePtr->setSubTypeIndex( rAttribs.getInteger( XML_idx, 0 ) );
         break;
     // nvSpPr CT_ShapeNonVisual end
 
diff --git a/oox/source/drawingml/table/tablecellcontext.cxx b/oox/source/drawingml/table/tablecellcontext.cxx
index 0227a03f0f0c..8f256b725528 100644
--- a/oox/source/drawingml/table/tablecellcontext.cxx
+++ b/oox/source/drawingml/table/tablecellcontext.cxx
@@ -36,9 +36,9 @@ TableCellContext::TableCellContext( ContextHandler2Helper const & rParent, const
 , mrTableCell( rTableCell )
 {
     if ( rAttribs.hasAttribute( XML_rowSpan ) )
-        mrTableCell.setRowSpan( rAttribs.getStringDefaulted( XML_rowSpan ).toInt32() );
+        mrTableCell.setRowSpan( rAttribs.getInteger( XML_rowSpan, 0 ) );
     if ( rAttribs.hasAttribute( XML_gridSpan ) )
-        mrTableCell.setGridSpan( rAttribs.getStringDefaulted( XML_gridSpan ).toInt32() );
+        mrTableCell.setGridSpan( rAttribs.getInteger( XML_gridSpan, 0 ) );
 
     mrTableCell.sethMerge( rAttribs.getBool( XML_hMerge, false ) );
     mrTableCell.setvMerge( rAttribs.getBool( XML_vMerge, false ) );
diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx
index 65c5ff4b782b..c3bd979cfaf5 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -79,7 +79,7 @@ TableContext::onCreateContext( ::sal_Int32 aElementToken, const AttributeList& r
     case A_TOKEN( gridCol ):            // CT_TableCol
         {
             std::vector< sal_Int32 >& rvTableGrid( mrTableProperties.getTableGrid() );
-            rvTableGrid.push_back( rAttribs.getStringDefaulted( XML_w ).toInt32() );
+            rvTableGrid.push_back( rAttribs.getInteger( XML_w, 0 ) );
         }
         break;
     case A_TOKEN( tr ):                 // CT_TableRow
diff --git a/oox/source/drawingml/table/tablerowcontext.cxx b/oox/source/drawingml/table/tablerowcontext.cxx
index 744c3302f123..cf0afa4a25c6 100644
--- a/oox/source/drawingml/table/tablerowcontext.cxx
+++ b/oox/source/drawingml/table/tablerowcontext.cxx
@@ -34,7 +34,7 @@ TableRowContext::TableRowContext( ContextHandler2Helper const & rParent, const A
 : ContextHandler2( rParent )
 , mrTableRow( rTableRow )
 {
-    rTableRow.setHeight( rAttribs.getStringDefaulted( XML_h ).toInt32() );
+    rTableRow.setHeight( rAttribs.getInteger( XML_h, 0 ) );
 }
 
 TableRowContext::~TableRowContext()
diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx
index f16dc06489f0..df54fe98b71e 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -96,22 +96,22 @@ ContextHandlerRef Transform2DContext::onCreateContext( sal_Int32 aElementToken,
     switch( aElementToken )
     {
     case A_TOKEN( off ):        // horz/vert translation
-        mrShape.setPosition( awt::Point( rAttribs.getStringDefaulted( XML_x ).toInt32(), rAttribs.getStringDefaulted( XML_y ).toInt32() ) );
+        mrShape.setPosition( awt::Point( rAttribs.getInteger( XML_x, 0 ), rAttribs.getInteger( XML_y, 0 ) ) );
         break;
     case A_TOKEN( ext ):        // horz/vert size
-        mrShape.setSize( awt::Size( rAttribs.getStringDefaulted( XML_cx ).toInt32(), rAttribs.getStringDefaulted( XML_cy ).toInt32() ) );
+        mrShape.setSize( awt::Size( rAttribs.getInteger( XML_cx, 0 ), rAttribs.getInteger( XML_cy, 0 ) ) );
         break;
     case A_TOKEN( chOff ):  // horz/vert translation of children
-        mrShape.setChildPosition( awt::Point( rAttribs.getStringDefaulted( XML_x ).toInt32(), rAttribs.getStringDefaulted( XML_y ).toInt32() ) );
+        mrShape.setChildPosition( awt::Point( rAttribs.getInteger( XML_x, 0 ), rAttribs.getInteger( XML_y, 0 ) ) );
         break;
     case A_TOKEN( chExt ):  // horz/vert size of children
         {
-            sal_Int32 nChExtCx = rAttribs.getStringDefaulted(XML_cx).toInt32();
+            sal_Int32 nChExtCx = rAttribs.getInteger(XML_cx, 0);
 
             if(nChExtCx == 0)
                 nChExtCx = mrShape.getSize().Width;
 
-            sal_Int32 nChExtCy = rAttribs.getStringDefaulted(XML_cy).toInt32();
+            sal_Int32 nChExtCy = rAttribs.getInteger(XML_cy, 0);
 
             if(nChExtCy == 0)
                 nChExtCy = mrShape.getSize().Height;
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index ac73be10ed9b..82d6908ef036 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -74,7 +74,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con
 
             if( rAttribs.hasAttribute( XML_idx ) )
             {
-                sal_Int32 nSubTypeIndex = rAttribs.getStringDefaulted( XML_idx ).toInt32();
+                sal_Int32 nSubTypeIndex = rAttribs.getInteger( XML_idx, 0 );
                 mpShapePtr->setSubTypeIndex( nSubTypeIndex );
 
                 if(!oSubType.has_value() && pMasterPersist)
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index 6e7ca833b1f5..6c6a340a9f8a 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -77,7 +77,7 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( sal_Int32 aElementToken
     case PPT_TOKEN( ph ):
         mpGroupShapePtr->setSubType( rAttribs.getToken( XML_type, FastToken::DONTKNOW ) );
         if( rAttribs.hasAttribute( XML_idx ) )
-            mpGroupShapePtr->setSubTypeIndex( rAttribs.getStringDefaulted( XML_idx ).toInt32() );
+            mpGroupShapePtr->setSubTypeIndex( rAttribs.getInteger( XML_idx, 0 ) );
         break;
     // nvSpPr CT_ShapeNonVisual end