[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - fpicker/source

[Caolán McNamara]

 fpicker/source/office/iodlgimp.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24fbc8ef2a4332b7a70e9d1148ea625df862388c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jul 2 11:09:22 2014 +0100

    fix crash when m_aType is '*'
    
    Change-Id: If2c4ca98814a58b785cd2670eac1e522e70464fd
    (cherry picked from commit 5983675eccd9517915d8f5558c25f47c952edb24)
    Reviewed-on: https://gerrit.libreoffice.org/10048
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index 816d6ef..2f211f5 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -57,7 +57,7 @@ public:
 
     const OUString&     GetName() const     { return m_aName; }
     const OUString&     GetType() const     { return m_aType; }
-    const OUString      GetExtension() const    { return m_aType.copy( 2 ); }
+    const OUString      GetExtension() const    { return m_aType.getLength() > 2 ? m_aType.copy( 2 ) : OUString(); }
 
     bool            isGroupSeparator() const    { return m_aType.isEmpty(); }
 };