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

[Caolán McNamara (via logerrit)]

 fpicker/source/office/RemoteFilesDialog.cxx |    4 ++--
 fpicker/source/office/fpdialogbase.hxx      |    4 ++--
 fpicker/source/office/iodlg.cxx             |   10 +++++-----
 fpicker/uiconfig/ui/remotefilesdialog.ui    |    1 +
 vcl/source/window/menu.cxx                  |    3 +--
 5 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 3fb1417804a7f6f1e39e94d62f7f9199fd53a9bb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 18 16:45:09 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Oct 19 17:33:18 2019 +0200

    Drop ModalDialog middleman
    
    Change-Id: I8bc39e1a85045a6e6c15735b440ada8c3abc222b
    Reviewed-on: https://gerrit.libreoffice.org/81068
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 94649c6abb93..a2f8ffb63631 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -367,12 +367,12 @@ void RemoteFilesDialog::dispose()
     m_pListView_btn.clear();
     m_pAddMenu.clear();
 
-    ModalDialog::dispose();
+    Dialog::dispose();
 }
 
 void RemoteFilesDialog::Resize()
 {
-    ModalDialog::Resize();
+    Dialog::Resize();
 
     if( m_pFileView && m_pContainer )
     {
diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx
index f845812ff9ce..961ab53d2d6b 100644
--- a/fpicker/source/office/fpdialogbase.hxx
+++ b/fpicker/source/office/fpdialogbase.hxx
@@ -62,11 +62,11 @@ namespace o3tl {
 
 // SvtFileDialog_Base
 
-class SvtFileDialog_Base : public ModalDialog, public ::svt::IFilePickerController
+class SvtFileDialog_Base : public Dialog, public ::svt::IFilePickerController
 {
 public:
     SvtFileDialog_Base( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription )
-    : ModalDialog( pParent, rID, rUIXMLDescription )
+    : Dialog( pParent, rID, rUIXMLDescription )
     {
     }
 
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index ed097017dc5e..15b95020b5ed 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -532,7 +532,7 @@ void SvtFileDialog::dispose()
     _pPbPlay.clear();
     _pPrevWin.clear();
     m_aDisabledControls.clear();
-    ModalDialog::dispose();
+    Dialog::dispose();
 }
 
 void SvtFileDialog::Init_Impl
@@ -1585,7 +1585,7 @@ bool SvtFileDialog::EventNotify( NotifyEvent& rNEvt )
             }
         }
     }
-    return bRet || ModalDialog::EventNotify(rNEvt);
+    return bRet || Dialog::EventNotify(rNEvt);
 }
 
 namespace
@@ -1661,7 +1661,7 @@ short SvtFileDialog::Execute()
 
     // start the dialog
     _bIsInExecute = true;
-    short nResult = ModalDialog::Execute();
+    short nResult = Dialog::Execute();
     _bIsInExecute = false;
 
     SAL_WARN_IF( m_pCurrentAsyncAction.is(), "fpicker.office", "SvtFilePicker::Execute: still running an async action!" );
@@ -1691,7 +1691,7 @@ bool SvtFileDialog::StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx)
         return false;
 
     // start of the dialog
-    return ModalDialog::StartExecuteAsync(rCtx);
+    return Dialog::StartExecuteAsync(rCtx);
 }
 
 void SvtFileDialog::onAsyncOperationStarted()
@@ -2269,7 +2269,7 @@ void SvtFileDialog::DataChanged( const DataChangedEvent& _rDCEvt )
     if ( DataChangedEventType::SETTINGS == _rDCEvt.GetType() )
         implUpdateImages( );
 
-    ModalDialog::DataChanged( _rDCEvt );
+    Dialog::DataChanged( _rDCEvt );
 }
 
 
diff --git a/fpicker/uiconfig/ui/remotefilesdialog.ui b/fpicker/uiconfig/ui/remotefilesdialog.ui
index e27242c520e9..eb4b9959c2b8 100644
--- a/fpicker/uiconfig/ui/remotefilesdialog.ui
+++ b/fpicker/uiconfig/ui/remotefilesdialog.ui
@@ -44,6 +44,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="remotefilesdialog|RemoteFilesDialog">Remote Files</property>
+    <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child>
       <placeholder/>
commit 4bc377da92e83192facb736d8dadc32891f99e25
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 18 16:02:57 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Oct 19 17:33:04 2019 +0200

    only warn if it would make a difference
    
    Change-Id: I7ee9ccb2444fc63b2d32520907f502ae596c984d
    Reviewed-on: https://gerrit.libreoffice.org/81067
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c1502e891a84..34ceee0069aa 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -950,7 +950,7 @@ void Menu::ShowItem( sal_uInt16 nItemId, bool bVisible )
     size_t          nPos;
     MenuItemData*   pData = pItemList->GetData( nItemId, nPos );
 
-    SAL_WARN_IF(IsMenuBar(), "vcl", "Menu::ShowItem - ignored for menu bar entries!");
+    SAL_WARN_IF(IsMenuBar() && !bVisible , "vcl", "Menu::ShowItem - ignored for menu bar entries!");
     if (!IsMenuBar()&& pData && (pData->bVisible != bVisible))
     {
         vcl::Window* pWin = ImplGetWindow();
@@ -1463,7 +1463,6 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
             // Separator
             if (!IsMenuBar()&& (pData->eType == MenuItemType::SEPARATOR))
             {
-                //Useless: SAL_WARN_IF( IsMenuBar(), "vcl", "Separator in MenuBar ?! " );
                 pData->aSz.setHeight( 4 );
             }