[Libreoffice-commits] core.git: 2 commits - writerperfect/source

Fridrich Å trba fridrich.strba at bluewin.ch
Mon Mar 4 01:00:53 PST 2013


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

New commits:
commit 9cae1dc5311c09168fbe1f04bea3d4ee33a04bb7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Mar 4 10:00:23 2013 +0100

    Oops
    
    Change-Id: I4ccf42a703cce56b32fc38f0caa068c19bf2a5f0

diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 1b803ca..2729d42 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -142,7 +142,7 @@ throw( com::sun::star::uno::RuntimeException )
 
     if (!sTypeName.isEmpty())
     {
-        if ( location == nLength ) )
+        if ( location == nLength )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";
commit 328adfb538032d903dfae32397367259d9c4a605
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Mar 4 09:37:09 2013 +0100

    Save some getLength calls
    
    Change-Id: I4103a338e487ee29da6ac056215c4fa0a244fa65

diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index d0204b3..b5c6452 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -145,9 +145,9 @@ throw( com::sun::star::uno::RuntimeException )
     if (libcdr::CDRDocument::isSupported(&input))
         sTypeName = "draw_CorelDraw_Document";
 
-    if (sTypeName.getLength())
+    if (!sTypeName.isEmpty())
     {
-        if ( location == Descriptor.getLength() )
+        if ( location == nLength )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 8dec748..f9c0f21 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -144,9 +144,9 @@ throw( com::sun::star::uno::RuntimeException )
     if (libcdr::CMXDocument::isSupported(&input))
         sTypeName = "draw_Corel_Presentation_Exchange";
 
-    if (sTypeName.getLength())
+    if (!sTypeName.isEmpty())
     {
-        if ( location == Descriptor.getLength() )
+        if ( location == nLength )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index a892308..c50571b 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -140,9 +140,9 @@ throw( com::sun::star::uno::RuntimeException )
     if (libmspub::MSPUBDocument::isSupported(&input))
         sTypeName = "draw_Publisher_Document";
 
-    if (sTypeName.getLength())
+    if (!sTypeName.isEmpty())
     {
-        if ( location == Descriptor.getLength() )
+        if ( location == nLength )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index a566947..1b803ca 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -142,7 +142,7 @@ throw( com::sun::star::uno::RuntimeException )
 
     if (!sTypeName.isEmpty())
     {
-        if ( location == Descriptor.getLength() )
+        if ( location == nLength ) )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index b142e1a..e4067f9 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -148,7 +148,7 @@ throw( com::sun::star::uno::RuntimeException )
 
     if (!sTypeName.isEmpty())
     {
-        if ( location == Descriptor.getLength() )
+        if ( location == nLength )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";
diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx
index f441539d..6c37a36 100644
--- a/writerperfect/source/writer/MSWorksImportFilter.cxx
+++ b/writerperfect/source/writer/MSWorksImportFilter.cxx
@@ -151,7 +151,7 @@ throw( com::sun::star::uno::RuntimeException )
 
     if (!sTypeName.isEmpty())
     {
-        if ( location == Descriptor.getLength() )
+        if ( location == nLength )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index ec476c2..3de9727 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -206,7 +206,7 @@ throw( RuntimeException )
 
     if (!sTypeName.isEmpty())
     {
-        if ( location == Descriptor.getLength() )
+        if ( location == nLength )
         {
             Descriptor.realloc(nLength+1);
             Descriptor[location].Name = "TypeName";


More information about the Libreoffice-commits mailing list