Kaydet (Commit) c578ed53 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

No explicit rtl::OUString ctors needed, sberg dixit

Change-Id: I0b675213064a10cebfdea1fb99573dcf3e34284b
üst 3a36408b
...@@ -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( "draw_CorelDraw_Document" ); sTypeName = "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( "TypeName" ); Descriptor[location].Name = "TypeName";
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
......
...@@ -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( "draw_Corel_Presentation_Exchange" ); sTypeName = "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( "TypeName" ); Descriptor[location].Name = "TypeName";
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
......
...@@ -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( "draw_Publisher_Document" ); sTypeName = "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( "TypeName" ); Descriptor[location].Name = "TypeName";
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
......
...@@ -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( "draw_Visio_Document" ); sTypeName = "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( "TypeName" ); Descriptor[location].Name = "TypeName";
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
......
...@@ -146,14 +146,14 @@ throw( com::sun::star::uno::RuntimeException ) ...@@ -146,14 +146,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( "draw_WordPerfect_Graphics" ); sTypeName = "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("TypeName"); Descriptor[location].Name = "TypeName";
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
......
...@@ -171,14 +171,14 @@ throw( com::sun::star::uno::RuntimeException ) ...@@ -171,14 +171,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( "writer_MS_Works_Document" ); sTypeName = "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("TypeName"); Descriptor[location].Name = "TypeName";
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
......
...@@ -226,14 +226,14 @@ throw( RuntimeException ) ...@@ -226,14 +226,14 @@ throw( 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( "writer_WordPerfect_Document" ); sTypeName = "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("TypeName"); Descriptor[location].Name = "TypeName";
} }
Descriptor[location].Value <<=sTypeName; Descriptor[location].Value <<=sTypeName;
...@@ -343,7 +343,7 @@ throw (RuntimeException) ...@@ -343,7 +343,7 @@ throw (RuntimeException)
aPasswdDlg.SetMinLen(0); aPasswdDlg.SetMinLen(0);
if(!aPasswdDlg.Execute()) if(!aPasswdDlg.Execute())
return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL; return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
msPassword = ::rtl::OUString(aPasswdDlg.GetPassword().GetBuffer()); msPassword = aPasswdDlg.GetPassword().GetBuffer();
aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8); aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8);
if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr())) if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
break; break;
...@@ -361,7 +361,7 @@ Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValue ...@@ -361,7 +361,7 @@ Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValue
Sequence<PropertyValue> aRet(1); Sequence<PropertyValue> aRet(1);
PropertyValue *pArray = aRet.getArray(); PropertyValue *pArray = aRet.getArray();
pArray[0].Name = rtl::OUString( "Password" ); pArray[0].Name = "Password";
pArray[0].Value <<= msPassword; pArray[0].Value <<= msPassword;
return aRet; return aRet;
...@@ -378,7 +378,7 @@ throw(com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::Pr ...@@ -378,7 +378,7 @@ throw(com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::Pr
const PropertyValue &rProp = pPropArray[i]; const PropertyValue &rProp = pPropArray[i];
::rtl::OUString aPropName = rProp.Name; ::rtl::OUString aPropName = rProp.Name;
if ( aPropName == ::rtl::OUString("Password") ) if ( aPropName == "Password" )
rProp.Value >>= msPassword; rProp.Value >>= msPassword;
else if ( aPropName == "InputStream" ) else if ( aPropName == "InputStream" )
rProp.Value >>= mxInputStream; rProp.Value >>= mxInputStream;
......
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