[Libreoffice-commits] .: writerperfect/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Jul 5 15:37:05 PDT 2012
writerperfect/source/draw/CDRImportFilter.cxx | 12 ++++++------
writerperfect/source/draw/CMXImportFilter.cxx | 12 ++++++------
writerperfect/source/draw/MSPUBImportFilter.cxx | 12 ++++++------
writerperfect/source/draw/VisioImportFilter.cxx | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 14ca2a853cde386bea8cf8bf45d803933592aeaf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Jul 6 00:36:13 2012 +0200
Bin RTL_CONSTASCII_USTRINGPARAM
Change-Id: Idba2f900f962da57f9e9254b71b68f9b64f6ba6c
diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index 431b18d..7fc2288 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -86,7 +86,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
- OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
+ OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to..
@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream );
if (libcdr::CDRDocument::isSupported(&input))
- sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_CorelDraw_Document" ) );
+ sTypeName = OUString( "draw_CorelDraw_Document" );
if (sTypeName.getLength())
{
if ( location == Descriptor.getLength() )
{
Descriptor.realloc(nLength+1);
- Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
+ Descriptor[location].Name = ::rtl::OUString( "TypeName" );
}
Descriptor[location].Value <<=sTypeName;
@@ -190,7 +190,7 @@ throw (RuntimeException)
#ifdef DEBUG
std::cerr << "CDRImportFilter_getImplementationName" << std::endl;
#endif
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.CDRImportFilter" ) );
+ return OUString ( "com.sun.star.comp.Draw.CDRImportFilter" );
}
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
@@ -211,8 +211,8 @@ throw (RuntimeException)
#endif
Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
- pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
+ pArray[0] = OUString ( SERVICE_NAME1 );
+ pArray[1] = OUString ( SERVICE_NAME2 );
return aRet;
}
#undef SERVICE_NAME2
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 1658c36..d3ae6ff 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -86,7 +86,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
- OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
+ OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to..
@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream );
if (libcdr::CMXDocument::isSupported(&input))
- sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Corel_Presentation_Exchange" ) );
+ sTypeName = OUString( "draw_Corel_Presentation_Exchange" );
if (sTypeName.getLength())
{
if ( location == Descriptor.getLength() )
{
Descriptor.realloc(nLength+1);
- Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
+ Descriptor[location].Name = ::rtl::OUString( "TypeName" );
}
Descriptor[location].Value <<=sTypeName;
@@ -190,7 +190,7 @@ throw (RuntimeException)
#ifdef DEBUG
std::cerr << "CMXImportFilter_getImplementationName" << std::endl;
#endif
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.CMXImportFilter" ) );
+ return OUString ( "com.sun.star.comp.Draw.CMXImportFilter" );
}
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
@@ -211,8 +211,8 @@ throw (RuntimeException)
#endif
Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
- pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
+ pArray[0] = OUString ( SERVICE_NAME1 );
+ pArray[1] = OUString ( SERVICE_NAME2 );
return aRet;
}
#undef SERVICE_NAME2
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 0301ee8..49af07d 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -82,7 +82,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
- OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
+ OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to..
@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream );
if (libmspub::MSPUBDocument::isSupported(&input))
- sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Publisher_Document" ) );
+ sTypeName = OUString( "draw_Publisher_Document" );
if (sTypeName.getLength())
{
if ( location == Descriptor.getLength() )
{
Descriptor.realloc(nLength+1);
- Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
+ Descriptor[location].Name = ::rtl::OUString( "TypeName" );
}
Descriptor[location].Value <<=sTypeName;
@@ -186,7 +186,7 @@ throw (RuntimeException)
#ifdef DEBUG
std::cerr << "MSPUBImportFilter_getImplementationName" << std::endl;
#endif
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.MSPUBImportFilter" ) );
+ return OUString ( "com.sun.star.comp.Draw.MSPUBImportFilter" );
}
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
@@ -207,8 +207,8 @@ throw (RuntimeException)
#endif
Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
- pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
+ pArray[0] = OUString ( SERVICE_NAME1 );
+ pArray[1] = OUString ( SERVICE_NAME2 );
return aRet;
}
#undef SERVICE_NAME2
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index c821774..1a601b0 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -82,7 +82,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to..
- OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.XMLOasisImporter" ) );
+ OUString sXMLImportService ( "com.sun.star.comp.Draw.XMLOasisImporter" );
Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to..
@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream );
if (libvisio::VisioDocument::isSupported(&input))
- sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Visio_Document" ) );
+ sTypeName = OUString( "draw_Visio_Document" );
if (!sTypeName.isEmpty())
{
if ( location == Descriptor.getLength() )
{
Descriptor.realloc(nLength+1);
- Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName"));
+ Descriptor[location].Name = ::rtl::OUString( "TypeName" );
}
Descriptor[location].Value <<=sTypeName;
@@ -186,7 +186,7 @@ throw (RuntimeException)
#ifdef DEBUG
std::cerr << "VisioImportFilter_getImplementationName" << std::endl;
#endif
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.VisioImportFilter" ) );
+ return OUString ( "com.sun.star.comp.Draw.VisioImportFilter" );
}
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
@@ -207,8 +207,8 @@ throw (RuntimeException)
#endif
Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
- pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
+ pArray[0] = OUString ( SERVICE_NAME1 );
+ pArray[1] = OUString ( SERVICE_NAME2 );
return aRet;
}
#undef SERVICE_NAME2
More information about the Libreoffice-commits
mailing list