[Libreoffice-commits] core.git: 6 commits - framework/Library_fwk.mk framework/source include/sal solenv/bin
Matúš Kukan
matus.kukan at collabora.com
Mon Feb 10 07:46:49 PST 2014
framework/Library_fwk.mk | 4
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 29 -
framework/source/layoutmanager/toolbarlayoutmanager.hxx | 7
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 14
framework/source/uiconfiguration/uiconfigurationmanager.cxx | 28 -
framework/source/uielement/menubarmanager.cxx | 7
framework/source/uielement/toolbarmanager.cxx | 7
framework/source/uifactory/addonstoolbarfactory.cxx | 240 ++++++++++
framework/source/uifactory/addonstoolboxfactory.cxx | 240 ----------
framework/source/uifactory/toolbarfactory.cxx | 99 ++++
framework/source/uifactory/toolboxfactory.cxx | 99 ----
framework/source/uifactory/uielementfactorymanager.cxx | 16
include/sal/log-areas.dox | 1
solenv/bin/native-code.py | 2
14 files changed, 395 insertions(+), 398 deletions(-)
New commits:
commit 4c726e9607fbcd54c5ef39c951202e3776ec35ae
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Mon Feb 10 16:40:30 2014 +0100
Survive missing UIElementFactories.
And try to not use AddonsToolBarFactory in native code generator.
Change-Id: I4782e6c719bdc7e01da14d2ea026e119da542517
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index 68cf917..2282b06 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModuleManager2.hpp>
@@ -503,10 +504,17 @@ throw ( RuntimeException )
aServiceSpecifier = m_pConfigAccess->getFactorySpecifierFromTypeNameModule( aType, aName, aModuleId );
} // SAFE
- if ( !aServiceSpecifier.isEmpty() )
- return Reference< XUIElementFactory >( m_xContext->getServiceManager()->createInstanceWithContext(aServiceSpecifier, m_xContext), UNO_QUERY );
- else
- return Reference< XUIElementFactory >();
+ if ( !aServiceSpecifier.isEmpty() ) try
+ {
+ return Reference< XUIElementFactory >(m_xContext->getServiceManager()->
+ createInstanceWithContext(aServiceSpecifier, m_xContext), UNO_QUERY);
+ }
+ catch ( const css::loader::CannotActivateFactoryException& )
+ {
+ SAL_WARN("fwk.uielement", aServiceSpecifier <<
+ " not available. This should happen only on mobile platforms.");
+ }
+ return Reference< XUIElementFactory >();
}
void SAL_CALL UIElementFactoryManager::registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId, const OUString& aFactoryImplementationName )
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index cf57fc1..3883a8d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -48,7 +48,6 @@ core_factory_list = [
core_constructor_list = [
# framework/util/fwk.component
- "com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation",
"com_sun_star_comp_framework_AutoRecovery_get_implementation",
"com_sun_star_comp_framework_Frame_get_implementation",
"com_sun_star_comp_framework_JobExecutor_get_implementation",
commit 5306890b2c960235183caad0bf89e5f31f2f29a0
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Mon Feb 10 12:15:07 2014 +0100
native code generator: Do not use uui component.
Since fe537786a42abea57551395f73328db48bebd086 and
4ff56fd1fa6f0ad2501274086a03d51a0e9cf03f it should not be needed.
Change-Id: I497c7920e94c322cee5db1b10cd61f30dfbba634
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ada5a43..cf57fc1 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -41,7 +41,6 @@ core_factory_list = [
("libunordflo.a", "unordf_component_getFactory"),
("libunoxmllo.a", "unoxml_component_getFactory"),
("libutllo.a", "utl_component_getFactory"),
- ("libuuilo.a", "uui_component_getFactory"),
("libxmlsecurity.a", "xmlsecurity_component_getFactory"),
("libxolo.a", "xo_component_getFactory"),
("libxstor.a", "xstor_component_getFactory"),
commit d55495daf9b412eacc271860788ad822e99e57c1
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Mon Feb 10 11:49:18 2014 +0100
Do not throw if AcceleratorConfigurations are missing.
Which can happen on mobile platforms if we don't want them.
Change-Id: I53639ccc75886708850d2d3a01eec76104b7f2c9
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index e4b302e..1bbcc39 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1483,9 +1483,16 @@ Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager
if ( m_bDisposed )
throw DisposedException();
- if ( !m_xModuleAcceleratorManager.is() )
+ if ( !m_xModuleAcceleratorManager.is() ) try
+ {
m_xModuleAcceleratorManager = ui::ModuleAcceleratorConfiguration::
createWithModuleIdentifier(m_xContext, m_aModuleIdentifier);
+ }
+ catch ( const css::uno::DeploymentException& )
+ {
+ SAL_WARN("fwk.uiconfiguration", "ModuleAcceleratorConfiguration"
+ " not available. This should happen only on mobile platforms.");
+ }
return m_xModuleAcceleratorManager;
}
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index f34e7cb..b3f3078 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1178,9 +1178,16 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort
// SAFE ->
ResetableGuard aGuard( m_aLock );
- if (!m_xAccConfig.is())
+ if (!m_xAccConfig.is()) try
+ {
m_xAccConfig = DocumentAcceleratorConfiguration::
createWithDocumentRoot(m_xContext, m_xDocConfigStorage);
+ }
+ catch ( const css::uno::DeploymentException& )
+ {
+ SAL_WARN("fwk.uiconfiguration", "DocumentAcceleratorConfiguration"
+ " not available. This should happen only on mobile platforms.");
+ }
return m_xAccConfig;
}
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 7504d07..736c2d5 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1542,11 +1542,16 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
}
}
- if ( !xGlobalAccelCfg.is() )
+ if ( !xGlobalAccelCfg.is() ) try
{
xGlobalAccelCfg = GlobalAcceleratorConfiguration::create( m_xContext );
m_xGlobalAcceleratorManager = xGlobalAccelCfg;
}
+ catch ( const css::uno::DeploymentException& )
+ {
+ SAL_WARN("fwk.uielement", "GlobalAcceleratorConfiguration"
+ " not available. This should happen only on mobile platforms.");
+ }
}
KeyCode aEmptyKeyCode;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 1b44174..49bb973 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -2229,11 +2229,16 @@ bool ToolBarManager::RetrieveShortcut( const OUString& rCommandURL, OUString& rS
}
}
- if ( !xGlobalAccelCfg.is() )
+ if ( !xGlobalAccelCfg.is() ) try
{
xGlobalAccelCfg = GlobalAcceleratorConfiguration::create( m_xContext );
m_xGlobalAcceleratorManager = xGlobalAccelCfg;
}
+ catch ( const css::uno::DeploymentException& )
+ {
+ SAL_WARN("fwk.uielement", "GlobalAcceleratorConfiguration"
+ " not available. This should happen only on mobile platforms.");
+ }
}
bool bFound = false;
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 5ff8c18..e4e031f 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -197,6 +197,7 @@ certain functionality.
@li @c fwk.joburl
@li @c fwk.loadenv
@li @c fwk.session
+ at li @c fwk.uiconfiguration
@li @c fwk.uielement
@section i18nlangtag
commit e034b0323c7e5494a01abc0d1deab4fb2727bd9f
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Mon Feb 10 11:30:52 2014 +0100
Simplify the code a bit.
Change-Id: I57581fb0f3439ddc4a4848466f6925d962b04aea
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 981e6c6..e4b302e 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -1483,14 +1483,9 @@ Reference< ui::XAcceleratorConfiguration > SAL_CALL ModuleUIConfigurationManager
if ( m_bDisposed )
throw DisposedException();
- Reference< XComponentContext > xContext = m_xContext;
- OUString aModule = m_aModuleIdentifier;
-
if ( !m_xModuleAcceleratorManager.is() )
- {
- Reference< ui::XAcceleratorConfiguration > xManager = ui::ModuleAcceleratorConfiguration::createWithModuleIdentifier(xContext, aModule);
- m_xModuleAcceleratorManager = xManager;
- }
+ m_xModuleAcceleratorManager = ui::ModuleAcceleratorConfiguration::
+ createWithModuleIdentifier(m_xContext, m_aModuleIdentifier);
return m_xModuleAcceleratorManager;
}
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 845233f..f34e7cb 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -1178,24 +1178,11 @@ Reference< XAcceleratorConfiguration > SAL_CALL UIConfigurationManager::getShort
// SAFE ->
ResetableGuard aGuard( m_aLock );
- if (m_xAccConfig.is())
- return m_xAccConfig;
+ if (!m_xAccConfig.is())
+ m_xAccConfig = DocumentAcceleratorConfiguration::
+ createWithDocumentRoot(m_xContext, m_xDocConfigStorage);
- Reference< XComponentContext > xContext = m_xContext;
- Reference< XStorage > xDocumentRoot = m_xDocConfigStorage;
-
- aGuard.unlock();
- // <- SAFE
-
- Reference< XAcceleratorConfiguration > xAccConfig = DocumentAcceleratorConfiguration::createWithDocumentRoot(xContext, xDocumentRoot);
-
- // SAFE ->
- aGuard.lock();
- m_xAccConfig = xAccConfig;
- aGuard.unlock();
- // <- SAFE
-
- return xAccConfig;
+ return m_xAccConfig;
}
Reference< XInterface > SAL_CALL UIConfigurationManager::getEventsManager() throw (::com::sun::star::uno::RuntimeException)
commit cc5ec80521546cddd0ce12fcd25becbcf2c7d2a5
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Fri Feb 7 15:58:00 2014 +0100
misc cleanup and unnecessary OUStrings
Change-Id: Idef960995d7b13af049de5a5045b99df642dc3df
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 71a29b4..333d325 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -67,18 +67,11 @@ ToolbarLayoutManager::ToolbarLayoutManager(
m_bDockingInProgress( false ),
m_bVisible( true ),
m_bLayoutInProgress( false ),
- m_bToolbarCreation( false ),
- m_aFullAddonTbxPrefix( "private:resource/toolbar/addon_" ),
- m_aCustomTbxPrefix( "custom_" ),
- m_aCustomizeCmd( "ConfigureDialog" ),
- m_aToolbarTypeString( UIRESOURCETYPE_TOOLBAR )
+ m_bToolbarCreation( false )
{
// initialize rectangles to zero values
setZeroRectangle( m_aDockingAreaOffsets );
setZeroRectangle( m_aDockingArea );
-
- // create toolkit object
- m_xToolkit = awt::Toolkit::create( m_xContext );
}
ToolbarLayoutManager::~ToolbarLayoutManager()
@@ -433,7 +426,7 @@ bool ToolbarLayoutManager::requestToolbar( const OUString& rResourceURL )
{
bMustCallCreate = true;
aRequestedToolbar.m_aName = rResourceURL;
- aRequestedToolbar.m_aType = m_aToolbarTypeString;
+ aRequestedToolbar.m_aType = UIRESOURCETYPE_TOOLBAR;
aRequestedToolbar.m_xUIElement = xUIElement;
implts_readWindowStateData( rResourceURL, aRequestedToolbar );
}
@@ -465,15 +458,13 @@ bool ToolbarLayoutManager::createToolbar( const OUString& rResourceURL )
bool ToolbarLayoutManager::destroyToolbar( const OUString& rResourceURL )
{
- const OUString aAddonTbResourceName( "private:resource/toolbar/addon_" );
-
UIElementVector::iterator pIter;
uno::Reference< lang::XComponent > xComponent;
bool bNotify( false );
bool bMustBeSorted( false );
bool bMustLayouted( false );
- bool bMustBeDestroyed( rResourceURL.indexOf( aAddonTbResourceName ) != 0 );
+ bool bMustBeDestroyed( !rResourceURL.startsWith("private:resource/toolbar/addon_") );
WriteGuard aWriteLock( m_aLock );
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter )
@@ -992,7 +983,6 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
uno::Reference< ui::XUIElement > xUIElement;
sal_uInt32 nCount = m_pAddonOptions->GetAddonsToolBarCount();
- OUString aAddonsToolBarStaticName( m_aFullAddonTbxPrefix );
OUString aElementType( "toolbar" );
uno::Sequence< beans::PropertyValue > aPropSeq( 2 );
@@ -1001,7 +991,8 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
aPropSeq[1].Name = "ConfigurationData";
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
- OUString aAddonToolBarName( aAddonsToolBarStaticName + m_pAddonOptions->GetAddonsToolbarResourceName(i) );
+ OUString aAddonToolBarName( "private:resource/toolbar/addon_" +
+ m_pAddonOptions->GetAddonsToolbarResourceName(i) );
aAddonToolBarData = m_pAddonOptions->GetAddonsToolBarPart( i );
aPropSeq[1].Value <<= aAddonToolBarData;
@@ -1161,7 +1152,7 @@ void ToolbarLayoutManager::implts_createNonContextSensitiveToolBars()
// - Toolbars (the statusbar is also member of the persistent window state)
// - Not custom toolbars, there are created with their own method (implts_createCustomToolbars)
if ( aElementType.equalsIgnoreAsciiCase("toolbar") &&
- aElementName.indexOf( m_aCustomTbxPrefix ) == -1 )
+ aElementName.indexOf( "custom_" ) == -1 )
{
UIElement aNewToolbar = implts_findToolbar( aName );
bool bFound = ( aNewToolbar.m_aName == aName );
@@ -1209,7 +1200,7 @@ void ToolbarLayoutManager::implts_createCustomToolBars( const uno::Sequence< uno
}
// Only create custom toolbars. Their name have to start with "custom_"!
- if ( !aTbxResName.isEmpty() && ( aTbxResName.indexOf( m_aCustomTbxPrefix ) != -1 ) )
+ if ( !aTbxResName.isEmpty() && ( aTbxResName.indexOf( "custom_" ) != -1 ) )
implts_createCustomToolBar( aTbxResName, aTbxTitle );
}
}
@@ -1359,7 +1350,7 @@ void ToolbarLayoutManager::implts_createToolBar( const OUString& aName, bool& bN
else
{
// Create new UI element and try to read its state data
- UIElement aNewToolbar( aName, m_aToolbarTypeString, xUIElement );
+ UIElement aNewToolbar( aName, UIRESOURCETYPE_TOOLBAR, xUIElement );
implts_readWindowStateData( aName, aNewToolbar );
implts_setElementData( aNewToolbar, xDockWindow );
implts_insertToolbar( aNewToolbar );
@@ -1378,7 +1369,7 @@ void ToolbarLayoutManager::implts_createToolBar( const OUString& aName, bool& bN
{
ToolBox* pToolbar = (ToolBox *)pWindow;
sal_uInt16 nMenuType = pToolbar->GetMenuType();
- if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, m_aCustomizeCmd ))
+ if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, "ConfigureDialog" ))
pToolbar->SetMenuType( nMenuType & ~TOOLBOX_MENUTYPE_CUSTOMIZE );
else
pToolbar->SetMenuType( nMenuType | TOOLBOX_MENUTYPE_CUSTOMIZE );
@@ -3872,7 +3863,7 @@ throw (uno::RuntimeException)
OUString aElementType;
OUString aElementName;
parseResourceURL( rEvent.ResourceURL, aElementType, aElementName );
- if ( aElementName.indexOf( m_aCustomTbxPrefix ) != -1 )
+ if ( aElementName.indexOf( "custom_" ) != -1 )
{
// custom toolbar must be directly created, shown and layouted!
createToolbar( rEvent.ResourceURL );
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 4c2a64c..aa79775 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -294,7 +294,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
css::uno::Reference< ::com::sun::star::ui::XUIElementFactory > m_xUIElementFactoryManager;
css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr;
css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr;
- css::uno::Reference< ::com::sun::star::awt::XToolkit2 > m_xToolkit;
css::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState;
ILayoutNotifications* m_pParentLayouter;
@@ -317,12 +316,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
bool m_bVisible;
bool m_bLayoutInProgress;
bool m_bToolbarCreation;
-
- OUString m_aFullAddonTbxPrefix;
- OUString m_aCustomTbxPrefix;
- OUString m_aCustomizeCmd;
- OUString m_aToolbarTypeString;
- OUString m_aModuleIdentifier;
};
} // namespace framework
diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index 8f9fff8..2a89e5c 100644
--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -196,7 +196,7 @@ throw ( ::com::sun::star::container::NoSuchElementException,
Args[n].Value >>= aResourceURL;
}
- if ( aResourceURL.indexOf( "private:resource/toolbar/addon_" ) != 0 )
+ if ( !aResourceURL.startsWith("private:resource/toolbar/addon_") )
throw IllegalArgumentException();
// Identify frame and determine module identifier to look for context based buttons
commit e3e1bddb85bac9b8008a02a9fab057aae4b5c839
Author: Matúš Kukan <matus.kukan at collabora.com>
Date: Fri Feb 7 15:17:29 2014 +0100
Rename ToolBoxFactory -> ToolBarFactory, as the service is named.
Change-Id: Iec6cbefcb6863f14d6c21b2f7fd8e3418cb5d2d5
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index 7c40db8..9a2347d 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -157,11 +157,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
framework/source/uielement/toolbarmerger \
framework/source/uielement/toolbarwrapper \
framework/source/uielement/uicommanddescription \
- framework/source/uifactory/addonstoolboxfactory \
+ framework/source/uifactory/addonstoolbarfactory \
framework/source/uifactory/factoryconfiguration \
framework/source/uifactory/menubarfactory \
framework/source/uifactory/statusbarfactory \
- framework/source/uifactory/toolboxfactory \
+ framework/source/uifactory/toolbarfactory \
framework/source/uifactory/uicontrollerfactory \
framework/source/uifactory/uielementfactorymanager \
framework/source/uifactory/windowcontentfactorymanager \
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
similarity index 94%
rename from framework/source/uifactory/addonstoolboxfactory.cxx
rename to framework/source/uifactory/addonstoolbarfactory.cxx
index ffdea9c..8f9fff8 100644
--- a/framework/source/uifactory/addonstoolboxfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -52,13 +52,13 @@ using namespace framework;
namespace {
-class AddonsToolBoxFactory : protected ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
+class AddonsToolBarFactory : protected ThreadHelpBase, // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::WeakImplHelper2< css::lang::XServiceInfo ,
css::ui::XUIElementFactory >
{
public:
- AddonsToolBoxFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
- virtual ~AddonsToolBoxFactory();
+ AddonsToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
+ virtual ~AddonsToolBarFactory();
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
@@ -91,7 +91,7 @@ private:
css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager;
};
-AddonsToolBoxFactory::AddonsToolBoxFactory(
+AddonsToolBarFactory::AddonsToolBarFactory(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
ThreadHelpBase( &Application::GetSolarMutex() )
, m_xContext( xContext )
@@ -99,7 +99,7 @@ AddonsToolBoxFactory::AddonsToolBoxFactory(
{
}
-AddonsToolBoxFactory::~AddonsToolBoxFactory()
+AddonsToolBarFactory::~AddonsToolBarFactory()
{
}
@@ -117,7 +117,7 @@ static sal_Bool IsCorrectContext( const OUString& rModuleIdentifier, const OUStr
return sal_False;
}
-sal_Bool AddonsToolBoxFactory::hasButtonsInContext(
+sal_Bool AddonsToolBarFactory::hasButtonsInContext(
const Sequence< Sequence< PropertyValue > >& rPropSeqSeq,
const Reference< XFrame >& rFrame )
{
@@ -172,7 +172,7 @@ sal_Bool AddonsToolBoxFactory::hasButtonsInContext(
}
// XUIElementFactory
-Reference< XUIElement > SAL_CALL AddonsToolBoxFactory::createUIElement(
+Reference< XUIElement > SAL_CALL AddonsToolBarFactory::createUIElement(
const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
throw ( ::com::sun::star::container::NoSuchElementException,
@@ -234,7 +234,7 @@ com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new AddonsToolBoxFactory(context));
+ return cppu::acquire(new AddonsToolBarFactory(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uifactory/toolboxfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx
similarity index 92%
rename from framework/source/uifactory/toolboxfactory.cxx
rename to framework/source/uifactory/toolbarfactory.cxx
index ad64f4b..74f856f 100644
--- a/framework/source/uifactory/toolboxfactory.cxx
+++ b/framework/source/uifactory/toolbarfactory.cxx
@@ -35,10 +35,10 @@ using namespace framework;
namespace {
-class ToolBoxFactory : public MenuBarFactory
+class ToolBarFactory : public MenuBarFactory
{
public:
- ToolBoxFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
+ ToolBarFactory( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException)
@@ -66,13 +66,13 @@ public:
throw ( css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException );
};
-ToolBoxFactory::ToolBoxFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
+ToolBarFactory::ToolBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
MenuBarFactory( xContext )
{
}
// XUIElementFactory
-Reference< XUIElement > SAL_CALL ToolBoxFactory::createUIElement(
+Reference< XUIElement > SAL_CALL ToolBarFactory::createUIElement(
const OUString& ResourceURL,
const Sequence< PropertyValue >& Args )
throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
@@ -93,7 +93,7 @@ com_sun_star_comp_framework_ToolBarFactory_get_implementation(
css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ToolBoxFactory(context));
+ return cppu::acquire(new ToolBarFactory(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list