[Libreoffice-commits] core.git: framework/source
Chris Sherlock
chris.sherlock79 at gmail.com
Sat May 10 22:54:54 PDT 2014
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 54 ++++++----------
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 1
2 files changed, 23 insertions(+), 32 deletions(-)
New commits:
commit 777bc22ca6490a4300f30fc1b45287dce789a36f
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Fri May 9 16:51:11 2014 +1000
Remove ToolBarLayoutManager::implts_createUIElement()
There is no need for this function, merge it into createUIElement.
This really helps when I'm looking at a backtrace in gdb.
Change-Id: I005b5161eb2cc8acf509ae7ba4e41186969904d1
Reviewed-on: https://gerrit.libreoffice.org/9309
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 68e64b8..6814ace 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -462,7 +462,29 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL )
UIElement aToolbarElement = implts_findToolbar( rResourceURL );
if ( !aToolbarElement.m_xUIElement.is() )
{
- uno::Reference< ui::XUIElement > xUIElement = implts_createElement( rResourceURL );
+ uno::Reference< ui::XUIElement > xUIElement;
+
+ uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
+ aPropSeq[0].Name = "Frame";
+ aPropSeq[0].Value <<= m_xFrame;
+ aPropSeq[1].Name = "Persistent";
+ aPropSeq[1].Value <<= true;
+ uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
+ aReadLock.clear();
+
+ implts_setToolbarCreation( true );
+ try
+ {
+ if ( xUIElementFactory.is() )
+ xUIElement = xUIElementFactory->createUIElement( rResourceURL, aPropSeq );
+ }
+ catch (const container::NoSuchElementException&)
+ {
+ }
+ catch (const lang::IllegalArgumentException&)
+ {
+ }
+ implts_setToolbarCreation( false );
bool bVisible( false );
bool bFloating( false );
@@ -1374,36 +1396,6 @@ bool ToolbarLayoutManager::implts_isToolbarCreationActive()
return m_bToolbarCreation;
}
-uno::Reference< ui::XUIElement > ToolbarLayoutManager::implts_createElement( const OUString& aName )
-{
- uno::Reference< ui::XUIElement > xUIElement;
-
- SolarMutexClearableGuard aReadLock;
- uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
- aPropSeq[0].Name = "Frame";
- aPropSeq[0].Value <<= m_xFrame;
- aPropSeq[1].Name = "Persistent";
- aPropSeq[1].Value <<= true;
- uno::Reference< ui::XUIElementFactory > xUIElementFactory( m_xUIElementFactoryManager );
- aReadLock.clear();
-
- implts_setToolbarCreation( true );
- try
- {
- if ( xUIElementFactory.is() )
- xUIElement = xUIElementFactory->createUIElement( aName, aPropSeq );
- }
- catch (const container::NoSuchElementException&)
- {
- }
- catch (const lang::IllegalArgumentException&)
- {
- }
- implts_setToolbarCreation( false );
-
- return xUIElement;
-}
-
void ToolbarLayoutManager::implts_setElementData( UIElement& rElement, const uno::Reference< awt::XDockableWindow >& rDockWindow )
{
SolarMutexClearableGuard aReadLock;
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 52d9139..1169e5c 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -258,7 +258,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
void implts_createNonContextSensitiveToolBars();
void implts_createCustomToolBars( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& aCustomTbxSeq );
void implts_createCustomToolBar( const OUString& aTbxResName, const OUString& aTitle );
- css::uno::Reference< css::ui::XUIElement > implts_createElement( const OUString& aName );
void implts_setToolbarCreation( bool bStart = true );
bool implts_isToolbarCreationActive();
More information about the Libreoffice-commits
mailing list