[Libreoffice-commits] .: oox/inc oox/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 4 07:12:11 PST 2013
oox/inc/oox/core/relations.hxx | 6
oox/inc/oox/dump/dumperbase.hxx | 9
oox/inc/oox/helper/helper.hxx | 5
oox/source/core/fastparser.cxx | 2
oox/source/core/fasttokenhandler.cxx | 4
oox/source/core/filterbase.cxx | 23
oox/source/core/filterdetect.cxx | 48
oox/source/core/xmlfilterbase.cxx | 30
oox/source/docprop/ooxmldocpropimport.cxx | 6
oox/source/drawingml/chart/axisconverter.cxx | 12
oox/source/drawingml/chart/chartconverter.cxx | 2
oox/source/drawingml/chart/chartspaceconverter.cxx | 2
oox/source/drawingml/chart/objectformatter.cxx | 2
oox/source/drawingml/chart/plotareaconverter.cxx | 2
oox/source/drawingml/chart/seriesconverter.cxx | 32
oox/source/drawingml/chart/titleconverter.cxx | 6
oox/source/drawingml/chart/typegroupconverter.cxx | 20
oox/source/drawingml/customshapegeometry.cxx | 126 +-
oox/source/drawingml/customshapepresets1.cxx | 832 ++++++-------
oox/source/drawingml/customshapepresets2.cxx | 732 +++++------
oox/source/drawingml/customshapepresets3.cxx | 734 +++++------
oox/source/drawingml/customshapepresets4.cxx | 730 +++++------
oox/source/drawingml/customshapepresets5.cxx | 858 +++++++-------
oox/source/drawingml/customshapepresets6.cxx | 316 ++---
oox/source/drawingml/customshapeproperties.cxx | 6
oox/source/drawingml/customshapes/generatePresetsCXX.pl | 2
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 2
oox/source/drawingml/fillproperties.cxx | 4
oox/source/drawingml/hyperlinkcontext.cxx | 18
oox/source/drawingml/lineproperties.cxx | 10
oox/source/drawingml/shape.cxx | 12
oox/source/drawingml/textcharacterpropertiescontext.cxx | 2
oox/source/drawingml/textfield.cxx | 14
oox/source/drawingml/textparagraph.cxx | 2
oox/source/drawingml/textparagraphproperties.cxx | 14
oox/source/drawingml/textrun.cxx | 2
oox/source/dump/dumperbase.cxx | 8
oox/source/dump/oledumper.cxx | 2
oox/source/export/shapes.cxx | 2
oox/source/helper/containerhelper.cxx | 4
oox/source/helper/graphichelper.cxx | 12
oox/source/helper/modelobjecthelper.cxx | 18
oox/source/helper/propertymap.cxx | 8
oox/source/helper/textinputstream.cxx | 6
oox/source/ole/axcontrol.cxx | 76 -
oox/source/ole/axcontrolfragment.cxx | 2
oox/source/ole/olehelper.cxx | 32
oox/source/ole/oleobjecthelper.cxx | 6
oox/source/ole/olestorage.cxx | 6
oox/source/ole/vbacontrol.cxx | 14
oox/source/ole/vbaproject.cxx | 24
oox/source/ppt/commontimenodecontext.cxx | 11
oox/source/ppt/dgmimport.cxx | 4
oox/source/ppt/dgmlayout.cxx | 19
oox/source/ppt/pptimport.cxx | 10
oox/source/ppt/presentationfragmenthandler.cxx | 10
oox/source/ppt/soundactioncontext.cxx | 2
oox/source/ppt/timenode.cxx | 22
oox/source/ppt/timenodelistcontext.cxx | 4
oox/source/shape/ShapeContextHandler.cxx | 4
oox/source/shape/ShapeFilterBase.cxx | 2
oox/source/vml/vmldrawing.cxx | 4
oox/source/vml/vmlshape.cxx | 12
63 files changed, 2466 insertions(+), 2485 deletions(-)
New commits:
commit b08ded38b0e0eeb8d150e7f71137833396e22387
Author: Miklos Vajna <vmiklos at suse.cz>
Date: Fri Jan 4 15:39:44 2013 +0100
oox: kill no longer needed CREATE_OUSTRING
diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 94b9908..a283871 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 16562e5..5a73eb1 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 c450784..bfe2796 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 1726513..ffeb255 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 23235fa..3791b95 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 00892db..3c3e8c3 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 212775a..a581d10 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 bfca0d7..3703126 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 9339c53..ea91a6a 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 bf4b4f8..1ad07f5 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 607572d..e280f08 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 dd7bded..db04215 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 8c36959..dc76fef 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 5346291..ff67b5f 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 157f4cd..adfe078 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 cda8f94..d71cb97 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 7b72fd4..7f996bf 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 790b253..ffa0e6f 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 5fcf655..f2bcb4b 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[] = {
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list