You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/04/16 20:53:59 UTC

[openoffice] branch AOO42X updated (b03844c -> 973eedc)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git.


    from b03844c  Cleaned up resource files
     new 12978a2  Quick fix to get the version string right in the About dialog
     new 24b0728  Get the version string right independently from its length
     new 973eedc  Give the new variable a better name

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/cui/source/dialogs/about.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

[openoffice] 02/03: Get the version string right independently from its length

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 24b07285b4e2b5678df8bf62004ea23ccec5c7ef
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Thu Apr 15 21:19:11 2021 +0200

    Get the version string right independently from its length
    
    (cherry picked from commit 2bb5117116b35a13dabd10c558487fd8ffa33b39)
---
 main/cui/source/dialogs/about.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/cui/source/dialogs/about.cxx b/main/cui/source/dialogs/about.cxx
index 150eb6e..ddfc45a 100644
--- a/main/cui/source/dialogs/about.cxx
+++ b/main/cui/source/dialogs/about.cxx
@@ -499,13 +499,14 @@ const rtl::OUString AboutDialog::GetBuildId() const
     // For better readability, strip the duplicate ProductMajor ("340").
     if ( sProductSource.getLength() )
     {
+        sal_Int32 versionLength = sProductSource.getLength() - 3;
         bool bMatchingUPD =
                 ( sProductSource.getLength() >= 3 )
-            &&  ( sBuildId.getLength() >= 3 )
-            &&  ( sProductSource.copy( sProductSource.getLength() - 4 ) == sBuildId.copy( 0, 4 ) );
+            &&  ( sBuildId.getLength() >= versionLength )
+            &&  ( sProductSource.copy( 3 ) == sBuildId.copy( 0, versionLength ) );
         OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" );
         if ( bMatchingUPD )
-            sProductSource = sProductSource.copy( 0, sProductSource.getLength() - 4 );
+            sProductSource = sProductSource.copy( 0, sProductSource.getLength() - versionLength );
 
         // prepend the product source
         sBuildIdBuff.insert( 0, sProductSource );

[openoffice] 01/03: Quick fix to get the version string right in the About dialog

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 12978a2410a2d234a532ee77daf1ecf354853ed9
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Thu Apr 15 00:24:02 2021 +0200

    Quick fix to get the version string right in the About dialog
    
    This is not really a good solution. But we can use it until someone else has a better idea.
    (cherry picked from commit b33d75b3fb597aac2bdbf5a9dc7ea43ec6f5561b)
---
 main/cui/source/dialogs/about.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/cui/source/dialogs/about.cxx b/main/cui/source/dialogs/about.cxx
index 5c21ec9..150eb6e 100644
--- a/main/cui/source/dialogs/about.cxx
+++ b/main/cui/source/dialogs/about.cxx
@@ -502,10 +502,10 @@ const rtl::OUString AboutDialog::GetBuildId() const
         bool bMatchingUPD =
                 ( sProductSource.getLength() >= 3 )
             &&  ( sBuildId.getLength() >= 3 )
-            &&  ( sProductSource.copy( sProductSource.getLength() - 3 ) == sBuildId.copy( 0, 3 ) );
+            &&  ( sProductSource.copy( sProductSource.getLength() - 4 ) == sBuildId.copy( 0, 4 ) );
         OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" );
         if ( bMatchingUPD )
-            sProductSource = sProductSource.copy( 0, sProductSource.getLength() - 3 );
+            sProductSource = sProductSource.copy( 0, sProductSource.getLength() - 4 );
 
         // prepend the product source
         sBuildIdBuff.insert( 0, sProductSource );

[openoffice] 03/03: Give the new variable a better name

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 973eedc55351462ba717e9af8d70bfd85445bef4
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Thu Apr 15 21:39:19 2021 +0200

    Give the new variable a better name
    
    (cherry picked from commit a524e3b9fa2406b2d2d0639635ac5f2826f38374)
---
 main/cui/source/dialogs/about.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/cui/source/dialogs/about.cxx b/main/cui/source/dialogs/about.cxx
index ddfc45a..91e5c3c 100644
--- a/main/cui/source/dialogs/about.cxx
+++ b/main/cui/source/dialogs/about.cxx
@@ -499,14 +499,14 @@ const rtl::OUString AboutDialog::GetBuildId() const
     // For better readability, strip the duplicate ProductMajor ("340").
     if ( sProductSource.getLength() )
     {
-        sal_Int32 versionLength = sProductSource.getLength() - 3;
+        sal_Int32 nMajorLength = sProductSource.getLength() - 3;
         bool bMatchingUPD =
                 ( sProductSource.getLength() >= 3 )
-            &&  ( sBuildId.getLength() >= versionLength )
-            &&  ( sProductSource.copy( 3 ) == sBuildId.copy( 0, versionLength ) );
+            &&  ( sBuildId.getLength() >= nMajorLength )
+            &&  ( sProductSource.copy( 3 ) == sBuildId.copy( 0, nMajorLength ) );
         OSL_ENSURE( bMatchingUPD, "BUILDID and ProductSource do not match in their UPD" );
         if ( bMatchingUPD )
-            sProductSource = sProductSource.copy( 0, sProductSource.getLength() - versionLength );
+            sProductSource = sProductSource.copy( 0, sProductSource.getLength() - nMajorLength );
 
         // prepend the product source
         sBuildIdBuff.insert( 0, sProductSource );