[Libreoffice-commits] core.git: sdext/source

Chris Sherlock chris.sherlock79 at gmail.com
Sat Dec 26 11:07:54 PST 2015


 sdext/source/minimizer/fileopendialog.cxx |    4 ++--
 sdext/source/minimizer/fileopendialog.hxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 90bf2d8064c42c6b7e43dce3267a30084557b4ec
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Sun Dec 27 02:30:57 2015 +1100

    sdext: change instances of maName to more descriptive names
    
    Change-Id: If1cb55737240ba1e35e18790894d421aae660026
    Reviewed-on: https://gerrit.libreoffice.org/20960
    Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
    Tested-by: Chris Sherlock <chris.sherlock79 at gmail.com>

diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index 7ea16bd..076cff5 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -97,7 +97,7 @@ FileOpenDialog::FileOpenDialog( const Reference< XComponentContext >& rxContext
                                 j = aFilterProperties.getLength();
                         }
                         break;
-                        case TK_Name :      rProperty.Value >>= aFilterEntry.maName; break;
+                        case TK_Name :      rProperty.Value >>= aFilterEntry.maFilterEntryName; break;
                         case TK_UIName :    rProperty.Value >>= aFilterEntry.maUIName; break;
                         case TK_Type :      rProperty.Value >>= aFilterEntry.maType; break;
                         case TK_Flags :     rProperty.Value >>= aFilterEntry.maFlags; break;
@@ -177,7 +177,7 @@ OUString FileOpenDialog::getFilterName() const
     {
         if ( aIter->maUIName == aUIName )
         {
-            aFilterName = aIter->maName;
+            aFilterName = aIter->maFilterEntryName;
             break;
         }
     }
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index 1b25d6e..53b1c14 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -32,7 +32,7 @@ class FileOpenDialog
     // a list of filters that are provided within the SaveDialog
     struct FilterEntry
     {
-        OUString maName;
+        OUString maFilterEntryName;
         OUString maType;
         OUString maUIName;
         sal_Int32 maFlags;


More information about the Libreoffice-commits mailing list