summaryrefslogtreecommitdiff
path: root/framework/source/uifactory
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-02-07 15:17:29 +0100
committerMatúš Kukan <matus.kukan@collabora.com>2014-02-10 16:43:53 +0100
commite3e1bddb85bac9b8008a02a9fab057aae4b5c839 (patch)
treeef6c33a62b4e4e3ea36f67bfe67c9b0732b763a2 /framework/source/uifactory
parent289ced4011a2866fcf59b86c7cf9a89c924882cc (diff)
Rename ToolBoxFactory -> ToolBarFactory, as the service is named.
Change-Id: Iec6cbefcb6863f14d6c21b2f7fd8e3418cb5d2d5
Diffstat (limited to 'framework/source/uifactory')
-rw-r--r--framework/source/uifactory/addonstoolbarfactory.cxx (renamed from framework/source/uifactory/addonstoolboxfactory.cxx)16
-rw-r--r--framework/source/uifactory/toolbarfactory.cxx (renamed from framework/source/uifactory/toolboxfactory.cxx)10
2 files changed, 13 insertions, 13 deletions
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx
index ffdea9c8c570..8f9fff8ab89d 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
index ad64f4b06832..74f856faea69 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: */