[Libreoffice-commits] .: 2 commits - fpicker/source vcl/source

[Ivan Timofeev]

 fpicker/source/office/iodlgimp.cxx |    2 +-
 vcl/source/control/menubtn.cxx     |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c0308fb3bd0e635a49802c346bc716030846d62c
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Wed Aug 8 21:35:10 2012 +0400

    some MenuButtons have weird PUSHBUTTON_DROPDOWN_TOOLBOX style
    
    ... actually only SvtFileDialogURLSelector has it.
    The problem is that in this case ImplGetSeparatorX() returns 0.
    
    Change-Id: I2f5bebce31b4f137782b5f34cc7954554af06863

diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 5994522..acc7e9a 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -154,7 +154,8 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt )
     if ( mnMenuMode & MENUBUTTON_MENUMODE_TIMED )
     {
         // if the separated dropdown symbol is not hit, delay the popup execution
-        if( rMEvt.GetPosPixel().X() <= ImplGetSeparatorX() )
+        if( mnDDStyle != PUSHBUTTON_DROPDOWN_MENUBUTTON || // no separator at all
+            rMEvt.GetPosPixel().X() <= ImplGetSeparatorX() )
         {
             if ( !mpMenuTimer )
             {
commit a3f55e0ad678464a30dde004c97c8b0a680bc8de
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Wed Aug 8 21:12:10 2012 +0400

    missing "Workplace" string for STR_SVT_MIMETYPE_CNT_FSYSBOX
    
    No one hit upon an idea to hold the "Up One Level" button in the file picker
    to notice this? :) Only the bug in MenuButton has helped to discover.
    
    Change-Id: I760eff05dd19c3fdeb4b2052c0c20dbde6f6d2ed

diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 9269b07..0c5165b 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -70,7 +70,7 @@ namespace
     {
         ResMgr * operator ()()
         {
-            return ResMgr::CreateResMgr ("svs");
+            return ResMgr::CreateResMgr ("svl");
         }
         static ResMgr * getOrCreate()
         {