[Libreoffice-commits] core.git: framework/inc framework/source vcl/source
0 files changed New commits: commit 9495b7c935097a7f18896b3835e3a8cc6b0db2ce Author: Andrea Gelmini AuthorDate: Fri Nov 1 08:07:34 2019 +0100 Commit: Julien Nabet CommitDate: Fri Nov 1 22:55:04 2019 +0100 Removed executable permission on src file Change-Id: Id4dc99968fc453f5ab3ee5e7b30bfacf79e843b7 Reviewed-on: https://gerrit.libreoffice.org/81867 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx old mode 100755 new mode 100644 diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx old mode 100755 new mode 100644 diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx old mode 100755 new mode 100644 diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc framework/source vcl/source
framework/inc/services/desktop.hxx |2 -
framework/source/services/desktop.cxx |7 ++-
vcl/source/app/settings.cxx| 25 -
vcl/source/app/svapp.cxx | 10 +++--
vcl/source/font/PhysicalFontCollection.cxx | 11 +-
vcl/source/outdev/font.cxx | 37
vcl/source/window/window.cxx | 52 +++--
7 files changed, 103 insertions(+), 41 deletions(-)
New commits:
commit f0e90c712b701b2d3b4f4725dfbed8c5ea924b0f
Author: Caolán McNamara
Date: Wed Aug 19 15:27:07 2015 +0100
for testing allow disabling configmgr for time critical paths
Change-Id: I83396e7c90d3b182f353a77c9bdf06fd17af92a1
diff --git a/framework/inc/services/desktop.hxx
b/framework/inc/services/desktop.hxx
index dc3d4d7..1d47522 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -409,7 +409,7 @@ class Desktop : private cppu::BaseMutex,
css::uno::Reference< css::frame::XFrame >
m_xLastFrame; /// last target of "loadComponentFromURL()"!
css::uno::Any
m_aInteractionRequest;
bool
m_bSuspendQuickstartVeto; /// don't ask quickstart for a veto
-SvtCommandOptions
m_aCommandOptions;/// ref counted class to support disabling commands
defined by configuration file
+std::unique_ptr
m_xCommandOptions;/// ref counted class to support disabling commands
defined by configuration file
OUString
m_sName;
OUString
m_sTitle;
css::uno::Reference< css::frame::XDispatchRecorderSupplier >
m_xDispatchRecorderSupplier;
diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
index 32add3f..9c2eb1c 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -63,6 +63,7 @@
#include
#include
+#include
#include
namespace framework{
@@ -162,7 +163,6 @@ Desktop::Desktop( const css::uno::Reference<
css::uno::XComponentContext >& xCon
, m_xLastFrame(
)
, m_aInteractionRequest (
)
, m_bSuspendQuickstartVeto( false
)
-, m_aCommandOptions (
)
, m_sName (
)
, m_sTitle(
)
, m_xDispatchRecorderSupplier(
)
@@ -646,8 +646,11 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL
Desktop::queryDispatch( co
if ( aURL.Protocol.equalsIgnoreAsciiCase(".uno:") )
aCommand = aURL.Path;
+if (!m_xCommandOptions && !utl::ConfigManager::IsAvoidConfig())
+m_xCommandOptions.reset(new SvtCommandOptions);
+
// Make std::unordered_map lookup if the current URL is in the disabled
list
-if ( m_aCommandOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
aCommand ) )
+if (m_xCommandOptions &&
m_xCommandOptions->Lookup(SvtCommandOptions::CMDOPTION_DISABLED, aCommand))
return css::uno::Reference< css::frame::XDispatch >();
else
{
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 33674f8..a8fb56a 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -50,6 +50,7 @@
#include "unotools/localedatawrapper.hxx"
#include "unotools/collatorwrapper.hxx"
#include "unotools/confignode.hxx"
+#include "unotools/configmgr.hxx"
#include "unotools/syslocaleoptions.hxx"
using namespace ::com::sun::star;
@@ -687,7 +688,10 @@ void ImplStyleData::SetStandardStyles()
vcl::Font aStdFont( FAMILY_SWISS, Size( 0, 8 ) );
aStdFont.SetCharSet( osl_getThreadTextEncoding() );
aStdFont.SetWeight( WEIGHT_NORMAL );
-aStdFont.SetName(
utl::DefaultFontConfiguration::get().getUserInterfaceFont( LanguageTag("en")) );
+if (!utl::ConfigManager::IsAvoidConfig())
+
aStdFont.SetName(utl::DefaultFontConfiguration::get().getUserInterfaceFont(LanguageTag("en")));
+else
+aStdFont.SetName("Liberation Serif");
maAppFont = aStdFont;
maHelpFont = aStdFont;
maMenuFont = aStdFont;
@@ -2707,7 +2711,8 @@ ImplAllSettingsData::ImplAllSettingsData()
mpUILocaleDataWrapper = NULL;
mpI18nHelper= NULL;
mpUII18nHelper = NULL;
-maMiscSettings.SetEnab
[Libreoffice-commits] core.git: framework/inc framework/source vcl/source
framework/inc/dispatch/closedispatcher.hxx|3 ++-
framework/source/dispatch/closedispatcher.cxx | 10 --
vcl/source/helper/evntpost.cxx|6 ++
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit db06595d13ab00c1c7584456b4bcd85797eadaa9
Author: Stephan Bergmann
Date: Tue May 6 16:33:55 2014 +0200
vcl::EventPoster shall probably be covered by SolarMutex
...as most parts of VCL. Ran across at least one case where a remote call
to
framework::CloseDispatcher::release -> ~CloseDispatcher -> ~EventPoster ->
Application::RemoveUserEvent caused a crash. As always with SolarMutex,
keep
fingers crossed that this is about the right level to acquire it.
Change-Id: I8f4be7329adbf72355774fa5d3c472270da3ddd2
diff --git a/framework/inc/dispatch/closedispatcher.hxx
b/framework/inc/dispatch/closedispatcher.hxx
index 3c01754..db5f7c3 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -36,6 +36,7 @@
#include
#include
+#include
#include
#include
@@ -88,7 +89,7 @@ class CloseDispatcher : public ::cppu::WeakImplHelper2<
/** @short used for asynchronous callbacks within the main thread.
@descr Internally we work asynchronous. Because our callis
are not aware, that her request can kill its own
environment ... */
-::vcl::EventPoster m_aAsyncCallback;
+boost::scoped_ptr m_aAsyncCallback;
/** @short used inside asyncronous callback to decide,
which operation must be executed. */
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index afef22b..f511d00 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -57,7 +57,8 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference<
css::uno::XComponent
const css::uno::Reference< css::frame::XFrame
>& xFrame ,
const OUString&
sTarget)
: m_xContext (rxContext )
-, m_aAsyncCallback (LINK( this, CloseDispatcher, impl_asyncCallback))
+, m_aAsyncCallback(
+new vcl::EventPoster(LINK(this, CloseDispatcher, impl_asyncCallback)))
, m_eOperation(E_CLOSE_DOC)
, m_lStatusListener(m_mutex)
, m_pSysWindow(NULL)
@@ -77,6 +78,8 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference<
css::uno::XComponent
CloseDispatcher::~CloseDispatcher()
{
+SolarMutexGuard g;
+m_aAsyncCallback.reset();
}
void SAL_CALL CloseDispatcher::dispatch(const css::util::URL&
aURL ,
@@ -215,7 +218,10 @@ void SAL_CALL
CloseDispatcher::dispatchWithNotification(const css::util::URL&
if ( bIsSynchron )
impl_asyncCallback(0);
else
-m_aAsyncCallback.Post(0);
+{
+SolarMutexGuard g;
+m_aAsyncCallback->Post(0);
+}
}
/**
diff --git a/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx
index 6c551e1..28ede4a 100644
--- a/vcl/source/helper/evntpost.cxx
+++ b/vcl/source/helper/evntpost.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
+#include
#include
#include
@@ -31,6 +34,7 @@ EventPoster::EventPoster( const Link& rLink )
EventPoster::~EventPoster()
{
+DBG_TESTSOLARMUTEX();
if ( m_nId )
GetpApp()->RemoveUserEvent( m_nId );
}
@@ -38,11 +42,13 @@ EventPoster::~EventPoster()
void EventPoster::Post( UserEvent* pEvent )
{
+DBG_TESTSOLARMUTEX();
m_nId = GetpApp()->PostUserEvent( ( LINK( this, EventPoster, DoEvent_Impl
) ), pEvent );
}
IMPL_LINK( EventPoster, DoEvent_Impl, UserEvent*, pEvent )
{
+DBG_TESTSOLARMUTEX();
m_nId = 0;
m_aLink.Call( pEvent );
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
