diff options
Diffstat (limited to 'vbahelper/source')
-rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 4 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbashapes.cxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 7ae94d465bfa..8b0c206058a4 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -499,13 +499,13 @@ OUString getAnyAsString( const uno::Any& pvargItem ) OUString -ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator) +ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, const OUString& _sElementName, std::u16string_view _sSuffixSeparator) { return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2)); } OUString -ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix) +ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, const OUString& _sElementName, std::u16string_view _sSuffixSeparator, sal_Int32 _nStartSuffix) { if ( !_slist.hasElements() ) return _sElementName; diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 6177a23b595b..118082fa9667 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -223,7 +223,7 @@ ScVbaShapes::AddRectangle(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWid uno::Reference< drawing::XShape > xShape( createShape( "com.sun.star.drawing.RectangleShape" ), uno::UNO_SET_THROW ); m_xShapes->add( xShape ); - OUString sName(createName( "Rectangle" )); + OUString sName(createName( u"Rectangle" )); setDefaultShapeProperties( xShape ); setShape_NameProperty( xShape, sName ); @@ -266,7 +266,7 @@ ScVbaShapes::AddEllipse(sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth setShape_AnchorTypeAndRangeProperty(xShape, _aRange); */ - OUString name(createName( "Oval" )); + OUString name(createName( u"Oval" )); setDefaultShapeProperties(xShape); setShape_NameProperty(xShape, name); @@ -301,7 +301,7 @@ ScVbaShapes::AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_In awt::Point aMovePositionIfRange( 0, 0 ); - OUString name(createName( "Line" )); + OUString name(createName( u"Line" )); setDefaultShapeProperties(xShape); setShape_NameProperty(xShape, name); @@ -357,7 +357,7 @@ ScVbaShapes::AddTextboxInWriter( sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _n setDefaultShapeProperties(xShape); - OUString sName(createName( "Text Box" )); + OUString sName(createName( u"Text Box" )); setShape_NameProperty( xShape, sName ); awt::Size size; @@ -411,7 +411,7 @@ ScVbaShapes::setShape_NameProperty( const uno::Reference< css::drawing::XShape > } OUString -ScVbaShapes::createName( const OUString& sName ) +ScVbaShapes::createName( std::u16string_view sName ) { sal_Int32 nActNumber = 1 + m_nNewShapeCount; m_nNewShapeCount++; |