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

[Noel Power]

 basic/source/runtime/methods.cxx             |    2 +-
 svx/source/sidebar/text/SvxSBFontNameBox.cxx |    1 -
 svx/source/sidebar/text/SvxSBFontNameBox.hxx |    1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 175509176433cf5df2d98718e1a6f9cf5bbe9658
Author: Noel Power <noel.power at suse.com>
Date:   Mon May 20 09:56:26 2013 +0100

    fix wildcard handling regression( for basic functions like Dir ) fdo#64536
    
    Tweak another fallout from String->OUString
    
    Change-Id: I3932bdb441fe6b08cefa6331870956664ade77bd

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ff85d10..2fd3eb5 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2619,7 +2619,7 @@ OUString implSetupWildcard( const OUString& rFileParam, SbiRTLData* pRTLData )
 
     // Is there a pure file name left? Otherwise the path is
     // invalid anyway because it was not accepted by OSL before
-    if (string::equals(aPureFileName, '*'))
+    if (!string::equals(aPureFileName, '*'))
     {
         pRTLData->pWildCard = new WildCard( aPureFileName );
     }
commit d7f93b544de67218659bc07bb54adc04f94769a6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 20 14:19:06 2013 +0300

    WaE: private field 'bInput' is not used
    
    Change-Id: I0a220120e312b901549f7243c0d1bf750a1227a1

diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
index c60ece6..1137617 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
@@ -87,7 +87,6 @@ SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent,  const ResId& rResId  ) :
     FontNameBox ( pParent, rResId )
 ,   pFontList   ( NULL )
 ,   nFtCount    ( 0 )
-,   bInput(false)
 ,   pBindings(NULL)
 {
     EnableControls_Impl();
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
index 65fcc10..82289e3 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
@@ -52,7 +52,6 @@ private:
     Font            aCurFont;
     String          aCurText;
     sal_uInt16 nFtCount;
-    bool bInput;
     void            EnableControls_Impl();
     SfxBindings*    pBindings;//
 protected: