[Libreoffice-commits] core.git: 2 commits - include/vcl sfx2/source vcl/source

[Libreoffice Gerrit user]

 include/vcl/event.hxx               |    2 --
 include/vcl/graphicfilter.hxx       |    3 +--
 sfx2/source/view/frame2.cxx         |    2 +-
 vcl/source/filter/graphicfilter.cxx |    4 ----
 vcl/source/window/window.cxx        |   10 ++--------
 5 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit 057d3afa9616136040f9daaba4b54bb1ecb314b5
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Dec 3 21:23:31 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Dec 4 07:13:52 2018 +0100

    remove unnecessary GraphicFilterImportFlags::AllowPartialStreamRead
    
    Change-Id: I43036745b50e99dc47bb9b63f78e8f3c6eea2c89
    Reviewed-on: https://gerrit.libreoffice.org/64486
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index 8152dbc972b1..0ce9f50ba0c4 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -56,7 +56,6 @@ enum class GraphicFilterImportFlags
     SetLogsizeForJpeg      = 0x001,
     DontSetLogsizeForJpeg  = 0x002,
     ForPreview             = 0x004,
-    AllowPartialStreamRead = 0x010,
     /// Only create a bitmap, do not read pixel data.
     OnlyCreateBitmap       = 0x020,
     /// Read pixel data into an existing bitmap.
@@ -64,7 +63,7 @@ enum class GraphicFilterImportFlags
 };
 namespace o3tl
 {
-    template<> struct typed_flags<GraphicFilterImportFlags> : is_typed_flags<GraphicFilterImportFlags, 0x0077> {};
+    template<> struct typed_flags<GraphicFilterImportFlags> : is_typed_flags<GraphicFilterImportFlags, 0x0067> {};
 }
 
 #define IMP_BMP                 "SVBMP"
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 2f1c15df344d..67a71a21fb52 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1705,10 +1705,6 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath,
             else if ( (*pFilterData)[ i ].Name == "AllowPartialStreamRead" )
             {
                 (*pFilterData)[ i ].Value >>= bAllowPartialStreamRead;
-                if ( bAllowPartialStreamRead )
-                    nImportFlags |= GraphicFilterImportFlags::AllowPartialStreamRead;
-                else
-                    nImportFlags &=~GraphicFilterImportFlags::AllowPartialStreamRead;
             }
             else if ( (*pFilterData)[ i ].Name == "CreateNativeLink" )
             {
commit 0d4f5bc196d29c6d79acb916f459a0baf758b71d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Dec 3 20:51:38 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Dec 4 07:13:38 2018 +0100

    remove unused MouseNotifyEvent enum values
    
    Change-Id: I3d007287daf82a96e6aead6d75d81ef3e1a6f267
    Reviewed-on: https://gerrit.libreoffice.org/64483
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 6cd6f4a54c83..45d7b5df750c 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -276,9 +276,7 @@ enum class MouseNotifyEvent
     GETFOCUS         = 6,
     LOSEFOCUS        = 7,
     COMMAND          = 8,
-    DESTROY          = 9,
     INPUTENABLE      = 10,
-    INPUTDISABLE     = 11,
     EXECUTEDIALOG    = 100,
     ENDEXECUTEDIALOG = 101
 };
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 8e62ca2c4a38..f55359981ced 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -117,7 +117,7 @@ bool SfxFrameWindow_Impl::EventNotify( NotifyEvent& rNEvt )
         if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) )
             return true;
     }
-    else if ( rNEvt.GetType() == MouseNotifyEvent::EXECUTEDIALOG /*|| rNEvt.GetType() == MouseNotifyEvent::INPUTDISABLE*/ )
+    else if ( rNEvt.GetType() == MouseNotifyEvent::EXECUTEDIALOG )
     {
         pView->SetModalMode( true );
         return true;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 99e3db2abc97..a12d597091a7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -395,12 +395,6 @@ void Window::dispose()
     // hide window in order to trigger the Paint-Handling
     Hide();
 
-    // announce the window is to be destroyed
-    {
-        NotifyEvent aNEvt( MouseNotifyEvent::DESTROY, this );
-        CompatNotify( aNEvt );
-    }
-
     // EndExtTextInputMode
     if ( pSVData->maWinData.mpExtTextInputWin == this )
     {
@@ -2534,9 +2528,9 @@ void Window::EnableInput( bool bEnable, bool bChild )
         ImplGenerateMouseMove();
 
     // #104827# notify parent
-    if ( bNotify )
+    if ( bNotify && bEnable )
     {
-        NotifyEvent aNEvt( bEnable ? MouseNotifyEvent::INPUTENABLE : MouseNotifyEvent::INPUTDISABLE, this );
+        NotifyEvent aNEvt( MouseNotifyEvent::INPUTENABLE, this );
         CompatNotify( aNEvt );
     }
 }