[Libreoffice-commits] core.git: 2 commits - filter/source framework/inc framework/source include/vcl vcl/inc vcl/source
Caolán McNamara
caolanm at redhat.com
Thu Oct 8 02:44:17 PDT 2015
filter/source/config/cache/filtercache.hxx | 2 +-
framework/inc/jobs/jobresult.hxx | 2 +-
framework/source/inc/loadenv/loadenv.hxx | 2 +-
framework/source/services/autorecovery.cxx | 2 +-
framework/source/services/frame.cxx | 2 +-
include/vcl/svapp.hxx | 4 ++++
vcl/inc/svdata.hxx | 3 ++-
vcl/source/app/svapp.cxx | 29 +++++++++++++++++++----------
8 files changed, 30 insertions(+), 16 deletions(-)
New commits:
commit 06d253ef3a3339300eff4fd38db728301516bf4d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Oct 8 10:43:03 2015 +0100
afl-eventtesting: add Application::EndAllDialogs
which uses PostUserEvent like Application::Quit so can ensure
EndAllDialogs gets called before Quit
Change-Id: I9eb7dbd4f012be2e9b9cea7a73c90c5aaba141aa
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 1d8392c..a5fb8fe 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1481,6 +1481,10 @@ public:
static css::uno::Reference< css::ui::dialogs::XFolderPicker2 >
createFolderPicker( const css::uno::Reference< css::uno::XComponentContext >& rServiceManager );
+ /** Cancel all open dialogs
+ */
+ static void EndAllDialogs();
+
///@}
// For vclbootstrapprotector:
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 87e6589..779a140 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -161,7 +161,8 @@ struct ImplSVAppData
Idle* mpEventTestingIdle;
int mnEventTestLimit;
- DECL_STATIC_LINK_TYPED( ImplSVAppData, ImplQuitMsg, void*, void );
+ DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplQuitMsg, void*, void);
+ DECL_STATIC_LINK_TYPED(ImplSVAppData, ImplEndAllDialogsMsg, void*, void);
DECL_LINK_TYPED(VclEventTestingHdl, Idle*, void);
};
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 2c01744..94ebc6e 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -328,6 +328,21 @@ const vcl::KeyCode* Application::GetReservedKeyCode( sal_uLong i )
return &ImplReservedKeys::get()->first[i].mKeyCode;
}
+IMPL_STATIC_LINK_NOARG_TYPED( ImplSVAppData, ImplEndAllDialogsMsg, void*, void )
+{
+ vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow();
+ while (pAppWindow)
+ {
+ Dialog::EndAllDialogs(pAppWindow);
+ pAppWindow = Application::GetNextTopLevelWindow(pAppWindow);
+ }
+}
+
+void Application::EndAllDialogs()
+{
+ Application::PostUserEvent( LINK( NULL, ImplSVAppData, ImplEndAllDialogsMsg ) );
+}
+
namespace
{
bool InjectKeyEvent(SvStream& rStream)
@@ -351,14 +366,8 @@ namespace
void CloseDialogsAndQuit()
{
- Scheduler::ProcessTaskScheduling(true);
- vcl::Window* pAppWindow = Application::GetFirstTopLevelWindow();
- while (pAppWindow)
- {
- Dialog::EndAllDialogs(pAppWindow);
- pAppWindow = Application::GetNextTopLevelWindow(pAppWindow);
- }
- Scheduler::ProcessTaskScheduling(true);
+ Scheduler::ProcessTaskScheduling(false);
+ Application::EndAllDialogs();
Application::Quit();
}
}
@@ -375,7 +384,7 @@ IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void)
}
else
{
- Scheduler::ProcessTaskScheduling(true);
+ Scheduler::ProcessTaskScheduling(false);
if (InjectKeyEvent(*mpEventTestInput))
--mnEventTestLimit;
if (!mpEventTestInput->good())
@@ -383,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(ImplSVAppData, VclEventTestingHdl, Idle *, void)
SAL_INFO("vcl.eventtesting", "Event Input exhausted, exit next cycle");
mnEventTestLimit = 0;
}
- Scheduler::ProcessTaskScheduling(true);
+ Scheduler::ProcessTaskScheduling(false);
mpEventTestingIdle->Start();
}
}
commit 4855e780dc4f3cdfcadbce07b6bbdeb9b4eb2d0b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 7 17:25:16 2015 +0100
full fill mostly fulfill
Change-Id: I9dc05c6eea33ede422f6a4c7b76a41c496f3ceca
diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx
index e70e06a..a986849 100644
--- a/filter/source/config/cache/filtercache.hxx
+++ b/filter/source/config/cache/filtercache.hxx
@@ -324,7 +324,7 @@ class FilterCache : public BaseLock
@throw An exception if the cache could not be filled really
or seems to be invalid afterwards. But there is no reaction
at all if this method does nothing inside, because the cache
- is already full filled!
+ is already fully filled!
*/
void load(EFillState eRequired)
throw(css::uno::Exception);
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 33b5049..86b67b9 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -94,7 +94,7 @@ class JobResult
/**
represent the part "DispatchResult"
- It's a full filled event type, which was given
+ It's a fulfilled event type, which was given
back by the executed job. Any user of us can send
it to his registered result listener directly.
*/
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index a5513b5..7e1bff7 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -77,7 +77,7 @@ public:
@descr The load environment must know, if a content
is related to a target frame or not. Only "visible"
- components, which full fill the requirements of the
+ components, which fullfil the requirements of the
model-controller-view paradigm can be loaded into a frame.
Such contents are classified as E_CAN_BE_LOADED.
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 8967ea9..ab8a9f3 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -740,7 +740,7 @@ private:
SessionSave/CrashSave => pParams != 0
@return A suggestion, how the timer (if its not already disabled!)
- should be restarted to full fill the requirements.
+ should be restarted to fulfill the requirements.
@threadsafe
*/
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index e1d336c..2e978a2 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2468,7 +2468,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::
if (xCloser.is())
xCloser->dispatch(aURL, css::uno::Sequence< css::beans::PropertyValue >());
- // Attention: If this dispatch works synchronous ... and full fill its job ...
+ // Attention: If this dispatch works synchronous ... and fulfill its job ...
// this line of code will never be reached ...
// Or if it will be reached it will be for sure that all your member are gone .-)
}
More information about the Libreoffice-commits
mailing list