diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-04 15:39:44 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-04 16:11:57 +0100 |
| commit | b08ded38b0e0eeb8d150e7f71137833396e22387 (patch) | |
| tree | 1086ed768d281a6ed91b8c1347becc57fbbb2061 | |
| parent | b53d03f4c970f13f9849c01f1d0b6ad42185148d (diff) | |
oox: kill no longer needed CREATE_OUSTRING
63 files changed, 2466 insertions, 2485 deletions
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx index 94b990858fd4..a28387197568 100644 --- a/oox/inc/oox/core/relations.hxx +++ b/oox/inc/oox/core/relations.hxx @@ -33,17 +33,17 @@ namespace core { /** Expands to an OUString containing an 'officeDocument' relation type created from the passed literal(!) ASCII(!) character array. */ #define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \ - CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/" ascii ) + ( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/" ascii ) /** Expands to an OUString containing a 'package' relation type created from the passed literal(!) ASCII(!) character array. */ #define CREATE_PACKAGE_RELATION_TYPE( ascii ) \ - CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships/" ascii ) + ( "http://schemas.openxmlformats.org/package/2006/relationships/" ascii ) /** Expands to an OUString containing an MS Office specific relation type created from the passed literal(!) ASCII(!) character array. */ #define CREATE_MSOFFICE_RELATION_TYPE( ascii ) \ - CREATE_OUSTRING( "http://schemas.microsoft.com/office/2006/relationships/" ascii ) + ( "http://schemas.microsoft.com/office/2006/relationships/" ascii ) // ============================================================================ diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 16562e584312..5a73eb18043f 100644 --- a/oox/inc/oox/dump/dumperbase.hxx +++ b/oox/inc/oox/dump/dumperbase.hxx @@ -67,13 +67,12 @@ namespace dump { #define OOX_DUMP_UNKNOWN "?unknown" #define OOX_DUMP_ERRASCII( ascii ) "?err:" ascii -#define OOX_DUMP_ERRSTRING( ascii ) CREATE_OUSTRING( OOX_DUMP_ERRASCII( ascii ) ) -#define OOX_DUMP_ERR_NOMAP OOX_DUMP_ERRSTRING( "no-map" ) -#define OOX_DUMP_ERR_NONAME OOX_DUMP_ERRSTRING( "no-name" ) -#define OOX_DUMP_ERR_STREAM OOX_DUMP_ERRSTRING( "stream-error" ) +#define OOX_DUMP_ERR_NOMAP "no-map" +#define OOX_DUMP_ERR_NONAME "no-name" +#define OOX_DUMP_ERR_STREAM "stream-error" -#define OOX_DUMP_DUMPEXT CREATE_OUSTRING( ".dump" ) +#define OOX_DUMP_DUMPEXT ".dump" const sal_Unicode OOX_DUMP_STRQUOTE = '\''; const sal_Unicode OOX_DUMP_FMLASTRQUOTE = '"'; diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx index c4507844152a..bfe2796581c3 100644 --- a/oox/inc/oox/helper/helper.hxx +++ b/oox/inc/oox/helper/helper.hxx @@ -52,11 +52,6 @@ namespace oox { #define CREATE_OSTRING( ascii ) \ ::rtl::OString( RTL_CONSTASCII_STRINGPARAM( ascii ) ) -/** Expands to a temporary ::rtl::OUString, created from a literal(!) ASCII(!) - character array. */ -#define CREATE_OUSTRING( ascii ) \ - ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( ascii ) ) - /** Convert an OUString to an ASCII C string. Use for debug purposes only. */ #define OUSTRING_TO_CSTR( str ) \ ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr() diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx index 1726513e8ae0..ffeb255df0a6 100644 --- a/oox/source/core/fastparser.cxx +++ b/oox/source/core/fastparser.cxx @@ -71,7 +71,7 @@ FastParser::FastParser( const Reference< XComponentContext >& rxContext ) throw( { // create a fast parser instance Reference< XMultiComponentFactory > xFactory( rxContext->getServiceManager(), UNO_SET_THROW ); - mxParser.set( xFactory->createInstanceWithContext( CREATE_OUSTRING( "com.sun.star.xml.sax.FastParser" ), rxContext ), UNO_QUERY_THROW ); + mxParser.set( xFactory->createInstanceWithContext( "com.sun.star.xml.sax.FastParser", rxContext ), UNO_QUERY_THROW ); // create the fast tokenhandler mxTokenHandler.set( new FastTokenHandler ); diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx index 23235faaee30..3791b950dc26 100644 --- a/oox/source/core/fasttokenhandler.cxx +++ b/oox/source/core/fasttokenhandler.cxx @@ -36,13 +36,13 @@ using ::rtl::OUString; OUString SAL_CALL FastTokenHandler_getImplementationName() { - return CREATE_OUSTRING( "com.sun.star.comp.oox.core.FastTokenHandler" ); + return OUString( "com.sun.star.comp.oox.core.FastTokenHandler" ); } Sequence< OUString > SAL_CALL FastTokenHandler_getSupportedServiceNames() { Sequence< OUString > aServiceNames( 1 ); - aServiceNames[ 0 ] = CREATE_OUSTRING( "com.sun.star.xml.sax.FastTokenHandler" ); + aServiceNames[ 0 ] = "com.sun.star.xml.sax.FastTokenHandler"; return aServiceNames; } diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 00892dbeca52..3c3e8c34c15d 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -300,10 +300,10 @@ OUString FilterBase::getAbsoluteUrl( const OUString& rUrl ) const { // handle some special cases before calling ::rtl::Uri::convertRelToAbs() - const OUString aFileSchema = CREATE_OUSTRING( "file:" ); - const OUString aFilePrefix = CREATE_OUSTRING( "file:///" ); + const OUString aFileSchema = "file:"; + const OUString aFilePrefix = "file:///"; const sal_Int32 nFilePrefixLen = aFilePrefix.getLength(); - const OUString aUncPrefix = CREATE_OUSTRING( "//" ); + const OUString aUncPrefix = "//"; /* (1) convert all backslashes to slashes, and check that passed URL is not empty. */ @@ -427,15 +427,15 @@ OUString SAL_CALL FilterBase::getImplementationName() throw( RuntimeException ) sal_Bool SAL_CALL FilterBase::supportsService( const OUString& rServiceName ) throw( RuntimeException ) { return - (rServiceName == CREATE_OUSTRING( "com.sun.star.document.ImportFilter" )) || - (rServiceName == CREATE_OUSTRING( "com.sun.star.document.ExportFilter" )); + (rServiceName == "com.sun.star.document.ImportFilter" ) || + (rServiceName == "com.sun.star.document.ExportFilter" ); } Sequence< OUString > SAL_CALL FilterBase::getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aServiceNames( 2 ); - aServiceNames[ 0 ] = CREATE_OUSTRING( "com.sun.star.document.ImportFilter" ); - aServiceNames[ 1 ] = CREATE_OUSTRING( "com.sun.star.document.ExportFilter" ); + aServiceNames[ 0 ] = "com.sun.star.document.ImportFilter"; + aServiceNames[ 1 ] = "com.sun.star.document.ExportFilter"; return aServiceNames; } @@ -547,20 +547,19 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc mxImpl->mxTargetFrame = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_FRAME(), Reference< XFrame >() ); mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() ); mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() ); - mxImpl->mxParentShape = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "ParentShape" ), mxImpl->mxParentShape ); + mxImpl->mxParentShape = mxImpl->maMediaDesc.getUnpackedValueOrDefault( "ParentShape", mxImpl->mxParentShape ); // Check for ISO OOXML - OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "FilterName" ), OUString() ); + OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( "FilterName", OUString() ); try { - Reference< XNameAccess > xFilters( getServiceFactory()->createInstance( - CREATE_OUSTRING( "com.sun.star.document.FilterFactory" ) ), UNO_QUERY_THROW ); + Reference< XNameAccess > xFilters( getServiceFactory()->createInstance("com.sun.star.document.FilterFactory" ), UNO_QUERY_THROW ); Any aValues = xFilters->getByName( sFilterName ); Sequence<PropertyValue > aPropSeq; aValues >>= aPropSeq; SequenceAsHashMap aProps( aPropSeq ); - sal_Int32 nVersion = aProps.getUnpackedValueOrDefault( CREATE_OUSTRING( "FileFormatVersion" ), sal_Int32( 0 ) ); + sal_Int32 nVersion = aProps.getUnpackedValueOrDefault( "FileFormatVersion", sal_Int32( 0 ) ); mxImpl->meVersion = OoxmlVersion( nVersion ); } catch ( const Exception& ) diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 212775a50a1f..a581d10c1d66 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -180,34 +180,34 @@ OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& r { if( rContentType.equalsAscii("application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" ) || rContentType.equalsAscii("application/vnd.ms-word.document.macroEnabled.main+xml" ) ) - return CREATE_OUSTRING( "writer_MS_Word_2007" ); + return OUString( "writer_MS_Word_2007" ); if( rContentType.equalsAscii("application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml") || rContentType.equalsAscii("application/vnd.ms-word.template.macroEnabledTemplate.main+xml") ) - return CREATE_OUSTRING( "writer_MS_Word_2007_Template" ); + return OUString( "writer_MS_Word_2007_Template" ); if( rContentType.equalsAscii("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml") || rContentType.equalsAscii("application/vnd.ms-excel.sheet.macroEnabled.main+xml") ) - return CREATE_OUSTRING( "MS Excel 2007 XML" ); + return OUString( "MS Excel 2007 XML" ); if( rContentType.equalsAscii("application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml") || rContentType.equalsAscii("application/vnd.ms-excel.template.macroEnabled.main+xml") ) - return CREATE_OUSTRING( "MS Excel 2007 XML Template" ); + return OUString( "MS Excel 2007 XML Template" ); if ( rContentType == "application/vnd.ms-excel.sheet.binary.macroEnabled.main" ) - return CREATE_OUSTRING( "MS Excel 2007 Binary" ); + return OUString( "MS Excel 2007 Binary" ); if( rContentType.equalsAscii("application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml") || rContentType.equalsAscii("application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml") ) - return CREATE_OUSTRING( "MS PowerPoint 2007 XML" ); + return OUString( "MS PowerPoint 2007 XML" ); if( rContentType.equalsAscii("application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml") || rContentType.equalsAscii("application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml") ) - return CREATE_OUSTRING( "MS PowerPoint 2007 XML AutoPlay" ); + return OUString( "MS PowerPoint 2007 XML AutoPlay" ); if( rContentType.equalsAscii("application/vnd.openxmlformats-officedocument.presentationml.template.main+xml") || rContentType.equalsAscii("application/vnd.ms-powerpoint.template.macroEnabled.main+xml") ) - return CREATE_OUSTRING( "MS PowerPoint 2007 XML Template" ); + return OUString( "MS PowerPoint 2007 XML Template" ); return OUString(); } @@ -237,14 +237,14 @@ void FilterDetectDocHandler::parseContentTypesOverride( const AttributeList& rAt Sequence< OUString > FilterDetect_getSupportedServiceNames() { Sequence< OUString > aServiceNames( 1 ); - aServiceNames[ 0 ] = CREATE_OUSTRING( "com.sun.star.frame.ExtendedTypeDetection" ); + aServiceNames[ 0 ] = "com.sun.star.frame.ExtendedTypeDetection"; return aServiceNames; } /* Helper for XServiceInfo */ OUString FilterDetect_getImplementationName() { - return CREATE_OUSTRING( "com.sun.star.comp.oox.FormatDetector" ); + return OUString( "com.sun.star.comp.oox.FormatDetector" ); } /* Helper for registry */ @@ -451,10 +451,10 @@ Sequence< NamedValue > lclGenerateEncryptionKey( const PackageEncryptionInfo& rE if( lclCheckEncryptionData( pnKey, nRequiredKeyLen, rEncrInfo.mpnEncrVerifier, sizeof( rEncrInfo.mpnEncrVerifier ), rEncrInfo.mpnEncrVerifierHash, sizeof( rEncrInfo.mpnEncrVerifierHash ) ) ) { SequenceAsHashMap aEncryptionData; - aEncryptionData[ CREATE_OUSTRING( "AES128EncryptionKey" ) ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( pnKey ), nRequiredKeyLen ); - aEncryptionData[ CREATE_OUSTRING( "AES128EncryptionSalt" ) ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( rEncrInfo.mpnSalt ), rEncrInfo.mnSaltSize ); - aEncryptionData[ CREATE_OUSTRING( "AES128EncryptionVerifier" ) ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( rEncrInfo.mpnEncrVerifier ), sizeof( rEncrInfo.mpnEncrVerifier ) ); - aEncryptionData[ CREATE_OUSTRING( "AES128EncryptionVerifierHash" ) ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( rEncrInfo.mpnEncrVerifierHash ), sizeof( rEncrInfo.mpnEncrVerifierHash ) ); + aEncryptionData[ "AES128EncryptionKey" ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( pnKey ), nRequiredKeyLen ); + aEncryptionData[ "AES128EncryptionSalt" ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( rEncrInfo.mpnSalt ), rEncrInfo.mnSaltSize ); + aEncryptionData[ "AES128EncryptionVerifier" ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( rEncrInfo.mpnEncrVerifier ), sizeof( rEncrInfo.mpnEncrVerifier ) ); + aEncryptionData[ "AES128EncryptionVerifierHash" ] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( rEncrInfo.mpnEncrVerifierHash ), sizeof( rEncrInfo.mpnEncrVerifierHash ) ); aResult = aEncryptionData.getAsConstNamedValueList(); } @@ -496,9 +496,9 @@ PasswordVerifier::PasswordVerifier( const PackageEncryptionInfo& rEncryptInfo ) ::comphelper::DocPasswordVerifierResult PasswordVerifier::verifyEncryptionData( const Sequence< NamedValue >& rEncryptionData ) { SequenceAsHashMap aHashData( rEncryptionData ); - Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( CREATE_OUSTRING( "AES128EncryptionKey" ), Sequence< sal_Int8 >() ); - Sequence< sal_Int8 > aVerifier = aHashData.getUnpackedValueOrDefault( CREATE_OUSTRING( "AES128EncryptionVerifier" ), Sequence< sal_Int8 >() ); - Sequence< sal_Int8 > aVerifierHash = aHashData.getUnpackedValueOrDefault( CREATE_OUSTRING( "AES128EncryptionVerifierHash" ), Sequence< sal_Int8 >() ); + Sequence< sal_Int8 > aKey = aHashData.getUnpackedValueOrDefault( "AES128EncryptionKey", Sequence< sal_Int8 >() ); + Sequence< sal_Int8 > aVerifier = aHashData.getUnpackedValueOrDefault( "AES128EncryptionVerifier", Sequence< sal_Int8 >() ); + Sequence< sal_Int8 > aVerifierHash = aHashData.getUnpackedValueOrDefault( "AES128EncryptionVerifierHash", Sequence< sal_Int8 >() ); bool bResult = lclCheckEncryptionData( reinterpret_cast< const sal_uInt8* >( aKey.getConstArray() ), aKey.getLength(), @@ -520,7 +520,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript return xInStrm; // check if a temporary file is passed in the 'ComponentData' property - Reference< XStream > xDecrypted( rMediaDesc.getComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ) ), UNO_QUERY ); + Reference< XStream > xDecrypted( rMediaDesc.getComponentDataEntry( "DecryptedPackage" ), UNO_QUERY ); if( xDecrypted.is() ) { Reference< XInputStream > xDecrInStrm = xDecrypted->getInputStream(); @@ -533,8 +533,8 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript if( aOleStorage.isStorage() ) try { // open the required input streams in the encrypted package - Reference< XInputStream > xEncryptionInfo( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptionInfo" ) ), UNO_SET_THROW ); - Reference< XInputStream > xEncryptedPackage( aOleStorage.openInputStream( CREATE_OUSTRING( "EncryptedPackage" ) ), UNO_SET_THROW ); + Reference< XInputStream > xEncryptionInfo( aOleStorage.openInputStream( "EncryptionInfo" ), UNO_SET_THROW ); + Reference< XInputStream > xEncryptedPackage( aOleStorage.openInputStream( "EncryptedPackage" ), UNO_SET_THROW ); // read the encryption info stream PackageEncryptionInfo aEncryptInfo; @@ -558,7 +558,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript feature with password. Try this first before prompting the user for a password. */ ::std::vector< OUString > aDefaultPasswords; - aDefaultPasswords.push_back( CREATE_OUSTRING( "VelvetSweatshop" ) ); + aDefaultPasswords.push_back( "VelvetSweatshop" ); /* Use the comphelper password helper to request a password. This helper returns either with the correct password @@ -603,7 +603,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript aDecryptedPackage.seekToStart(); // store temp file in media descriptor to keep it alive - rMediaDesc.setComponentDataEntry( CREATE_OUSTRING( "DecryptedPackage" ), Any( xTempFile ) ); + rMediaDesc.setComponentDataEntry( "DecryptedPackage", Any( xTempFile ) ); Reference< XInputStream > xDecrInStrm = xTempFile->getInputStream(); if( lclIsZipPackage( mxContext, xDecrInStrm ) ) @@ -672,8 +672,8 @@ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq /* Parse '_rels/.rels' to get the target path and '[Content_Types].xml' to determine the content type of the part at the target path. */ - aParser.parseStream( aZipStorage, CREATE_OUSTRING( "_rels/.rels" ) ); - aParser.parseStream( aZipStorage, CREATE_OUSTRING( "[Content_Types].xml" ) ); + aParser.parseStream( aZipStorage, "_rels/.rels" ); + aParser.parseStream( aZipStorage, "[Content_Types].xml" ); } } catch( const Exception& ) diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx index bfca0d73010b..37031268137f 100644 --- a/oox/source/core/xmlfilterbase.cxx +++ b/oox/source/core/xmlfilterbase.cxx @@ -182,8 +182,8 @@ namespace XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : maFastParser( rxContext ), - maBinSuffix( CREATE_OUSTRING( ".bin" ) ), - maVmlSuffix( CREATE_OUSTRING( ".vml" ) ) + maBinSuffix( ".bin" ), + maVmlSuffix( ".vml" ) { // register XML namespaces const Sequence< beans::Pair< OUString, sal_Int32 > > ids= @@ -412,14 +412,14 @@ OUString lclAddRelation( const Reference< XRelationshipAccess > xRelations, sal_ OUString sId = OUStringBuffer().appendAscii( "rId" ).append( nId ).makeStringAndClear(); Sequence< StringPair > aEntry( bExternal ? 3 : 2 ); - aEntry[0].First = CREATE_OUSTRING( "Type" ); + aEntry[0].First = "Type"; aEntry[0].Second = rType; - aEntry[1].First = CREATE_OUSTRING( "Target" ); + aEntry[1].First = "Target"; aEntry[1].Second = rTarget; if( bExternal ) { - aEntry[2].First = CREATE_OUSTRING( "TargetMode" ); - aEntry[2].Second = CREATE_OUSTRING( "External" ); + aEntry[2].First = "TargetMode"; + aEntry[2].Second = "External"; } xRelations->insertRelationshipByID( sId, aEntry, sal_True ); @@ -525,14 +525,14 @@ writeCoreProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xPro { OUString sValue; if( rSelf.getVersion() == oox::core::ISOIEC_29500_2008 ) - sValue = CREATE_OUSTRING( "http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties" ); + sValue = "http://schemas.openxmlformats.org/officedocument/2006/relationships/metadata/core-properties"; else - sValue = CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" ); + sValue = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"; - rSelf.addRelation( sValue, CREATE_OUSTRING( "docProps/core.xml" ) ); + rSelf.addRelation( sValue, "docProps/core.xml" ); FSHelperPtr pCoreProps = rSelf.openFragmentStreamWithSerializer( - CREATE_OUSTRING( "docProps/core.xml" ), - CREATE_OUSTRING( "application/vnd.openxmlformats-package.core-properties+xml" ) ); + "docProps/core.xml", + "application/vnd.openxmlformats-package.core-properties+xml" ); pCoreProps->startElementNS( XML_cp, XML_coreProperties, FSNS( XML_xmlns, XML_cp ), "http://schemas.openxmlformats.org/package/2006/metadata/core-properties", FSNS( XML_xmlns, XML_dc ), "http://purl.org/dc/elements/1.1/", @@ -571,11 +571,11 @@ static void writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProperties ) { rSelf.addRelation( - CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" ), - CREATE_OUSTRING( "docProps/app.xml" ) ); + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties", + "docProps/app.xml" ); FSHelperPtr pAppProps = rSelf.openFragmentStreamWithSerializer( - CREATE_OUSTRING( "docProps/app.xml" ), - CREATE_OUSTRING( "application/vnd.openxmlformats-officedocument.extended-properties+xml" ) ); + "docProps/app.xml", + "application/vnd.openxmlformats-officedocument.extended-properties+xml" ); pAppProps->startElement( XML_Properties, XML_xmlns, "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties", FSNS( XML_xmlns, XML_vt ), "http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes", diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 9339c5362777..ea91a6a2daa4 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -49,13 +49,13 @@ using ::rtl::OUString; OUString SAL_CALL DocumentPropertiesImport_getImplementationName() { - return CREATE_OUSTRING( "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter" ); + return OUString( "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter" ); } Sequence< OUString > SAL_CALL DocumentPropertiesImport_getSupportedServiceNames() { Sequence< OUString > aServices( 1 ); - aServices[ 0 ] = CREATE_OUSTRING( "com.sun.star.document.OOXMLDocumentPropertiesImporter" ); + aServices[ 0 ] = "com.sun.star.document.OOXMLDocumentPropertiesImporter"; return aServices; } @@ -155,7 +155,7 @@ void SAL_CALL DocumentPropertiesImport::importProperties( if( aCoreStreams.hasElements() || aExtStreams.hasElements() || aCustomStreams.hasElements() ) { if( aCoreStreams.getLength() > 1 ) - throw IOException( CREATE_OUSTRING( "Unexpected core properties stream!" ), Reference< XInterface >() ); + throw IOException( "Unexpected core properties stream!", Reference< XInterface >() ); ::oox::core::FastParser aParser( mxContext ); aParser.registerNamespace( NMSP_packageMetaCorePr ); diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx index bf4b4f87a667..1ad07f53776d 100644 --- a/oox/source/drawingml/chart/axisconverter.cxx +++ b/oox/source/drawingml/chart/axisconverter.cxx @@ -130,7 +130,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo ObjectFormatter& rFormatter = getFormatter(); // create the axis object (always) - xAxis.set( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Axis" ) ), UNO_QUERY_THROW ); + xAxis.set( createInstance( "com.sun.star.chart2.Axis" ), UNO_QUERY_THROW ); PropertySet aAxisProp( xAxis ); // #i58688# axis enabled aAxisProp.setProperty( PROP_Show, !mrModel.mbDeleted ); @@ -219,7 +219,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo if( mrModel.mnTypeId == C_TOKEN( dateAx ) ) { // scaling algorithm - aScaleData.Scaling.set( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.LinearScaling" ) ), UNO_QUERY ); + aScaleData.Scaling.set( createInstance( "com.sun.star.chart2.LinearScaling" ), UNO_QUERY ); // min/max lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin ); lclSetValueOrClearAny( aScaleData.Maximum, mrModel.mofMax ); @@ -250,8 +250,8 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo // scaling algorithm bool bLogScale = lclIsLogarithmicScale( mrModel ); OUString aScalingService = bLogScale ? - CREATE_OUSTRING( "com.sun.star.chart2.LogarithmicScaling" ) : - CREATE_OUSTRING( "com.sun.star.chart2.LinearScaling" ); + OUString( "com.sun.star.chart2.LogarithmicScaling" ) : + OUString( "com.sun.star.chart2.LinearScaling" ); aScaleData.Scaling.set( createInstance( aScalingService ), UNO_QUERY ); // min/max lclSetValueOrClearAny( aScaleData.Minimum, mrModel.mofMin ); @@ -334,7 +334,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo { Reference< XTitled > xTitled( xAxis, UNO_QUERY_THROW ); TitleConverter aTitleConv( *this, *mrModel.mxTitle ); - aTitleConv.convertFromModel( xTitled, CREATE_OUSTRING( "Axis Title" ), OBJECTTYPE_AXISTITLE, nAxesSetIdx, nAxisIdx ); + aTitleConv.convertFromModel( xTitled, "Axis Title", OBJECTTYPE_AXISTITLE, nAxesSetIdx, nAxisIdx ); } } catch( Exception& ) @@ -358,4 +358,4 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo } // namespace drawingml } // namespace oox -/* vim:n:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx index 607572d489f9..e280f088da8d 100644 --- a/oox/source/drawingml/chart/chartconverter.cxx +++ b/oox/source/drawingml/chart/chartconverter.cxx @@ -54,7 +54,7 @@ static OUString lclGenerateApiString( const OUString& rString ) OUString aRetString = rString; sal_Int32 nQuotePos = aRetString.getLength(); while( (nQuotePos = aRetString.lastIndexOf( '"', nQuotePos )) >= 0 ) - aRetString = aRetString.replaceAt( nQuotePos, 1, CREATE_OUSTRING( "\"\"" ) ); + aRetString = aRetString.replaceAt( nQuotePos, 1, "\"\"" ); return OUStringBuffer().append( sal_Unicode( '"' ) ).append( aRetString ).append( sal_Unicode( '"' ) ).makeStringAndClear(); } diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx index dd7bded7d01d..db0421585aac 100644 --- a/oox/source/drawingml/chart/chartspaceconverter.cxx +++ b/oox/source/drawingml/chart/chartspaceconverter.cxx @@ -120,7 +120,7 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern if( mrModel.mxTitle.is() || !aAutoTitle.isEmpty() ) { if( aAutoTitle.isEmpty() ) - aAutoTitle = CREATE_OUSTRING( "Chart Title" ); + aAutoTitle = "Chart Title"; Reference< XTitled > xTitled( getChartDocument(), UNO_QUERY_THROW ); TitleConverter aTitleConv( *this, mrModel.mxTitle.getOrCreate() ); aTitleConv.convertFromModel( xTitled, aAutoTitle, OBJECTTYPE_CHARTTITLE ); diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx index 8c3695993e43..dc76fef505e2 100644 --- a/oox/source/drawingml/chart/objectformatter.cxx +++ b/oox/source/drawingml/chart/objectformatter.cxx @@ -1014,7 +1014,7 @@ void ObjectTypeFormatter::convertAutomaticFill( PropertySet& rPropSet, sal_Int32 ObjectFormatterData::ObjectFormatterData( const XmlFilterBase& rFilter, const Reference< XChartDocument >& rxChartDoc, const ChartSpaceModel& rChartSpace ) : mrFilter( rFilter ), maModelObjHelper( Reference< XMultiServiceFactory >( rxChartDoc, UNO_QUERY ) ), - maEnUsLocale( CREATE_OUSTRING( "en" ), CREATE_OUSTRING( "US" ), OUString() ), + maEnUsLocale( "en", "US", OUString() ), mnMaxSeriesIdx( -1 ) { const ObjectTypeFormatEntry* pEntryEnd = STATIC_ARRAY_END( spObjTypeFormatEntries ); diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx index 5346291a5c22..ff67b5fb3a1e 100644 --- a/oox/source/drawingml/chart/plotareaconverter.cxx +++ b/oox/source/drawingml/chart/plotareaconverter.cxx @@ -318,7 +318,7 @@ void PlotAreaConverter::convertFromModel( View3DModel& rView3DModel ) Reference< XDiagram > xDiagram; try { - xDiagram.set( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Diagram" ) ), UNO_QUERY_THROW ); + xDiagram.set( createInstance( "com.sun.star.chart2.Diagram" ), UNO_QUERY_THROW ); getChartDocument()->setFirstDiagram( xDiagram ); } catch( Exception& ) diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 157f4cdbf7c3..adfe078c0766 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -76,14 +76,14 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( if( pTitle ) { TextConverter aTextConv( rParent, *pTitle ); - xTitleSeq = aTextConv.createDataSequence( CREATE_OUSTRING( "label" ) ); + xTitleSeq = aTextConv.createDataSequence( "label" ); } // create the labeled data sequence, if values or title are present Reference< XLabeledDataSequence > xLabeledSeq; if( xValueSeq.is() || xTitleSeq.is() ) { - xLabeledSeq.set( rParent.createInstance( CREATE_OUSTRING( "com.sun.star.chart2.data.LabeledDataSequence" ) ), UNO_QUERY ); + xLabeledSeq.set( rParent.createInstance( "com.sun.star.chart2.data.LabeledDataSequence" ), UNO_QUERY ); if( xLabeledSeq.is() ) { xLabeledSeq->setValues( xValueSeq ); @@ -141,7 +141,7 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt // data label separator (do not overwrite series separator, if no explicit point separator is present) if( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) - rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( CREATE_OUSTRING( "; " ) ) ); + rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( "; " ) ); // data label placement (do not overwrite series placement, if no explicit point placement is present) if( bDataSeriesLabel || rDataLabel.monLabelPos.has() ) @@ -256,7 +256,7 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData bool bShowNeg = (mrModel.mnTypeId == XML_minus) || (mrModel.mnTypeId == XML_both); if( bShowPos || bShowNeg ) try { - Reference< XPropertySet > xErrorBar( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.ErrorBar" ) ), UNO_QUERY_THROW ); + Reference< XPropertySet > xErrorBar( createInstance( "com.sun.star.chart2.ErrorBar" ), UNO_QUERY_THROW ); PropertySet aBarProp( xErrorBar ); // plus/minus bars @@ -351,15 +351,15 @@ Reference< XLabeledDataSequence > ErrorBarConverter::createLabeledDataSequence( case ErrorBarModel::PLUS: switch( mrModel.mnDirection ) { - case XML_x: aRole = CREATE_OUSTRING( "error-bars-x-positive" ); break; - case XML_y: aRole = CREATE_OUSTRING( "error-bars-y-positive" ); break; + case XML_x: aRole = "error-bars-x-positive"; break; + case XML_y: aRole = "error-bars-y-positive"; break; } break; case ErrorBarModel::MINUS: switch( mrModel.mnDirection ) { - case XML_x: aRole = CREATE_OUSTRING( "error-bars-x-negative" ); break; - case XML_y: aRole = CREATE_OUSTRING( "error-bars-y-negative" ); break; + case XML_x: aRole = "error-bars-x-negative"; break; + case XML_y: aRole = "error-bars-y-negative"; break; } break; } @@ -403,12 +403,12 @@ void TrendlineConverter::convertFromModel( const Reference< XDataSeries >& rxDat OUString aServiceName; switch( mrModel.mnTypeId ) { - case XML_exp: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.ExponentialRegressionCurve" ); break; - case XML_linear: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.LinearRegressionCurve" ); break; - case XML_log: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.LogarithmicRegressionCurve" ); break; + case XML_exp: aServiceName = "com.sun.star.chart2.ExponentialRegressionCurve"; break; + case XML_linear: aServiceName = "com.sun.star.chart2.LinearRegressionCurve"; break; + case XML_log: aServiceName = "com.sun.star.chart2.LogarithmicRegressionCurve"; break; case XML_movingAvg: /* #i66819# moving average trendlines not supported */ break; case XML_poly: /* #i20819# polynomial trendlines not supported */ break; - case XML_power: aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PotentialRegressionCurve" ); break; + case XML_power: aServiceName = "com.sun.star.chart2.PotentialRegressionCurve"; break; default: OSL_FAIL( "TrendlineConverter::convertFromModel - unknown trendline type" ); } if( !aServiceName.isEmpty() ) @@ -510,7 +510,7 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve const TypeGroupInfo& rTypeInfo = rTypeGroup.getTypeInfo(); // create the data series object - Reference< XDataSeries > xDataSeries( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.DataSeries" ) ), UNO_QUERY ); + Reference< XDataSeries > xDataSeries( createInstance( "com.sun.star.chart2.DataSeries" ), UNO_QUERY ); PropertySet aSeriesProp( xDataSeries ); // attach data and title sequences to series @@ -521,7 +521,7 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve // create vector of all value sequences ::std::vector< Reference< XLabeledDataSequence > > aLabeledSeqVec; // add Y values - Reference< XLabeledDataSequence > xYValueSeq = createValueSequence( CREATE_OUSTRING( "values-y" ) ); + Reference< XLabeledDataSequence > xYValueSeq = createValueSequence( "values-y" ); if( xYValueSeq.is() ) { aLabeledSeqVec.push_back( xYValueSeq ); @@ -532,13 +532,13 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve // add X values of scatter and bubble charts if( !rTypeInfo.mbCategoryAxis ) { - Reference< XLabeledDataSequence > xXValueSeq = createCategorySequence( CREATE_OUSTRING( "values-x" ) ); + Reference< XLabeledDataSequence > xXValueSeq = createCategorySequence( "values-x" ); if( xXValueSeq.is() ) aLabeledSeqVec.push_back( xXValueSeq ); // add size values of bubble charts if( rTypeInfo.meTypeId == TYPEID_BUBBLE ) { - Reference< XLabeledDataSequence > xSizeValueSeq = createLabeledDataSequence( SeriesModel::POINTS, CREATE_OUSTRING( "values-size" ), true ); + Reference< XLabeledDataSequence > xSizeValueSeq = createLabeledDataSequence( SeriesModel::POINTS, "values-size", true ); if( xSizeValueSeq.is() ) aLabeledSeqVec.push_back( xSizeValueSeq ); } diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index cda8f947ebd1..d71cb977fa0e 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -120,7 +120,7 @@ Reference< XFormattedString > TextConverter::appendFormattedString( Reference< XFormattedString > xFmtStr; try { - xFmtStr.set( ConverterRoot::createInstance( CREATE_OUSTRING( "com.sun.star.chart2.FormattedString" ) ), UNO_QUERY_THROW ); + xFmtStr.set( ConverterRoot::createInstance( "com.sun.star.chart2.FormattedString" ), UNO_QUERY_THROW ); xFmtStr->setString( bAddNewLine ? (rString + OUString( sal_Unicode( '\n' ) )) : rString ); orStringVec.push_back( xFmtStr ); } @@ -152,7 +152,7 @@ void TitleConverter::convertFromModel( const Reference< XTitled >& rxTitled, con if( aStringSeq.hasElements() ) try { // create the title object and set the string data - Reference< XTitle > xTitle( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Title" ) ), UNO_QUERY_THROW ); + Reference< XTitle > xTitle( createInstance( "com.sun.star.chart2.Title" ), UNO_QUERY_THROW ); xTitle->setText( aStringSeq ); rxTitled->setTitleObject( xTitle ); @@ -193,7 +193,7 @@ void LegendConverter::convertFromModel( const Reference< XDiagram >& rxDiagram ) namespace cssc2 = ::com::sun::star::chart2; // create the legend - Reference< XLegend > xLegend( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.Legend" ) ), UNO_QUERY_THROW ); + Reference< XLegend > xLegend( createInstance( "com.sun.star.chart2.Legend" ), UNO_QUERY_THROW ); rxDiagram->setLegend( xLegend ); PropertySet aPropSet( xLegend ); aPropSet.setProperty( PROP_Show, true ); diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 7b72fd42a1d3..7f996bfa062b 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -243,16 +243,16 @@ Reference< XCoordinateSystem > TypeGroupConverter::createCoordinateSystem() if( maTypeInfo.mbPolarCoordSystem ) { if( mb3dChart ) - aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PolarCoordinateSystem3d" ); + aServiceName = "com.sun.star.chart2.PolarCoordinateSystem3d"; else - aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.PolarCoordinateSystem2d" ); + aServiceName = "com.sun.star.chart2.PolarCoordinateSystem2d"; } else { if( mb3dChart ) - aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.CartesianCoordinateSystem3d" ); + aServiceName = "com.sun.star.chart2.CartesianCoordinateSystem3d"; else - aServiceName = CREATE_OUSTRING( "com.sun.star.chart2.CartesianCoordinateSystem2d" ); + aServiceName = "com.sun.star.chart2.CartesianCoordinateSystem2d"; } // create the coordinate system object @@ -279,7 +279,7 @@ Reference< XLabeledDataSequence > TypeGroupConverter::createCategorySequence() if( (*aIt)->maSources.has( SeriesModel::CATEGORIES ) ) { SeriesConverter aSeriesConv( *this, **aIt ); - xLabeledSeq = aSeriesConv.createCategorySequence( CREATE_OUSTRING( "categories" ) ); + xLabeledSeq = aSeriesConv.createCategorySequence( "categories" ); } } return xLabeledSeq; @@ -346,7 +346,7 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra if( maTypeInfo.meTypeId == TYPEID_STOCK ) { // create the data series object - Reference< XDataSeries > xDataSeries( createInstance( CREATE_OUSTRING( "com.sun.star.chart2.DataSeries" ) ), UNO_QUERY ); + Reference< XDataSeries > xDataSeries( createInstance( "com.sun.star.chart2.DataSeries" ), UNO_QUERY ); Reference< XDataSink > xDataSink( xDataSeries, UNO_QUERY ); if( xDataSink.is() ) { @@ -360,10 +360,10 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra OUString aRole; switch( nRoleIdx ) { - case 0: aRole = CREATE_OUSTRING( "values-first" ); break; - case 1: aRole = CREATE_OUSTRING( "values-max" ); break; - case 2: aRole = CREATE_OUSTRING( "values-min" ); break; - case 3: aRole = CREATE_OUSTRING( "values-last" ); break; + case 0: aRole = "values-first"; break; + case 1: aRole = "values-max"; break; + case 2: aRole = "values-min"; break; + case 3: aRole = "values-last"; break; } Reference< XLabeledDataSequence > xDataSeq = (*aIt)->createValueSequence( aRole ); if( xDataSeq.is() ) diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index 790b253da796..ffa0e6fcf61f 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -116,9 +116,9 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter ) sal_Int32 nFormulaIndex; if ( rParameter.Value >>= nFormulaIndex ) { - aRet = CREATE_OUSTRING( "?" ) + aRet = "?" + OUString::valueOf( nFormulaIndex ) - + CREATE_OUSTRING( " " ); + + " "; } } else @@ -134,9 +134,9 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter ) sal_Int32 nAdjustmentIndex; if ( rParameter.Value >>= nAdjustmentIndex ) { - aRet = CREATE_OUSTRING( "$" ) + aRet = "$" + OUString::valueOf( nAdjustmentIndex ) - + CREATE_OUSTRING( " " ); + + " "; } } else @@ -147,73 +147,73 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter ) break; case EnhancedCustomShapeParameterType::LEFT : { - const OUString sLeft( CREATE_OUSTRING( "left" ) ); + const OUString sLeft( "left" ); aRet = sLeft; } break; case EnhancedCustomShapeParameterType::TOP : { - const OUString sTop( CREATE_OUSTRING( "top" ) ); + const OUString sTop( "top" ); aRet = sTop; } break; case EnhancedCustomShapeParameterType::RIGHT : { - const OUString sRight( CREATE_OUSTRING( "right" ) ); + const OUString sRight( "right" ); aRet = sRight; } break; case EnhancedCustomShapeParameterType::BOTTOM : { - const OUString sBottom( CREATE_OUSTRING( "bottom" ) ); + const OUString sBottom( "bottom" ); aRet = sBottom; } break; case EnhancedCustomShapeParameterType::XSTRETCH : { - const OUString sXStretch( CREATE_OUSTRING( "xstretch" ) ); + const OUString sXStretch( "xstretch" ); aRet = sXStretch; } break; case EnhancedCustomShapeParameterType::YSTRETCH : { - const OUString sYStretch( CREATE_OUSTRING( "ystretch" ) ); + const OUString sYStretch( "ystretch" ); aRet = sYStretch; } break; case EnhancedCustomShapeParameterType::HASSTROKE : { - const OUString sHasStroke( CREATE_OUSTRING( "hasstroke" ) ); + const OUString sHasStroke( "hasstroke" ); aRet = sHasStroke; } break; case EnhancedCustomShapeParameterType::HASFILL : { - const OUString sHasFill( CREATE_OUSTRING( "hasfill" ) ); + const OUString sHasFill( "hasfill" ); aRet = sHasFill; } break; case EnhancedCustomShapeParameterType::WIDTH : { - const OUString sWidth( CREATE_OUSTRING( "width" ) ); + const OUString sWidth( "width" ); aRet = sWidth; } break; case EnhancedCustomShapeParameterType::HEIGHT : { - const OUString sHeight( CREATE_OUSTRING( "height" ) ); + const OUString sHeight( "height" ); aRet = sHeight; } break; case EnhancedCustomShapeParameterType::LOGWIDTH : { - const OUString sLogWidth( CREATE_OUSTRING( "logwidth" ) ); + const OUString sLogWidth( "logwidth" ); aRet = sLogWidth; } break; case EnhancedCustomShapeParameterType::LOGHEIGHT : { - const OUString sLogHeight( CREATE_OUSTRING( "logheight" ) ); + const OUString sLogHeight( "logheight" ); aRet = sLogHeight; } break; @@ -251,7 +251,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "logheight" ); + aGuide.maFormula = "logheight" ; aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -281,7 +281,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "logheight/" ) + OUString::valueOf( nIntVal ); + aGuide.maFormula = "logheight/" + OUString::valueOf( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -300,7 +300,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "max(logwidth,logheight)" ); + aGuide.maFormula = "max(logwidth,logheight)"; aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -310,7 +310,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "min(logwidth,logheight)" ); + aGuide.maFormula = "min(logwidth,logheight)"; aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -332,7 +332,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "min(logwidth,logheight)/" ) + OUString::valueOf( nIntVal ); + aGuide.maFormula = "min(logwidth,logheight)/" + OUString::valueOf( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -346,7 +346,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu { CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "logwidth" ); + aGuide.maFormula = "logwidth" ; aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -379,7 +379,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu CustomShapeGuide aGuide; aGuide.maName = rValue; - aGuide.maFormula = CREATE_OUSTRING( "logwidth/" ) + OUString::valueOf( nIntVal ); + aGuide.maFormula = "logwidth/" + OUString::valueOf( nIntVal ); aRet.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( rCustomShapeProperties.getGuideList(), aGuide ) ); aRet.Type = EnhancedCustomShapeParameterType::EQUATION; @@ -498,116 +498,116 @@ static OUString convertToOOEquation( CustomShapeProperties& rCustomShapeProperti case FC_MULDIV : { if ( nParameters == 3 ) - aEquation = sParameters[ 0 ] + CREATE_OUSTRING( "*" ) + sParameters[ 1 ] - + CREATE_OUSTRING( "/" ) + sParameters[ 2 ]; + aEquation = sParameters[ 0 ] + "*" + sParameters[ 1 ] + + "/" + sParameters[ 2 ]; } break; case FC_PLUSMINUS : { if ( nParameters == 3 ) - aEquation = sParameters[ 0 ] + CREATE_OUSTRING( "+" ) + sParameters[ 1 ] - + CREATE_OUSTRING( "-" ) + sParameters[ 2 ]; + aEquation = sParameters[ 0 ] + "+" + sParameters[ 1 ] + + "-" + sParameters[ 2 ]; } break; case FC_PLUSDIV : { if ( nParameters == 3 ) - aEquation = CREATE_OUSTRING( "(" ) + sParameters[ 0 ] + CREATE_OUSTRING( "+" ) - + sParameters[ 1 ] + CREATE_OUSTRING( ")/" ) + sParameters[ 2 ]; + aEquation = "(" + sParameters[ 0 ] + "+" + + sParameters[ 1 ] + ")/" + sParameters[ 2 ]; } break; case FC_IFELSE : case FC_IFELSE1 : { if ( nParameters == 3 ) - aEquation = CREATE_OUSTRING( "if(" ) + sParameters[ 0 ] + CREATE_OUSTRING( "," ) - + sParameters[ 1 ] + CREATE_OUSTRING( "," ) + sParameters[ 2 ] + CREATE_OUSTRING( ")" ); + aEquation = "if(" + sParameters[ 0 ] + "," + + sParameters[ 1 ] + "," + sParameters[ 2 ] + ")"; } break; case FC_ABS : { if ( nParameters == 1 ) - aEquation = CREATE_OUSTRING( "abs(" ) + sParameters[ 0 ] + CREATE_OUSTRING( ")" ); + aEquation = "abs(" + sParameters[ 0 ] + ")"; } break; case FC_AT2 : { if ( nParameters == 2 ) - aEquation = CREATE_OUSTRING( "(10800000*atan2(" ) + sParameters[ 1 ] + CREATE_OUSTRING( "," ) - + sParameters[ 0 ] + CREATE_OUSTRING( "))/pi" ); + aEquation = "(10800000*atan2(" + sParameters[ 1 ] + "," + + sParameters[ 0 ] + "))/pi"; } break; case FC_CAT2 : { if ( nParameters == 3 ) - aEquation = sParameters[ 0 ] + CREATE_OUSTRING( "*(cos(atan2(" ) + - sParameters[ 2 ] + CREATE_OUSTRING( "," ) + sParameters[ 1 ] + CREATE_OUSTRING( ")))" ); + aEquation = sParameters[ 0 ] + "*(cos(atan2(" + + sParameters[ 2 ] + "," + sParameters[ 1 ] + ")))"; } break; case FC_COS : { if ( nParameters == 2 ) - aEquation = sParameters[ 0 ] + CREATE_OUSTRING( "*cos(pi*(" ) + - sParameters[ 1 ] + CREATE_OUSTRING( ")/10800000)" ); + aEquation = sParameters[ 0 ] + "*cos(pi*(" + + sParameters[ 1 ] + ")/10800000)"; } break; case FC_MAX : { if ( nParameters == 2 ) - aEquation = CREATE_OUSTRING( "max(" ) + sParameters[ 0 ] + CREATE_OUSTRING( "," ) + - sParameters[ 1 ] + CREATE_OUSTRING( ")" ); + aEquation = "max(" + sParameters[ 0 ] + "," + + sParameters[ 1 ] + ")"; } break; case FC_MIN : { if ( nParameters == 2 ) - aEquation = CREATE_OUSTRING( "min(" ) + sParameters[ 0 ] + CREATE_OUSTRING( "," ) + - sParameters[ 1 ] + CREATE_OUSTRING( ")" ); + aEquation = "min(" + sParameters[ 0 ] + "," + + sParameters[ 1 ] + ")"; } break; case FC_MOD : { if ( nParameters == 3 ) - aEquation = CREATE_OUSTRING( "sqrt(" ) - + sParameters[ 0 ] + CREATE_OUSTRING( "*" ) + sParameters[ 0 ] + CREATE_OUSTRING( "+" ) - + sParameters[ 1 ] + CREATE_OUSTRING( "*" ) + sParameters[ 1 ] + CREATE_OUSTRING( "+" ) - + sParameters[ 2 ] + CREATE_OUSTRING( "*" ) + sParameters[ 2 ] + CREATE_OUSTRING( ")" ); + aEquation = "sqrt(" + + sParameters[ 0 ] + "*" + sParameters[ 0 ] + "+" + + sParameters[ 1 ] + "*" + sParameters[ 1 ] + "+" + + sParameters[ 2 ] + "*" + sParameters[ 2 ] + ")"; } break; case FC_PIN : { if ( nParameters == 3 ) // if(x-y,x,if(y-z,z,y)) - aEquation = CREATE_OUSTRING( "if(" ) + sParameters[ 0 ] + CREATE_OUSTRING( "-" ) + sParameters[ 1 ] - + CREATE_OUSTRING( "," ) + sParameters[ 0 ] + CREATE_OUSTRING( ",if(" ) + sParameters[ 2 ] - + CREATE_OUSTRING( "-" ) + sParameters[ 1 ] + CREATE_OUSTRING( "," ) + sParameters[ 1 ] - + CREATE_OUSTRING( "," ) + sParameters[ 2 ] + CREATE_OUSTRING( "))" ); + aEquation = "if(" + sParameters[ 0 ] + "-" + sParameters[ 1 ] + + "," + sParameters[ 0 ] + ",if(" + sParameters[ 2 ] + + "-" + sParameters[ 1 ] + "," + sParameters[ 1 ] + + "," + sParameters[ 2 ] + "))"; } break; case FC_SAT2 : { if ( nParameters == 3 ) - aEquation = sParameters[ 0 ] + CREATE_OUSTRING( "*(sin(atan2(" ) + - sParameters[ 2 ] + CREATE_OUSTRING( "," ) + sParameters[ 1 ] + CREATE_OUSTRING( ")))" ); + aEquation = sParameters[ 0 ] + "*(sin(atan2(" + + sParameters[ 2 ] + "," + sParameters[ 1 ] + ")))"; } break; case FC_SIN : { if ( nParameters == 2 ) - aEquation = sParameters[ 0 ] + CREATE_OUSTRING( "*sin(pi*(" ) + - sParameters[ 1 ] + CREATE_OUSTRING( ")/10800000)" ); + aEquation = sParameters[ 0 ] + "*sin(pi*(" + + sParameters[ 1 ] + ")/10800000)"; } break; case FC_SQRT : { if ( nParameters == 1 ) - aEquation = CREATE_OUSTRING( "sqrt(" ) + sParameters[ 0 ] + CREATE_OUSTRING( ")" ); + aEquation = "sqrt(" + sParameters[ 0 ] + ")"; } break; case FC_TAN : { if ( nParameters == 2 ) - aEquation = sParameters[ 0 ] + CREATE_OUSTRING( "*tan(pi*(" ) + - sParameters[ 1 ] + CREATE_OUSTRING( ")/10800000)" ); + aEquation = sParameters[ 0 ] + "*tan(pi*(" + + sParameters[ 1 ] + ")/10800000)"; } break; case FC_VAL : @@ -1100,18 +1100,18 @@ Reference< XFastContextHandler > Path2DContext::createFastChildContext( sal_Int3 sal_Int32 nArcNum = mrCustomShapeProperties.getArcNum(); // start angle - aGuide.maName = CREATE_OUSTRING("arctosa") + OUString::valueOf( nArcNum ); - aGuide.maFormula = CREATE_OUSTRING( "(") + aGuide.maName = "arctosa" + OUString::valueOf( nArcNum ); + aGuide.maFormula = "(" + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, xAttribs->getOptionalValue( XML_stAng ) ) ) - + CREATE_OUSTRING( ")/60000.0" ); + + ")/60000.0"; aAngles.First.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) ); aAngles.First.Type = EnhancedCustomShapeParameterType::EQUATION; // swing angle - aGuide.maName = CREATE_OUSTRING("arctosw") + OUString::valueOf( nArcNum ); - aGuide.maFormula = CREATE_OUSTRING( "(") + aGuide.maName = "arctosw" + OUString::valueOf( nArcNum ); + aGuide.maFormula = "(" + GetFormulaParameter( GetAdjCoordinate( mrCustomShapeProperties, xAttribs->getOptionalValue( XML_swAng ) ) ) - + CREATE_OUSTRING( ")/60000.0" ); + + ")/60000.0"; aAngles.Second.Value = Any( CustomShapeProperties::SetCustomShapeGuideValue( mrCustomShapeProperties.getGuideList(), aGuide ) ); aAngles.Second.Type = EnhancedCustomShapeParameterType::EQUATION; diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index 5fcf655350dd..f2bcb4baa119 100644 --- a/oox/source/drawingml/customshapepresets1.cxx +++ b/oox/source/drawingml/customshapepresets1.cxx @@ -69,7 +69,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -235,7 +235,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -272,7 +272,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -308,7 +308,7 @@ class ShapeCactionButtonSound : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonSound"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonSound"); return aPropertyMap; } @@ -324,22 +324,22 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -361,7 +361,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -371,7 +371,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -379,7 +379,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -387,7 +387,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -395,7 +395,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -403,12 +403,12 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -417,7 +417,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -427,7 +427,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -435,7 +435,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -443,7 +443,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -451,7 +451,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -459,12 +459,12 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -481,7 +481,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -517,7 +517,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -532,7 +532,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -568,7 +568,7 @@ class ShapeCborderCallout1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-borderCallout1"); return aPropertyMap; } @@ -613,7 +613,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -699,7 +699,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -726,7 +726,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -762,7 +762,7 @@ class ShapeCplaqueTabs : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plaqueTabs"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-plaqueTabs"); return aPropertyMap; } @@ -778,17 +778,17 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -863,7 +863,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -873,7 +873,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -881,7 +881,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -889,7 +889,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -898,7 +898,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -908,7 +908,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -916,7 +916,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -924,7 +924,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -933,7 +933,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -943,7 +943,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 15); aParameter.Value = aAny; @@ -951,7 +951,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -959,7 +959,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -976,7 +976,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1127,7 +1127,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1159,7 +1159,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1195,7 +1195,7 @@ class ShapeCcurvedLeftArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedLeftArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedLeftArrow"); return aPropertyMap; } @@ -1211,7 +1211,7 @@ class ShapeCoctagon : public CustomShapeProvider { Any aAny ((sal_Int32) 29289); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1235,7 +1235,7 @@ class ShapeCoctagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1245,7 +1245,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1253,7 +1253,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1261,7 +1261,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1278,7 +1278,7 @@ class ShapeCoctagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1324,7 +1324,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1335,7 +1335,7 @@ class ShapeCoctagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1371,7 +1371,7 @@ class ShapeCoctagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-octagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-octagon"); return aPropertyMap; } @@ -1387,17 +1387,17 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 16667); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1457,7 +1457,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1467,7 +1467,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1475,7 +1475,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1483,7 +1483,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1492,7 +1492,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1502,7 +1502,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 7); aParameter.Value = aAny; @@ -1510,7 +1510,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1518,7 +1518,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -1527,7 +1527,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1537,7 +1537,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 33333); aParameter.Value = aAny; @@ -1545,7 +1545,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1553,7 +1553,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -1570,7 +1570,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1816,7 +1816,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1852,7 +1852,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1888,7 +1888,7 @@ class ShapeCleftRightRibbon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightRibbon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftRightRibbon"); return aPropertyMap; } @@ -1958,7 +1958,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2244,7 +2244,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2293,7 +2293,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2329,7 +2329,7 @@ class ShapeCactionButtonInformation : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonInformation"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonInformation"); return aPropertyMap; } @@ -2345,17 +2345,17 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2377,7 +2377,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2387,7 +2387,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2395,7 +2395,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2403,7 +2403,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2412,7 +2412,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2422,7 +2422,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2430,7 +2430,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2438,7 +2438,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -2447,7 +2447,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2457,7 +2457,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2465,7 +2465,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2473,7 +2473,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -2490,7 +2490,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2526,7 +2526,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2537,7 +2537,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2573,7 +2573,7 @@ class ShapeCbentConnector5 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector5"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bentConnector5"); return aPropertyMap; } @@ -2589,27 +2589,27 @@ class ShapeCcircularArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 1142319); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 20457681); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 10800000); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 12500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2824,7 +2824,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2838,7 +2838,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2852,7 +2852,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2862,7 +2862,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -2870,7 +2870,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2882,7 +2882,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2892,7 +2892,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -2900,7 +2900,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2920,7 +2920,7 @@ class ShapeCcircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -2971,7 +2971,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2984,7 +2984,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3020,7 +3020,7 @@ class ShapeCcircularArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-circularArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-circularArrow"); return aPropertyMap; } @@ -3036,22 +3036,22 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3088,7 +3088,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3098,7 +3098,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -3106,7 +3106,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3114,7 +3114,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3123,7 +3123,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3133,7 +3133,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -3141,7 +3141,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3149,7 +3149,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3158,7 +3158,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3168,7 +3168,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -3176,7 +3176,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3184,7 +3184,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -3193,7 +3193,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -3203,7 +3203,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 8); aParameter.Value = aAny; @@ -3211,7 +3211,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3219,7 +3219,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -3236,7 +3236,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3297,7 +3297,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3308,7 +3308,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3344,7 +3344,7 @@ class ShapeCdownArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-downArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-downArrowCallout"); return aPropertyMap; } @@ -3360,7 +3360,7 @@ class ShapeCmathMinus : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3383,7 +3383,7 @@ class ShapeCmathMinus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -3393,7 +3393,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -3401,7 +3401,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3409,7 +3409,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3426,7 +3426,7 @@ class ShapeCmathMinus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -3452,7 +3452,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3463,7 +3463,7 @@ class ShapeCmathMinus : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3499,7 +3499,7 @@ class ShapeCmathMinus : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathMinus"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathMinus"); return aPropertyMap; } @@ -3515,12 +3515,12 @@ class ShapeCgear9 : public CustomShapeProvider { Any aAny ((sal_Int32) 10000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 1763); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3799,7 +3799,7 @@ class ShapeCgear9 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3809,7 +3809,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 20000); aParameter.Value = aAny; @@ -3817,7 +3817,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3825,7 +3825,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3834,7 +3834,7 @@ class ShapeCgear9 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3844,7 +3844,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2679); aParameter.Value = aAny; @@ -3852,7 +3852,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3860,7 +3860,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3877,7 +3877,7 @@ class ShapeCgear9 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -4113,7 +4113,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4141,7 +4141,7 @@ class ShapeCgear9 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4177,7 +4177,7 @@ class ShapeCgear9 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-gear9"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-gear9"); return aPropertyMap; } @@ -4193,7 +4193,7 @@ class ShapeCround1Rect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4219,7 +4219,7 @@ class ShapeCround1Rect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4229,7 +4229,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -4237,7 +4237,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4245,7 +4245,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4262,7 +4262,7 @@ class ShapeCround1Rect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4298,7 +4298,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4311,7 +4311,7 @@ class ShapeCround1Rect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4347,7 +4347,7 @@ class ShapeCround1Rect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-round1Rect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-round1Rect"); return aPropertyMap; } @@ -4363,7 +4363,7 @@ class ShapeCsun : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4430,7 +4430,7 @@ class ShapeCsun : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4440,7 +4440,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 46875); aParameter.Value = aAny; @@ -4448,7 +4448,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 12500); aParameter.Value = aAny; @@ -4456,7 +4456,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4473,7 +4473,7 @@ class ShapeCsun : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -4614,7 +4614,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4649,7 +4649,7 @@ class ShapeCsun : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4685,7 +4685,7 @@ class ShapeCsun : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-sun"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-sun"); return aPropertyMap; } @@ -4701,7 +4701,7 @@ class ShapeCplaque : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4735,7 +4735,7 @@ class ShapeCplaque : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4745,7 +4745,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -4753,7 +4753,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4761,7 +4761,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4778,7 +4778,7 @@ class ShapeCplaque : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4844,7 +4844,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4861,7 +4861,7 @@ class ShapeCplaque : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4897,7 +4897,7 @@ class ShapeCplaque : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plaque"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-plaque"); return aPropertyMap; } @@ -4913,7 +4913,7 @@ class ShapeCchevron : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4939,7 +4939,7 @@ class ShapeCchevron : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4949,7 +4949,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -4957,7 +4957,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4965,7 +4965,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4982,7 +4982,7 @@ class ShapeCchevron : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5018,7 +5018,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5029,7 +5029,7 @@ class ShapeCchevron : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5065,7 +5065,7 @@ class ShapeCchevron : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chevron"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-chevron"); return aPropertyMap; } @@ -5102,7 +5102,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5138,7 +5138,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5149,7 +5149,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -5160,7 +5160,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5196,7 +5196,7 @@ class ShapeCflowChartPreparation : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPreparation"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartPreparation"); return aPropertyMap; } @@ -5212,7 +5212,7 @@ class ShapeCdiagStripe : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5237,7 +5237,7 @@ class ShapeCdiagStripe : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -5247,7 +5247,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -5255,7 +5255,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5263,7 +5263,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -5280,7 +5280,7 @@ class ShapeCdiagStripe : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5306,7 +5306,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5317,7 +5317,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5353,7 +5353,7 @@ class ShapeCdiagStripe : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-diagStripe"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-diagStripe"); return aPropertyMap; } @@ -5369,12 +5369,12 @@ class ShapeCpentagon : public CustomShapeProvider { Any aAny ((sal_Int32) 105146); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("hf"); + aAdjSequence [0].Name = "hf"; } { Any aAny ((sal_Int32) 110557); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [1].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5414,7 +5414,7 @@ class ShapeCpentagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5445,7 +5445,7 @@ class ShapeCpentagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5456,7 +5456,7 @@ class ShapeCpentagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5492,7 +5492,7 @@ class ShapeCpentagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-pentagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-pentagon"); return aPropertyMap; } @@ -5566,7 +5566,7 @@ class ShapeCfunnel : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5617,7 +5617,7 @@ class ShapeCfunnel : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5633,7 +5633,7 @@ class ShapeCfunnel : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5669,7 +5669,7 @@ class ShapeCfunnel : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-funnel"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-funnel"); return aPropertyMap; } @@ -5698,7 +5698,7 @@ class ShapeCchartStar : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5754,7 +5754,7 @@ class ShapeCchartStar : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5774,7 +5774,7 @@ class ShapeCchartStar : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (2); { awt::Size aSize; @@ -5800,7 +5800,7 @@ class ShapeCchartStar : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartStar"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-chartStar"); return aPropertyMap; } @@ -5816,22 +5816,22 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5853,7 +5853,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5863,7 +5863,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5871,7 +5871,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5879,7 +5879,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5887,7 +5887,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5895,12 +5895,12 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -5909,7 +5909,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5919,7 +5919,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5927,7 +5927,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5935,7 +5935,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5943,7 +5943,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5951,12 +5951,12 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -5973,7 +5973,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6019,7 +6019,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6038,7 +6038,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6074,7 +6074,7 @@ class ShapeCaccentBorderCallout1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentBorderCallout1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-accentBorderCallout1"); return aPropertyMap; } @@ -6090,12 +6090,12 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6124,7 +6124,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6134,7 +6134,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -6142,7 +6142,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6150,7 +6150,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6159,7 +6159,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6169,7 +6169,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6177,7 +6177,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6185,7 +6185,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6202,7 +6202,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6248,7 +6248,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6259,7 +6259,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6295,7 +6295,7 @@ class ShapeCnotchedRightArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-notchedRightArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-notchedRightArrow"); return aPropertyMap; } @@ -6311,7 +6311,7 @@ class ShapeCrightBracket : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6347,7 +6347,7 @@ class ShapeCrightBracket : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6357,7 +6357,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6365,7 +6365,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6373,7 +6373,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6390,7 +6390,7 @@ class ShapeCrightBracket : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6456,7 +6456,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6476,7 +6476,7 @@ class ShapeCrightBracket : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6512,7 +6512,7 @@ class ShapeCrightBracket : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightBracket"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-rightBracket"); return aPropertyMap; } @@ -6548,7 +6548,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6579,7 +6579,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6590,7 +6590,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -6601,7 +6601,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6637,7 +6637,7 @@ class ShapeCflowChartOffpageConnector : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOffpageConnector"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartOffpageConnector"); return aPropertyMap; } @@ -6653,12 +6653,12 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6688,7 +6688,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6698,7 +6698,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -6706,7 +6706,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6714,7 +6714,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6723,7 +6723,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6733,7 +6733,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6741,7 +6741,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6749,7 +6749,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6766,7 +6766,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6822,7 +6822,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6833,7 +6833,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6869,7 +6869,7 @@ class ShapeCleftRightArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftRightArrow"); return aPropertyMap; } @@ -6885,7 +6885,7 @@ class ShapeCdecagon : public CustomShapeProvider { Any aAny ((sal_Int32) 105146); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [0].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6924,7 +6924,7 @@ class ShapeCdecagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6980,7 +6980,7 @@ class ShapeCdecagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6991,7 +6991,7 @@ class ShapeCdecagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7027,7 +7027,7 @@ class ShapeCdecagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-decagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-decagon"); return aPropertyMap; } @@ -7126,7 +7126,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7457,7 +7457,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7503,7 +7503,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7539,7 +7539,7 @@ class ShapeCactionButtonHelp : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonHelp"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonHelp"); return aPropertyMap; } @@ -7555,7 +7555,7 @@ class ShapeCstar24 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7654,7 +7654,7 @@ class ShapeCstar24 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7664,7 +7664,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 82); aParameter.Value = aAny; @@ -7672,7 +7672,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7680,7 +7680,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7697,7 +7697,7 @@ class ShapeCstar24 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7943,7 +7943,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7954,7 +7954,7 @@ class ShapeCstar24 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7990,7 +7990,7 @@ class ShapeCstar24 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star24"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star24"); return aPropertyMap; } @@ -8006,17 +8006,17 @@ class ShapeCmathDivide : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 5880); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 11760); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8059,7 +8059,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -8069,7 +8069,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 36745); aParameter.Value = aAny; @@ -8077,7 +8077,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1000); aParameter.Value = aAny; @@ -8085,7 +8085,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8094,7 +8094,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8104,7 +8104,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 7); aParameter.Value = aAny; @@ -8112,7 +8112,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8120,7 +8120,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -8129,7 +8129,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8139,7 +8139,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 4); aParameter.Value = aAny; @@ -8147,7 +8147,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1000); aParameter.Value = aAny; @@ -8155,7 +8155,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -8172,7 +8172,7 @@ class ShapeCmathDivide : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8228,7 +8228,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8245,7 +8245,7 @@ class ShapeCmathDivide : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8281,7 +8281,7 @@ class ShapeCmathDivide : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathDivide"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathDivide"); return aPropertyMap; } @@ -8297,12 +8297,12 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8328,7 +8328,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8338,7 +8338,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8346,7 +8346,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8354,7 +8354,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8363,7 +8363,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8373,7 +8373,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8381,7 +8381,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8389,7 +8389,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -8406,7 +8406,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8462,7 +8462,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8473,7 +8473,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8509,7 +8509,7 @@ class ShapeCcurvedConnector4 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector4"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedConnector4"); return aPropertyMap; } @@ -8568,7 +8568,7 @@ class ShapeCflowChartOr : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8684,7 +8684,7 @@ class ShapeCflowChartOr : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8707,7 +8707,7 @@ class ShapeCflowChartOr : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8743,7 +8743,7 @@ class ShapeCflowChartOr : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOr"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartOr"); return aPropertyMap; } @@ -8759,42 +8759,42 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; - aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); + aAdjSequence [6].Name = "adj7"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; - aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); + aAdjSequence [7].Name = "adj8"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8820,7 +8820,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8830,7 +8830,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8838,7 +8838,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8846,7 +8846,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8854,7 +8854,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8862,12 +8862,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -8876,7 +8876,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8886,7 +8886,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8894,7 +8894,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8902,7 +8902,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8910,7 +8910,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8918,12 +8918,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -8932,7 +8932,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8942,7 +8942,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8950,7 +8950,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8958,7 +8958,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8966,7 +8966,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8974,12 +8974,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -8988,7 +8988,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8998,7 +8998,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -9006,7 +9006,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -9014,7 +9014,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -9022,7 +9022,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -9030,12 +9030,12 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 7); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 6); aPropSequence [6].Value = makeAny (aAny); } @@ -9052,7 +9052,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9098,7 +9098,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9113,7 +9113,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9149,7 +9149,7 @@ class ShapeCborderCallout3 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout3"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-borderCallout3"); return aPropertyMap; } @@ -9165,22 +9165,22 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 48123); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -9220,7 +9220,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9230,7 +9230,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -9238,7 +9238,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9246,7 +9246,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -9255,7 +9255,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9265,7 +9265,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -9273,7 +9273,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9281,7 +9281,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -9290,7 +9290,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9300,7 +9300,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -9308,7 +9308,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9316,7 +9316,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -9325,7 +9325,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -9335,7 +9335,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 9); aParameter.Value = aAny; @@ -9343,7 +9343,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9351,7 +9351,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -9368,7 +9368,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9464,7 +9464,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9475,7 +9475,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9511,7 +9511,7 @@ class ShapeCupDownArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-upDownArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-upDownArrowCallout"); return aPropertyMap; } @@ -9550,7 +9550,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9576,7 +9576,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9587,7 +9587,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -9598,7 +9598,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9634,7 +9634,7 @@ class ShapeCflowChartDecision : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDecision"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartDecision"); return aPropertyMap; } diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx index f979b6f5de97..023588a1fd36 100644 --- a/oox/source/drawingml/customshapepresets2.cxx +++ b/oox/source/drawingml/customshapepresets2.cxx @@ -30,22 +30,22 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 48123); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -85,7 +85,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -95,7 +95,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -103,7 +103,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -111,7 +111,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -120,7 +120,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -130,7 +130,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -138,7 +138,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -146,7 +146,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -155,7 +155,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -165,7 +165,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -173,7 +173,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -181,7 +181,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -190,7 +190,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -200,7 +200,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 9); aParameter.Value = aAny; @@ -208,7 +208,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -216,7 +216,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -233,7 +233,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -329,7 +329,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -340,7 +340,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -376,7 +376,7 @@ class ShapeCleftRightArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftRightArrowCallout"); return aPropertyMap; } @@ -414,7 +414,7 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -440,7 +440,7 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -451,7 +451,7 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -462,7 +462,7 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -498,7 +498,7 @@ class ShapeCflowChartManualOperation : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartManualOperation"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartManualOperation"); return aPropertyMap; } @@ -514,12 +514,12 @@ class ShapeCsnipRoundRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 16667); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -547,7 +547,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -557,7 +557,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -565,7 +565,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -573,7 +573,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -582,7 +582,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -592,7 +592,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -600,7 +600,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -608,7 +608,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -625,7 +625,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -671,7 +671,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -683,7 +683,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -719,7 +719,7 @@ class ShapeCsnipRoundRect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snipRoundRect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-snipRoundRect"); return aPropertyMap; } @@ -735,7 +735,7 @@ class ShapeCmathPlus : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -764,7 +764,7 @@ class ShapeCmathPlus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -774,7 +774,7 @@ class ShapeCmathPlus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 73490); aParameter.Value = aAny; @@ -782,7 +782,7 @@ class ShapeCmathPlus : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -790,7 +790,7 @@ class ShapeCmathPlus : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -807,7 +807,7 @@ class ShapeCmathPlus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -873,7 +873,7 @@ class ShapeCmathPlus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -884,7 +884,7 @@ class ShapeCmathPlus : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -920,7 +920,7 @@ class ShapeCmathPlus : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathPlus"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathPlus"); return aPropertyMap; } @@ -961,7 +961,7 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1052,7 +1052,7 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1083,7 +1083,7 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1119,7 +1119,7 @@ class ShapeCactionButtonForwardNext : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonForwardNext"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonForwardNext"); return aPropertyMap; } @@ -1135,7 +1135,7 @@ class ShapeCcan : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1174,7 +1174,7 @@ class ShapeCcan : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1184,7 +1184,7 @@ class ShapeCcan : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1192,7 +1192,7 @@ class ShapeCcan : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1200,7 +1200,7 @@ class ShapeCcan : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1217,7 +1217,7 @@ class ShapeCcan : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1323,7 +1323,7 @@ class ShapeCcan : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1350,7 +1350,7 @@ class ShapeCcan : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1386,7 +1386,7 @@ class ShapeCcan : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-can"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-can"); return aPropertyMap; } @@ -1402,7 +1402,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1428,7 +1428,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1438,7 +1438,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1446,7 +1446,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1454,7 +1454,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1471,7 +1471,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1557,7 +1557,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1579,7 +1579,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1615,7 +1615,7 @@ class ShapeCfoldedCorner : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-foldedCorner"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-foldedCorner"); return aPropertyMap; } @@ -1631,7 +1631,7 @@ class ShapeCstar32 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1752,7 +1752,7 @@ class ShapeCstar32 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1762,7 +1762,7 @@ class ShapeCstar32 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 104); aParameter.Value = aAny; @@ -1770,7 +1770,7 @@ class ShapeCstar32 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1778,7 +1778,7 @@ class ShapeCstar32 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1795,7 +1795,7 @@ class ShapeCstar32 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2121,7 +2121,7 @@ class ShapeCstar32 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2132,7 +2132,7 @@ class ShapeCstar32 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2168,7 +2168,7 @@ class ShapeCstar32 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star32"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star32"); return aPropertyMap; } @@ -2205,7 +2205,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2271,7 +2271,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2294,7 +2294,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (3); { awt::Size aSize; @@ -2317,7 +2317,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2353,7 +2353,7 @@ class ShapeCflowChartInternalStorage : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartInternalStorage"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartInternalStorage"); return aPropertyMap; } @@ -2369,12 +2369,12 @@ class ShapeCupDownArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2405,7 +2405,7 @@ class ShapeCupDownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2415,7 +2415,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -2423,7 +2423,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2431,7 +2431,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2440,7 +2440,7 @@ class ShapeCupDownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -2450,7 +2450,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -2458,7 +2458,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2466,7 +2466,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -2483,7 +2483,7 @@ class ShapeCupDownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2539,7 +2539,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2550,7 +2550,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2586,7 +2586,7 @@ class ShapeCupDownArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-upDownArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-upDownArrow"); return aPropertyMap; } @@ -2629,7 +2629,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2775,7 +2775,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2786,7 +2786,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -2797,7 +2797,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2833,7 +2833,7 @@ class ShapeCirregularSeal2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-irregularSeal2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-irregularSeal2"); return aPropertyMap; } @@ -2849,12 +2849,12 @@ class ShapeCmathEqual : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 11760); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2886,7 +2886,7 @@ class ShapeCmathEqual : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -2896,7 +2896,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 36745); aParameter.Value = aAny; @@ -2904,7 +2904,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2912,7 +2912,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2921,7 +2921,7 @@ class ShapeCmathEqual : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2931,7 +2931,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -2939,7 +2939,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2947,7 +2947,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -2964,7 +2964,7 @@ class ShapeCmathEqual : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -3010,7 +3010,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3024,7 +3024,7 @@ class ShapeCmathEqual : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3060,7 +3060,7 @@ class ShapeCmathEqual : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathEqual"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathEqual"); return aPropertyMap; } @@ -3076,7 +3076,7 @@ class ShapeCstar12 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3128,7 +3128,7 @@ class ShapeCstar12 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3138,7 +3138,7 @@ class ShapeCstar12 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -3146,7 +3146,7 @@ class ShapeCstar12 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3154,7 +3154,7 @@ class ShapeCstar12 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3171,7 +3171,7 @@ class ShapeCstar12 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3297,7 +3297,7 @@ class ShapeCstar12 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3308,7 +3308,7 @@ class ShapeCstar12 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3344,7 +3344,7 @@ class ShapeCstar12 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star12"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star12"); return aPropertyMap; } @@ -3360,27 +3360,27 @@ class ShapeCuturnArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 43750); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 75000); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3437,7 +3437,7 @@ class ShapeCuturnArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3447,7 +3447,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -3455,7 +3455,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3463,7 +3463,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3472,7 +3472,7 @@ class ShapeCuturnArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3482,7 +3482,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -3490,7 +3490,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3498,7 +3498,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3507,7 +3507,7 @@ class ShapeCuturnArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3517,7 +3517,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 6); aParameter.Value = aAny; @@ -3525,7 +3525,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3533,7 +3533,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -3542,7 +3542,7 @@ class ShapeCuturnArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3552,7 +3552,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 21); aParameter.Value = aAny; @@ -3560,7 +3560,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3568,7 +3568,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -3577,7 +3577,7 @@ class ShapeCuturnArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3587,7 +3587,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -3595,7 +3595,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 9); aParameter.Value = aAny; @@ -3603,7 +3603,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [3].Value = makeAny (aAny); } @@ -3620,7 +3620,7 @@ class ShapeCuturnArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3721,7 +3721,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3740,7 +3740,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3776,7 +3776,7 @@ class ShapeCuturnArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-uturnArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-uturnArrow"); return aPropertyMap; } @@ -3813,7 +3813,7 @@ class ShapeCsquareTabs : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3899,7 +3899,7 @@ class ShapeCsquareTabs : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3922,7 +3922,7 @@ class ShapeCsquareTabs : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3958,7 +3958,7 @@ class ShapeCsquareTabs : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-squareTabs"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-squareTabs"); return aPropertyMap; } @@ -3974,17 +3974,17 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4023,7 +4023,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4033,7 +4033,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -4041,7 +4041,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4049,7 +4049,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4058,7 +4058,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4068,7 +4068,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -4076,7 +4076,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4084,7 +4084,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -4093,7 +4093,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4103,7 +4103,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 4); aParameter.Value = aAny; @@ -4111,7 +4111,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4119,7 +4119,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -4136,7 +4136,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4227,7 +4227,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4238,7 +4238,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4274,7 +4274,7 @@ class ShapeCleftRightUpArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightUpArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftRightUpArrow"); return aPropertyMap; } @@ -4290,7 +4290,7 @@ class ShapeChomePlate : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4314,7 +4314,7 @@ class ShapeChomePlate : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4324,7 +4324,7 @@ class ShapeChomePlate : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -4332,7 +4332,7 @@ class ShapeChomePlate : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4340,7 +4340,7 @@ class ShapeChomePlate : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4357,7 +4357,7 @@ class ShapeChomePlate : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4388,7 +4388,7 @@ class ShapeChomePlate : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4399,7 +4399,7 @@ class ShapeChomePlate : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4435,7 +4435,7 @@ class ShapeChomePlate : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-homePlate"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-homePlate"); return aPropertyMap; } @@ -4476,7 +4476,7 @@ class ShapeCdodecagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4542,7 +4542,7 @@ class ShapeCdodecagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4553,7 +4553,7 @@ class ShapeCdodecagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4589,7 +4589,7 @@ class ShapeCdodecagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-dodecagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-dodecagon"); return aPropertyMap; } @@ -4605,22 +4605,22 @@ class ShapeCleftArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4657,7 +4657,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4667,7 +4667,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -4675,7 +4675,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4683,7 +4683,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4692,7 +4692,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -4702,7 +4702,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -4710,7 +4710,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4718,7 +4718,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -4727,7 +4727,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4737,7 +4737,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -4745,7 +4745,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4753,7 +4753,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -4762,7 +4762,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4772,7 +4772,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 8); aParameter.Value = aAny; @@ -4780,7 +4780,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4788,7 +4788,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -4805,7 +4805,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4866,7 +4866,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4877,7 +4877,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4913,7 +4913,7 @@ class ShapeCleftArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftArrowCallout"); return aPropertyMap; } @@ -4929,12 +4929,12 @@ class ShapeCchord : public CustomShapeProvider { Any aAny ((sal_Int32) 2700000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 16200000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4981,7 +4981,7 @@ class ShapeCchord : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4995,7 +4995,7 @@ class ShapeCchord : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5017,7 +5017,7 @@ class ShapeCchord : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5038,7 +5038,7 @@ class ShapeCchord : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5049,7 +5049,7 @@ class ShapeCchord : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5085,7 +5085,7 @@ class ShapeCchord : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chord"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-chord"); return aPropertyMap; } @@ -5101,22 +5101,22 @@ class ShapeCquadArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 18515); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 18515); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18515); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 48123); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5162,7 +5162,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5172,7 +5172,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -5180,7 +5180,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5188,7 +5188,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -5197,7 +5197,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5207,7 +5207,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -5215,7 +5215,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5223,7 +5223,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -5232,7 +5232,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5242,7 +5242,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -5250,7 +5250,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5258,7 +5258,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -5267,7 +5267,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -5277,7 +5277,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 6); aParameter.Value = aAny; @@ -5285,7 +5285,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -5293,7 +5293,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -5310,7 +5310,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5476,7 +5476,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5487,7 +5487,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5523,7 +5523,7 @@ class ShapeCquadArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-quadArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-quadArrowCallout"); return aPropertyMap; } @@ -5569,7 +5569,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5720,7 +5720,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5760,7 +5760,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5796,7 +5796,7 @@ class ShapeCactionButtonBeginning : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonBeginning"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonBeginning"); return aPropertyMap; } @@ -5847,7 +5847,7 @@ class ShapeCellipse : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5898,7 +5898,7 @@ class ShapeCellipse : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5909,7 +5909,7 @@ class ShapeCellipse : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5945,7 +5945,7 @@ class ShapeCellipse : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ellipse"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-ellipse"); return aPropertyMap; } @@ -5991,7 +5991,7 @@ class ShapeCactionButtonEnd : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6142,7 +6142,7 @@ class ShapeCactionButtonEnd : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6182,7 +6182,7 @@ class ShapeCactionButtonEnd : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6218,7 +6218,7 @@ class ShapeCactionButtonEnd : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonEnd"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonEnd"); return aPropertyMap; } @@ -6234,12 +6234,12 @@ class ShapeCarc : public CustomShapeProvider { Any aAny ((sal_Int32) 16200000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6303,7 +6303,7 @@ class ShapeCarc : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6317,7 +6317,7 @@ class ShapeCarc : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6339,7 +6339,7 @@ class ShapeCarc : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -6380,7 +6380,7 @@ class ShapeCarc : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6397,7 +6397,7 @@ class ShapeCarc : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6433,7 +6433,7 @@ class ShapeCarc : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-arc"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-arc"); return aPropertyMap; } @@ -6449,7 +6449,7 @@ class ShapeCstar16 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6521,7 +6521,7 @@ class ShapeCstar16 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6531,7 +6531,7 @@ class ShapeCstar16 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -6539,7 +6539,7 @@ class ShapeCstar16 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6547,7 +6547,7 @@ class ShapeCstar16 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6564,7 +6564,7 @@ class ShapeCstar16 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6730,7 +6730,7 @@ class ShapeCstar16 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6741,7 +6741,7 @@ class ShapeCstar16 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6777,7 +6777,7 @@ class ShapeCstar16 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star16"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star16"); return aPropertyMap; } @@ -6793,7 +6793,7 @@ class ShapeCparallelogram : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6831,7 +6831,7 @@ class ShapeCparallelogram : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6841,7 +6841,7 @@ class ShapeCparallelogram : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6849,7 +6849,7 @@ class ShapeCparallelogram : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6857,7 +6857,7 @@ class ShapeCparallelogram : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6874,7 +6874,7 @@ class ShapeCparallelogram : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6900,7 +6900,7 @@ class ShapeCparallelogram : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6911,7 +6911,7 @@ class ShapeCparallelogram : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6947,7 +6947,7 @@ class ShapeCparallelogram : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-parallelogram"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-parallelogram"); return aPropertyMap; } @@ -6963,7 +6963,7 @@ class ShapeCbevel : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6986,7 +6986,7 @@ class ShapeCbevel : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6996,7 +6996,7 @@ class ShapeCbevel : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -7004,7 +7004,7 @@ class ShapeCbevel : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7012,7 +7012,7 @@ class ShapeCbevel : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7029,7 +7029,7 @@ class ShapeCbevel : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -7215,7 +7215,7 @@ class ShapeCbevel : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7267,7 +7267,7 @@ class ShapeCbevel : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7303,7 +7303,7 @@ class ShapeCbevel : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bevel"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bevel"); return aPropertyMap; } @@ -7319,7 +7319,7 @@ class ShapeCroundRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7353,7 +7353,7 @@ class ShapeCroundRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7363,7 +7363,7 @@ class ShapeCroundRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -7371,7 +7371,7 @@ class ShapeCroundRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7379,7 +7379,7 @@ class ShapeCroundRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7396,7 +7396,7 @@ class ShapeCroundRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7462,7 +7462,7 @@ class ShapeCroundRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7479,7 +7479,7 @@ class ShapeCroundRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7515,7 +7515,7 @@ class ShapeCroundRect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-roundRect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-roundRect"); return aPropertyMap; } @@ -7531,22 +7531,22 @@ class ShapeCaccentCallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7568,7 +7568,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7578,7 +7578,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7586,7 +7586,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7594,7 +7594,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7602,7 +7602,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7610,12 +7610,12 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -7624,7 +7624,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7634,7 +7634,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7642,7 +7642,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7650,7 +7650,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7658,7 +7658,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7666,12 +7666,12 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -7688,7 +7688,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7734,7 +7734,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7754,7 +7754,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7790,7 +7790,7 @@ class ShapeCaccentCallout1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentCallout1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-accentCallout1"); return aPropertyMap; } @@ -7829,7 +7829,7 @@ class ShapeCflowChartSort : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7885,7 +7885,7 @@ class ShapeCflowChartSort : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7906,7 +7906,7 @@ class ShapeCflowChartSort : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (3); { awt::Size aSize; @@ -7929,7 +7929,7 @@ class ShapeCflowChartSort : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7965,7 +7965,7 @@ class ShapeCflowChartSort : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartSort"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartSort"); return aPropertyMap; } @@ -7981,7 +7981,7 @@ class ShapeCstar8 : public CustomShapeProvider { Any aAny ((sal_Int32) 37500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8023,7 +8023,7 @@ class ShapeCstar8 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8033,7 +8033,7 @@ class ShapeCstar8 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -8041,7 +8041,7 @@ class ShapeCstar8 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8049,7 +8049,7 @@ class ShapeCstar8 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8066,7 +8066,7 @@ class ShapeCstar8 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8152,7 +8152,7 @@ class ShapeCstar8 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8163,7 +8163,7 @@ class ShapeCstar8 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8199,7 +8199,7 @@ class ShapeCstar8 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star8"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star8"); return aPropertyMap; } @@ -8248,7 +8248,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8314,7 +8314,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8331,7 +8331,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8367,7 +8367,7 @@ class ShapeCflowChartAlternateProcess : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartAlternateProcess"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartAlternateProcess"); return aPropertyMap; } @@ -8383,7 +8383,7 @@ class ShapeCmoon : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8441,7 +8441,7 @@ class ShapeCmoon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8451,7 +8451,7 @@ class ShapeCmoon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 87500); aParameter.Value = aAny; @@ -8459,7 +8459,7 @@ class ShapeCmoon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8467,7 +8467,7 @@ class ShapeCmoon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8484,7 +8484,7 @@ class ShapeCmoon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8515,7 +8515,7 @@ class ShapeCmoon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8526,7 +8526,7 @@ class ShapeCmoon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8562,7 +8562,7 @@ class ShapeCmoon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-moon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-moon"); return aPropertyMap; } @@ -8578,12 +8578,12 @@ class ShapeCstar6 : public CustomShapeProvider { Any aAny ((sal_Int32) 28868); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } { Any aAny ((sal_Int32) 115470); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); + aAdjSequence [1].Name = "hf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8620,7 +8620,7 @@ class ShapeCstar6 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8630,7 +8630,7 @@ class ShapeCstar6 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -8638,7 +8638,7 @@ class ShapeCstar6 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8646,7 +8646,7 @@ class ShapeCstar6 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8663,7 +8663,7 @@ class ShapeCstar6 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8729,7 +8729,7 @@ class ShapeCstar6 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8740,7 +8740,7 @@ class ShapeCstar6 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8776,7 +8776,7 @@ class ShapeCstar6 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star6"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star6"); return aPropertyMap; } diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx index ae77848e8f09..7208cf125a53 100644 --- a/oox/source/drawingml/customshapepresets3.cxx +++ b/oox/source/drawingml/customshapepresets3.cxx @@ -30,12 +30,12 @@ class ShapeCround2SameRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -75,7 +75,7 @@ class ShapeCround2SameRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -85,7 +85,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -93,7 +93,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -101,7 +101,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -110,7 +110,7 @@ class ShapeCround2SameRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -120,7 +120,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -128,7 +128,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -136,7 +136,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -153,7 +153,7 @@ class ShapeCround2SameRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -224,7 +224,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -242,7 +242,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -278,7 +278,7 @@ class ShapeCround2SameRect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-round2SameRect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-round2SameRect"); return aPropertyMap; } @@ -294,12 +294,12 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -333,7 +333,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -343,7 +343,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -351,7 +351,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -359,7 +359,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -368,7 +368,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -378,7 +378,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -386,7 +386,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -394,7 +394,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -411,7 +411,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -437,7 +437,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -448,7 +448,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -484,7 +484,7 @@ class ShapeCnonIsoscelesTrapezoid : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-nonIsoscelesTrapezoid"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-nonIsoscelesTrapezoid"); return aPropertyMap; } @@ -523,7 +523,7 @@ class ShapeCdiamond : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -549,7 +549,7 @@ class ShapeCdiamond : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -560,7 +560,7 @@ class ShapeCdiamond : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -596,7 +596,7 @@ class ShapeCdiamond : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-diamond"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-diamond"); return aPropertyMap; } @@ -612,17 +612,17 @@ class ShapeCellipseRibbon : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 12500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -683,7 +683,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -693,7 +693,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -701,7 +701,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -709,7 +709,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -718,7 +718,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -728,7 +728,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 75000); aParameter.Value = aAny; @@ -736,7 +736,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -744,7 +744,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -753,7 +753,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -763,7 +763,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -771,7 +771,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -779,7 +779,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -796,7 +796,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1087,7 +1087,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1143,7 +1143,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1179,7 +1179,7 @@ class ShapeCellipseRibbon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ellipseRibbon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-ellipseRibbon"); return aPropertyMap; } @@ -1195,32 +1195,32 @@ class ShapeCcallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1244,7 +1244,7 @@ class ShapeCcallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1254,7 +1254,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1262,7 +1262,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1270,7 +1270,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1278,7 +1278,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1286,12 +1286,12 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -1300,7 +1300,7 @@ class ShapeCcallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1310,7 +1310,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1318,7 +1318,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1326,7 +1326,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1334,7 +1334,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1342,12 +1342,12 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -1356,7 +1356,7 @@ class ShapeCcallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1366,7 +1366,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1374,7 +1374,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1382,7 +1382,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1390,7 +1390,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1398,12 +1398,12 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -1420,7 +1420,7 @@ class ShapeCcallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1461,7 +1461,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1477,7 +1477,7 @@ class ShapeCcallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1513,7 +1513,7 @@ class ShapeCcallout2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-callout2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-callout2"); return aPropertyMap; } @@ -1529,12 +1529,12 @@ class ShapeCpie : public CustomShapeProvider { Any aAny ((sal_Int32) 0); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 16200000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1579,7 +1579,7 @@ class ShapeCpie : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1593,7 +1593,7 @@ class ShapeCpie : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1615,7 +1615,7 @@ class ShapeCpie : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -1641,7 +1641,7 @@ class ShapeCpie : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1653,7 +1653,7 @@ class ShapeCpie : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1689,7 +1689,7 @@ class ShapeCpie : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-pie"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-pie"); return aPropertyMap; } @@ -1705,7 +1705,7 @@ class ShapeCstar4 : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1735,7 +1735,7 @@ class ShapeCstar4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1745,7 +1745,7 @@ class ShapeCstar4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1753,7 +1753,7 @@ class ShapeCstar4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1761,7 +1761,7 @@ class ShapeCstar4 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1778,7 +1778,7 @@ class ShapeCstar4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1824,7 +1824,7 @@ class ShapeCstar4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1835,7 +1835,7 @@ class ShapeCstar4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1871,7 +1871,7 @@ class ShapeCstar4 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star4"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star4"); return aPropertyMap; } @@ -1908,7 +1908,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1974,7 +1974,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1997,7 +1997,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (3); { awt::Size aSize; @@ -2020,7 +2020,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2056,7 +2056,7 @@ class ShapeCflowChartPredefinedProcess : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPredefinedProcess"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartPredefinedProcess"); return aPropertyMap; } @@ -2102,7 +2102,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2158,7 +2158,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2171,7 +2171,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -2182,7 +2182,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2218,7 +2218,7 @@ class ShapeCflowChartPunchedTape : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPunchedTape"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartPunchedTape"); return aPropertyMap; } @@ -2253,7 +2253,7 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2279,7 +2279,7 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2290,7 +2290,7 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2326,7 +2326,7 @@ class ShapeCcurvedConnector2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedConnector2"); return aPropertyMap; } @@ -2342,7 +2342,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2360,7 +2360,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2370,7 +2370,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2378,7 +2378,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2386,7 +2386,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2403,7 +2403,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2429,7 +2429,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2440,7 +2440,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2476,7 +2476,7 @@ class ShapeCbentConnector3 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector3"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bentConnector3"); return aPropertyMap; } @@ -2513,7 +2513,7 @@ class ShapeCcornerTabs : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2579,7 +2579,7 @@ class ShapeCcornerTabs : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2602,7 +2602,7 @@ class ShapeCcornerTabs : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2638,7 +2638,7 @@ class ShapeCcornerTabs : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cornerTabs"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-cornerTabs"); return aPropertyMap; } @@ -2654,12 +2654,12 @@ class ShapeChexagon : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } { Any aAny ((sal_Int32) 115470); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [1].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2697,7 +2697,7 @@ class ShapeChexagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2707,7 +2707,7 @@ class ShapeChexagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -2715,7 +2715,7 @@ class ShapeChexagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2723,7 +2723,7 @@ class ShapeChexagon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2740,7 +2740,7 @@ class ShapeChexagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2776,7 +2776,7 @@ class ShapeChexagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2787,7 +2787,7 @@ class ShapeChexagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2823,7 +2823,7 @@ class ShapeChexagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-hexagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-hexagon"); return aPropertyMap; } @@ -2874,7 +2874,7 @@ class ShapeCflowChartConnector : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2925,7 +2925,7 @@ class ShapeCflowChartConnector : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2936,7 +2936,7 @@ class ShapeCflowChartConnector : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2972,7 +2972,7 @@ class ShapeCflowChartConnector : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartConnector"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartConnector"); return aPropertyMap; } @@ -3019,7 +3019,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3100,7 +3100,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3125,7 +3125,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (3); { awt::Size aSize; @@ -3148,7 +3148,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3184,7 +3184,7 @@ class ShapeCflowChartMagneticDisk : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticDisk"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartMagneticDisk"); return aPropertyMap; } @@ -3229,7 +3229,7 @@ class ShapeCheart : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -3270,7 +3270,7 @@ class ShapeCheart : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3281,7 +3281,7 @@ class ShapeCheart : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3317,7 +3317,7 @@ class ShapeCheart : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-heart"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-heart"); return aPropertyMap; } @@ -3333,12 +3333,12 @@ class ShapeCribbon2 : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3410,7 +3410,7 @@ class ShapeCribbon2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3420,7 +3420,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 33333); aParameter.Value = aAny; @@ -3428,7 +3428,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3436,7 +3436,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3445,7 +3445,7 @@ class ShapeCribbon2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3455,7 +3455,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 75000); aParameter.Value = aAny; @@ -3463,7 +3463,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -3471,7 +3471,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3488,7 +3488,7 @@ class ShapeCribbon2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3869,7 +3869,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3932,7 +3932,7 @@ class ShapeCribbon2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3968,7 +3968,7 @@ class ShapeCribbon2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ribbon2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-ribbon2"); return aPropertyMap; } @@ -3984,7 +3984,7 @@ class ShapeCbracePair : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4047,7 +4047,7 @@ class ShapeCbracePair : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -4057,7 +4057,7 @@ class ShapeCbracePair : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -4065,7 +4065,7 @@ class ShapeCbracePair : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4073,7 +4073,7 @@ class ShapeCbracePair : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4090,7 +4090,7 @@ class ShapeCbracePair : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -4316,7 +4316,7 @@ class ShapeCbracePair : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4352,7 +4352,7 @@ class ShapeCbracePair : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4388,7 +4388,7 @@ class ShapeCbracePair : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bracePair"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bracePair"); return aPropertyMap; } @@ -4424,7 +4424,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4445,7 +4445,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4456,7 +4456,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -4467,7 +4467,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4503,7 +4503,7 @@ class ShapeCflowChartExtract : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartExtract"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartExtract"); return aPropertyMap; } @@ -4565,7 +4565,7 @@ class ShapeCactionButtonHome : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4856,7 +4856,7 @@ class ShapeCactionButtonHome : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4905,7 +4905,7 @@ class ShapeCactionButtonHome : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4941,7 +4941,7 @@ class ShapeCactionButtonHome : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonHome"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonHome"); return aPropertyMap; } @@ -4957,42 +4957,42 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; - aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); + aAdjSequence [6].Name = "adj7"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; - aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); + aAdjSequence [7].Name = "adj8"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5018,7 +5018,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5028,7 +5028,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5036,7 +5036,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5044,7 +5044,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5052,7 +5052,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5060,12 +5060,12 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -5074,7 +5074,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5084,7 +5084,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5092,7 +5092,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5100,7 +5100,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5108,7 +5108,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5116,12 +5116,12 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -5130,7 +5130,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5140,7 +5140,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5148,7 +5148,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5156,7 +5156,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5164,7 +5164,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5172,12 +5172,12 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -5186,7 +5186,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5196,7 +5196,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5204,7 +5204,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5212,7 +5212,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5220,7 +5220,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5228,12 +5228,12 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 7); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 6); aPropSequence [6].Value = makeAny (aAny); } @@ -5250,7 +5250,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5306,7 +5306,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5325,7 +5325,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5361,7 +5361,7 @@ class ShapeCaccentBorderCallout3 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentBorderCallout3"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-accentBorderCallout3"); return aPropertyMap; } @@ -5397,7 +5397,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5443,7 +5443,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5464,7 +5464,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (3); { awt::Size aSize; @@ -5487,7 +5487,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5523,7 +5523,7 @@ class ShapeCflowChartOfflineStorage : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOfflineStorage"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartOfflineStorage"); return aPropertyMap; } @@ -5564,7 +5564,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5690,7 +5690,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5701,7 +5701,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -5712,7 +5712,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5748,7 +5748,7 @@ class ShapeCirregularSeal1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-irregularSeal1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-irregularSeal1"); return aPropertyMap; } @@ -5764,17 +5764,17 @@ class ShapeCquadArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 22500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 22500); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 22500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5814,7 +5814,7 @@ class ShapeCquadArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5824,7 +5824,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -5832,7 +5832,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5840,7 +5840,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -5849,7 +5849,7 @@ class ShapeCquadArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5859,7 +5859,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -5867,7 +5867,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5875,7 +5875,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -5884,7 +5884,7 @@ class ShapeCquadArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5894,7 +5894,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 4); aParameter.Value = aAny; @@ -5902,7 +5902,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5910,7 +5910,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -5927,7 +5927,7 @@ class ShapeCquadArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6053,7 +6053,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6064,7 +6064,7 @@ class ShapeCquadArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6100,7 +6100,7 @@ class ShapeCquadArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-quadArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-quadArrow"); return aPropertyMap; } @@ -6116,12 +6116,12 @@ class ShapeCleftBrace : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6170,7 +6170,7 @@ class ShapeCleftBrace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6180,7 +6180,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -6188,7 +6188,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6196,7 +6196,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6205,7 +6205,7 @@ class ShapeCleftBrace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -6215,7 +6215,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -6223,7 +6223,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6231,7 +6231,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6248,7 +6248,7 @@ class ShapeCleftBrace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -6364,7 +6364,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6388,7 +6388,7 @@ class ShapeCleftBrace : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6424,7 +6424,7 @@ class ShapeCleftBrace : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftBrace"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftBrace"); return aPropertyMap; } @@ -6440,7 +6440,7 @@ class ShapeCleftBracket : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6476,7 +6476,7 @@ class ShapeCleftBracket : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -6486,7 +6486,7 @@ class ShapeCleftBracket : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6494,7 +6494,7 @@ class ShapeCleftBracket : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6502,7 +6502,7 @@ class ShapeCleftBracket : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6519,7 +6519,7 @@ class ShapeCleftBracket : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -6585,7 +6585,7 @@ class ShapeCleftBracket : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6605,7 +6605,7 @@ class ShapeCleftBracket : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6641,7 +6641,7 @@ class ShapeCleftBracket : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftBracket"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftBracket"); return aPropertyMap; } @@ -6657,17 +6657,17 @@ class ShapeCblockArc : public CustomShapeProvider { Any aAny ((sal_Int32) 10800000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6761,7 +6761,7 @@ class ShapeCblockArc : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6775,7 +6775,7 @@ class ShapeCblockArc : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6785,7 +6785,7 @@ class ShapeCblockArc : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -6793,7 +6793,7 @@ class ShapeCblockArc : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6813,7 +6813,7 @@ class ShapeCblockArc : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -6849,7 +6849,7 @@ class ShapeCblockArc : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6862,7 +6862,7 @@ class ShapeCblockArc : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6898,7 +6898,7 @@ class ShapeCblockArc : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-blockArc"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-blockArc"); return aPropertyMap; } @@ -6914,7 +6914,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6936,7 +6936,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6946,7 +6946,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -6954,7 +6954,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -6962,7 +6962,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6979,7 +6979,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7020,7 +7020,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7031,7 +7031,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7067,7 +7067,7 @@ class ShapeCcurvedConnector3 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector3"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedConnector3"); return aPropertyMap; } @@ -7083,17 +7083,17 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 16667); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7158,7 +7158,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7168,7 +7168,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7176,7 +7176,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7184,7 +7184,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7192,7 +7192,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7200,12 +7200,12 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [6].Value = makeAny (aAny); } @@ -7222,7 +7222,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7348,7 +7348,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7366,7 +7366,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7402,7 +7402,7 @@ class ShapeCwedgeRoundRectCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wedgeRoundRectCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-wedgeRoundRectCallout"); return aPropertyMap; } @@ -7479,7 +7479,7 @@ class ShapeCactionButtonMovie : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7810,7 +7810,7 @@ class ShapeCactionButtonMovie : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7841,7 +7841,7 @@ class ShapeCactionButtonMovie : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7877,7 +7877,7 @@ class ShapeCactionButtonMovie : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonMovie"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonMovie"); return aPropertyMap; } @@ -7917,7 +7917,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7958,7 +7958,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7972,7 +7972,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -7983,7 +7983,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8019,7 +8019,7 @@ class ShapeCflowChartOnlineStorage : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOnlineStorage"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartOnlineStorage"); return aPropertyMap; } @@ -8035,12 +8035,12 @@ class ShapeCgear6 : public CustomShapeProvider { Any aAny ((sal_Int32) 15000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 3526); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8178,7 +8178,7 @@ class ShapeCgear6 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8188,7 +8188,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 20000); aParameter.Value = aAny; @@ -8196,7 +8196,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8204,7 +8204,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8213,7 +8213,7 @@ class ShapeCgear6 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8223,7 +8223,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5358); aParameter.Value = aAny; @@ -8231,7 +8231,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8239,7 +8239,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -8256,7 +8256,7 @@ class ShapeCgear6 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8417,7 +8417,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8439,7 +8439,7 @@ class ShapeCgear6 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8475,7 +8475,7 @@ class ShapeCgear6 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-gear6"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-gear6"); return aPropertyMap; } @@ -8491,12 +8491,12 @@ class ShapeChalfFrame : public CustomShapeProvider { Any aAny ((sal_Int32) 33333); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 33333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8531,7 +8531,7 @@ class ShapeChalfFrame : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -8541,7 +8541,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 6); aParameter.Value = aAny; @@ -8549,7 +8549,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8557,7 +8557,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8566,7 +8566,7 @@ class ShapeChalfFrame : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8576,7 +8576,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -8584,7 +8584,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8592,7 +8592,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -8609,7 +8609,7 @@ class ShapeChalfFrame : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8645,7 +8645,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8656,7 +8656,7 @@ class ShapeChalfFrame : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8692,7 +8692,7 @@ class ShapeChalfFrame : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-halfFrame"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-halfFrame"); return aPropertyMap; } @@ -8708,12 +8708,12 @@ class ShapeCsnip2SameRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8745,7 +8745,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8755,7 +8755,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -8763,7 +8763,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8771,7 +8771,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8780,7 +8780,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8790,7 +8790,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -8798,7 +8798,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8806,7 +8806,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -8823,7 +8823,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8869,7 +8869,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8880,7 +8880,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8916,7 +8916,7 @@ class ShapeCsnip2SameRect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snip2SameRect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-snip2SameRect"); return aPropertyMap; } @@ -8932,7 +8932,7 @@ class ShapeCtriangle : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8954,7 +8954,7 @@ class ShapeCtriangle : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8964,7 +8964,7 @@ class ShapeCtriangle : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -8972,7 +8972,7 @@ class ShapeCtriangle : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8980,7 +8980,7 @@ class ShapeCtriangle : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8997,7 +8997,7 @@ class ShapeCtriangle : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9018,7 +9018,7 @@ class ShapeCtriangle : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9029,7 +9029,7 @@ class ShapeCtriangle : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9065,7 +9065,7 @@ class ShapeCtriangle : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-triangle"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-triangle"); return aPropertyMap; } diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index 62fcc5716617..f7a112da8070 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.cxx @@ -30,7 +30,7 @@ class ShapeCteardrop : public CustomShapeProvider { Any aAny ((sal_Int32) 100000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -74,7 +74,7 @@ class ShapeCteardrop : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -84,7 +84,7 @@ class ShapeCteardrop : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 200000); aParameter.Value = aAny; @@ -92,7 +92,7 @@ class ShapeCteardrop : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -100,7 +100,7 @@ class ShapeCteardrop : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -117,7 +117,7 @@ class ShapeCteardrop : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -178,7 +178,7 @@ class ShapeCteardrop : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -191,7 +191,7 @@ class ShapeCteardrop : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -227,7 +227,7 @@ class ShapeCteardrop : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-teardrop"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-teardrop"); return aPropertyMap; } @@ -263,7 +263,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -299,7 +299,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -311,7 +311,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -322,7 +322,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -358,7 +358,7 @@ class ShapeCflowChartDocument : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDocument"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartDocument"); return aPropertyMap; } @@ -374,22 +374,22 @@ class ShapeCrightArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -426,7 +426,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -436,7 +436,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -444,7 +444,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -452,7 +452,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -461,7 +461,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -471,7 +471,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -479,7 +479,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -487,7 +487,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -496,7 +496,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -506,7 +506,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -514,7 +514,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -522,7 +522,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -531,7 +531,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -541,7 +541,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 8); aParameter.Value = aAny; @@ -549,7 +549,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -557,7 +557,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -574,7 +574,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -635,7 +635,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -646,7 +646,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -682,7 +682,7 @@ class ShapeCrightArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-rightArrowCallout"); return aPropertyMap; } @@ -698,12 +698,12 @@ class ShapeCrightBrace : public CustomShapeProvider { Any aAny ((sal_Int32) 8333); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -753,7 +753,7 @@ class ShapeCrightBrace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -763,7 +763,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -771,7 +771,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -779,7 +779,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -788,7 +788,7 @@ class ShapeCrightBrace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -798,7 +798,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -806,7 +806,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -814,7 +814,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -831,7 +831,7 @@ class ShapeCrightBrace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -947,7 +947,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -971,7 +971,7 @@ class ShapeCrightBrace : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1007,7 +1007,7 @@ class ShapeCrightBrace : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightBrace"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-rightBrace"); return aPropertyMap; } @@ -1036,7 +1036,7 @@ class ShapeCchartPlus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1082,7 +1082,7 @@ class ShapeCchartPlus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1100,7 +1100,7 @@ class ShapeCchartPlus : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (2); { awt::Size aSize; @@ -1126,7 +1126,7 @@ class ShapeCchartPlus : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartPlus"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-chartPlus"); return aPropertyMap; } @@ -1163,7 +1163,7 @@ class ShapeCflowChartManualInput : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1189,7 +1189,7 @@ class ShapeCflowChartManualInput : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1200,7 +1200,7 @@ class ShapeCflowChartManualInput : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -1211,7 +1211,7 @@ class ShapeCflowChartManualInput : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1247,7 +1247,7 @@ class ShapeCflowChartManualInput : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartManualInput"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartManualInput"); return aPropertyMap; } @@ -1283,7 +1283,7 @@ class ShapeCflowChartMerge : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1304,7 +1304,7 @@ class ShapeCflowChartMerge : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1315,7 +1315,7 @@ class ShapeCflowChartMerge : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -1326,7 +1326,7 @@ class ShapeCflowChartMerge : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1362,7 +1362,7 @@ class ShapeCflowChartMerge : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMerge"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartMerge"); return aPropertyMap; } @@ -1395,7 +1395,7 @@ class ShapeCline : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (2); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1411,7 +1411,7 @@ class ShapeCline : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1430,7 +1430,7 @@ class ShapeCline : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-line"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-line"); return aPropertyMap; } @@ -1446,12 +1446,12 @@ class ShapeCdownArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1480,7 +1480,7 @@ class ShapeCdownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1490,7 +1490,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -1498,7 +1498,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1506,7 +1506,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1515,7 +1515,7 @@ class ShapeCdownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -1525,7 +1525,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1533,7 +1533,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1541,7 +1541,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -1558,7 +1558,7 @@ class ShapeCdownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1599,7 +1599,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1610,7 +1610,7 @@ class ShapeCdownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1646,7 +1646,7 @@ class ShapeCdownArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-downArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-downArrow"); return aPropertyMap; } @@ -1662,17 +1662,17 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1748,7 +1748,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1758,7 +1758,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1766,7 +1766,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1774,7 +1774,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1783,7 +1783,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1793,7 +1793,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1801,7 +1801,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1809,7 +1809,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -1818,7 +1818,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1828,7 +1828,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 15); aParameter.Value = aAny; @@ -1836,7 +1836,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1844,7 +1844,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -1861,7 +1861,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -2017,7 +2017,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2051,7 +2051,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2087,7 +2087,7 @@ class ShapeCcurvedDownArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedDownArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedDownArrow"); return aPropertyMap; } @@ -2167,7 +2167,7 @@ class ShapeCactionButtonReturn : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2498,7 +2498,7 @@ class ShapeCactionButtonReturn : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2553,7 +2553,7 @@ class ShapeCactionButtonReturn : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2589,7 +2589,7 @@ class ShapeCactionButtonReturn : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonReturn"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonReturn"); return aPropertyMap; } @@ -2629,7 +2629,7 @@ class ShapeCflowChartInputOutput : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2655,7 +2655,7 @@ class ShapeCflowChartInputOutput : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2666,7 +2666,7 @@ class ShapeCflowChartInputOutput : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -2677,7 +2677,7 @@ class ShapeCflowChartInputOutput : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2713,7 +2713,7 @@ class ShapeCflowChartInputOutput : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartInputOutput"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartInputOutput"); return aPropertyMap; } @@ -2729,7 +2729,7 @@ class ShapeCbracketPair : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2771,7 +2771,7 @@ class ShapeCbracketPair : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -2781,7 +2781,7 @@ class ShapeCbracketPair : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -2789,7 +2789,7 @@ class ShapeCbracketPair : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2797,7 +2797,7 @@ class ShapeCbracketPair : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2814,7 +2814,7 @@ class ShapeCbracketPair : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2940,7 +2940,7 @@ class ShapeCbracketPair : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2968,7 +2968,7 @@ class ShapeCbracketPair : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3004,7 +3004,7 @@ class ShapeCbracketPair : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bracketPair"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bracketPair"); return aPropertyMap; } @@ -3020,7 +3020,7 @@ class ShapeCsmileyFace : public CustomShapeProvider { Any aAny ((sal_Int32) 4653); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3068,7 +3068,7 @@ class ShapeCsmileyFace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3078,7 +3078,7 @@ class ShapeCsmileyFace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 4653); aParameter.Value = aAny; @@ -3086,7 +3086,7 @@ class ShapeCsmileyFace : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -4653); aParameter.Value = aAny; @@ -3094,7 +3094,7 @@ class ShapeCsmileyFace : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3111,7 +3111,7 @@ class ShapeCsmileyFace : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3192,7 +3192,7 @@ class ShapeCsmileyFace : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3219,7 +3219,7 @@ class ShapeCsmileyFace : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3255,7 +3255,7 @@ class ShapeCsmileyFace : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-smileyFace"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-smileyFace"); return aPropertyMap; } @@ -3290,7 +3290,7 @@ class ShapeCactionButtonBlank : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3316,7 +3316,7 @@ class ShapeCactionButtonBlank : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3327,7 +3327,7 @@ class ShapeCactionButtonBlank : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3363,7 +3363,7 @@ class ShapeCactionButtonBlank : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonBlank"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonBlank"); return aPropertyMap; } @@ -3379,12 +3379,12 @@ class ShapeCwave : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3431,7 +3431,7 @@ class ShapeCwave : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -3441,7 +3441,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 20000); aParameter.Value = aAny; @@ -3449,7 +3449,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3457,7 +3457,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3466,7 +3466,7 @@ class ShapeCwave : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3476,7 +3476,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 10000); aParameter.Value = aAny; @@ -3484,7 +3484,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -10000); aParameter.Value = aAny; @@ -3492,7 +3492,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3509,7 +3509,7 @@ class ShapeCwave : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -3555,7 +3555,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3568,7 +3568,7 @@ class ShapeCwave : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3604,7 +3604,7 @@ class ShapeCwave : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wave"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-wave"); return aPropertyMap; } @@ -3620,12 +3620,12 @@ class ShapeCswooshArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 16667); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3671,7 +3671,7 @@ class ShapeCswooshArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3681,7 +3681,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 75000); aParameter.Value = aAny; @@ -3689,7 +3689,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -3697,7 +3697,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3706,7 +3706,7 @@ class ShapeCswooshArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3716,7 +3716,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -3724,7 +3724,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3732,7 +3732,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3749,7 +3749,7 @@ class ShapeCswooshArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3800,7 +3800,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3813,7 +3813,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3849,7 +3849,7 @@ class ShapeCswooshArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-swooshArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-swooshArrow"); return aPropertyMap; } @@ -3908,7 +3908,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4024,7 +4024,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4047,7 +4047,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4083,7 +4083,7 @@ class ShapeCflowChartSummingJunction : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartSummingJunction"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartSummingJunction"); return aPropertyMap; } @@ -4130,7 +4130,7 @@ class ShapeClightningBolt : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4191,7 +4191,7 @@ class ShapeClightningBolt : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4202,7 +4202,7 @@ class ShapeClightningBolt : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -4213,7 +4213,7 @@ class ShapeClightningBolt : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4249,7 +4249,7 @@ class ShapeClightningBolt : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-lightningBolt"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-lightningBolt"); return aPropertyMap; } @@ -4288,7 +4288,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4324,7 +4324,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4337,7 +4337,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -4348,7 +4348,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4384,7 +4384,7 @@ class ShapeCflowChartDisplay : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDisplay"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartDisplay"); return aPropertyMap; } @@ -4425,7 +4425,7 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4516,7 +4516,7 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4547,7 +4547,7 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4583,7 +4583,7 @@ class ShapeCactionButtonBackPrevious : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonBackPrevious"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonBackPrevious"); return aPropertyMap; } @@ -4599,7 +4599,7 @@ class ShapeCframe : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4622,7 +4622,7 @@ class ShapeCframe : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4632,7 +4632,7 @@ class ShapeCframe : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -4640,7 +4640,7 @@ class ShapeCframe : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4648,7 +4648,7 @@ class ShapeCframe : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4665,7 +4665,7 @@ class ShapeCframe : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4711,7 +4711,7 @@ class ShapeCframe : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4725,7 +4725,7 @@ class ShapeCframe : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4761,7 +4761,7 @@ class ShapeCframe : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-frame"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-frame"); return aPropertyMap; } @@ -4800,7 +4800,7 @@ class ShapeCrtTriangle : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4821,7 +4821,7 @@ class ShapeCrtTriangle : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4832,7 +4832,7 @@ class ShapeCrtTriangle : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4868,7 +4868,7 @@ class ShapeCrtTriangle : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rtTriangle"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-rtTriangle"); return aPropertyMap; } @@ -4920,7 +4920,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -4981,7 +4981,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4993,7 +4993,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5029,7 +5029,7 @@ class ShapeCflowChartMagneticTape : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticTape"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartMagneticTape"); return aPropertyMap; } @@ -5045,17 +5045,17 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5131,7 +5131,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5141,7 +5141,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -5149,7 +5149,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5157,7 +5157,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -5166,7 +5166,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5176,7 +5176,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -5184,7 +5184,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5192,7 +5192,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -5201,7 +5201,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5211,7 +5211,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 15); aParameter.Value = aAny; @@ -5219,7 +5219,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5227,7 +5227,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -5244,7 +5244,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5395,7 +5395,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5425,7 +5425,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5461,7 +5461,7 @@ class ShapeCcurvedRightArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedRightArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedRightArrow"); return aPropertyMap; } @@ -5477,17 +5477,17 @@ class ShapeCleftUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5524,7 +5524,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5534,7 +5534,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -5542,7 +5542,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5550,7 +5550,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -5559,7 +5559,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5569,7 +5569,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -5577,7 +5577,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5585,7 +5585,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -5594,7 +5594,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5604,7 +5604,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -5612,7 +5612,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5620,7 +5620,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -5637,7 +5637,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5703,7 +5703,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5714,7 +5714,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5750,7 +5750,7 @@ class ShapeCleftUpArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftUpArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftUpArrow"); return aPropertyMap; } @@ -5766,12 +5766,12 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5821,7 +5821,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5831,7 +5831,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5839,7 +5839,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5847,7 +5847,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5855,7 +5855,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5863,12 +5863,12 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [6].Value = makeAny (aAny); } @@ -5885,7 +5885,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5911,7 +5911,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5923,7 +5923,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5959,7 +5959,7 @@ class ShapeCwedgeEllipseCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wedgeEllipseCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-wedgeEllipseCallout"); return aPropertyMap; } @@ -5975,12 +5975,12 @@ class ShapeCdoubleWave : public CustomShapeProvider { Any aAny ((sal_Int32) 6250); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6033,7 +6033,7 @@ class ShapeCdoubleWave : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -6043,7 +6043,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 12500); aParameter.Value = aAny; @@ -6051,7 +6051,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6059,7 +6059,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6068,7 +6068,7 @@ class ShapeCdoubleWave : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6078,7 +6078,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 10000); aParameter.Value = aAny; @@ -6086,7 +6086,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -10000); aParameter.Value = aAny; @@ -6094,7 +6094,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6111,7 +6111,7 @@ class ShapeCdoubleWave : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -6187,7 +6187,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6200,7 +6200,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6236,7 +6236,7 @@ class ShapeCdoubleWave : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-doubleWave"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-doubleWave"); return aPropertyMap; } @@ -6252,22 +6252,22 @@ class ShapeCbentArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 43750); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6311,7 +6311,7 @@ class ShapeCbentArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6321,7 +6321,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6329,7 +6329,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6337,7 +6337,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6346,7 +6346,7 @@ class ShapeCbentArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6356,7 +6356,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -6364,7 +6364,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6372,7 +6372,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6381,7 +6381,7 @@ class ShapeCbentArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6391,7 +6391,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -6399,7 +6399,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6407,7 +6407,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -6416,7 +6416,7 @@ class ShapeCbentArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6426,7 +6426,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 13); aParameter.Value = aAny; @@ -6434,7 +6434,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6442,7 +6442,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -6459,7 +6459,7 @@ class ShapeCbentArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6530,7 +6530,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6545,7 +6545,7 @@ class ShapeCbentArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6581,7 +6581,7 @@ class ShapeCbentArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bentArrow"); return aPropertyMap; } @@ -6597,12 +6597,12 @@ class ShapeCstar10 : public CustomShapeProvider { Any aAny ((sal_Int32) 42533); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } { Any aAny ((sal_Int32) 105146); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); + aAdjSequence [1].Name = "hf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6652,7 +6652,7 @@ class ShapeCstar10 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6662,7 +6662,7 @@ class ShapeCstar10 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -6670,7 +6670,7 @@ class ShapeCstar10 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6678,7 +6678,7 @@ class ShapeCstar10 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6695,7 +6695,7 @@ class ShapeCstar10 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -6801,7 +6801,7 @@ class ShapeCstar10 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6812,7 +6812,7 @@ class ShapeCstar10 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6848,7 +6848,7 @@ class ShapeCstar10 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star10"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star10"); return aPropertyMap; } @@ -6864,12 +6864,12 @@ class ShapeCleftArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6898,7 +6898,7 @@ class ShapeCleftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6908,7 +6908,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -6916,7 +6916,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6924,7 +6924,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6933,7 +6933,7 @@ class ShapeCleftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6943,7 +6943,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6951,7 +6951,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6959,7 +6959,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6976,7 +6976,7 @@ class ShapeCleftArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7017,7 +7017,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7028,7 +7028,7 @@ class ShapeCleftArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7064,7 +7064,7 @@ class ShapeCleftArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftArrow"); return aPropertyMap; } @@ -7080,17 +7080,17 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7167,7 +7167,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7177,7 +7177,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -7185,7 +7185,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7193,7 +7193,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7202,7 +7202,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7212,7 +7212,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -7220,7 +7220,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7228,7 +7228,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -7237,7 +7237,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7247,7 +7247,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 15); aParameter.Value = aAny; @@ -7255,7 +7255,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7263,7 +7263,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -7280,7 +7280,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -7431,7 +7431,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7463,7 +7463,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7499,7 +7499,7 @@ class ShapeCcurvedUpArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedUpArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedUpArrow"); return aPropertyMap; } @@ -7515,7 +7515,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7539,7 +7539,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7549,7 +7549,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -7557,7 +7557,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7565,7 +7565,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7582,7 +7582,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7613,7 +7613,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7624,7 +7624,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7660,7 +7660,7 @@ class ShapeCsnip1Rect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snip1Rect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-snip1Rect"); return aPropertyMap; } @@ -7676,17 +7676,17 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 12500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7757,7 +7757,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7767,7 +7767,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -7775,7 +7775,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7783,7 +7783,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7792,7 +7792,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7802,7 +7802,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -7810,7 +7810,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -7818,7 +7818,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -7827,7 +7827,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -7837,7 +7837,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7845,7 +7845,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -7853,7 +7853,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -7870,7 +7870,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8166,7 +8166,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8222,7 +8222,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8258,7 +8258,7 @@ class ShapeCellipseRibbon2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ellipseRibbon2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-ellipseRibbon2"); return aPropertyMap; } @@ -8274,7 +8274,7 @@ class ShapeCplus : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8302,7 +8302,7 @@ class ShapeCplus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8312,7 +8312,7 @@ class ShapeCplus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -8320,7 +8320,7 @@ class ShapeCplus : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8328,7 +8328,7 @@ class ShapeCplus : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8345,7 +8345,7 @@ class ShapeCplus : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8411,7 +8411,7 @@ class ShapeCplus : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8422,7 +8422,7 @@ class ShapeCplus : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8458,7 +8458,7 @@ class ShapeCplus : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plus"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-plus"); return aPropertyMap; } diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index 2b826d9cedbf..d4cf90cc066e 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.cxx @@ -30,42 +30,42 @@ class ShapeCaccentCallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; - aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); + aAdjSequence [6].Name = "adj7"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; - aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); + aAdjSequence [7].Name = "adj8"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -91,7 +91,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -101,7 +101,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -109,7 +109,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -117,7 +117,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -125,7 +125,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -133,12 +133,12 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -147,7 +147,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -157,7 +157,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -165,7 +165,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -173,7 +173,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -181,7 +181,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -189,12 +189,12 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -203,7 +203,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -213,7 +213,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -221,7 +221,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -229,7 +229,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -237,7 +237,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -245,12 +245,12 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -259,7 +259,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -269,7 +269,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -277,7 +277,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -285,7 +285,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -293,7 +293,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -301,12 +301,12 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 7); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 6); aPropSequence [6].Value = makeAny (aAny); } @@ -323,7 +323,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -379,7 +379,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -399,7 +399,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -435,7 +435,7 @@ class ShapeCaccentCallout3 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentCallout3"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-accentCallout3"); return aPropertyMap; } @@ -451,27 +451,27 @@ class ShapeCleftCircularArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -1142319); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 1142319); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 10800000); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 12500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -699,7 +699,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -713,7 +713,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -727,7 +727,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -737,7 +737,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -745,7 +745,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -757,7 +757,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -767,7 +767,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -775,7 +775,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -795,7 +795,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -851,7 +851,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -865,7 +865,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -901,7 +901,7 @@ class ShapeCleftCircularArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftCircularArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftCircularArrow"); return aPropertyMap; } @@ -917,12 +917,12 @@ class ShapeCrightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -951,7 +951,7 @@ class ShapeCrightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -961,7 +961,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -969,7 +969,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -977,7 +977,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -986,7 +986,7 @@ class ShapeCrightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -996,7 +996,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1004,7 +1004,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1012,7 +1012,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -1029,7 +1029,7 @@ class ShapeCrightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1070,7 +1070,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1081,7 +1081,7 @@ class ShapeCrightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1117,7 +1117,7 @@ class ShapeCrightArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-rightArrow"); return aPropertyMap; } @@ -1153,7 +1153,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1184,7 +1184,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1195,7 +1195,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -1206,7 +1206,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1242,7 +1242,7 @@ class ShapeCflowChartPunchedCard : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPunchedCard"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartPunchedCard"); return aPropertyMap; } @@ -1258,12 +1258,12 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider { Any aAny ((sal_Int32) 0); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 16667); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1295,7 +1295,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1305,7 +1305,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1313,7 +1313,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1321,7 +1321,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1330,7 +1330,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1340,7 +1340,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1348,7 +1348,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1356,7 +1356,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -1373,7 +1373,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -1419,7 +1419,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1430,7 +1430,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1466,7 +1466,7 @@ class ShapeCsnip2DiagRect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snip2DiagRect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-snip2DiagRect"); return aPropertyMap; } @@ -1482,7 +1482,7 @@ class ShapeCverticalScroll : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1549,7 +1549,7 @@ class ShapeCverticalScroll : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -1559,7 +1559,7 @@ class ShapeCverticalScroll : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -1567,7 +1567,7 @@ class ShapeCverticalScroll : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1575,7 +1575,7 @@ class ShapeCverticalScroll : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1592,7 +1592,7 @@ class ShapeCverticalScroll : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -1908,7 +1908,7 @@ class ShapeCverticalScroll : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1963,7 +1963,7 @@ class ShapeCverticalScroll : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1999,7 +1999,7 @@ class ShapeCverticalScroll : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-verticalScroll"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-verticalScroll"); return aPropertyMap; } @@ -2015,17 +2015,17 @@ class ShapeCstar7 : public CustomShapeProvider { Any aAny ((sal_Int32) 34601); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } { Any aAny ((sal_Int32) 102572); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); + aAdjSequence [1].Name = "hf"; } { Any aAny ((sal_Int32) 105210); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [2].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2081,7 +2081,7 @@ class ShapeCstar7 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2091,7 +2091,7 @@ class ShapeCstar7 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -2099,7 +2099,7 @@ class ShapeCstar7 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2107,7 +2107,7 @@ class ShapeCstar7 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2124,7 +2124,7 @@ class ShapeCstar7 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -2200,7 +2200,7 @@ class ShapeCstar7 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2211,7 +2211,7 @@ class ShapeCstar7 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2247,7 +2247,7 @@ class ShapeCstar7 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star7"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star7"); return aPropertyMap; } @@ -2276,7 +2276,7 @@ class ShapeCchartX : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2322,7 +2322,7 @@ class ShapeCchartX : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2340,7 +2340,7 @@ class ShapeCchartX : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (2); { awt::Size aSize; @@ -2366,7 +2366,7 @@ class ShapeCchartX : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartX"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-chartX"); return aPropertyMap; } @@ -2451,7 +2451,7 @@ class ShapeCcloud : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2737,7 +2737,7 @@ class ShapeCcloud : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2772,7 +2772,7 @@ class ShapeCcloud : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (2); { awt::Size aSize; @@ -2789,7 +2789,7 @@ class ShapeCcloud : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2825,7 +2825,7 @@ class ShapeCcloud : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cloud"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-cloud"); return aPropertyMap; } @@ -2841,7 +2841,7 @@ class ShapeCcube : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2866,7 +2866,7 @@ class ShapeCcube : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -2876,7 +2876,7 @@ class ShapeCcube : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -2884,7 +2884,7 @@ class ShapeCcube : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2892,7 +2892,7 @@ class ShapeCcube : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2909,7 +2909,7 @@ class ShapeCcube : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3030,7 +3030,7 @@ class ShapeCcube : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3063,7 +3063,7 @@ class ShapeCcube : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3099,7 +3099,7 @@ class ShapeCcube : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cube"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-cube"); return aPropertyMap; } @@ -3115,12 +3115,12 @@ class ShapeCround2DiagRect : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 0); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -3160,7 +3160,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3170,7 +3170,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -3178,7 +3178,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3186,7 +3186,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -3195,7 +3195,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -3205,7 +3205,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -3213,7 +3213,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -3221,7 +3221,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -3238,7 +3238,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -3309,7 +3309,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3327,7 +3327,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3363,7 +3363,7 @@ class ShapeCround2DiagRect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-round2DiagRect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-round2DiagRect"); return aPropertyMap; } @@ -3401,7 +3401,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3707,7 +3707,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3753,7 +3753,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (3); { awt::Size aSize; @@ -3776,7 +3776,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3812,7 +3812,7 @@ class ShapeCflowChartMultidocument : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMultidocument"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartMultidocument"); return aPropertyMap; } @@ -3857,7 +3857,7 @@ class ShapeCactionButtonDocument : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4013,7 +4013,7 @@ class ShapeCactionButtonDocument : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4052,7 +4052,7 @@ class ShapeCactionButtonDocument : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4088,7 +4088,7 @@ class ShapeCactionButtonDocument : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonDocument"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-actionButtonDocument"); return aPropertyMap; } @@ -4131,7 +4131,7 @@ class ShapeCflowChartTerminator : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4172,7 +4172,7 @@ class ShapeCflowChartTerminator : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4186,7 +4186,7 @@ class ShapeCflowChartTerminator : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -4197,7 +4197,7 @@ class ShapeCflowChartTerminator : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4233,7 +4233,7 @@ class ShapeCflowChartTerminator : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartTerminator"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartTerminator"); return aPropertyMap; } @@ -4277,7 +4277,7 @@ class ShapeCflowChartDelay : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4308,7 +4308,7 @@ class ShapeCflowChartDelay : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4321,7 +4321,7 @@ class ShapeCflowChartDelay : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4357,7 +4357,7 @@ class ShapeCflowChartDelay : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDelay"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartDelay"); return aPropertyMap; } @@ -4373,17 +4373,17 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4413,7 +4413,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4423,7 +4423,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -4431,7 +4431,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -4439,7 +4439,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4448,7 +4448,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4458,7 +4458,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -4466,7 +4466,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -4474,7 +4474,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -4483,7 +4483,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4493,7 +4493,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -4501,7 +4501,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -4509,7 +4509,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -4526,7 +4526,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -4597,7 +4597,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -4608,7 +4608,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4644,7 +4644,7 @@ class ShapeCcurvedConnector5 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector5"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-curvedConnector5"); return aPropertyMap; } @@ -4660,7 +4660,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -4727,7 +4727,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -4737,7 +4737,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -4745,7 +4745,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -4753,7 +4753,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -4770,7 +4770,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5086,7 +5086,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5140,7 +5140,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5176,7 +5176,7 @@ class ShapeChorizontalScroll : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-horizontalScroll"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-horizontalScroll"); return aPropertyMap; } @@ -5192,12 +5192,12 @@ class ShapeCbentConnector4 : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5217,7 +5217,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5227,7 +5227,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5235,7 +5235,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5243,7 +5243,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -5252,7 +5252,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5262,7 +5262,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5270,7 +5270,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5278,7 +5278,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -5295,7 +5295,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -5326,7 +5326,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5337,7 +5337,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5373,7 +5373,7 @@ class ShapeCbentConnector4 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector4"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bentConnector4"); return aPropertyMap; } @@ -5389,27 +5389,27 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 12500); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 1142319); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 20457681); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 11942319); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 12500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5662,7 +5662,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5676,7 +5676,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5690,7 +5690,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5700,7 +5700,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -5708,7 +5708,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5720,7 +5720,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5730,7 +5730,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -5738,7 +5738,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -5758,7 +5758,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -5824,7 +5824,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -5839,7 +5839,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5875,7 +5875,7 @@ class ShapeCleftRightCircularArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightCircularArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-leftRightCircularArrow"); return aPropertyMap; } @@ -5891,12 +5891,12 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -5948,7 +5948,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -5958,7 +5958,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5966,7 +5966,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5974,7 +5974,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -5982,7 +5982,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -5990,12 +5990,12 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [6].Value = makeAny (aAny); } @@ -6012,7 +6012,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6098,7 +6098,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6109,7 +6109,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6145,7 +6145,7 @@ class ShapeCwedgeRectCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wedgeRectCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-wedgeRectCallout"); return aPropertyMap; } @@ -6161,32 +6161,32 @@ class ShapeCaccentCallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6210,7 +6210,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6220,7 +6220,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -6228,7 +6228,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -6236,7 +6236,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -6244,7 +6244,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -6252,12 +6252,12 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -6266,7 +6266,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6276,7 +6276,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -6284,7 +6284,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -6292,7 +6292,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -6300,7 +6300,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -6308,12 +6308,12 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -6322,7 +6322,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6332,7 +6332,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -6340,7 +6340,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -6348,7 +6348,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -6356,7 +6356,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -6364,12 +6364,12 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -6386,7 +6386,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6437,7 +6437,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6457,7 +6457,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6493,7 +6493,7 @@ class ShapeCaccentCallout2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentCallout2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-accentCallout2"); return aPropertyMap; } @@ -6540,7 +6540,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6631,7 +6631,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6658,7 +6658,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (3); { awt::Size aSize; @@ -6681,7 +6681,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6717,7 +6717,7 @@ class ShapeCflowChartMagneticDrum : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticDrum"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartMagneticDrum"); return aPropertyMap; } @@ -6733,12 +6733,12 @@ class ShapeCcorner : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6769,7 +6769,7 @@ class ShapeCcorner : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -6779,7 +6779,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -6787,7 +6787,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6795,7 +6795,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -6804,7 +6804,7 @@ class ShapeCcorner : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -6814,7 +6814,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2); aParameter.Value = aAny; @@ -6822,7 +6822,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -6830,7 +6830,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -6847,7 +6847,7 @@ class ShapeCcorner : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -6883,7 +6883,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -6894,7 +6894,7 @@ class ShapeCcorner : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6930,7 +6930,7 @@ class ShapeCcorner : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-corner"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-corner"); return aPropertyMap; } @@ -6946,32 +6946,32 @@ class ShapeCborderCallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -6995,7 +6995,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7005,7 +7005,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7013,7 +7013,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7021,7 +7021,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7029,7 +7029,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7037,12 +7037,12 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -7051,7 +7051,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7061,7 +7061,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7069,7 +7069,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7077,7 +7077,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7085,7 +7085,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7093,12 +7093,12 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -7107,7 +7107,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7117,7 +7117,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7125,7 +7125,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7133,7 +7133,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -7141,7 +7141,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -7149,12 +7149,12 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -7171,7 +7171,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7212,7 +7212,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7227,7 +7227,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7263,7 +7263,7 @@ class ShapeCborderCallout2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-borderCallout2"); return aPropertyMap; } @@ -7279,7 +7279,7 @@ class ShapeCdonut : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7326,7 +7326,7 @@ class ShapeCdonut : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7336,7 +7336,7 @@ class ShapeCdonut : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -7344,7 +7344,7 @@ class ShapeCdonut : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7364,7 +7364,7 @@ class ShapeCdonut : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7460,7 +7460,7 @@ class ShapeCdonut : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7474,7 +7474,7 @@ class ShapeCdonut : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7510,7 +7510,7 @@ class ShapeCdonut : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-donut"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-donut"); return aPropertyMap; } @@ -7548,7 +7548,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -7584,7 +7584,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7595,7 +7595,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -7606,7 +7606,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7642,7 +7642,7 @@ class ShapeCflowChartCollate : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartCollate"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartCollate"); return aPropertyMap; } @@ -7658,17 +7658,17 @@ class ShapeCmathNotEqual : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 6600000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 11760); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -7741,7 +7741,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -7751,7 +7751,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -7759,7 +7759,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7767,7 +7767,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -7776,7 +7776,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (1); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7790,7 +7790,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -7800,7 +7800,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -7808,7 +7808,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -7816,7 +7816,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -7833,7 +7833,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -7939,7 +7939,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -7950,7 +7950,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -7986,7 +7986,7 @@ class ShapeCmathNotEqual : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathNotEqual"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathNotEqual"); return aPropertyMap; } @@ -8019,7 +8019,7 @@ class ShapeCbentConnector2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8040,7 +8040,7 @@ class ShapeCbentConnector2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8051,7 +8051,7 @@ class ShapeCbentConnector2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8087,7 +8087,7 @@ class ShapeCbentConnector2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bentConnector2"); return aPropertyMap; } @@ -8103,7 +8103,7 @@ class ShapeCmathMultiply : public CustomShapeProvider { Any aAny ((sal_Int32) 23520); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8151,7 +8151,7 @@ class ShapeCmathMultiply : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -8161,7 +8161,7 @@ class ShapeCmathMultiply : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 51965); aParameter.Value = aAny; @@ -8169,7 +8169,7 @@ class ShapeCmathMultiply : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -8177,7 +8177,7 @@ class ShapeCmathMultiply : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -8194,7 +8194,7 @@ class ShapeCmathMultiply : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8260,7 +8260,7 @@ class ShapeCmathMultiply : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8271,7 +8271,7 @@ class ShapeCmathMultiply : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8307,7 +8307,7 @@ class ShapeCmathMultiply : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathMultiply"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-mathMultiply"); return aPropertyMap; } @@ -8323,12 +8323,12 @@ class ShapeCheptagon : public CustomShapeProvider { Any aAny ((sal_Int32) 102572); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("hf"); + aAdjSequence [0].Name = "hf"; } { Any aAny ((sal_Int32) 105210); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [1].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8372,7 +8372,7 @@ class ShapeCheptagon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -8413,7 +8413,7 @@ class ShapeCheptagon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8424,7 +8424,7 @@ class ShapeCheptagon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8460,7 +8460,7 @@ class ShapeCheptagon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-heptagon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-heptagon"); return aPropertyMap; } @@ -8495,7 +8495,7 @@ class ShapeCrect : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8521,7 +8521,7 @@ class ShapeCrect : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8532,7 +8532,7 @@ class ShapeCrect : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8568,7 +8568,7 @@ class ShapeCrect : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rect"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-rect"); return aPropertyMap; } @@ -8584,32 +8584,32 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -46667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -8633,7 +8633,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8643,7 +8643,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8651,7 +8651,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8659,7 +8659,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8667,7 +8667,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8675,12 +8675,12 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -8689,7 +8689,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8699,7 +8699,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8707,7 +8707,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8715,7 +8715,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8723,7 +8723,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8731,12 +8731,12 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -8745,7 +8745,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -8755,7 +8755,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8763,7 +8763,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8771,7 +8771,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -8779,7 +8779,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -8787,12 +8787,12 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -8809,7 +8809,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8860,7 +8860,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8879,7 +8879,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8915,7 +8915,7 @@ class ShapeCaccentBorderCallout2 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentBorderCallout2"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-accentBorderCallout2"); return aPropertyMap; } @@ -8958,7 +8958,7 @@ class ShapeCpieWedge : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -8984,7 +8984,7 @@ class ShapeCpieWedge : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -8996,7 +8996,7 @@ class ShapeCpieWedge : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9032,7 +9032,7 @@ class ShapeCpieWedge : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-pieWedge"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-pieWedge"); return aPropertyMap; } @@ -9048,22 +9048,22 @@ class ShapeCupArrowCallout : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) 64977); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -9100,7 +9100,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9110,7 +9110,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 3); aParameter.Value = aAny; @@ -9118,7 +9118,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9126,7 +9126,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -9135,7 +9135,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9145,7 +9145,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -9153,7 +9153,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9161,7 +9161,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -9170,7 +9170,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -9180,7 +9180,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 5); aParameter.Value = aAny; @@ -9188,7 +9188,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9196,7 +9196,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -9205,7 +9205,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -9215,7 +9215,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 8); aParameter.Value = aAny; @@ -9223,7 +9223,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -9231,7 +9231,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 3); aPropSequence [3].Value = makeAny (aAny); } @@ -9248,7 +9248,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9309,7 +9309,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9320,7 +9320,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9356,7 +9356,7 @@ class ShapeCupArrowCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-upArrowCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-upArrowCallout"); return aPropertyMap; } @@ -9391,7 +9391,7 @@ class ShapeCflowChartProcess : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -9417,7 +9417,7 @@ class ShapeCflowChartProcess : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -9428,7 +9428,7 @@ class ShapeCflowChartProcess : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (1); { awt::Size aSize; @@ -9439,7 +9439,7 @@ class ShapeCflowChartProcess : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9475,7 +9475,7 @@ class ShapeCflowChartProcess : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartProcess"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-flowChartProcess"); return aPropertyMap; } diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx index 649857e7a0c1..bd1a51dc866d 100644 --- a/oox/source/drawingml/customshapepresets6.cxx +++ b/oox/source/drawingml/customshapepresets6.cxx @@ -30,17 +30,17 @@ class ShapeCstar5 : public CustomShapeProvider { Any aAny ((sal_Int32) 19098); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } { Any aAny ((sal_Int32) 105146); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("hf"); + aAdjSequence [1].Name = "hf"; } { Any aAny ((sal_Int32) 110557); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("vf"); + aAdjSequence [2].Name = "vf"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -86,7 +86,7 @@ class ShapeCstar5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -96,7 +96,7 @@ class ShapeCstar5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -104,7 +104,7 @@ class ShapeCstar5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -112,7 +112,7 @@ class ShapeCstar5 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -129,7 +129,7 @@ class ShapeCstar5 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::EQUATION, @@ -185,7 +185,7 @@ class ShapeCstar5 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -196,7 +196,7 @@ class ShapeCstar5 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -232,7 +232,7 @@ class ShapeCstar5 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star5"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-star5"); return aPropertyMap; } @@ -265,7 +265,7 @@ class ShapeClineInv : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (2); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -281,7 +281,7 @@ class ShapeClineInv : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -300,7 +300,7 @@ class ShapeClineInv : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-lineInv"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-lineInv"); return aPropertyMap; } @@ -333,7 +333,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -349,7 +349,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -360,7 +360,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -396,7 +396,7 @@ class ShapeCstraightConnector1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-straightConnector1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-straightConnector1"); return aPropertyMap; } @@ -412,12 +412,12 @@ class ShapeCstripedRightArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 50000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -450,7 +450,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -460,7 +460,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 100000); aParameter.Value = aAny; @@ -468,7 +468,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -476,7 +476,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -485,7 +485,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -495,7 +495,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -503,7 +503,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -511,7 +511,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -528,7 +528,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -609,7 +609,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -626,7 +626,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -662,7 +662,7 @@ class ShapeCstripedRightArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-stripedRightArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-stripedRightArrow"); return aPropertyMap; } @@ -678,42 +678,42 @@ class ShapeCcallout3 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 18750); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } { Any aAny ((sal_Int32) 100000); aAdjSequence [4].Value = aAny; - aAdjSequence [4].Name = CREATE_OUSTRING ("adj5"); + aAdjSequence [4].Name = "adj5"; } { Any aAny ((sal_Int32) -16667); aAdjSequence [5].Value = aAny; - aAdjSequence [5].Name = CREATE_OUSTRING ("adj6"); + aAdjSequence [5].Name = "adj6"; } { Any aAny ((sal_Int32) 112963); aAdjSequence [6].Value = aAny; - aAdjSequence [6].Name = CREATE_OUSTRING ("adj7"); + aAdjSequence [6].Name = "adj7"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [7].Value = aAny; - aAdjSequence [7].Name = CREATE_OUSTRING ("adj8"); + aAdjSequence [7].Name = "adj8"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -739,7 +739,7 @@ class ShapeCcallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -749,7 +749,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -757,7 +757,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -765,7 +765,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -773,7 +773,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -781,12 +781,12 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -795,7 +795,7 @@ class ShapeCcallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -805,7 +805,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -813,7 +813,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -821,7 +821,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -829,7 +829,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -837,12 +837,12 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -851,7 +851,7 @@ class ShapeCcallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -861,7 +861,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -869,7 +869,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -877,7 +877,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -885,7 +885,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -893,12 +893,12 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 5); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 4); aPropSequence [6].Value = makeAny (aAny); } @@ -907,7 +907,7 @@ class ShapeCcallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -917,7 +917,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -925,7 +925,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -933,7 +933,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -941,7 +941,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -949,12 +949,12 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 7); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 6); aPropSequence [6].Value = makeAny (aAny); } @@ -971,7 +971,7 @@ class ShapeCcallout3 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1017,7 +1017,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1033,7 +1033,7 @@ class ShapeCcallout3 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1069,7 +1069,7 @@ class ShapeCcallout3 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-callout3"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-callout3"); return aPropertyMap; } @@ -1085,17 +1085,17 @@ class ShapeCbentUpArrow : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 25000); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1128,7 +1128,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::NORMAL, @@ -1138,7 +1138,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1146,7 +1146,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1154,7 +1154,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1163,7 +1163,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1173,7 +1173,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1181,7 +1181,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1189,7 +1189,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -1198,7 +1198,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1208,7 +1208,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1216,7 +1216,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1224,7 +1224,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [3].Value = makeAny (aAny); } @@ -1241,7 +1241,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1292,7 +1292,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1303,7 +1303,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1339,7 +1339,7 @@ class ShapeCbentUpArrow : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentUpArrow"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-bentUpArrow"); return aPropertyMap; } @@ -1355,7 +1355,7 @@ class ShapeCnoSmoking : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1420,7 +1420,7 @@ class ShapeCnoSmoking : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1430,7 +1430,7 @@ class ShapeCnoSmoking : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RadiusRangeMaximum"); + aPropSequence [1].Name = "RadiusRangeMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 50000); aParameter.Value = aAny; @@ -1438,7 +1438,7 @@ class ShapeCnoSmoking : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RadiusRangeMinimum"); + aPropSequence [2].Name = "RadiusRangeMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1458,7 +1458,7 @@ class ShapeCnoSmoking : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1539,7 +1539,7 @@ class ShapeCnoSmoking : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1556,7 +1556,7 @@ class ShapeCnoSmoking : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1592,7 +1592,7 @@ class ShapeCnoSmoking : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-noSmoking"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-noSmoking"); return aPropertyMap; } @@ -1608,7 +1608,7 @@ class ShapeCtrapezoid : public CustomShapeProvider { Any aAny ((sal_Int32) 25000); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj"); + aAdjSequence [0].Name = "adj"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1638,7 +1638,7 @@ class ShapeCtrapezoid : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1648,7 +1648,7 @@ class ShapeCtrapezoid : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 1); aParameter.Value = aAny; @@ -1656,7 +1656,7 @@ class ShapeCtrapezoid : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -1664,7 +1664,7 @@ class ShapeCtrapezoid : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -1681,7 +1681,7 @@ class ShapeCtrapezoid : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -1707,7 +1707,7 @@ class ShapeCtrapezoid : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -1718,7 +1718,7 @@ class ShapeCtrapezoid : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -1754,7 +1754,7 @@ class ShapeCtrapezoid : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-trapezoid"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-trapezoid"); return aPropertyMap; } @@ -1770,12 +1770,12 @@ class ShapeCcloudCallout : public CustomShapeProvider { Any aAny ((sal_Int32) -20833); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 62500); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -1887,7 +1887,7 @@ class ShapeCcloudCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -1897,7 +1897,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1905,7 +1905,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1913,7 +1913,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -1921,7 +1921,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -1929,12 +1929,12 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 0); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 1); aPropSequence [6].Value = makeAny (aAny); } @@ -1951,7 +1951,7 @@ class ShapeCcloudCallout : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2282,7 +2282,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2329,7 +2329,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + aPropSequence [2].Name = "SubViewSize"; Sequence< awt::Size > aSizeSequence (5); { awt::Size aSize; @@ -2364,7 +2364,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aPropSequence [2].Value = makeAny (aSizeSequence); } { - aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [3].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2400,7 +2400,7 @@ class ShapeCcloudCallout : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cloudCallout"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-cloudCallout"); return aPropertyMap; } @@ -2416,22 +2416,22 @@ class ShapeCcallout1 : public CustomShapeProvider { Any aAny ((sal_Int32) 18750); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) -8333); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } { Any aAny ((sal_Int32) 112500); aAdjSequence [2].Value = aAny; - aAdjSequence [2].Name = CREATE_OUSTRING ("adj3"); + aAdjSequence [2].Name = "adj3"; } { Any aAny ((sal_Int32) -38333); aAdjSequence [3].Value = aAny; - aAdjSequence [3].Name = CREATE_OUSTRING ("adj4"); + aAdjSequence [3].Name = "adj4"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2453,7 +2453,7 @@ class ShapeCcallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2463,7 +2463,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2471,7 +2471,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2479,7 +2479,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2487,7 +2487,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2495,12 +2495,12 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [6].Value = makeAny (aAny); } @@ -2509,7 +2509,7 @@ class ShapeCcallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (7); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2519,7 +2519,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2527,7 +2527,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2535,7 +2535,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [3].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 2147483647); aParameter.Value = aAny; @@ -2543,7 +2543,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [3].Value = makeAny (aParameter); } { - aPropSequence [4].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [4].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) -2147483647); aParameter.Value = aAny; @@ -2551,12 +2551,12 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [4].Value = makeAny (aParameter); } { - aPropSequence [5].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [5].Name = "RefX"; Any aAny ((sal_Int32) 3); aPropSequence [5].Value = makeAny (aAny); } { - aPropSequence [6].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [6].Name = "RefY"; Any aAny ((sal_Int32) 2); aPropSequence [6].Value = makeAny (aAny); } @@ -2573,7 +2573,7 @@ class ShapeCcallout1 : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -2609,7 +2609,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -2625,7 +2625,7 @@ class ShapeCcallout1 : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2661,7 +2661,7 @@ class ShapeCcallout1 : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-callout1"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-callout1"); return aPropertyMap; } @@ -2677,12 +2677,12 @@ class ShapeCribbon : public CustomShapeProvider { Any aAny ((sal_Int32) 16667); aAdjSequence [0].Value = aAny; - aAdjSequence [0].Name = CREATE_OUSTRING ("adj1"); + aAdjSequence [0].Name = "adj1"; } { Any aAny ((sal_Int32) 50000); aAdjSequence [1].Value = aAny; - aAdjSequence [1].Name = CREATE_OUSTRING ("adj2"); + aAdjSequence [1].Name = "adj2"; } aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence; } @@ -2752,7 +2752,7 @@ class ShapeCribbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2762,7 +2762,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeYMaximum"); + aPropSequence [1].Name = "RangeYMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 33333); aParameter.Value = aAny; @@ -2770,7 +2770,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeYMinimum"); + aPropSequence [2].Name = "RangeYMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 0); aParameter.Value = aAny; @@ -2778,7 +2778,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefY"); + aPropSequence [3].Name = "RefY"; Any aAny ((sal_Int32) 0); aPropSequence [3].Value = makeAny (aAny); } @@ -2787,7 +2787,7 @@ class ShapeCribbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (4); { - aPropSequence [0].Name = CREATE_OUSTRING ("Position"); + aPropSequence [0].Name = "Position"; static const CustomShapeProvider::ParameterPairData aData = { EnhancedCustomShapeParameterType::EQUATION, @@ -2797,7 +2797,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPair(&aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("RangeXMaximum"); + aPropSequence [1].Name = "RangeXMaximum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 75000); aParameter.Value = aAny; @@ -2805,7 +2805,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (aParameter); } { - aPropSequence [2].Name = CREATE_OUSTRING ("RangeXMinimum"); + aPropSequence [2].Name = "RangeXMinimum"; EnhancedCustomShapeParameter aParameter; Any aAny ((sal_Int32) 25000); aParameter.Value = aAny; @@ -2813,7 +2813,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [2].Value = makeAny (aParameter); } { - aPropSequence [3].Name = CREATE_OUSTRING ("RefX"); + aPropSequence [3].Name = "RefX"; Any aAny ((sal_Int32) 1); aPropSequence [3].Value = makeAny (aAny); } @@ -2830,7 +2830,7 @@ class ShapeCribbon : public CustomShapeProvider { Sequence< PropertyValue > aPropSequence (3); { - aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); + aPropSequence [0].Name = "Coordinates"; static const CustomShapeProvider::ParameterPairData aData[] = { { EnhancedCustomShapeParameterType::NORMAL, @@ -3206,7 +3206,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [0].Value = makeAny (createParameterPairSequence(SAL_N_ELEMENTS(aData), aData)); } { - aPropSequence [1].Name = CREATE_OUSTRING ("Segments"); + aPropSequence [1].Name = "Segments"; static const sal_uInt16 nValues[] = { // Command, Count 1,1, @@ -3270,7 +3270,7 @@ class ShapeCribbon : public CustomShapeProvider aPropSequence [1].Value = makeAny (createSegmentSequence( SAL_N_ELEMENTS( nValues ), nValues )); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = "TextFrames"; Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -3306,7 +3306,7 @@ class ShapeCribbon : public CustomShapeProvider aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } - aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ribbon"); + aPropertyMap [ PROP_Type ] <<= OUString("ooxml-ribbon"); return aPropertyMap; } diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index ea5dc1f32de9..48173b7c7ffb 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -154,7 +154,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi if ( maAdjustmentGuideList.size() ) { - const OUString sType = CREATE_OUSTRING( "Type" ); + const OUString sType = "Type"; const OUString sCustomShapeGeometry("CustomShapeGeometry"); uno::Any aGeoPropSet = xPropSet->getPropertyValue( sCustomShapeGeometry ); uno::Sequence< beans::PropertyValue > aGeoPropSeq; @@ -201,7 +201,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi if ( sConnectorShapeType.getLength() > 0 ) aGeoPropSeq[ i ].Value <<= sConnectorShapeType; else - aGeoPropSeq[ i ].Value <<= CREATE_OUSTRING( "ooxml-CustomShape" ); + aGeoPropSeq[ i ].Value <<= OUString( "ooxml-CustomShape" ); } } } @@ -211,7 +211,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi { sal_uInt32 i; PropertyMap aPropertyMap; - aPropertyMap[ PROP_Type ] <<= CREATE_OUSTRING( "ooxml-non-primitive" ); + aPropertyMap[ PROP_Type ] <<= OUString( "ooxml-non-primitive" ); aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX ); aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY ); awt::Size aSize; diff --git a/oox/source/drawingml/customshapes/generatePresetsCXX.pl b/oox/source/drawingml/customshapes/generatePresetsCXX.pl index de7a83fa3666..e129d0320a8b 100755 --- a/oox/source/drawingml/customshapes/generatePresetsCXX.pl +++ b/oox/source/drawingml/customshapes/generatePresetsCXX.pl @@ -127,7 +127,7 @@ sub generateSource print OUT " {\n"; print OUT " PropertyMap aPropertyMap;\n\n"; print OUT @{$sources->{$shape}}; - print OUT " aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING(\"ooxml-", $shape, "\");\n\n"; + print OUT " aPropertyMap [ PROP_Type ] <<= OUString(\"ooxml-", $shape, "\");\n\n"; print OUT " return aPropertyMap;\n"; print OUT " }\n"; print OUT "};\n"; diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx index 6e153577aa79..fa9f15523a31 100644 --- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx +++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx @@ -40,7 +40,7 @@ DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler& rParent, OUString sValue = xAttributes->getOptionalValue( XML_minVer ); if( sValue.isEmpty() ) { - sValue = CREATE_OUSTRING( "http://schemas.openxmlformats.org/drawingml/2006/diagram" ); + sValue = "http://schemas.openxmlformats.org/drawingml/2006/diagram"; } mpLayout->setMinVer( sValue ); mpLayout->setUniqueId( xAttributes->getOptionalValue( XML_uniqueId ) ); diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index caeab1b35cfd..327b19b89a35 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -86,12 +86,12 @@ const awt::Size lclGetOriginalSize( const GraphicHelper& rGraphicHelper, const R try { Reference< beans::XPropertySet > xGraphicPropertySet( rxGraphic, UNO_QUERY_THROW ); - if( xGraphicPropertySet->getPropertyValue( CREATE_OUSTRING( "Size100thMM" ) ) >>= aSizeHmm ) + if( xGraphicPropertySet->getPropertyValue( "Size100thMM" ) >>= aSizeHmm ) { if( !aSizeHmm.Width && !aSizeHmm.Height ) { // MAPMODE_PIXEL USED :-( awt::Size aSourceSizePixel( 0, 0 ); - if( xGraphicPropertySet->getPropertyValue( CREATE_OUSTRING( "SizePixel" ) ) >>= aSourceSizePixel ) + if( xGraphicPropertySet->getPropertyValue( "SizePixel" ) >>= aSourceSizePixel ) aSizeHmm = rGraphicHelper.convertScreenPixelToHmm( aSourceSizePixel ); } } diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx index 6da4db30062f..44892cf1579c 100644 --- a/oox/source/drawingml/hyperlinkcontext.cxx +++ b/oox/source/drawingml/hyperlinkcontext.cxx @@ -78,22 +78,22 @@ HyperLinkContext::HyperLinkContext( ContextHandler& rParent, // ppaction://macro?name=MACRO_NAME // ppaction://program - const OUString sPPAction( CREATE_OUSTRING( "ppaction://" ) ); + const OUString sPPAction( "ppaction://" ); if ( aAction.matchIgnoreAsciiCase( sPPAction, 0 ) ) { OUString aPPAct( aAction.copy( sPPAction.getLength() ) ); sal_Int32 nIndex = aPPAct.indexOf( '?', 0 ); OUString aPPAction( nIndex > 0 ? aPPAct.copy( 0, nIndex ) : aPPAct ); - const OUString sHlinkshowjump( CREATE_OUSTRING( "hlinkshowjump" ) ); - const OUString sHlinksldjump( CREATE_OUSTRING( "hlinksldjump" ) ); + const OUString sHlinkshowjump( "hlinkshowjump" ); + const OUString sHlinksldjump( "hlinksldjump" ); if ( aPPAction.match( sHlinkshowjump ) ) { - const OUString sJump( CREATE_OUSTRING( "jump=" ) ); + const OUString sJump( "jump=" ); if ( aPPAct.match( sJump, nIndex + 1 ) ) { OUString aDestination( aPPAct.copy( nIndex + 1 + sJump.getLength() ) ); - sURL = sURL.concat( CREATE_OUSTRING( "#action?jump=" ) ); + sURL = sURL.concat( "#action?jump=" ); sURL = sURL.concat( aDestination ); } } @@ -122,13 +122,13 @@ HyperLinkContext::HyperLinkContext( ContextHandler& rParent, sal_Int32 nPageNumber = sHref.copy( nIndex2, nLength ).toInt32(); if ( nPageNumber ) { - const OUString sSlide( CREATE_OUSTRING( "slide" ) ); - const OUString sNotesSlide( CREATE_OUSTRING( "notesSlide" ) ); + const OUString sSlide( "slide" ); + const OUString sNotesSlide( "notesSlide" ); const OUString aSlideType( sHref.copy( 0, nIndex2 ) ); if ( aSlideType.match( sSlide ) ) - sURL = CREATE_OUSTRING( "#Slide " ).concat( OUString::valueOf( nPageNumber ) ); + sURL = OUString( "#Slide " ).concat( OUString::valueOf( nPageNumber ) ); else if ( aSlideType.match( sNotesSlide ) ) - sURL = CREATE_OUSTRING( "#Notes " ).concat( OUString::valueOf( nPageNumber ) ); + sURL = OUString( "#Notes " ).concat( OUString::valueOf( nPageNumber ) ); // else: todo for other types such as notesMaster or slideMaster as they can't be referenced easily } } diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index 1d049eec3219..09432ab3db72 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -185,20 +185,20 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, switch( nArrowType ) { case XML_triangle: - aBuffer.append( CREATE_OUSTRING( "msArrowEnd" ) ); + aBuffer.append( "msArrowEnd" ); break; case XML_arrow: - aBuffer.append( CREATE_OUSTRING( "msArrowOpenEnd" ) ); + aBuffer.append( "msArrowOpenEnd" ); break; case XML_stealth: - aBuffer.append( CREATE_OUSTRING( "msArrowStealthEnd" ) ); + aBuffer.append( "msArrowStealthEnd" ); break; case XML_diamond: - aBuffer.append( CREATE_OUSTRING( "msArrowDiamondEnd" ) ); + aBuffer.append( "msArrowDiamondEnd" ); bMarkerCenter = true; break; case XML_oval: - aBuffer.append( CREATE_OUSTRING( "msArrowOvalEnd" ) ); + aBuffer.append( "msArrowOvalEnd" ); bMarkerCenter = true; break; } diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index ad8729eadeb6..2ea289c6585e 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -154,7 +154,7 @@ ChartShapeInfo& Shape::setChartType( bool bEmbedShapes ) { OSL_ENSURE( meFrameType == FRAMETYPE_GENERIC, "Shape::setChartType - multiple frame types" ); meFrameType = FRAMETYPE_CHART; - msServiceName = CREATE_OUSTRING( "com.sun.star.drawing.OLE2Shape" ); + msServiceName = "com.sun.star.drawing.OLE2Shape"; mxChartShapeInfo.reset( new ChartShapeInfo( bEmbedShapes ) ); return *mxChartShapeInfo; } @@ -163,7 +163,7 @@ void Shape::setDiagramType() { OSL_ENSURE( meFrameType == FRAMETYPE_GENERIC, "Shape::setDiagramType - multiple frame types" ); meFrameType = FRAMETYPE_DIAGRAM; - msServiceName = CREATE_OUSTRING( "com.sun.star.drawing.GroupShape" ); + msServiceName = "com.sun.star.drawing.GroupShape"; mnSubType = 0; } @@ -171,7 +171,7 @@ void Shape::setTableType() { OSL_ENSURE( meFrameType == FRAMETYPE_GENERIC, "Shape::setTableType - multiple frame types" ); meFrameType = FRAMETYPE_TABLE; - msServiceName = CREATE_OUSTRING( "com.sun.star.drawing.TableShape" ); + msServiceName = "com.sun.star.drawing.TableShape"; mnSubType = 0; } @@ -463,7 +463,7 @@ Reference< XShape > Shape::createAndInsert( if ( mbHidden || mbHiddenMasterShape ) { SAL_INFO("oox", "invisible shape with id: " << msId); - const OUString sVisible( CREATE_OUSTRING( "Visible" ) ); + const OUString sVisible( "Visible" ); xSet->setPropertyValue( sVisible, Any( sal_False ) ); } @@ -635,7 +635,7 @@ OUString Shape::finalizeServiceName( XmlFilterBase& rFilter, const OUString& rSe { awt::Size aOleSize( rShapeRect.Width, rShapeRect.Height ); if( rFilter.getOleObjectHelper().importOleObject( maShapeProperties, *mxOleObjectInfo, aOleSize ) ) - aServiceName = CREATE_OUSTRING( "com.sun.star.drawing.OLE2Shape" ); + aServiceName = "com.sun.star.drawing.OLE2Shape"; // get the path to the representation graphic OUString aGraphicPath; @@ -670,7 +670,7 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& { // set the chart2 OLE class ID at the OLE shape PropertySet aShapeProp( mxShape ); - aShapeProp.setProperty( PROP_CLSID, CREATE_OUSTRING( "12dcae26-281f-416f-a234-c3086127382e" ) ); + aShapeProp.setProperty( PROP_CLSID, OUString( "12dcae26-281f-416f-a234-c3086127382e" ) ); // get the XModel interface of the embedded object from the OLE shape Reference< frame::XModel > xDocModel; diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 06a60e3cbe23..ed2ef6e88726 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -66,7 +66,7 @@ TextCharacterPropertiesContext::TextCharacterPropertiesContext( /* todo: we need to be able to iterate over the XFastAttributes // ST_TextNonNegativePoint - const OUString sCharKerning( CREATE_OUSTRING( "CharKerning" ) ); + const OUString sCharKerning( "CharKerning" ); //case A_TOKEN( kern ): // ST_TextLanguageID diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx index a863563e7733..d18859337bf2 100644 --- a/oox/source/drawingml/textfield.cxx +++ b/oox/source/drawingml/textfield.cxx @@ -69,7 +69,7 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, bool bIsDate = true; int idx = p.toInt32(); // OSL_TRACE( "OOX: p = %s, %d", p.pData->buffer, idx ); - xIface = xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.text.TextField.DateTime" ) ); + xIface = xFactory->createInstance( "com.sun.star.text.TextField.DateTime" ); aFields.push_back( Reference< XTextField > ( xIface, UNO_QUERY ) ); Reference< XPropertySet > xProps( xIface, UNO_QUERY_THROW ); @@ -92,10 +92,10 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, case 7: // Date Mon-yy break; case 8: // DateTime dd/mm/yyyy H:MM PM - lclCreateTextFields( aFields, xModel, CREATE_OUSTRING( "datetime12" ) ); + lclCreateTextFields( aFields, xModel, "datetime12" ); break; case 9: // DateTime dd/mm/yy H:MM:SS PM - lclCreateTextFields( aFields, xModel, CREATE_OUSTRING( "datetime13" ) ); + lclCreateTextFields( aFields, xModel, "datetime13" ); break; case 10: // Time H:MM bIsDate = false; @@ -111,8 +111,8 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, bIsDate = false; break; } - xProps->setPropertyValue( CREATE_OUSTRING( "IsDate" ), makeAny( bIsDate ) ); - xProps->setPropertyValue( CREATE_OUSTRING( "IsFixed" ), makeAny( false ) ); + xProps->setPropertyValue( "IsDate", makeAny( bIsDate ) ); + xProps->setPropertyValue( "IsFixed", makeAny( false ) ); } catch(Exception & e) { @@ -121,7 +121,7 @@ void lclCreateTextFields( std::list< Reference< XTextField > > & aFields, } else if ( sType.compareToAscii( "slidenum" ) == 0 ) { - xIface = xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.text.TextField.PageNumber" ) ); + xIface = xFactory->createInstance( "com.sun.star.text.TextField.PageNumber" ); aFields.push_back( Reference< XTextField > ( xIface, UNO_QUERY ) ); } } @@ -168,7 +168,7 @@ sal_Int32 TextField::insertAt( } else { - xText->insertString( xStart, CREATE_OUSTRING( " " ), sal_False ); + xText->insertString( xStart, " ", sal_False ); } xText->insertTextContent( xStart, xContent, sal_False ); } diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index fa43d6aa8986..bab0ecdac5ec 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -122,7 +122,7 @@ void TextParagraph::insertAt( // empty paragraphs do not have bullets in ppt if ( !nParagraphSize ) { - const OUString sNumberingLevel( CREATE_OUSTRING( "NumberingLevel" ) ); + const OUString sNumberingLevel( "NumberingLevel" ); xProps->setPropertyValue( sNumberingLevel, Any( static_cast< sal_Int16 >( -1 ) ) ); } diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 684810739da1..6923d9993ee9 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -83,19 +83,19 @@ void BulletList::setNone( ) void BulletList::setSuffixParenBoth() { - msNumberingSuffix <<= CREATE_OUSTRING( ")" ); - msNumberingPrefix <<= CREATE_OUSTRING( "(" ); + msNumberingSuffix <<= OUString( ")" ); + msNumberingPrefix <<= OUString( "(" ); } void BulletList::setSuffixParenRight() { - msNumberingSuffix <<= CREATE_OUSTRING( ")" ); + msNumberingSuffix <<= OUString( ")" ); msNumberingPrefix <<= OUString(); } void BulletList::setSuffixPeriod() { - msNumberingSuffix <<= CREATE_OUSTRING( "." ); + msNumberingSuffix <<= OUString( "." ); msNumberingPrefix <<= OUString(); } @@ -107,7 +107,7 @@ void BulletList::setSuffixNone() void BulletList::setSuffixMinusRight() { - msNumberingSuffix <<= CREATE_OUSTRING( "-" ); + msNumberingSuffix <<= OUString( "-" ); msNumberingPrefix <<= OUString(); } @@ -487,7 +487,7 @@ float TextParagraphProperties::getCharHeightPoints( float fDefault ) const void TextParagraphProperties::dump() const { Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); - Reference< ::com::sun::star::drawing::XShape > xShape( oox::ppt::PowerPointImport::mpDebugFilterBase->getModelFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.presentation.TitleTextShape" ) ), UNO_QUERY ); + Reference< ::com::sun::star::drawing::XShape > xShape( oox::ppt::PowerPointImport::mpDebugFilterBase->getModelFactory()->createInstance( "com.sun.star.presentation.TitleTextShape" ), UNO_QUERY ); Reference< ::com::sun::star::text::XText > xText( xShape, UNO_QUERY ); Reference< com::sun::star::drawing::XDrawPage > xDebugPage(ppt::SlidePersist::mxDebugPage.get(), UNO_QUERY); @@ -496,7 +496,7 @@ void TextParagraphProperties::dump() const PropertyMap emptyMap; - const OUString sText = CREATE_OUSTRING("debug"); + const OUString sText = "debug"; xText->setString( sText ); Reference< ::com::sun::star::text::XTextCursor > xStart( xText->createTextCursor(), UNO_QUERY ); Reference< ::com::sun::star::text::XTextRange > xRange( xStart, UNO_QUERY ); diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx index 00eae0755c33..e5ab05dba2e3 100644 --- a/oox/source/drawingml/textrun.cxx +++ b/oox/source/drawingml/textrun.cxx @@ -127,7 +127,7 @@ sal_Int32 TextRun::insertAt( { OSL_TRACE( "OOX: URL field" ); Reference< XMultiServiceFactory > xFactory( rFilterBase.getModel(), UNO_QUERY ); - Reference< XTextField > xField( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.text.TextField.URL" ) ), UNO_QUERY ); + Reference< XTextField > xField( xFactory->createInstance( "com.sun.star.text.TextField.URL" ), UNO_QUERY ); if( xField.is() ) { Reference< XTextCursor > xTextFieldCursor = xText->createTextCursor(); diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 067cf7bfabff..f23263b62962 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -134,7 +134,7 @@ Reference< XTextOutputStream > InputOutputHelper::openTextOutputStream( if( rxContext.is() && rxOutStrm.is() && pcCharset ) try { Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW ); - Reference< XActiveDataSource > xDataSource( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TextOutputStream" ) ), UNO_QUERY_THROW ); + Reference< XActiveDataSource > xDataSource( xFactory->createInstance( "com.sun.star.io.TextOutputStream" ), UNO_QUERY_THROW ); xDataSource->setOutputStream( rxOutStrm ); xTextOutStrm.set( xDataSource, UNO_QUERY_THROW ); xTextOutStrm->setEncoding( OUString::createFromAscii( pcCharset ) ); @@ -185,9 +185,9 @@ OUStringVector::const_iterator ItemFormat::parse( const OUStringVector& rFormatV if( meFmtType == FORMATTYPE_NONE ) { if ( aFmtType == "unused" ) - set( meDataType, FORMATTYPE_HEX, CREATE_OUSTRING( OOX_DUMP_UNUSED ) ); + set( meDataType, FORMATTYPE_HEX, OOX_DUMP_UNUSED ); else if ( aFmtType == "unknown" ) - set( meDataType, FORMATTYPE_HEX, CREATE_OUSTRING( OOX_DUMP_UNKNOWN ) ); + set( meDataType, FORMATTYPE_HEX, OOX_DUMP_UNKNOWN ); } return aIt; @@ -1119,7 +1119,7 @@ OUString FlagsList::implGetName( const Config& /*rCfg*/, sal_Int64 nKey ) const setFlag( nKey, nFound, false ); if( nKey != 0 ) { - OUStringBuffer aUnknown( CREATE_OUSTRING( OOX_DUMP_UNKNOWN ) ); + OUStringBuffer aUnknown( OOX_DUMP_UNKNOWN ); aUnknown.append( OOX_DUMP_ITEMSEP ); StringHelper::appendShortHex( aUnknown, nKey, true ); StringHelper::enclose( aUnknown, '(', ')' ); diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index 9f26fcf97b2a..bd38cd4dc64b 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -443,7 +443,7 @@ void OlePropertyStreamObject::dumpBlob( sal_Int32 nPropId, const String& rName ) if( nSize > 0 ) { OUString aPropName = mxPropIds->getName( cfg(), nPropId ); - if( aPropName == CREATE_OUSTRING( "'_PID_HLINKS'" ) ) + if( aPropName == "'_PID_HLINKS'" ) dumpHlinks( nSize ); else dumpBinary( rName, nSize ); diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 862f839c120e..9c8436e158c1 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1313,7 +1313,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape ) if( xSheetDoc.is() ) { Reference< XComponent > xDocument( mAny, UNO_QUERY ); - Reference< XExporter > xExporter( mpFB->getServiceFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilterExport" ) ), UNO_QUERY ); + Reference< XExporter > xExporter( mpFB->getServiceFactory()->createInstance( "com.sun.star.comp.oox.ExcelFilterExport" ), UNO_QUERY ); if( xDocument.is() && xExporter.is() && mpFB ) { Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( OUStringBuffer() diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx index 98884e5a7833..75bd99e6a4d3 100644 --- a/oox/source/helper/containerhelper.cxx +++ b/oox/source/helper/containerhelper.cxx @@ -88,7 +88,7 @@ Reference< XIndexContainer > ContainerHelper::createIndexContainer( const Refere if( rxContext.is() ) try { Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW ); - xContainer.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.IndexedPropertyValues" ) ), UNO_QUERY_THROW ); + xContainer.set( xFactory->createInstance( "com.sun.star.document.IndexedPropertyValues" ), UNO_QUERY_THROW ); } catch( Exception& ) { @@ -103,7 +103,7 @@ Reference< XNameContainer > ContainerHelper::createNameContainer( const Referenc if( rxContext.is() ) try { Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW ); - xContainer.set( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.NamedPropertyValues" ) ), UNO_QUERY_THROW ); + xContainer.set( xFactory->createInstance( "com.sun.star.document.NamedPropertyValues" ), UNO_QUERY_THROW ); } catch( Exception& ) { diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 8cd4d8d86928..512e9a1f8aa2 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -67,7 +67,7 @@ inline sal_Int32 lclConvertScreenPixelToHmm( double fPixel, double fPixelPerHmm GraphicHelper::GraphicHelper( const Reference< XComponentContext >& rxContext, const Reference< XFrame >& rxTargetFrame, const StorageRef& rxStorage ) : mxContext( rxContext ), mxStorage( rxStorage ), - maGraphicObjScheme( CREATE_OUSTRING( "vnd.sun.star.GraphicObject:" ) ) + maGraphicObjScheme( "vnd.sun.star.GraphicObject:" ) { OSL_ENSURE( mxContext.is(), "GraphicHelper::GraphicHelper - missing component context" ); if( mxContext.is() ) @@ -239,20 +239,20 @@ Reference< XGraphic > GraphicHelper::importGraphic( const Reference< XInputStrea if( rxInStrm.is() && mxGraphicProvider.is() ) try { Sequence< PropertyValue > aArgs( 1 ); - aArgs[ 0 ].Name = CREATE_OUSTRING( "InputStream" ); + aArgs[ 0 ].Name = "InputStream"; aArgs[ 0 ].Value <<= rxInStrm; if ( pExtHeader && pExtHeader->mapMode > 0 ) { aArgs.realloc( aArgs.getLength() + 1 ); Sequence< PropertyValue > aFilterData( 3 ); - aFilterData[ 0 ].Name = CREATE_OUSTRING( "ExternalWidth" ); + aFilterData[ 0 ].Name = "ExternalWidth"; aFilterData[ 0 ].Value <<= pExtHeader->xExt; - aFilterData[ 1 ].Name = CREATE_OUSTRING( "ExternalHeight" ); + aFilterData[ 1 ].Name = "ExternalHeight"; aFilterData[ 1 ].Value <<= pExtHeader->yExt; - aFilterData[ 2 ].Name = CREATE_OUSTRING( "ExternalMapMode" ); + aFilterData[ 2 ].Name = "ExternalMapMode"; aFilterData[ 2 ].Value <<= pExtHeader->mapMode; - aArgs[ 1 ].Name = CREATE_OUSTRING( "FilterData" ); + aArgs[ 1 ].Name = "FilterData"; aArgs[ 1 ].Value <<= aFilterData; } diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx index ef3e099db51a..7d3954710974 100644 --- a/oox/source/helper/modelobjecthelper.cxx +++ b/oox/source/helper/modelobjecthelper.cxx @@ -85,15 +85,15 @@ void ObjectContainer::createContainer() const // ============================================================================ ModelObjectHelper::ModelObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) : - maMarkerContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.MarkerTable" ) ), - maDashContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.DashTable" ) ), - maGradientContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.GradientTable" ) ), - maTransGradContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.TransparencyGradientTable" ) ), - maBitmapUrlContainer( rxModelFactory, CREATE_OUSTRING( "com.sun.star.drawing.BitmapTable" ) ), - maDashNameBase( CREATE_OUSTRING( "msLineDash " ) ), - maGradientNameBase( CREATE_OUSTRING( "msFillGradient " ) ), - maTransGradNameBase( CREATE_OUSTRING( "msTransGradient " ) ), - maBitmapUrlNameBase( CREATE_OUSTRING( "msFillBitmap " ) ) + maMarkerContainer( rxModelFactory, "com.sun.star.drawing.MarkerTable" ), + maDashContainer( rxModelFactory, "com.sun.star.drawing.DashTable" ), + maGradientContainer( rxModelFactory, "com.sun.star.drawing.GradientTable" ), + maTransGradContainer( rxModelFactory, "com.sun.star.drawing.TransparencyGradientTable" ), + maBitmapUrlContainer( rxModelFactory, "com.sun.star.drawing.BitmapTable" ), + maDashNameBase( "msLineDash " ), + maGradientNameBase( "msFillGradient " ), + maTransGradNameBase( "msTransGradient " ), + maBitmapUrlNameBase( "msFillBitmap " ) { } diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index bd5f8bae0eed..f4b9b11186d7 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -558,7 +558,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0) if( value >>= strValue ) { printLevel (level); - fprintf (stderr,"OUString str = CREATE_OUSTRING (\"%s\");\n", USS( strValue ) ); + fprintf (stderr,"OUString str = \"%s\";\n", USS( strValue ) ); return "Any (str)"; } else if( value >>= strArray ) { if (strArray.getLength() == 0) @@ -580,7 +580,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0) printLevel (level); fprintf (stderr, "{\n"); printLevel (level + 1); - fprintf (stderr, "aPropSequence [%d].Name = CREATE_OUSTRING (\"%s\");\n", i, USS( propArray[i].Name )); + fprintf (stderr, "aPropSequence [%d].Name = \"%s\";\n", i, USS( propArray[i].Name )); const char *var = lclDumpAnyValueCode( propArray[i].Value, level + 1 ); printLevel (level + 1); fprintf (stderr, "aPropSequence [%d].Value = makeAny (%s);\n", i, var); @@ -631,7 +631,7 @@ static const char* lclDumpAnyValueCode( Any value, int level = 0) fprintf (stderr, "aAdjSequence [%d].Value = %s;\n", i, var); if (adjArray[i].Name.getLength() > 0) { printLevel (level + 1); - fprintf (stderr, "aAdjSequence [%d].Name = CREATE_OUSTRING (\"%s\");\n", i, USS (adjArray[i].Name)); + fprintf (stderr, "aAdjSequence [%d].Name = \"%s\";\n", i, USS (adjArray[i].Name)); } printLevel (level); fprintf (stderr, "}\n"); @@ -838,7 +838,7 @@ void PropertyMap::dumpCode( Reference< XPropertySet > rXPropSet ) { Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo (); Sequence< Property > props = info->getProperties (); - const OUString sType = CREATE_OUSTRING( "Type" ); + const OUString sType = "Type"; for (int i=0; i < props.getLength (); i++) { diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx index 29a623b533d8..926beb963455 100644 --- a/oox/source/helper/textinputstream.cxx +++ b/oox/source/helper/textinputstream.cxx @@ -95,7 +95,7 @@ void SAL_CALL UnoBinaryInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL UnoBinaryInputStream::available() throw (NotConnectedException, IOException, RuntimeException) { ensureConnected(); - throw RuntimeException( CREATE_OUSTRING( "Functionality not supported" ), Reference< XInputStream >() ); + throw RuntimeException( "Functionality not supported", Reference< XInputStream >() ); } void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, IOException, RuntimeException) @@ -108,7 +108,7 @@ void SAL_CALL UnoBinaryInputStream::closeInput() throw (NotConnectedException, I void UnoBinaryInputStream::ensureConnected() const throw (NotConnectedException) { if( !mpInStrm ) - throw NotConnectedException( CREATE_OUSTRING( "Stream closed" ), Reference< XInterface >() ); + throw NotConnectedException( "Stream closed", Reference< XInterface >() ); } } // namespace @@ -193,7 +193,7 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar ) if( rxContext.is() && rxInStrm.is() && pcCharset ) try { Reference< XMultiServiceFactory > xFactory( rxContext->getServiceManager(), UNO_QUERY_THROW ); - Reference< XActiveDataSink > xDataSink( xFactory->createInstance( CREATE_OUSTRING( "com.sun.star.io.TextInputStream" ) ), UNO_QUERY_THROW ); + Reference< XActiveDataSink > xDataSink( xFactory->createInstance( "com.sun.star.io.TextInputStream" ), UNO_QUERY_THROW ); xDataSink->setInputStream( rxInStrm ); xTextStrm.set( xDataSink, UNO_QUERY_THROW ); xTextStrm->setEncoding( OUString::createFromAscii( pcCharset ) ); diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 71450839bf67..648b10ded2fa 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -218,8 +218,8 @@ void lclPrepareConverter( PropertySet& rConverter, const Reference< XModel >& rx { Reference< XMultiServiceFactory > xModelFactory( rxDocModel, UNO_QUERY_THROW ); OUString aServiceName = bRange ? - CREATE_OUSTRING( "com.sun.star.table.CellRangeAddressConversion" ) : - CREATE_OUSTRING( "com.sun.star.table.CellAddressConversion" ); + OUString( "com.sun.star.table.CellRangeAddressConversion" ) : + OUString( "com.sun.star.table.CellAddressConversion" ); rConverter.set( xModelFactory->createInstance( aServiceName ) ); } catch (const Exception& e) @@ -358,15 +358,14 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo // create argument sequence NamedValue aValue; - aValue.Name = CREATE_OUSTRING( "BoundCell" ); + aValue.Name = "BoundCell"; aValue.Value <<= aAddress; Sequence< Any > aArgs( 1 ); aArgs[ 0 ] <<= aValue; // create the CellValueBinding instance and set at the control model Reference< XMultiServiceFactory > xModelFactory( mxDocModel, UNO_QUERY_THROW ); - Reference< XValueBinding > xBinding( xModelFactory->createInstanceWithArguments( - CREATE_OUSTRING( "com.sun.star.table.CellValueBinding" ), aArgs ), UNO_QUERY_THROW ); + Reference< XValueBinding > xBinding( xModelFactory->createInstanceWithArguments( "com.sun.star.table.CellValueBinding", aArgs ), UNO_QUERY_THROW ); xBindable->setValueBinding( xBinding ); } catch (const Exception& e) @@ -391,15 +390,14 @@ void ControlConverter::bindToSources( const Reference< XControlModel >& rxCtrlMo // create argument sequence NamedValue aValue; - aValue.Name = CREATE_OUSTRING( "CellRange" ); + aValue.Name = "CellRange"; aValue.Value <<= aRangeAddr; Sequence< Any > aArgs( 1 ); aArgs[ 0 ] <<= aValue; // create the EntrySource instance and set at the control model Reference< XMultiServiceFactory > xModelFactory( mxDocModel, UNO_QUERY_THROW ); - Reference< XListEntrySource > xEntrySource( xModelFactory->createInstanceWithArguments( - CREATE_OUSTRING( "com.sun.star.table.CellRangeListSource" ), aArgs ), UNO_QUERY_THROW ); + Reference< XListEntrySource > xEntrySource( xModelFactory->createInstanceWithArguments("com.sun.star.table.CellRangeListSource", aArgs ), UNO_QUERY_THROW ); xEntrySink->setListEntrySource( xEntrySource ); } catch (const Exception& e) @@ -612,38 +610,38 @@ OUString ControlModelBase::getServiceName() const ApiControlType eCtrlType = getControlType(); if( mbAwtModel ) switch( eCtrlType ) { - case API_CONTROL_BUTTON: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlButtonModel" ); - case API_CONTROL_FIXEDTEXT: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlFixedTextModel" ); - case API_CONTROL_IMAGE: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlImageControlModel" ); - case API_CONTROL_CHECKBOX: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlCheckBoxModel" ); - case API_CONTROL_RADIOBUTTON: return CREATE_OUSTRING( "com.sun.star.form.component.RadioButton" ); - case API_CONTROL_EDIT: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlEditModel" ); - case API_CONTROL_NUMERIC: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlNumericFieldModel" ); - case API_CONTROL_LISTBOX: return CREATE_OUSTRING( "com.sun.star.form.component.ListBox" ); - case API_CONTROL_COMBOBOX: return CREATE_OUSTRING( "com.sun.star.form.component.ComboBox" ); - case API_CONTROL_SPINBUTTON: return CREATE_OUSTRING( "com.sun.star.form.component.SpinButton" ); - case API_CONTROL_SCROLLBAR: return CREATE_OUSTRING( "com.sun.star.form.component.ScrollBar" ); - case API_CONTROL_PROGRESSBAR: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlProgressBarModel" ); - case API_CONTROL_GROUPBOX: return CREATE_OUSTRING( "com.sun.star.form.component.GroupBox" ); - case API_CONTROL_PAGE: return CREATE_OUSTRING( "com.sun.star.awt.UnoPageModel" ); - case API_CONTROL_MULTIPAGE: return CREATE_OUSTRING( "com.sun.star.awt.UnoMultiPageModel" ); - case API_CONTROL_DIALOG: return CREATE_OUSTRING( "com.sun.star.awt.UnoControlDialogModel" ); + case API_CONTROL_BUTTON: return OUString( "com.sun.star.awt.UnoControlButtonModel" ); + case API_CONTROL_FIXEDTEXT: return OUString( "com.sun.star.awt.UnoControlFixedTextModel" ); + case API_CONTROL_IMAGE: return OUString( "com.sun.star.awt.UnoControlImageControlModel" ); + case API_CONTROL_CHECKBOX: return OUString( "com.sun.star.awt.UnoControlCheckBoxModel" ); + case API_CONTROL_RADIOBUTTON: return OUString( "com.sun.star.form.component.RadioButton" ); + case API_CONTROL_EDIT: return OUString( "com.sun.star.awt.UnoControlEditModel" ); + case API_CONTROL_NUMERIC: return OUString( "com.sun.star.awt.UnoControlNumericFieldModel" ); + case API_CONTROL_LISTBOX: return OUString( "com.sun.star.form.component.ListBox" ); + case API_CONTROL_COMBOBOX: return OUString( "com.sun.star.form.component.ComboBox" ); + case API_CONTROL_SPINBUTTON: return OUString( "com.sun.star.form.component.SpinButton" ); + case API_CONTROL_SCROLLBAR: return OUString( "com.sun.star.form.component.ScrollBar" ); + case API_CONTROL_PROGRESSBAR: return OUString( "com.sun.star.awt.UnoControlProgressBarModel" ); + case API_CONTROL_GROUPBOX: return OUString( "com.sun.star.form.component.GroupBox" ); + case API_CONTROL_PAGE: return OUString( "com.sun.star.awt.UnoPageModel" ); + case API_CONTROL_MULTIPAGE: return OUString( "com.sun.star.awt.UnoMultiPageModel" ); + case API_CONTROL_DIALOG: return OUString( "com.sun.star.awt.UnoControlDialogModel" ); default: OSL_FAIL( "ControlModelBase::getServiceName - no AWT model service supported" ); } else switch( eCtrlType ) { - case API_CONTROL_BUTTON: return CREATE_OUSTRING( "com.sun.star.form.component.CommandButton" ); - case API_CONTROL_FIXEDTEXT: return CREATE_OUSTRING( "com.sun.star.form.component.FixedText" ); - case API_CONTROL_IMAGE: return CREATE_OUSTRING( "com.sun.star.form.component.DatabaseImageControl" ); - case API_CONTROL_CHECKBOX: return CREATE_OUSTRING( "com.sun.star.form.component.CheckBox" ); - case API_CONTROL_RADIOBUTTON: return CREATE_OUSTRING( "com.sun.star.form.component.RadioButton" ); - case API_CONTROL_EDIT: return CREATE_OUSTRING( "com.sun.star.form.component.TextField" ); - case API_CONTROL_NUMERIC: return CREATE_OUSTRING( "com.sun.star.form.component.NumericField" ); - case API_CONTROL_LISTBOX: return CREATE_OUSTRING( "com.sun.star.form.component.ListBox" ); - case API_CONTROL_COMBOBOX: return CREATE_OUSTRING( "com.sun.star.form.component.ComboBox" ); - case API_CONTROL_SPINBUTTON: return CREATE_OUSTRING( "com.sun.star.form.component.SpinButton" ); - case API_CONTROL_SCROLLBAR: return CREATE_OUSTRING( "com.sun.star.form.component.ScrollBar" ); - case API_CONTROL_GROUPBOX: return CREATE_OUSTRING( "com.sun.star.form.component.GroupBox" ); + case API_CONTROL_BUTTON: return OUString( "com.sun.star.form.component.CommandButton" ); + case API_CONTROL_FIXEDTEXT: return OUString( "com.sun.star.form.component.FixedText" ); + case API_CONTROL_IMAGE: return OUString( "com.sun.star.form.component.DatabaseImageControl" ); + case API_CONTROL_CHECKBOX: return OUString( "com.sun.star.form.component.CheckBox" ); + case API_CONTROL_RADIOBUTTON: return OUString( "com.sun.star.form.component.RadioButton" ); + case API_CONTROL_EDIT: return OUString( "com.sun.star.form.component.TextField" ); + case API_CONTROL_NUMERIC: return OUString( "com.sun.star.form.component.NumericField" ); + case API_CONTROL_LISTBOX: return OUString( "com.sun.star.form.component.ListBox" ); + case API_CONTROL_COMBOBOX: return OUString( "com.sun.star.form.component.ComboBox" ); + case API_CONTROL_SPINBUTTON: return OUString( "com.sun.star.form.component.SpinButton" ); + case API_CONTROL_SCROLLBAR: return OUString( "com.sun.star.form.component.ScrollBar" ); + case API_CONTROL_GROUPBOX: return OUString( "com.sun.star.form.component.GroupBox" ); default: OSL_FAIL( "ControlModelBase::getServiceName - no form component service supported" ); } return OUString(); @@ -674,7 +672,7 @@ void ControlModelBase::convertSize( PropertyMap& rPropMap, const ControlConverte ComCtlModelBase::ComCtlModelBase( sal_uInt32 nDataPartId5, sal_uInt32 nDataPartId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ) : - maFontData( CREATE_OUSTRING( "Tahoma" ), 82500 ), + maFontData( "Tahoma", 82500 ), mnFlags( 0 ), mnVersion( nVersion ), mnDataPartId5( nDataPartId5 ), @@ -2620,14 +2618,14 @@ Reference< XIndexContainer > EmbeddedForm::createXForm() try { Reference< XNameContainer > xFormsNC( mxFormsSupp->getForms(), UNO_SET_THROW ); - OUString aFormName = CREATE_OUSTRING( "Standard" ); + OUString aFormName = "Standard"; if( xFormsNC->hasByName( aFormName ) ) { mxFormIC.set( xFormsNC->getByName( aFormName ), UNO_QUERY_THROW ); } else if( mxModelFactory.is() ) { - Reference< XForm > xForm( mxModelFactory->createInstance( CREATE_OUSTRING( "com.sun.star.form.component.Form" ) ), UNO_QUERY_THROW ); + Reference< XForm > xForm( mxModelFactory->createInstance( "com.sun.star.form.component.Form" ), UNO_QUERY_THROW ); xFormsNC->insertByName( aFormName, Any( xForm ) ); mxFormIC.set( xForm, UNO_QUERY_THROW ); } diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx index af93537f4eb6..7cd0cadb515b 100644 --- a/oox/source/ole/axcontrolfragment.cxx +++ b/oox/source/ole/axcontrolfragment.cxx @@ -132,7 +132,7 @@ ContextHandlerRef AxControlFragment::onCreateContext( sal_Int32 nElement, const if( xStrgStrm.is() ) { OleStorage aStorage( getFilter().getComponentContext(), xStrgStrm, false ); - BinaryXInputStream aInStrm( aStorage.openInputStream( CREATE_OUSTRING( "f" ) ), true ); + BinaryXInputStream aInStrm( aStorage.openInputStream( "f" ), true ); if( !aInStrm.isEof() ) if( AxContainerModelBase* pModel = dynamic_cast< AxContainerModelBase* >( mrControl.createModelFromGuid( aClassId ) ) ) pModel->importBinaryModel( aInStrm ); diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx index 91dd7f33a7e3..6be9800faf94 100644 --- a/oox/source/ole/olehelper.cxx +++ b/oox/source/ole/olehelper.cxx @@ -379,7 +379,7 @@ public: void exportCompObj( const Reference< XOutputStream >& rxOut ); void exportControl( const Reference< XOutputStream >& rxOut, const ::com::sun::star::awt::Size& rSize ); }; -OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : maControl( CREATE_OUSTRING( "Unknown" ) ), mpModel( NULL ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel ) +OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : maControl( "Unknown" ), mpModel( NULL ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel ) { // try to get the guid Reference< com::sun::star::beans::XPropertySet > xProps( xCntrlModel, UNO_QUERY ); @@ -402,7 +402,7 @@ OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentCo Reference< XServiceInfo > xInfo( xCntrlModel, UNO_QUERY); if (xInfo-> - supportsService( CREATE_OUSTRING( "com.sun.star.form.component.FormattedField" ) ) ) + supportsService( "com.sun.star.form.component.FormattedField" ) ) nClassId = FORMULAFIELD; } else if ( nClassId == FormComponentType::COMMANDBUTTON ) @@ -416,9 +416,8 @@ OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentCo { Reference< XServiceInfo > xInfo( xCntrlModel, UNO_QUERY); - if (xInfo-> - supportsService(OUString( CREATE_OUSTRING( "com.sun.star.form.component.ImageControl" ) ) ) ) - nClassId = FormComponentType::IMAGECONTROL; + if (xInfo->supportsService("com.sun.star.form.component.ImageControl" ) ) + nClassId = FormComponentType::IMAGECONTROL; } GUIDCNamePairMap& cntrlMap = classIdToGUIDCNamePairMap::get(); @@ -427,7 +426,7 @@ OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentCo { aPropSet.getProperty(maName, PROP_Name ); maTypeName = OUString::createFromAscii( it->second.sName ); - maFullName = CREATE_OUSTRING( "Microsoft Forms 2.0 " ) + maTypeName; + maFullName = "Microsoft Forms 2.0 " + maTypeName; maControl = EmbeddedControl( maName ); maGUID = OUString::createFromAscii( it->second.sGUID ); mpModel = maControl.createModelFromGuid( maGUID ); @@ -474,7 +473,7 @@ MSConvertOCXControls::~MSConvertOCXControls() bool MSConvertOCXControls::importControlFromStream( ::oox::BinaryInputStream& rInStrm, Reference< XFormComponent >& rxFormComp, const OUString& rGuidString ) { - ::oox::ole::EmbeddedControl aControl( CREATE_OUSTRING( "Unknown" ) ); + ::oox::ole::EmbeddedControl aControl( "Unknown" ); if( ::oox::ole::ControlModelBase* pModel = aControl.createModelFromGuid( rGuidString ) ) { pModel->importBinaryModel( rInStrm ); @@ -541,14 +540,14 @@ sal_Bool MSConvertOCXControls::ReadOCXStorage( SotStorageRef& xOleStg, { if ( xOleStg.Is() ) { - SvStorageStreamRef pNameStream = xOleStg->OpenSotStream( CREATE_OUSTRING("\3OCXNAME")); + SvStorageStreamRef pNameStream = xOleStg->OpenSotStream( OUString("\3OCXNAME")); BinaryXInputStream aNameStream( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pNameStream ) ), true ); - SvStorageStreamRef pContents = xOleStg->OpenSotStream( CREATE_OUSTRING("contents")); + SvStorageStreamRef pContents = xOleStg->OpenSotStream( OUString("contents")); BinaryXInputStream aInStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper( *pContents ) ), true ); - SvStorageStreamRef pClsStrm = xOleStg->OpenSotStream( CREATE_OUSTRING("\1CompObj") ); + SvStorageStreamRef pClsStrm = xOleStg->OpenSotStream(OUString("\1CompObj")); BinaryXInputStream aClsStrm( Reference< XInputStream >( new utl::OSeekableInputStreamWrapper(*pClsStrm ) ), true ); aClsStrm.skip(12); @@ -588,17 +587,17 @@ sal_Bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxMode rName = exportHelper.getTypeName(); xOleStg->SetClass( aName,0x5C,sFullName); { - SvStorageStreamRef pNameStream = xOleStg->OpenSotStream( CREATE_OUSTRING("\3OCXNAME")); + SvStorageStreamRef pNameStream = xOleStg->OpenSotStream(OUString("\3OCXNAME")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pNameStream ); exportHelper.exportName( xOut ); } { - SvStorageStreamRef pObjStream = xOleStg->OpenSotStream( CREATE_OUSTRING("\1CompObj")); + SvStorageStreamRef pObjStream = xOleStg->OpenSotStream(OUString("\1CompObj")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pObjStream ); exportHelper.exportCompObj( xOut ); } { - SvStorageStreamRef pContents = xOleStg->OpenSotStream( CREATE_OUSTRING("contents")); + SvStorageStreamRef pContents = xOleStg->OpenSotStream(OUString("contents")); Reference< XOutputStream > xOut = new utl::OSeekableOutputStreamWrapper( *pContents ); exportHelper.exportControl( xOut, rSize ); } @@ -629,7 +628,7 @@ const Reference< XIndexContainer >& Reference< XNameContainer > xNameCont = xFormsSupplier->getForms(); - OUString sStdName = CREATE_OUSTRING( "WW-Standard" ); + OUString sStdName = "WW-Standard"; OUString sName( sStdName ); sal_uInt16 n = 0; @@ -645,15 +644,14 @@ const Reference< XIndexContainer >& return mxFormComps; Reference< XInterface > xCreate = - rServiceFactory->createInstance( CREATE_OUSTRING( - "com.sun.star.form.component.Form")); + rServiceFactory->createInstance("com.sun.star.form.component.Form"); if( xCreate.is() ) { Reference< XPropertySet > xFormPropSet( xCreate, UNO_QUERY ); Any aTmp(&sName,getCppuType((OUString *)0)); - xFormPropSet->setPropertyValue( CREATE_OUSTRING("Name"), aTmp ); + xFormPropSet->setPropertyValue( "Name", aTmp ); Reference< XForm > xForm( xCreate, UNO_QUERY ); OSL_ENSURE(xForm.is(), "No Form?"); diff --git a/oox/source/ole/oleobjecthelper.cxx b/oox/source/ole/oleobjecthelper.cxx index 382ceee8676f..9d089607517e 100644 --- a/oox/source/ole/oleobjecthelper.cxx +++ b/oox/source/ole/oleobjecthelper.cxx @@ -53,12 +53,12 @@ OleObjectInfo::OleObjectInfo() : // ============================================================================ OleObjectHelper::OleObjectHelper( const Reference< XMultiServiceFactory >& rxModelFactory ) : - maEmbeddedObjScheme( CREATE_OUSTRING( "vnd.sun.star.EmbeddedObject:" ) ), + maEmbeddedObjScheme( "vnd.sun.star.EmbeddedObject:" ), mnObjectId( 100 ) { if( rxModelFactory.is() ) try { - mxResolver.set( rxModelFactory->createInstance( CREATE_OUSTRING( "com.sun.star.document.ImportEmbeddedObjectResolver" ) ), UNO_QUERY ); + mxResolver.set( rxModelFactory->createInstance( "com.sun.star.document.ImportEmbeddedObjectResolver" ), UNO_QUERY ); } catch(const Exception& ) { @@ -95,7 +95,7 @@ bool OleObjectHelper::importOleObject( PropertyMap& rPropMap, const OleObjectInf // embedded OLE object - import the embedded data if( rOleObject.maEmbeddedData.hasElements() && mxResolver.is() ) try { - OUString aObjectId = CREATE_OUSTRING( "Obj" ) + OUString::valueOf( mnObjectId++ ); + OUString aObjectId = "Obj" + OUString::valueOf( mnObjectId++ ); Reference< XNameAccess > xResolverNA( mxResolver, UNO_QUERY_THROW ); Reference< XOutputStream > xOutStrm( xResolverNA->getByName( aObjectId ), UNO_QUERY_THROW ); diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx index 26b16a15e372..d6d47f04c1f0 100644 --- a/oox/source/ole/olestorage.cxx +++ b/oox/source/ole/olestorage.cxx @@ -246,8 +246,7 @@ void OleStorage::initStorage( const Reference< XInputStream >& rxInStream ) Sequence< Any > aArgs( 2 ); aArgs[ 0 ] <<= xInStrm; aArgs[ 1 ] <<= true; // true = do not create a copy of the input stream - mxStorage.set( xFactory->createInstanceWithArguments( - CREATE_OUSTRING( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), UNO_QUERY_THROW ); + mxStorage.set( xFactory->createInstanceWithArguments("com.sun.star.embed.OLESimpleStorage", aArgs ), UNO_QUERY_THROW ); } catch(const Exception& ) { @@ -263,8 +262,7 @@ void OleStorage::initStorage( const Reference< XStream >& rxOutStream ) Sequence< Any > aArgs( 2 ); aArgs[ 0 ] <<= rxOutStream; aArgs[ 1 ] <<= true; // true = do not create a copy of the stream - mxStorage.set( xFactory->createInstanceWithArguments( - CREATE_OUSTRING( "com.sun.star.embed.OLESimpleStorage" ), aArgs ), UNO_QUERY_THROW ); + mxStorage.set( xFactory->createInstanceWithArguments("com.sun.star.embed.OLESimpleStorage", aArgs ), UNO_QUERY_THROW ); } catch(const Exception& ) { diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx index 56c8cbbd19c1..6c311e251c0a 100644 --- a/oox/source/ole/vbacontrol.cxx +++ b/oox/source/ole/vbacontrol.cxx @@ -101,7 +101,7 @@ private: }; VbaControlNamesSet::VbaControlNamesSet() : - maDummyBaseName( CREATE_OUSTRING( "DummyGroupSep" ) ), + maDummyBaseName( "DummyGroupSep" ), mnIndex( 0 ) { } @@ -155,7 +155,7 @@ VbaDummyFormControl::VbaDummyFormControl( const OUString& rName ) mxCtrlModel.reset( new AxLabelModel ); mxCtrlModel->setAwtModelMode(); - mxCtrlModel->importProperty( XML_Size, CREATE_OUSTRING( "10;10" ) ); + mxCtrlModel->importProperty( XML_Size, "10;10" ); } } // namespace @@ -393,7 +393,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla { /* Open the 'f' stream containing the model of this control and a list of site models for all child controls. */ - BinaryXInputStream aFStrm( rStrg.openInputStream( CREATE_OUSTRING( "f" ) ), true ); + BinaryXInputStream aFStrm( rStrg.openInputStream( "f" ), true ); OSL_ENSURE( !aFStrm.isEof(), "VbaFormControl::importStorage - missing 'f' stream" ); /* Read the properties of this container control and the class table @@ -409,7 +409,7 @@ void VbaFormControl::importStorage( StorageBase& rStrg, const AxClassTable& rCla /* Open the 'o' stream containing models of embedded simple controls. Stream may be empty or missing, if this control contains no controls or only container controls. */ - BinaryXInputStream aOStrm( rStrg.openInputStream( CREATE_OUSTRING( "o" ) ), true ); + BinaryXInputStream aOStrm( rStrg.openInputStream( "o" ), true ); /* Iterate over all embedded controls, import model from 'o' stream (for embedded simple controls) or from the substorage @@ -742,14 +742,14 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib, return; // check that the '03VBFrame' stream exists, this is required for forms - BinaryXInputStream aInStrm( rVbaFormStrg.openInputStream( CREATE_OUSTRING( "\003VBFrame" ) ), true ); + BinaryXInputStream aInStrm( rVbaFormStrg.openInputStream( "\003VBFrame" ), true ); OSL_ENSURE( !aInStrm.isEof(), "VbaUserForm::importForm - missing \\003VBFrame stream" ); if( aInStrm.isEof() ) return; // scan for the line 'Begin {GUID} <FormName>' TextInputStream aFrameTextStrm( mxContext, aInStrm, eTextEnc ); - const OUString aBegin = CREATE_OUSTRING( "Begin" ); + const OUString aBegin = "Begin"; OUString aLine; bool bBeginFound = false; while( !bBeginFound && !aFrameTextStrm.isEof() ) @@ -758,7 +758,7 @@ void VbaUserForm::importForm( const Reference< XNameContainer >& rxDialogLib, bBeginFound = lclEatKeyword( aLine, aBegin ); } // check for the specific GUID that represents VBA forms - if( !bBeginFound || !lclEatKeyword( aLine, CREATE_OUSTRING( "{C62A69F0-16DC-11CE-9E98-00AA00574A4F}" ) ) ) + if( !bBeginFound || !lclEatKeyword( aLine, "{C62A69F0-16DC-11CE-9E98-00AA00574A4F}" ) ) return; // remaining line is the form name diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index f6a42a20e41b..f936b9040512 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -70,7 +70,7 @@ bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUS // some applications do not support all configuration items, assume 'false' in this case try { - Any aItem = ConfigurationHelper::readRelativeKey( rxConfigAccess, CREATE_OUSTRING( "Filter/Import/VBA" ), rItemName ); + Any aItem = ConfigurationHelper::readRelativeKey( rxConfigAccess, "Filter/Import/VBA", rItemName ); return aItem.has< bool >() && aItem.get< bool >(); } catch(const Exception& ) @@ -89,7 +89,7 @@ VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContex if( rxContext.is() ) try { OSL_ENSURE( !rConfigCompName.isEmpty(), "VbaFilterConfig::VbaFilterConfig - invalid configuration component name" ); - OUString aConfigPackage = CREATE_OUSTRING( "org.openoffice.Office." ) + rConfigCompName; + OUString aConfigPackage = "org.openoffice.Office." + rConfigCompName; mxConfigAccess = ConfigurationHelper::openConfig( rxContext, aConfigPackage, ConfigurationHelper::E_READONLY ); } catch(const Exception& ) @@ -104,17 +104,17 @@ VbaFilterConfig::~VbaFilterConfig() bool VbaFilterConfig::isImportVba() const { - return lclReadConfigItem( mxConfigAccess, CREATE_OUSTRING( "Load" ) ); + return lclReadConfigItem( mxConfigAccess, "Load" ); } bool VbaFilterConfig::isImportVbaExecutable() const { - return lclReadConfigItem( mxConfigAccess, CREATE_OUSTRING( "Executable" ) ); + return lclReadConfigItem( mxConfigAccess, "Executable" ); } bool VbaFilterConfig::isExportVba() const { - return lclReadConfigItem( mxConfigAccess, CREATE_OUSTRING( "Save" ) ); + return lclReadConfigItem( mxConfigAccess, "Save" ); } // ============================================================================ @@ -147,7 +147,7 @@ VbaProject::VbaProject( const Reference< XComponentContext >& rxContext, VbaFilterConfig( rxContext, rConfigCompName ), mxContext( rxContext ), mxDocModel( rxDocModel ), - maPrjName( CREATE_OUSTRING( "Standard" ) ) + maPrjName( "Standard" ) { OSL_ENSURE( mxContext.is(), "VbaProject::VbaProject - missing component context" ); OSL_ENSURE( mxDocModel.is(), "VbaProject::VbaProject - missing document model" ); @@ -264,7 +264,7 @@ Reference< XNameContainer > VbaProject::createDialogLibrary() void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) { - StorageRef xVbaStrg = rVbaPrjStrg.openSubStorage( CREATE_OUSTRING( "VBA" ), false ); + StorageRef xVbaStrg = rVbaPrjStrg.openSubStorage( "VBA", false ); OSL_ENSURE( xVbaStrg.get(), "VbaProject::importVba - cannot open 'VBA' substorage" ); if( !xVbaStrg ) return; @@ -273,7 +273,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap project such as the text encoding used throughout several streams, and a list of all code modules. */ - BinaryXInputStream aInStrm( xVbaStrg->openInputStream( CREATE_OUSTRING( "dir" ) ), true ); + BinaryXInputStream aInStrm( xVbaStrg->openInputStream( "dir" ), true ); // VbaInputStream implements decompression VbaInputStream aDirStrm( aInStrm ); OSL_ENSURE( !aDirStrm.isEof(), "VbaProject::importVba - cannot open 'dir' stream" ); @@ -362,7 +362,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap - The line 'BaseClass=<modulename>' declares a code module attached to a user form with the same name. */ - BinaryXInputStream aPrjStrm( rVbaPrjStrg.openInputStream( CREATE_OUSTRING( "PROJECT" ) ), true ); + BinaryXInputStream aPrjStrm( rVbaPrjStrg.openInputStream( "PROJECT" ), true ); OSL_ENSURE( !aPrjStrm.isEof(), "VbaProject::importVba - cannot open 'PROJECT' stream" ); // do not exit if this stream does not exist, but proceed to load the modules below if( !aPrjStrm.isEof() ) @@ -443,7 +443,7 @@ void VbaProject::importVba( StorageBase& rVbaPrjStrg, const GraphicHelper& rGrap Reference< XNameAccess > xDocObjectNA; try { - xDocObjectNA.set( xModelFactory->createInstance( CREATE_OUSTRING( "ooo.vba.VBAObjectModuleObjectProvider" ) ), UNO_QUERY ); + xDocObjectNA.set( xModelFactory->createInstance( "ooo.vba.VBAObjectModuleObjectProvider" ), UNO_QUERY ); } catch(const Exception& ) { @@ -515,7 +515,7 @@ void VbaProject::attachMacros() aArgs[ 0 ] <<= mxDocModel; aArgs[ 1 ] <<= maPrjName; Reference< XVBAMacroResolver > xResolver( xFactory->createInstanceWithArgumentsAndContext( - CREATE_OUSTRING( "com.sun.star.script.vba.VBAMacroResolver" ), aArgs, mxContext ), UNO_QUERY_THROW ); + "com.sun.star.script.vba.VBAMacroResolver", aArgs, mxContext ), UNO_QUERY_THROW ); maMacroAttachers.forEachMem( &VbaMacroAttacherBase::resolveAndAttachMacro, ::boost::cref( xResolver ) ); } catch(const Exception& ) @@ -531,7 +531,7 @@ void VbaProject::copyStorage( StorageBase& rVbaPrjStrg ) Reference< XStorage > xDocStorage( xStorageBasedDoc->getDocumentStorage(), UNO_QUERY_THROW ); { const sal_Int32 nOpenMode = ElementModes::SEEKABLE | ElementModes::WRITE | ElementModes::TRUNCATE; - Reference< XStream > xDocStream( xDocStorage->openStreamElement( CREATE_OUSTRING( "_MS_VBA_Macros" ), nOpenMode ), UNO_SET_THROW ); + Reference< XStream > xDocStream( xDocStorage->openStreamElement( "_MS_VBA_Macros", nOpenMode ), UNO_SET_THROW ); OleStorage aDestStorage( mxContext, xDocStream, false ); rVbaPrjStrg.copyStorageToStorage( aDestStorage ); aDestStorage.commit(); diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx index 4c5e15421b28..ddc4c14aeb3a 100644 --- a/oox/source/ppt/commontimenodecontext.cxx +++ b/oox/source/ppt/commontimenodecontext.cxx @@ -385,7 +385,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId if( attribs.hasAttribute( XML_afterEffect ) ) { - aUserData[ CREATE_OUSTRING( "after-effect" ) ] + aUserData[ "after-effect" ] = makeAny( attribs.getBool( XML_afterEffect, false ) ); } aProps[ NP_AUTOREVERSE ] = makeAny( attribs.getBool( XML_autoRev, false ) ); @@ -503,7 +503,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId nEnum = EffectNodeType::DEFAULT; break; } - aUserData[ CREATE_OUSTRING( "node-type" ) ] <<= nEnum; + aUserData[ "node-type" ] <<= nEnum; } // ST_TLTimeNodePresetClassType @@ -537,7 +537,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId nEffectPresetClass = 0; break; } - aUserData[ CREATE_OUSTRING( "preset-class" ) ] = makeAny( nEffectPresetClass ); + aUserData[ "preset-class" ] = makeAny( nEffectPresetClass ); if( attribs.hasAttribute( XML_presetID ) ) { sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 ); @@ -545,13 +545,12 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId while( p->mpStrPresetId && ((p->mnPresetClass != nEffectPresetClass) || (p->mnPresetId != nPresetId )) ) p++; - aUserData[ CREATE_OUSTRING( "preset-id" ) ] + aUserData[ "preset-id" ] = makeAny( OUString::createFromAscii( p->mpStrPresetId ) ); sal_Int32 nPresetSubType = attribs.getInteger( XML_presetSubtype, 0 ); if( nPresetSubType ) { - aUserData[ CREATE_OUSTRING( "preset-sub-type" ) ] - = makeAny( getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ) ); + aUserData[ "preset-sub-type" ] = makeAny( getConvertedSubType( nEffectPresetClass, nPresetId, nPresetSubType ) ); } } } diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx index 10d4e1db944f..0918f82eaa90 100644 --- a/oox/source/ppt/dgmimport.cxx +++ b/oox/source/ppt/dgmimport.cxx @@ -33,12 +33,12 @@ namespace oox { namespace ppt { OUString SAL_CALL QuickDiagrammingImport_getImplementationName() throw() { - return CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" ); + return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" ); } uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNames() throw() { - const OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ooxpptx.dgm.import" ); + const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.import"; const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx index ace557416c38..3fec83658de9 100644 --- a/oox/source/ppt/dgmlayout.cxx +++ b/oox/source/ppt/dgmlayout.cxx @@ -39,12 +39,12 @@ namespace oox { namespace ppt { OUString SAL_CALL QuickDiagrammingLayout_getImplementationName() throw() { - return CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.QuickDiagrammingLayout" ); + return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingLayout" ); } uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNames() throw() { - const OUString aServiceName = CREATE_OUSTRING( "com.sun.star.comp.ooxpptx.dgm.layout" ); + const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.layout"; const Sequence< OUString > aSeq( &aServiceName, 1 ); return aSeq; } @@ -84,8 +84,7 @@ bool QuickDiagrammingLayout::importDocument() throw() Reference<beans::XPropertySet> xPropSet2(xMasterPage, UNO_QUERY_THROW); Reference<xml::dom::XDocument> xThemeFragment; - xPropSet2->getPropertyValue( - CREATE_OUSTRING("PPTTheme")) >>= xThemeFragment; + xPropSet2->getPropertyValue("PPTTheme") >>= xThemeFragment; importFragment( new ThemeFragmentHandler( @@ -101,14 +100,10 @@ bool QuickDiagrammingLayout::importDocument() throw() Reference<xml::dom::XDocument> xQStyleDom; Reference<xml::dom::XDocument> xColorStyleDom; - xPropSet->getPropertyValue( - CREATE_OUSTRING("DiagramData")) >>= xDataModelDom; - xPropSet->getPropertyValue( - CREATE_OUSTRING("DiagramLayout")) >>= xLayoutDom; - xPropSet->getPropertyValue( - CREATE_OUSTRING("DiagramQStyle")) >>= xQStyleDom; - xPropSet->getPropertyValue( - CREATE_OUSTRING("DiagramColorStyle")) >>= xColorStyleDom; + xPropSet->getPropertyValue("DiagramData") >>= xDataModelDom; + xPropSet->getPropertyValue("DiagramLayout") >>= xLayoutDom; + xPropSet->getPropertyValue("DiagramQStyle") >>= xQStyleDom; + xPropSet->getPropertyValue("DiagramColorStyle") >>= xColorStyleDom; oox::drawingml::ShapePtr pShape( new oox::drawingml::Shape( "com.sun.star.drawing.DiagramShape" ) ); diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx index 06355264069b..a7e992219f8d 100644 --- a/oox/source/ppt/pptimport.cxx +++ b/oox/source/ppt/pptimport.cxx @@ -36,14 +36,14 @@ namespace oox { namespace ppt { OUString SAL_CALL PowerPointImport_getImplementationName() throw() { - return CREATE_OUSTRING( "com.sun.star.comp.oox.ppt.PowerPointImport" ); + return OUString( "com.sun.star.comp.oox.ppt.PowerPointImport" ); } uno::Sequence< OUString > SAL_CALL PowerPointImport_getSupportedServiceNames() throw() { Sequence< OUString > aSeq( 2 ); - aSeq[ 0 ] = CREATE_OUSTRING( "com.sun.star.document.ImportFilter" ); - aSeq[ 1 ] = CREATE_OUSTRING( "com.sun.star.document.ExportFilter" ); + aSeq[ 0 ] = "com.sun.star.document.ImportFilter"; + aSeq[ 1 ] = "com.sun.star.document.ExportFilter"; return aSeq; } @@ -140,7 +140,7 @@ sal_Bool SAL_CALL PowerPointImport::filter( const Sequence< PropertyValue >& rDe return true; if( isExportFilter() ) { - Reference< XExporter > xExporter( getServiceFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.Impress.oox.PowerPointExport" ) ), UNO_QUERY ); + Reference< XExporter > xExporter( getServiceFactory()->createInstance( "com.sun.star.comp.Impress.oox.PowerPointExport" ), UNO_QUERY ); if( xExporter.is() ) { Reference< XComponent > xDocument( getModel(), UNO_QUERY ); @@ -209,7 +209,7 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() const ::oox::ole::VbaProject* PowerPointImport::implCreateVbaProject() const { - return new ::oox::ole::VbaProject( getComponentContext(), getModel(), CREATE_OUSTRING( "Impress" ) ); + return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Impress" ); } OUString PowerPointImport::implGetImplementationName() const diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx index 196a470ea8a7..903337257f4b 100644 --- a/oox/source/ppt/presentationfragmenthandler.cxx +++ b/oox/source/ppt/presentationfragmenthandler.cxx @@ -79,7 +79,7 @@ void ResolveTextFields( XmlFilterBase& rFilter ) oox::core::TextFieldStack::const_iterator aIter( rTextFields.begin() ); while( aIter != rTextFields.end() ) { - const OUString sURL = CREATE_OUSTRING( "URL" ); + const OUString sURL = "URL"; Reference< drawing::XDrawPagesSupplier > xDPS( xModel, uno::UNO_QUERY_THROW ); Reference< drawing::XDrawPages > xDrawPages( xDPS->getDrawPages(), uno::UNO_QUERY_THROW ); @@ -91,8 +91,8 @@ void ResolveTextFields( XmlFilterBase& rFilter ) OUString aURL; if ( xPropSet->getPropertyValue( sURL ) >>= aURL ) { - const OUString sSlide = CREATE_OUSTRING( "#Slide " ); - const OUString sNotes = CREATE_OUSTRING( "#Notes " ); + const OUString sSlide = "#Slide "; + const OUString sNotes = "#Notes "; sal_Bool bNotes = sal_False; sal_Int32 nPageNumber = 0; if ( aURL.match( sSlide ) ) @@ -114,7 +114,7 @@ void ResolveTextFields( XmlFilterBase& rFilter ) xDrawPage = xPresentationPage->getNotesPage(); } Reference< container::XNamed > xNamed( xDrawPage, UNO_QUERY_THROW ); - aURL = CREATE_OUSTRING( "#" ).concat( xNamed->getName() ); + aURL = OUString( "#" ).concat( xNamed->getName() ); xPropSet->setPropertyValue( sURL, Any( aURL ) ); Reference< text::XTextContent > xContent( rTextField.xTextField, UNO_QUERY); Reference< text::XTextRange > xTextRange( rTextField.xTextCursor, UNO_QUERY ); @@ -338,7 +338,7 @@ bool PresentationFragmentHandler::importSlide( const FragmentHandlerRef& rxSlide SlidePersistPtr pMasterPersistPtr( pSlidePersistPtr->getMasterPersist() ); if ( pMasterPersistPtr.get() ) { - const OUString sLayout = CREATE_OUSTRING( "Layout" ); + const OUString sLayout = "Layout"; uno::Reference< beans::XPropertySet > xSet( xSlide, uno::UNO_QUERY_THROW ); xSet->setPropertyValue( sLayout, Any( pMasterPersistPtr->getLayoutFromValueToken() ) ); } diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx index b1f72b56ed86..0a266ba03922 100644 --- a/oox/source/ppt/soundactioncontext.cxx +++ b/oox/source/ppt/soundactioncontext.cxx @@ -70,7 +70,7 @@ namespace oox { namespace ppt { } // else if( mbStopSound ) // { -// maSlideProperties[ CREATE_OUSTRING( "" ) ] = Any( sal_True ); +// maSlideProperties[ "" ] = Any( sal_True ); // } } } diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx index e02d3cf7e0d4..eb0f55b845ac 100644 --- a/oox/source/ppt/timenode.cxx +++ b/oox/source/ppt/timenode.cxx @@ -58,34 +58,34 @@ namespace oox { namespace ppt { switch( nNodeType ) { case AnimationNodeType::PAR: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.ParallelTimeContainer"); + sServiceName = "com.sun.star.animations.ParallelTimeContainer"; break; case AnimationNodeType::SEQ: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.SequenceTimeContainer"); + sServiceName = "com.sun.star.animations.SequenceTimeContainer"; break; case AnimationNodeType::ANIMATE: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.Animate"); + sServiceName = "com.sun.star.animations.Animate"; break; case AnimationNodeType::ANIMATECOLOR: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateColor"); + sServiceName = "com.sun.star.animations.AnimateColor"; break; case AnimationNodeType::TRANSITIONFILTER: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.TransitionFilter"); + sServiceName = "com.sun.star.animations.TransitionFilter"; break; case AnimationNodeType::ANIMATEMOTION: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateMotion"); + sServiceName = "com.sun.star.animations.AnimateMotion"; break; case AnimationNodeType::ANIMATETRANSFORM: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateTransform"); + sServiceName = "com.sun.star.animations.AnimateTransform"; break; case AnimationNodeType::COMMAND: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.Command"); + sServiceName = "com.sun.star.animations.Command"; break; case AnimationNodeType::SET: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.AnimateSet"); + sServiceName = "com.sun.star.animations.AnimateSet"; break; case AnimationNodeType::AUDIO: - sServiceName = CREATE_OUSTRING("com.sun.star.animations.Audio"); + sServiceName = "com.sun.star.animations.Audio"; break; default: OSL_TRACE( "OOX: uhandled type %x", nNodeType ); @@ -546,7 +546,7 @@ namespace oox { namespace ppt { case AnimationNodeType::SEQ: { sal_Int16 nEnum = 0; - if( maUserData[ CREATE_OUSTRING( "node-type" ) ] >>= nEnum ) + if( maUserData[ "node-type" ] >>= nEnum ) { if( nEnum == EffectNodeType::MAIN_SEQUENCE ) { diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 51594fe7c22d..3247f15c5d95 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -277,7 +277,7 @@ namespace oox { namespace ppt { double fMediaTime = ::rtl::math::stringToDouble( aMediaTime, (sal_Unicode)('.'), (sal_Unicode)(','), &eStatus, NULL ); if( eStatus == rtl_math_ConversionStatus_Ok ) { - aParamValue.Name = CREATE_OUSTRING("MediaTime"); + aParamValue.Name = "MediaTime"; aParamValue.Value <<= fMediaTime; } nCommand = EffectCommands::PLAY; @@ -296,7 +296,7 @@ namespace oox { namespace ppt { if( nCommand == EffectCommands::CUSTOM ) { OSL_TRACE("OOX: CmdTimeNodeContext::endFastElement(), unknown command!"); - aParamValue.Name = CREATE_OUSTRING("UserDefined"); + aParamValue.Name = "UserDefined"; aParamValue.Value <<= msCommand; } if( aParamValue.Value.hasValue() ) diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index eeeae937be3f..11bab219184c 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -33,14 +33,14 @@ using namespace drawingml; ::rtl::OUString SAL_CALL ShapeContextHandler_getImplementationName() { - return CREATE_OUSTRING( "com.sun.star.comp.oox.ShapeContextHandler" ); + return OUString( "com.sun.star.comp.oox.ShapeContextHandler" ); } uno::Sequence< ::rtl::OUString > SAL_CALL ShapeContextHandler_getSupportedServiceNames() { uno::Sequence< ::rtl::OUString > s(1); - s[0] = CREATE_OUSTRING( "com.sun.star.xml.sax.FastShapeContextHandler" ); + s[0] = "com.sun.star.xml.sax.FastShapeContextHandler"; return s; } diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx index a4e66102a6d4..c1cebda87950 100644 --- a/oox/source/shape/ShapeFilterBase.cxx +++ b/oox/source/shape/ShapeFilterBase.cxx @@ -64,7 +64,7 @@ const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles ::oox::ole::VbaProject* ShapeFilterBase::implCreateVbaProject() const { - return new ::oox::ole::VbaProject( getComponentContext(), getModel(), CREATE_OUSTRING( "Writer" ) ); + return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Writer" ); } ::rtl::OUString ShapeFilterBase::implGetImplementationName() const diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx index e986b851289f..c68f89619ac4 100644 --- a/oox/source/vml/vmldrawing.cxx +++ b/oox/source/vml/vmldrawing.cxx @@ -57,7 +57,7 @@ namespace { OUString lclGetShapeId( sal_Int32 nShapeId ) { // identifier consists of a literal NUL character, a lowercase 's', and the id - return CREATE_OUSTRING( "\0s" ) + OUString::valueOf( nShapeId ); + return OUString( "\0s" ) + OUString::valueOf( nShapeId ); } /** Returns the numeric VML shape identifier from its textual representation. */ @@ -249,7 +249,7 @@ Reference< XShape > Drawing::createAndInsertXControlShape( const ::oox::ole::Emb Reference< XControlModel > xCtrlModel( getControlForm().convertAndInsert( rControl, rnCtrlIndex ), UNO_SET_THROW ); // create the control shape - xShape = createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.ControlShape" ), rxShapes, rShapeRect ); + xShape = createAndInsertXShape( "com.sun.star.drawing.ControlShape", rxShapes, rShapeRect ); // set the control model at the shape Reference< XControlShape >( xShape, UNO_QUERY_THROW )->setControl( xCtrlModel ); diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 6b280b4d1842..8aba860d146c 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -542,7 +542,7 @@ Reference< XShape > SimpleShape::createPictureObject( const Reference< XShapes > // ============================================================================ RectangleShape::RectangleShape( Drawing& rDrawing ) : - SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.RectangleShape" ) ) + SimpleShape( rDrawing, "com.sun.star.drawing.RectangleShape" ) { } @@ -576,14 +576,14 @@ Reference<XShape> RectangleShape::implConvertAndInsert(const Reference<XShapes>& // ============================================================================ EllipseShape::EllipseShape( Drawing& rDrawing ) : - SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.EllipseShape" ) ) + SimpleShape( rDrawing, "com.sun.star.drawing.EllipseShape" ) { } // ============================================================================ PolyLineShape::PolyLineShape( Drawing& rDrawing ) : - SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.PolyLineShape" ) ) + SimpleShape( rDrawing, "com.sun.star.drawing.PolyLineShape" ) { } @@ -711,7 +711,7 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes // ============================================================================ CustomShape::CustomShape( Drawing& rDrawing ) : - SimpleShape( rDrawing, CREATE_OUSTRING( "com.sun.star.drawing.CustomShape" ) ) + SimpleShape( rDrawing, "com.sun.star.drawing.CustomShape" ) { } @@ -759,7 +759,7 @@ Reference< XShape > ComplexShape::implConvertAndInsert( const Reference< XShapes awt::Size aOleSize( rShapeRect.Width, rShapeRect.Height ); if( rFilter.getOleObjectHelper().importOleObject( aOleProps, *pOleObjectInfo, aOleSize ) ) { - Reference< XShape > xShape = mrDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.OLE2Shape" ), rxShapes, rShapeRect ); + Reference< XShape > xShape = mrDrawing.createAndInsertXShape( "com.sun.star.drawing.OLE2Shape", rxShapes, rShapeRect ); if( xShape.is() ) { // set the replacement graphic @@ -857,7 +857,7 @@ Reference< XShape > GroupShape::implConvertAndInsert( const Reference< XShapes > aParentAnchor.maCoordSys = getCoordSystem(); if( !mxChildren->empty() && (aParentAnchor.maCoordSys.Width > 0) && (aParentAnchor.maCoordSys.Height > 0) ) try { - xGroupShape = mrDrawing.createAndInsertXShape( CREATE_OUSTRING( "com.sun.star.drawing.GroupShape" ), rxShapes, rShapeRect ); + xGroupShape = mrDrawing.createAndInsertXShape( "com.sun.star.drawing.GroupShape", rxShapes, rShapeRect ); Reference< XShapes > xChildShapes( xGroupShape, UNO_QUERY_THROW ); mxChildren->convertAndInsert( xChildShapes, &aParentAnchor ); // no child shape has been created - delete the group shape |