diff options
Diffstat (limited to 'xmlhelp/source/treeview')
-rw-r--r-- | xmlhelp/source/treeview/tvfactory.cxx | 35 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.cxx | 14 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvread.hxx | 26 |
3 files changed, 0 insertions, 75 deletions
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index 5cee589c8cac..b4cee958fd8e 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -25,7 +24,6 @@ #include "tvfactory.hxx" #include "tvread.hxx" - using namespace treeview; using namespace com::sun::star; using namespace com::sun::star::uno; @@ -33,22 +31,16 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::container; - - TVFactory::TVFactory( const uno::Reference< XComponentContext >& xContext ) : m_xContext( xContext ) { } - TVFactory::~TVFactory() { } - -////////////////////////////////////////////////////////////////////////// // XInterface -////////////////////////////////////////////////////////////////////////// void SAL_CALL TVFactory::acquire( @@ -58,7 +50,6 @@ TVFactory::acquire( OWeakObject::acquire(); } - void SAL_CALL TVFactory::release( void ) @@ -67,7 +58,6 @@ TVFactory::release( OWeakObject::release(); } - Any SAL_CALL TVFactory::queryInterface( const Type& rType ) @@ -81,9 +71,6 @@ TVFactory::queryInterface( return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } - -//////////////////////////////////////////////////////////////////////////////// -// // XTypeProvider methods. XTYPEPROVIDER_IMPL_3( TVFactory, @@ -91,10 +78,6 @@ XTYPEPROVIDER_IMPL_3( TVFactory, XTypeProvider, XMultiServiceFactory ); - - -//////////////////////////////////////////////////////////////////////////////// - // XServiceInfo methods. OUString SAL_CALL @@ -104,7 +87,6 @@ TVFactory::getImplementationName() return TVFactory::getImplementationName_static(); } - sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName ) @@ -115,7 +97,6 @@ TVFactory::supportsService( ServiceName.compareToAscii( "com.sun.star.ucb.HiearchyDataSource" ) == 0; } - Sequence< OUString > SAL_CALL TVFactory::getSupportedServiceNames( void ) throw( RuntimeException ) @@ -123,8 +104,6 @@ TVFactory::getSupportedServiceNames( void ) return TVFactory::getSupportedServiceNames_static(); } - - // XMultiServiceFactory Reference< XInterface > SAL_CALL @@ -146,7 +125,6 @@ TVFactory::createInstance( seq ); } - Reference< XInterface > SAL_CALL TVFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, @@ -192,7 +170,6 @@ TVFactory::createInstanceWithArguments( return m_xHDS; } - Sequence< OUString > SAL_CALL TVFactory::getAvailableServiceNames( ) throw( RuntimeException ) @@ -202,18 +179,14 @@ TVFactory::getAvailableServiceNames( ) return seq; } - - // static - OUString SAL_CALL TVFactory::getImplementationName_static() { return OUString( "com.sun.star.help.TreeViewImpl" ); } - Sequence< OUString > SAL_CALL TVFactory::getSupportedServiceNames_static() { @@ -223,7 +196,6 @@ TVFactory::getSupportedServiceNames_static() return seq; } - Reference< XSingleServiceFactory > SAL_CALL TVFactory::createServiceFactory( const Reference< XMultiServiceFactory >& rxServiceMgr ) @@ -236,8 +208,6 @@ TVFactory::createServiceFactory( TVFactory::getSupportedServiceNames_static() ) ); } - - Reference< XInterface > SAL_CALL TVFactory::CreateInstance( const Reference< XMultiServiceFactory >& xMultiServiceFactory ) @@ -246,7 +216,6 @@ TVFactory::CreateInstance( return Reference< XInterface >::query( xP ); } -//========================================================================= extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL treeview_component_getFactory( const sal_Char * pImplName,void * pServiceManager,void * pRegistryKey ) { @@ -259,17 +228,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL treeview_component_getFactory( Reference< XSingleServiceFactory > xFactory; - ////////////////////////////////////////////////////////////////////// // File Content Provider. - ////////////////////////////////////////////////////////////////////// if ( TVFactory::getImplementationName_static().compareToAscii( pImplName ) == 0 ) { xFactory = TVFactory::createServiceFactory( xSMgr ); } - ////////////////////////////////////////////////////////////////////// - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index bc4b3da741c9..988f2073ae77 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -165,7 +165,6 @@ namespace treeview { } - using namespace treeview; using namespace com::sun::star; using namespace com::sun::star::uno; @@ -177,7 +176,6 @@ using namespace com::sun::star::frame; using namespace com::sun::star::container; using namespace com::sun::star::deployment; - ConfigData::ConfigData() : prodName("%PRODUCTNAME"), prodVersion("%PRODUCTVERSION"), @@ -230,11 +228,7 @@ void SAL_CALL ConfigData::replaceName( OUString& oustring ) const } } - -////////////////////////////////////////////////////////////////////////// // XInterface -////////////////////////////////////////////////////////////////////////// - void SAL_CALL TVBase::acquire( @@ -267,8 +261,6 @@ TVBase::queryInterface( return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } -//////////////////////////////////////////////////////////////////////////////// -// // XTypeProvider methods. XTYPEPROVIDER_IMPL_5( TVBase, @@ -544,7 +536,6 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom) sal_Int32 c_int; sal_Int32 p_int = p->id.toInt32(); -////////////////////////////////check this level in the tree for(i = tvDom->children.begin(); i!=tvDom->children.end(); ++i) if (!((*i)->isLeaf()) && ((*i)->id.getLength() == p->id.getLength()) && @@ -564,7 +555,6 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom) max_It = i+1; } } -////////////////////////////////recursive call if necessary if (h) (*(tvDom->children.insert(max_It, p)))->parent = tvDom; else { @@ -722,7 +712,6 @@ ConfigData TVChildTarget::init( const Reference< XComponentContext >& xContext ) setupextension ); OUString locale( getKey( xHierAccess,"L10N/ooLocale" ) ); - // Determine fileurl from url and locale OUString url; osl::FileBase::RC errFile = osl::FileBase::getFileURLFromSystemPath( instPath,url ); @@ -916,14 +905,12 @@ TVChildTarget::getBooleanKey(const Reference< return ret; } - void TVChildTarget::subst( OUString& instpath ) const { SvtPathOptions aOptions; instpath = aOptions.SubstituteVariable( instpath ); } -//=================================================================== // class ExtensionIteratorBase static OUString aSlash("/"); @@ -1136,7 +1123,6 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUS } } -//=================================================================== // class TreeFileIterator OUString TreeFileIterator::nextTreeFile( sal_Int32& rnFileSize ) diff --git a/xmlhelp/source/treeview/tvread.hxx b/xmlhelp/source/treeview/tvread.hxx index 0b2eb6eeb5dd..5f48f25bfeed 100644 --- a/xmlhelp/source/treeview/tvread.hxx +++ b/xmlhelp/source/treeview/tvread.hxx @@ -38,7 +38,6 @@ namespace treeview { - class ConfigData { public: @@ -58,7 +57,6 @@ namespace treeview { void SAL_CALL replaceName( OUString& oustring ) const; }; - class TVDom; class TVChildTarget; @@ -92,12 +90,10 @@ namespace treeview { void ) throw(); - // XTypeProvider XTYPEPROVIDER_DECL() - // XNameAccess virtual com::sun::star::uno::Type SAL_CALL @@ -107,7 +103,6 @@ namespace treeview { return getCppuVoidType(); } - virtual sal_Bool SAL_CALL hasElements() throw( com::sun::star::uno::RuntimeException ) { @@ -134,7 +129,6 @@ namespace treeview { (void)aListener; } - // XComponent virtual void SAL_CALL dispose( ) @@ -157,7 +151,6 @@ namespace treeview { (void)aListener; } - // Abstract functions // XNameAccess @@ -175,7 +168,6 @@ namespace treeview { hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ) = 0; - // XHierarchicalNameAccess virtual com::sun::star::uno::Any SAL_CALL @@ -189,10 +181,6 @@ namespace treeview { }; // end class TVBase - - - - class TVRead : public TVBase { @@ -219,7 +207,6 @@ namespace treeview { hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); - // XHierarchicalNameAccess virtual com::sun::star::uno::Any SAL_CALL @@ -231,7 +218,6 @@ namespace treeview { hasByHierarchicalName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); - private: OUString Title; @@ -240,11 +226,6 @@ namespace treeview { }; // end class TVRead - - - - - class TVChildTarget : public TVBase { @@ -270,7 +251,6 @@ namespace treeview { hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); - // XHierarchicalNameAccess virtual com::sun::star::uno::Any SAL_CALL @@ -282,7 +262,6 @@ namespace treeview { hasByHierarchicalName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException ); - private: std::vector< rtl::Reference< TVRead > > Elements; @@ -314,7 +293,6 @@ namespace treeview { }; // end class TVChildTarget - enum IteratorState { USER_EXTENSIONS, @@ -370,8 +348,6 @@ namespace treeview { }; // end class ExtensionIteratorBase - - //=================================================================== class TreeFileIterator : public ExtensionIteratorBase { public: @@ -388,10 +364,8 @@ namespace treeview { }; // end class TreeFileIterator - } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |