diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx
index 8f4ad388dcd6..021fe41c2967 100644
--- a/include/svtools/toolboxcontroller.hxx
+++ b/include/svtools/toolboxcontroller.hxx
@@ -51,13 +51,13 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
                           public ::com::sun::star::lang::XInitialization,
                           public ::com::sun::star::util::XUpdatable,
                           public ::com::sun::star::lang::XComponent,
-                          public ::comphelper::OMutexAndBroadcastHelper,//shizhoubo
-                          public ::comphelper::OPropertyContainer,//shizhoubo
-                          public ::comphelper::OPropertyArrayUsageHelper< ToolboxController >,//shizhoubo
+                          public ::comphelper::OMutexAndBroadcastHelper,
+                          public ::comphelper::OPropertyContainer,
+                          public ::comphelper::OPropertyArrayUsageHelper< ToolboxController >,
                           public ::cppu::OWeakObject
 {
     private:
-        sal_Bool  m_bSupportVisible; //shizhoubo
+        sal_Bool  m_bSupportVisible;
     public:
         ToolboxController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
                            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
@@ -101,13 +101,13 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
         virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException);
-        // OPropertySetHelper //shizhoubo
+        // OPropertySetHelper
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any& rValue ) throw(com::sun::star::uno::Exception);
         virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any& rConvertedValue, com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const com::sun::star::uno::Any& rValue) throw(com::sun::star::lang::IllegalArgumentException);
-        // XPropertySet //shizhoubo
+        // XPropertySet
         virtual ::com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
         virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-        // OPropertyArrayUsageHelper //shizhoubo
+        // OPropertyArrayUsageHelper
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
 
 
@@ -120,7 +120,7 @@ class SVT_DLLPUBLIC ToolboxController : public ::com::sun::star::frame::XStatusL
 
     protected:
         bool getToolboxId( sal_uInt16& rItemId, ToolBox** ppToolBox );
-        void setSupportVisibleProperty(sal_Bool bValue); //shizhoubo
+        void setSupportVisibleProperty(sal_Bool bValue);
         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 3722c4d4111c..e66d7c5a2ae0 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -185,7 +185,6 @@ throw ( Exception, RuntimeException )
     {
         SolarMutexGuard aSolarMutexGuard;
         m_bInitialized = sal_True;
-        //shizhoubo add
         m_bSupportVisible = sal_False;
         PropertyValue aPropValue;
         for ( int i = 0; i < aArguments.getLength(); i++ )
@@ -714,7 +713,6 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ
 
 //
 //-------------------------------------------------------------------------
-// XPropertySet by shizhoubo
 com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >  SAL_CALL ToolboxController::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException)
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
@@ -725,7 +723,7 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >  SAL_C
 {
         return *const_cast<ToolboxController*>(this)->getArrayHelper();
 }
-//OPropertyArrayUsageHelper by shizhoubo
+
 //------------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper* ToolboxController::createArrayHelper( ) const
 {
@@ -733,12 +731,12 @@ com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >  SAL_C
         describeProperties(aProps);
         return new ::cppu::OPropertyArrayHelper(aProps);
 }
-//shizhoubo for supportsvisiable
+
 void ToolboxController::setSupportVisibleProperty(sal_Bool bValue)
 {
     m_bSupportVisible = bValue;
 }
-//OPropertySetHelper by shizhoubo
+
 sal_Bool SAL_CALL ToolboxController::convertFastPropertyValue( com::sun::star::uno::Any&    aConvertedValue ,
                                              com::sun::star::uno::Any&        aOldValue       ,
                                              sal_Int32                        nHandle         ,