[Libreoffice-commits] .: writerperfect/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Sep 3 07:37:12 PDT 2012


 writerperfect/source/draw/CDRImportFilter.cxx           |    4 ++--
 writerperfect/source/draw/CMXImportFilter.cxx           |    4 ++--
 writerperfect/source/draw/MSPUBImportFilter.cxx         |    4 ++--
 writerperfect/source/draw/VisioImportFilter.cxx         |    4 ++--
 writerperfect/source/draw/WPGImportFilter.cxx           |    4 ++--
 writerperfect/source/writer/MSWorksImportFilter.cxx     |    4 ++--
 writerperfect/source/writer/WordPerfectImportFilter.cxx |   10 +++++-----
 7 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit c578ed53615d219768bc1f07506b1e8756375db6
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 3 16:36:31 2012 +0200

    No explicit rtl::OUString ctors needed, sberg dixit
    
    Change-Id: I0b675213064a10cebfdea1fb99573dcf3e34284b

diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index 7fc2288..026c7b1 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
     WPXSvInputStream input( xInputStream );
 
     if (libcdr::CDRDocument::isSupported(&input))
-        sTypeName = OUString( "draw_CorelDraw_Document" );
+        sTypeName = "draw_CorelDraw_Document";
 
     if (sTypeName.getLength())
     {
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString( "TypeName" );
+            Descriptor[location].Name = "TypeName";
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index d3ae6ff..9d53df3 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -145,14 +145,14 @@ throw( com::sun::star::uno::RuntimeException )
     WPXSvInputStream input( xInputStream );
 
     if (libcdr::CMXDocument::isSupported(&input))
-        sTypeName = OUString( "draw_Corel_Presentation_Exchange" );
+        sTypeName = "draw_Corel_Presentation_Exchange";
 
     if (sTypeName.getLength())
     {
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString( "TypeName" );
+            Descriptor[location].Name = "TypeName";
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 49af07d..5f886ab 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException )
     WPXSvInputStream input( xInputStream );
 
     if (libmspub::MSPUBDocument::isSupported(&input))
-        sTypeName = OUString( "draw_Publisher_Document" );
+        sTypeName = "draw_Publisher_Document";
 
     if (sTypeName.getLength())
     {
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString( "TypeName" );
+            Descriptor[location].Name = "TypeName";
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 1a601b0..291f358 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -141,14 +141,14 @@ throw( com::sun::star::uno::RuntimeException )
     WPXSvInputStream input( xInputStream );
 
     if (libvisio::VisioDocument::isSupported(&input))
-        sTypeName = OUString( "draw_Visio_Document" );
+        sTypeName = "draw_Visio_Document";
 
     if (!sTypeName.isEmpty())
     {
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString( "TypeName" );
+            Descriptor[location].Name = "TypeName";
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index f8e654c..7538ee9 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -146,14 +146,14 @@ throw( com::sun::star::uno::RuntimeException )
     WPXSvInputStream input( xInputStream );
 
     if (libwpg::WPGraphics::isSupported(&input))
-        sTypeName = OUString(  "draw_WordPerfect_Graphics"  );
+        sTypeName = "draw_WordPerfect_Graphics";
 
     if (!sTypeName.isEmpty())
     {
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString("TypeName");
+            Descriptor[location].Name = "TypeName";
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index 6ca2e27..c5155ea 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -171,14 +171,14 @@ throw( com::sun::star::uno::RuntimeException )
     confidence = WPSDocument::isFileFormatSupported(&input);
 
     if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD))
-        sTypeName = OUString(  "writer_MS_Works_Document"  );
+        sTypeName = "writer_MS_Works_Document";
 
     if (!sTypeName.isEmpty())
     {
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString("TypeName");
+            Descriptor[location].Name = "TypeName";
         }
 
         Descriptor[location].Value <<=sTypeName;
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index faf095b..a7d1534 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -226,14 +226,14 @@ throw( RuntimeException )
     confidence = WPDocument::isFileFormatSupported(&input);
 
     if (confidence == WPD_CONFIDENCE_EXCELLENT || confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION)
-        sTypeName = OUString(  "writer_WordPerfect_Document"  );
+        sTypeName = "writer_WordPerfect_Document";
 
     if (!sTypeName.isEmpty())
     {
         if ( location == Descriptor.getLength() )
         {
             Descriptor.realloc(nLength+1);
-            Descriptor[location].Name = ::rtl::OUString("TypeName");
+            Descriptor[location].Name = "TypeName";
         }
 
         Descriptor[location].Value <<=sTypeName;
@@ -343,7 +343,7 @@ throw (RuntimeException)
             aPasswdDlg.SetMinLen(0);
             if(!aPasswdDlg.Execute())
                 return com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
-            msPassword = ::rtl::OUString(aPasswdDlg.GetPassword().GetBuffer());
+            msPassword = aPasswdDlg.GetPassword().GetBuffer();
             aUtf8Passwd = OUStringToOString(msPassword, RTL_TEXTENCODING_UTF8);
             if (WPD_PASSWORD_MATCH_OK == WPDocument::verifyPassword(&input, aUtf8Passwd.getStr()))
                 break;
@@ -361,7 +361,7 @@ Sequence<PropertyValue> SAL_CALL WordPerfectImportFilterDialog::getPropertyValue
     Sequence<PropertyValue> aRet(1);
     PropertyValue *pArray = aRet.getArray();
 
-    pArray[0].Name = rtl::OUString( "Password" );
+    pArray[0].Name = "Password";
     pArray[0].Value <<= msPassword;
 
     return aRet;
@@ -378,7 +378,7 @@ throw(com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::Pr
         const PropertyValue &rProp = pPropArray[i];
         ::rtl::OUString aPropName = rProp.Name;
 
-        if ( aPropName == ::rtl::OUString("Password") )
+        if ( aPropName == "Password" )
             rProp.Value >>= msPassword;
         else if ( aPropName == "InputStream" )
             rProp.Value >>= mxInputStream;


More information about the Libreoffice-commits mailing list