diff options
author | Michael Stahl <mstahl@redhat.com> | 2011-12-03 00:34:56 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-12-03 00:48:17 +0100 |
commit | 4f01d343cd6c4e8558cd4331277f02d7089ff476 (patch) | |
tree | f963ddb792764e0f937162ce06f71bbcc56aeaf8 /svtools | |
parent | 59307a7164e35396f34bf621ad7e9d2f265b1c7f (diff) |
property name spelling s/Visiable/Visible/
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/svtools/toolboxcontroller.hxx | 6 | ||||
-rw-r--r-- | svtools/source/uno/toolboxcontroller.cxx | 28 |
2 files changed, 16 insertions, 18 deletions
diff --git a/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx index af451e5d67bf..294fd8fe1460 100644 --- a/svtools/inc/svtools/toolboxcontroller.hxx +++ b/svtools/inc/svtools/toolboxcontroller.hxx @@ -43,13 +43,11 @@ #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/broadcasthelper.hxx> #include <com/sun/star/util/XURLTransformer.hpp> -//shizhoubo for ToolbarController Visiable #include <comphelper/proparrhlp.hxx> #include <comphelper/property.hxx> #include <comphelper/propertycontainer.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> -//end #include <boost/unordered_map.hpp> @@ -70,7 +68,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL public ::cppu::OWeakObject { private: - sal_Bool m_bSupportVisiable; //shizhoubo + sal_Bool m_bSupportVisible; //shizhoubo public: ToolboxController( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, @@ -133,7 +131,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL protected: bool getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox ); - void setSupportVisiableProperty(sal_Bool bValue); //shizhoubo + void setSupportVisibleProperty(sal_Bool bValue); //shizhoubo struct Listener { Listener( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& rDispatch ) : diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 115b09562c22..63318d44bf49 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -40,8 +40,8 @@ #include <vcl/toolbox.hxx> //shizhobo #include <com/sun/star/beans/PropertyAttribute.hpp> -const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE = 1; -const rtl::OUString TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIABLE( RTL_CONSTASCII_USTRINGPARAM( "SupportsVisiable" )); +const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE = 1; +const rtl::OUString TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE( RTL_CONSTASCII_USTRINGPARAM( "SupportsVisible" )); //end using ::rtl::OUString; @@ -97,8 +97,8 @@ ToolboxController::ToolboxController( , m_aListenerContainer( m_aMutex ) { //registger Propertyh by shizhoubo - registerProperty(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIABLE, TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, - &m_bSupportVisiable, getCppuType(&m_bSupportVisiable)); + registerProperty(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE, TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; @@ -121,8 +121,8 @@ ToolboxController::ToolboxController() : , m_aListenerContainer( m_aMutex ) { //registger Propertyh by shizhoubo - registerProperty(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIABLE, TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, - &m_bSupportVisiable, getCppuType(&m_bSupportVisiable)); + registerProperty(TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE, TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE, com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY, + &m_bSupportVisible, getCppuType(&m_bSupportVisible)); m_pImpl = new ToolboxController_Impl; } @@ -220,7 +220,7 @@ throw ( Exception, RuntimeException ) SolarMutexGuard aSolarMutexGuard; m_bInitialized = sal_True; //shizhoubo add - m_bSupportVisiable = sal_False; + m_bSupportVisible = sal_False; PropertyValue aPropValue; for ( int i = 0; i < aArguments.getLength(); i++ ) { @@ -771,9 +771,9 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_C return new ::cppu::OPropertyArrayHelper(aProps); } //shizhoubo for supportsvisiable -void ToolboxController::setSupportVisiableProperty(sal_Bool bValue) +void ToolboxController::setSupportVisibleProperty(sal_Bool bValue) { - m_bSupportVisiable = bValue; + m_bSupportVisible = bValue; } //OPropertySetHelper by shizhoubo sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( com::sun::star::uno::Any& aConvertedValue , @@ -783,14 +783,14 @@ sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( com::sun::star::u { switch (nHandle) { - case TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE: + case TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE: { sal_Bool aNewValue(sal_False); aValue >>= aNewValue; - if (aNewValue != m_bSupportVisiable) + if (aNewValue != m_bSupportVisible) { aConvertedValue <<= aNewValue; - aOldValue <<= m_bSupportVisiable; + aOldValue <<= m_bSupportVisible; return sal_True; } return sal_False; @@ -805,11 +805,11 @@ void SAL_CALL ToolboxController::setFastPropertyValue_NoBroadcast( throw( com::sun::star::uno::Exception) { OPropertyContainer::setFastPropertyValue_NoBroadcast(nHandle, aValue); - if (TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIABLE == nHandle) + if (TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE == nHandle) { sal_Bool rValue(sal_False); if (( aValue >>= rValue ) && m_bInitialized) - this->setSupportVisiableProperty( rValue ); + this->setSupportVisibleProperty( rValue ); } } |