Skip to content

C
core
Kaydet (Commit) 14ca2a85 authored tarafından Fridrich Štrba's avatar Fridrich Štrba
Dosyalara gözat
Seçenekler

Bin RTL_CONSTASCII_USTRINGPARAM 

Change-Id: Idba2f900f962da57f9e9254b71b68f9b64f6ba6c
üst b25385a6
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
writerperfect/source/draw/CDRImportFilter.cxx
Dosyayı görüntüle @ 14ca2a85
...@@ -86,7 +86,7 @@ throw (RuntimeException) ...@@ -86,7 +86,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII); sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to.. // 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 ); Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to.. // The XImporter sets up an empty target document for XDocumentHandler to write to..
...@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException ) ...@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream ); WPXSvInputStream input( xInputStream );
if (libcdr::CDRDocument::isSupported(&input)) if (libcdr::CDRDocument::isSupported(&input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_CorelDraw_Document" ) ); sTypeName = OUString( "draw_CorelDraw_Document" );
if (sTypeName.getLength()) if (sTypeName.getLength())
{ {
if ( location == Descriptor.getLength() ) if ( location == Descriptor.getLength() )
{ {
Descriptor.realloc(nLength+1); Descriptor.realloc(nLength+1);
Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")); Descriptor[location].Name = ::rtl::OUString( "TypeName" );
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
...@@ -190,7 +190,7 @@ throw (RuntimeException) ...@@ -190,7 +190,7 @@ throw (RuntimeException)
#ifdef DEBUG #ifdef DEBUG
std::cerr << "CDRImportFilter_getImplementationName" << std::endl; std::cerr << "CDRImportFilter_getImplementationName" << std::endl;
#endif #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" #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
...@@ -211,8 +211,8 @@ throw (RuntimeException) ...@@ -211,8 +211,8 @@ throw (RuntimeException)
#endif #endif
Sequence < OUString > aRet(2); Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray(); OUString *pArray = aRet.getArray();
pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); pArray[0] = OUString ( SERVICE_NAME1 );
pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); pArray[1] = OUString ( SERVICE_NAME2 );
return aRet; return aRet;
} }
#undef SERVICE_NAME2 #undef SERVICE_NAME2
......
writerperfect/source/draw/CMXImportFilter.cxx
Dosyayı görüntüle @ 14ca2a85
...@@ -86,7 +86,7 @@ throw (RuntimeException) ...@@ -86,7 +86,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII); sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to.. // 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 ); Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to.. // The XImporter sets up an empty target document for XDocumentHandler to write to..
...@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException ) ...@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream ); WPXSvInputStream input( xInputStream );
if (libcdr::CMXDocument::isSupported(&input)) if (libcdr::CMXDocument::isSupported(&input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Corel_Presentation_Exchange" ) ); sTypeName = OUString( "draw_Corel_Presentation_Exchange" );
if (sTypeName.getLength()) if (sTypeName.getLength())
{ {
if ( location == Descriptor.getLength() ) if ( location == Descriptor.getLength() )
{ {
Descriptor.realloc(nLength+1); Descriptor.realloc(nLength+1);
Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")); Descriptor[location].Name = ::rtl::OUString( "TypeName" );
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
...@@ -190,7 +190,7 @@ throw (RuntimeException) ...@@ -190,7 +190,7 @@ throw (RuntimeException)
#ifdef DEBUG #ifdef DEBUG
std::cerr << "CMXImportFilter_getImplementationName" << std::endl; std::cerr << "CMXImportFilter_getImplementationName" << std::endl;
#endif #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" #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
...@@ -211,8 +211,8 @@ throw (RuntimeException) ...@@ -211,8 +211,8 @@ throw (RuntimeException)
#endif #endif
Sequence < OUString > aRet(2); Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray(); OUString *pArray = aRet.getArray();
pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); pArray[0] = OUString ( SERVICE_NAME1 );
pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); pArray[1] = OUString ( SERVICE_NAME2 );
return aRet; return aRet;
} }
#undef SERVICE_NAME2 #undef SERVICE_NAME2
......
writerperfect/source/draw/MSPUBImportFilter.cxx
Dosyayı görüntüle @ 14ca2a85
...@@ -82,7 +82,7 @@ throw (RuntimeException) ...@@ -82,7 +82,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII); sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to.. // 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 ); Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to.. // The XImporter sets up an empty target document for XDocumentHandler to write to..
...@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException ) ...@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream ); WPXSvInputStream input( xInputStream );
if (libmspub::MSPUBDocument::isSupported(&input)) if (libmspub::MSPUBDocument::isSupported(&input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Publisher_Document" ) ); sTypeName = OUString( "draw_Publisher_Document" );
if (sTypeName.getLength()) if (sTypeName.getLength())
{ {
if ( location == Descriptor.getLength() ) if ( location == Descriptor.getLength() )
{ {
Descriptor.realloc(nLength+1); Descriptor.realloc(nLength+1);
Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")); Descriptor[location].Name = ::rtl::OUString( "TypeName" );
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
...@@ -186,7 +186,7 @@ throw (RuntimeException) ...@@ -186,7 +186,7 @@ throw (RuntimeException)
#ifdef DEBUG #ifdef DEBUG
std::cerr << "MSPUBImportFilter_getImplementationName" << std::endl; std::cerr << "MSPUBImportFilter_getImplementationName" << std::endl;
#endif #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" #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
...@@ -207,8 +207,8 @@ throw (RuntimeException) ...@@ -207,8 +207,8 @@ throw (RuntimeException)
#endif #endif
Sequence < OUString > aRet(2); Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray(); OUString *pArray = aRet.getArray();
pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); pArray[0] = OUString ( SERVICE_NAME1 );
pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); pArray[1] = OUString ( SERVICE_NAME2 );
return aRet; return aRet;
} }
#undef SERVICE_NAME2 #undef SERVICE_NAME2
......
writerperfect/source/draw/VisioImportFilter.cxx
Dosyayı görüntüle @ 14ca2a85
...@@ -82,7 +82,7 @@ throw (RuntimeException) ...@@ -82,7 +82,7 @@ throw (RuntimeException)
sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII); sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
// An XML import service: what we push sax messages to.. // 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 ); Reference < XDocumentHandler > xInternalHandler( comphelper::ComponentContext( mxContext ).createComponent( sXMLImportService ), UNO_QUERY );
// The XImporter sets up an empty target document for XDocumentHandler to write to.. // The XImporter sets up an empty target document for XDocumentHandler to write to..
...@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException ) ...@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream ); WPXSvInputStream input( xInputStream );
if (libvisio::VisioDocument::isSupported(&input)) if (libvisio::VisioDocument::isSupported(&input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_Visio_Document" ) ); sTypeName = OUString( "draw_Visio_Document" );
if (!sTypeName.isEmpty()) if (!sTypeName.isEmpty())
{ {
if ( location == Descriptor.getLength() ) if ( location == Descriptor.getLength() )
{ {
Descriptor.realloc(nLength+1); Descriptor.realloc(nLength+1);
Descriptor[location].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeName")); Descriptor[location].Name = ::rtl::OUString( "TypeName" );
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
...@@ -186,7 +186,7 @@ throw (RuntimeException) ...@@ -186,7 +186,7 @@ throw (RuntimeException)
#ifdef DEBUG #ifdef DEBUG
std::cerr << "VisioImportFilter_getImplementationName" << std::endl; std::cerr << "VisioImportFilter_getImplementationName" << std::endl;
#endif #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" #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
...@@ -207,8 +207,8 @@ throw (RuntimeException) ...@@ -207,8 +207,8 @@ throw (RuntimeException)
#endif #endif
Sequence < OUString > aRet(2); Sequence < OUString > aRet(2);
OUString *pArray = aRet.getArray(); OUString *pArray = aRet.getArray();
pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) ); pArray[0] = OUString ( SERVICE_NAME1 );
pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); pArray[1] = OUString ( SERVICE_NAME2 );
return aRet; return aRet;
} }
#undef SERVICE_NAME2 #undef SERVICE_NAME2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment