mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

targeted string re-work

Browse Source 
Change-Id: I2c166c63e9d2ab7d60bb404f643045678ef239a2
This commit is contained in:
Norbert Thiebaud
2012-06-01 15:46:46 -05:00
parent 6d8cd96939
commit 159435291b
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sal/qa/osl/file/osl_File.cxx
View File

@@ -6006,7 +6006,7 @@ namespace osl_Directory
# define PATH_BUFFER_SIZE PATH_MAX # define PATH_BUFFER_SIZE PATH_MAX
#endif #endif
char TEST_PATH_POSTFIX[] = "hello/world"; #define TEST_PATH_POSTFIX "hello/world"
//######################################## //########################################
OUString get_test_path() OUString get_test_path()
@@ -6113,8 +6113,8 @@ namespace osl_Directory
//########################################## //##########################################
void with_relative_path() void with_relative_path()
{ {
FileBase::RC rc = Directory::createPath( FileBase::RC rc = Directory::createPath( OUString(TEST_PATH_POSTFIX));
OUString(TEST_PATH_POSTFIX));
CPPUNIT_ASSERT_MESSAGE CPPUNIT_ASSERT_MESSAGE
( (

12
writerperfect/source/draw/WPGImportFilter.cxx
View File

@@ -104,7 +104,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..
@@ -163,14 +163,14 @@ throw( com::sun::star::uno::RuntimeException )
WPXSvInputStream input( xInputStream ); WPXSvInputStream input( xInputStream );
if (libwpg::WPGraphics::isSupported(&input)) if (libwpg::WPGraphics::isSupported(&input))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) ); sTypeName = OUString( "draw_WordPerfect_Graphics" );
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;
@@ -208,7 +208,7 @@ throw (RuntimeException)
#ifdef DEBUG #ifdef DEBUG
std::cerr << "WPGImportFilter_getImplementationName" << std::endl; std::cerr << "WPGImportFilter_getImplementationName" << std::endl;
#endif #endif
return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Draw.WPGImportFilter" ) ); return OUString ( "com.sun.star.comp.Draw.WPGImportFilter" );
} }
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter" #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
@@ -229,8 +229,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

12
writerperfect/source/writer/MSWorksImportFilter.cxx
View File

@@ -104,7 +104,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.Writer.XMLOasisImporter" ) ); OUString sXMLImportService ( "com.sun.star.comp.Writer.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..
@@ -191,14 +191,14 @@ throw( com::sun::star::uno::RuntimeException )
confidence = WPSDocument::isFileFormatSupported(&input); confidence = WPSDocument::isFileFormatSupported(&input);
if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD)) if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD))
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) ); sTypeName = OUString( "writer_MS_Works_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;
@@ -232,7 +232,7 @@ throw (Exception, RuntimeException)
OUString MSWorksImportFilter_getImplementationName () OUString MSWorksImportFilter_getImplementationName ()
throw (RuntimeException) throw (RuntimeException)
{ {
return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.MSWorksImportFilter" ) ); return OUString ( "com.sun.star.comp.Writer.MSWorksImportFilter" );
} }
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter" #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
@@ -247,8 +247,8 @@ throw (RuntimeException)
{ {
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

20
writerperfect/source/writer/WordPerfectImportFilter.cxx
View File

@@ -158,7 +158,7 @@ throw (RuntimeException)
} }
// 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.Writer.XMLOasisImporter" ) ); OUString sXMLImportService ( "com.sun.star.comp.Writer.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..
@@ -245,14 +245,14 @@ throw( uno::RuntimeException )
confidence = WPDocument::isFileFormatSupported(&input); confidence = WPDocument::isFileFormatSupported(&input);
if (confidence == WPD_CONFIDENCE_EXCELLENT || confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION) if (confidence == WPD_CONFIDENCE_EXCELLENT || confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION)
sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_WordPerfect_Document" ) ); sTypeName = OUString( "writer_WordPerfect_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;
@@ -286,7 +286,7 @@ throw (Exception, RuntimeException)
OUString WordPerfectImportFilter_getImplementationName () OUString WordPerfectImportFilter_getImplementationName ()
throw (RuntimeException) throw (RuntimeException)
{ {
return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WordPerfectImportFilter" ) ); return OUString ( "com.sun.star.comp.Writer.WordPerfectImportFilter" );
} }
#define SERVICE_NAME1 "com.sun.star.document.ImportFilter" #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
@@ -301,8 +301,8 @@ throw (RuntimeException)
{ {
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
@@ -380,7 +380,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getP
uno::Sequence<beans::PropertyValue> aRet(1); uno::Sequence<beans::PropertyValue> aRet(1);
beans::PropertyValue *pArray = aRet.getArray(); beans::PropertyValue *pArray = aRet.getArray();
pArray[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Password") ); pArray[0].Name = rtl::OUString( "Password" );
pArray[0].Value <<= msPassword; pArray[0].Value <<= msPassword;
return aRet; return aRet;
@@ -397,7 +397,7 @@ throw(beans::UnknownPropertyException, beans::PropertyVetoException,
const beans::PropertyValue &rProp = pPropArray[i]; const beans::PropertyValue &rProp = pPropArray[i];
::rtl::OUString aPropName = rProp.Name; ::rtl::OUString aPropName = rProp.Name;
if ( aPropName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password")) ) if ( aPropName == ::rtl::OUString("Password") )
rProp.Value >>= msPassword; rProp.Value >>= msPassword;
else if ( aPropName == "InputStream" ) else if ( aPropName == "InputStream" )
rProp.Value >>= mxInputStream; rProp.Value >>= mxInputStream;
@@ -427,7 +427,7 @@ throw (RuntimeException)
OUString WordPerfectImportFilterDialog_getImplementationName () OUString WordPerfectImportFilterDialog_getImplementationName ()
throw (RuntimeException) throw (RuntimeException)
{ {
return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WordPerfectImportFilterDialog" ) ); return OUString ( "com.sun.star.comp.Writer.WordPerfectImportFilterDialog" );
} }
#define SERVICE_NAME "com.sun.star.ui.dialogs.FilterOptionsDialog" #define SERVICE_NAME "com.sun.star.ui.dialogs.FilterOptionsDialog"
@@ -442,7 +442,7 @@ throw (RuntimeException)
{ {
Sequence < OUString > aRet(1); Sequence < OUString > aRet(1);
OUString *pArray = aRet.getArray(); OUString *pArray = aRet.getArray();
pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) ); pArray[0] = OUString ( SERVICE_NAME );
return aRet; return aRet;
} }
#undef SERVICE_NAME #undef SERVICE_NAME