diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 13:02:41 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-19 13:02:41 +0000 |
commit | 08bc586df3dc98feb00910d157537ec899cb14eb (patch) | |
tree | c5268ed4f2f060e440bbf83c9cbe4a8a671a829d /framework | |
parent | 804de10ea15b8614d63f85e1e38ec84bb813b365 (diff) |
INTEGRATION: CWS fwk56 (1.6.26); FILE MERGED
2006/11/09 08:23:54 cd 1.6.26.2: #i71264# Fix build problems with gcc 4.2
2006/10/27 09:17:16 oj 1.6.26.1: #i70935# add & to module parameter
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/uifactory/toolbarcontrollerfactory.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uifactory/toolbarcontrollerfactory.cxx b/framework/source/uifactory/toolbarcontrollerfactory.cxx index 4ad26f58a821..045b9af7f21f 100644 --- a/framework/source/uifactory/toolbarcontrollerfactory.cxx +++ b/framework/source/uifactory/toolbarcontrollerfactory.cxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbarcontrollerfactory.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:28:09 $ + * last change: $Author: ihi $ $Date: 2006-12-19 14:02:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -162,7 +162,7 @@ class ConfigurationAccess_ToolbarControllerFactory : // interfaces } }; - sal_Bool impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString aModule, rtl::OUString& aServiceSpecifier ) const; + sal_Bool impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier ) const; rtl::OUString m_aPropCommand; rtl::OUString m_aPropModule; @@ -383,7 +383,7 @@ void ConfigurationAccess_ToolbarControllerFactory::readConfigurationData() } } -sal_Bool ConfigurationAccess_ToolbarControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString aModule, rtl::OUString& aServiceSpecifier ) const +sal_Bool ConfigurationAccess_ToolbarControllerFactory::impl_getElementProps( const Any& aElement, rtl::OUString& aCommand, rtl::OUString& aModule, rtl::OUString& aServiceSpecifier ) const { Reference< XPropertySet > xPropertySet; aElement >>= xPropertySet; |