[Libreoffice-commits] .: fpicker/source

[Libreoffice Gerrit user]

 fpicker/source/office/iodlg.cxx |    7 +------
 fpicker/source/office/iodlg.src |    4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit a8c2cb0e6d0b9b301887be176694592f8ecda0c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 21 12:46:01 2012 +0000

    SvtURLBox derives from ComboBox not Edit
    
    so should use ComboBox in .src file once that's done we can remove the dummy
    Edit's which seem to exist only to get the right size/position onto the
    SvtURLBox. All of this removes the resource assert spew on loading
    the built-in filepicker
    
    Change-Id: I9e6249bc34ee563fc73784c46bb733901d4d55d6

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 0e60cfb..1f814aa 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -507,12 +507,9 @@ void SvtFileDialog::Init_Impl
     // Create control element, the order defines the tab control.
     _pImp->_pFtFileName = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILENAME ) );
 
-    SvtURLBox* pURLBox = new SvtURLBox( this );
+    SvtURLBox* pURLBox = new SvtURLBox( this, SvtResId( ED_EXPLORERFILE_FILENAME ) );
     pURLBox->SetUrlFilter( &m_aURLFilter );
     _pImp->_pEdFileName = pURLBox;
-
-    Edit aDummy( this, SvtResId( ED_EXPLORERFILE_FILENAME ) );
-    _pImp->_pEdFileName->SetPosSizePixel( aDummy.GetPosPixel(), aDummy.GetSizePixel() );
     _pImp->_pEdFileName->Show();
     pURLBox->SetSelectHdl( LINK( this, SvtFileDialog, EntrySelectHdl_Impl ) );
     pURLBox->SetOpenHdl( STATIC_LINK( this, SvtFileDialog, OpenHdl_Impl ) );
@@ -547,10 +544,8 @@ void SvtFileDialog::Init_Impl
         }
     }
 
-    Edit anOtherDummy( this, SvtResId( ED_EXPLORERFILE_CURRENTPATH ) );
     _pImp->_pEdCurrentPath = new SvtURLBox( this, SvtResId(ED_EXPLORERFILE_CURRENTPATH) );
     _pImp->_pEdCurrentPath->SetUrlFilter( &m_aURLFilter );
-    _pImp->_pEdCurrentPath->SetPosSizePixel( anOtherDummy.GetPosPixel(), anOtherDummy.GetSizePixel() );
     _pImp->_pEdCurrentPath->Show();
 
     _pImp->_pBtnFileOpen = new PushButton( this, SvtResId( BTN_EXPLORERFILE_OPEN ) );
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 4a25355..75feb9c 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -57,7 +57,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
     Sizeable = TRUE;
     HelpId = HID_EXPLORERDLG_FILE ;
     Size = MAP_APPFONT ( 280 , 174 ) ;
-    Edit ED_EXPLORERFILE_CURRENTPATH
+    ComboBox ED_EXPLORERFILE_CURRENTPATH
     {
         Pos = MAP_APPFONT ( 6 , 6 ) ;
         Size = MAP_APPFONT ( 90 , 12 ) ;
@@ -113,7 +113,7 @@ ModalDialog DLG_FPICKER_EXPLORERFILE
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "File ~name:" ;
     };
-    Edit ED_EXPLORERFILE_FILENAME
+    ComboBox ED_EXPLORERFILE_FILENAME
     {
         HelpID = "fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME";
         Pos = MAP_APPFONT ( 59 , 117 ) ;