[Libreoffice-commits] core.git: xmlhelp/source
Jelle van der Waa
jelle at vdwaa.nl
Sat Aug 10 12:23:46 PDT 2013
xmlhelp/source/cxxhelp/provider/content.cxx | 46 ------------------------
xmlhelp/source/cxxhelp/provider/content.hxx | 9 ----
xmlhelp/source/cxxhelp/provider/contentcaps.cxx | 9 ----
xmlhelp/source/cxxhelp/provider/databases.cxx | 34 -----------------
xmlhelp/source/cxxhelp/provider/databases.hxx | 30 ---------------
xmlhelp/source/cxxhelp/provider/provider.cxx | 30 ---------------
xmlhelp/source/cxxhelp/provider/provider.hxx | 12 ------
xmlhelp/source/cxxhelp/provider/resultset.cxx | 15 -------
xmlhelp/source/cxxhelp/provider/services.cxx | 5 --
xmlhelp/source/treeview/tvfactory.cxx | 35 ------------------
xmlhelp/source/treeview/tvread.cxx | 14 -------
xmlhelp/source/treeview/tvread.hxx | 26 -------------
12 files changed, 265 deletions(-)
New commits:
commit 2f66b0cb110c2f7d864f96e850015aa1741e1f94
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Sat Aug 10 19:28:48 2013 +0200
fdo#62475 removed pointless comments
Change-Id: I4fa01553246fa023806b3fec8e6e756a1efa59f1
Reviewed-on: https://gerrit.libreoffice.org/5342
Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 04837f2..7a84493 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/**************************************************************************
TODO
**************************************************************************
@@ -52,13 +51,7 @@
using namespace com::sun::star;
using namespace chelp;
-//=========================================================================
-//=========================================================================
-//
// Content Implementation.
-//
-//=========================================================================
-//=========================================================================
Content::Content( const uno::Reference< uno::XComponentContext >& rxContext,
::ucbhelper::ContentProviderImplHelper* pProvider,
@@ -71,17 +64,12 @@ Content::Content( const uno::Reference< uno::XComponentContext >& rxContext,
{
}
-//=========================================================================
// virtual
Content::~Content()
{
}
-//=========================================================================
-//
// XInterface methods.
-//
-//=========================================================================
// virtual
void SAL_CALL Content::acquire()
@@ -90,7 +78,6 @@ void SAL_CALL Content::acquire()
ContentImplHelper::acquire();
}
-//=========================================================================
// virtual
void SAL_CALL Content::release()
throw( )
@@ -98,7 +85,6 @@ void SAL_CALL Content::release()
ContentImplHelper::release();
}
-//=========================================================================
// virtual
uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
throw ( uno::RuntimeException )
@@ -107,15 +93,10 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
}
-//=========================================================================
-//
// XTypeProvider methods.
-//
-//=========================================================================
XTYPEPROVIDER_COMMON_IMPL( Content );
-//=========================================================================
// virtual
uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
throw( uno::RuntimeException )
@@ -145,11 +126,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
return (*pCollection).getTypes();
}
-//=========================================================================
-//
// XServiceInfo methods.
-//
-//=========================================================================
// virtual
OUString SAL_CALL Content::getImplementationName()
@@ -158,7 +135,6 @@ OUString SAL_CALL Content::getImplementationName()
return OUString( "CHelpContent" );
}
-//=========================================================================
// virtual
uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
throw( uno::RuntimeException )
@@ -169,11 +145,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
return aSNS;
}
-//=========================================================================
-//
// XContent methods.
-//
-//=========================================================================
// virtual
OUString SAL_CALL Content::getContentType()
@@ -182,11 +154,7 @@ OUString SAL_CALL Content::getContentType()
return OUString( MYUCP_CONTENT_TYPE );
}
-//=========================================================================
-//
// XCommandProcessor methods.
-//
-//=========================================================================
//virtual
void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
@@ -194,8 +162,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
{
}
-
-
class ResultSetForRootFactory
: public ResultSetFactory
{
@@ -209,7 +175,6 @@ private:
URLParameter m_aURLParameter;
Databases* m_pDatabases;
-
public:
ResultSetForRootFactory(
@@ -242,8 +207,6 @@ public:
}
};
-
-
class ResultSetForQueryFactory
: public ResultSetFactory
{
@@ -257,7 +220,6 @@ private:
URLParameter m_aURLParameter;
Databases* m_pDatabases;
-
public:
ResultSetForQueryFactory(
@@ -290,8 +252,6 @@ public:
}
};
-
-
// virtual
uno::Any SAL_CALL Content::execute(
const ucb::Command& aCommand,
@@ -421,9 +381,7 @@ uno::Any SAL_CALL Content::execute(
}
else
{
- //////////////////////////////////////////////////////////////////
// Unsupported command
- //////////////////////////////////////////////////////////////////
aRet <<= ucb::UnsupportedCommandException();
ucbhelper::cancelCommandExecution(aRet,Environment);
}
@@ -431,10 +389,6 @@ uno::Any SAL_CALL Content::execute(
return aRet;
}
-
-
-
-//=========================================================================
uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Sequence< beans::Property >& rProperties )
{
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 98b80dc..f39b5c8 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -37,14 +37,10 @@ namespace com { namespace sun { namespace star { namespace sdbc {
namespace chelp
{
-//=========================================================================
-
// UNO service name for the content.
#define MYUCP_CONTENT_SERVICE_NAME \
"com.sun.star.ucb.CHelpContent"
-//=========================================================================
-
class Databases;
struct ContentProperties
@@ -55,8 +51,6 @@ namespace chelp
ContentProperties() {}
};
-//=========================================================================
-
class Content : public ::ucbhelper::ContentImplHelper
{
public:
@@ -104,7 +98,6 @@ namespace chelp
abort( sal_Int32 CommandId )
throw( com::sun::star::uno::RuntimeException );
-
private:
// private members;
@@ -113,7 +106,6 @@ namespace chelp
URLParameter m_aURLParameter;
Databases* m_pDatabases;
-
// private methods
virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
@@ -132,7 +124,6 @@ namespace chelp
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rValues );
-
};
}
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 9b442dc..d53bbba 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
@@ -154,26 +154,17 @@ uno::Sequence< beans::Property > Content::getProperties(
return props;
}
-
-
-//=========================================================================
// virtual
uno::Sequence< star::ucb::CommandInfo > Content::getCommands(
const uno::Reference< star::ucb::XCommandEnvironment > & /*xEnv*/ )
{
- //=================================================================
- //
// Supported commands
- //
- //=================================================================
#define COMMAND_COUNT 5
static const star::ucb::CommandInfo aCommandInfoTable[] =
{
- ///////////////////////////////////////////////////////////////
// Required commands
- ///////////////////////////////////////////////////////////////
star::ucb::CommandInfo(
"getCommandInfo",
-1,
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 9305dd5..e19dc00 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -80,7 +80,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::deployment;
using namespace com::sun::star::beans;
-
OUString Databases::expandURL( const OUString& aURL )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -432,8 +431,6 @@ const std::vector< OUString >& Databases::getModuleList( const OUString& Languag
return m_avModules;
}
-
-
StaticModuleInformation* Databases::getStaticInformationForModule( const OUString& Module,
const OUString& Language )
{
@@ -527,9 +524,6 @@ StaticModuleInformation* Databases::getStaticInformationForModule( const OUStrin
return it->second;
}
-
-
-
OUString Databases::processLang( const OUString& Language )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -562,7 +556,6 @@ OUString Databases::processLang( const OUString& Language )
return ret;
}
-
OUString Databases::country( const OUString& Language )
{
sal_Int32 idx;
@@ -573,8 +566,6 @@ OUString Databases::country( const OUString& Language )
return OUString();
}
-
-
helpdatafileproxy::Hdf* Databases::getHelpDataFile( const OUString& Database,
const OUString& Language, bool helpText,
const OUString* pExtensionPath )
@@ -584,7 +575,6 @@ helpdatafileproxy::Hdf* Databases::getHelpDataFile( const OUString& Database,
osl::MutexGuard aGuard( m_aMutex );
-
OUString aFileExt( helpText ? OUString(".ht") : OUString(".db") );
OUString dbFileName = OUStringBuffer().append('/').append(Database).append(aFileExt).makeStringAndClear();
OUString key;
@@ -673,8 +663,6 @@ Databases::getCollator( const OUString& Language,
return it->second;
}
-
-
namespace chelp {
struct KeywordElementComparator
@@ -723,8 +711,6 @@ namespace chelp {
}
-
-
KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases,
helpdatafileproxy::Hdf* pHdf,
OUString& ky,
@@ -735,8 +721,6 @@ KeywordInfo::KeywordElement::KeywordElement( Databases *pDatabases,
init( pDatabases,pHdf,data );
}
-
-
void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids )
{
const sal_Unicode* idstr = ids.getStr();
@@ -788,8 +772,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,helpdatafileproxy:
}
}
-
-
KeywordInfo::KeywordInfo( const std::vector< KeywordElement >& aVec )
: listKey( aVec.size() ),
listId( aVec.size() ),
@@ -853,7 +835,6 @@ bool Databases::checkModuleMatchForExtension
return bBelongsToDatabase;
}
-
KeywordInfo* Databases::getKeyword( const OUString& Database,
const OUString& Language )
{
@@ -1116,15 +1097,12 @@ void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount
(*buffer)[*byteCount] = 0;
}
-
void Databases::changeCSS(const OUString& newStyleSheet)
{
m_aCSS = newStyleSheet.toAsciiLowerCase();
delete[] m_pCustomCSSDoc, m_pCustomCSSDoc = 0,m_nCustomCSSDocLength = 0;
}
-
-
void Databases::cascadingStylesheet( const OUString& Language,
char** buffer,
int* byteCount )
@@ -1237,7 +1215,6 @@ void Databases::cascadingStylesheet( const OUString& Language,
}
-
void Databases::setActiveText( const OUString& Module,
const OUString& Language,
const OUString& Id,
@@ -1299,7 +1276,6 @@ void Databases::setActiveText( const OUString& Module,
}
}
-
void Databases::setInstallPath( const OUString& aInstDir )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -1311,8 +1287,6 @@ void Databases::setInstallPath( const OUString& aInstDir )
m_aInstallDirectory += OUString( "/" );
}
-
-//===================================================================
// class ExtensionIteratorBase
ExtensionHelpExistanceMap ExtensionIteratorBase::aHelpExistanceMap;
@@ -1575,8 +1549,6 @@ void ExtensionIteratorBase::implGetLanguageVectorFromPackage( ::std::vector< OUS
}
}
-
-//===================================================================
// class DataBaseIterator
helpdatafileproxy::Hdf* DataBaseIterator::nextHdf( OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath )
@@ -1686,8 +1658,6 @@ helpdatafileproxy::Hdf* DataBaseIterator::implGetHdfFromPackage( Reference< depl
return pRetHdf;
}
-
-//===================================================================
// class KeyDataBaseFileIterator
//returns a file URL
@@ -1768,8 +1738,6 @@ OUString KeyDataBaseFileIterator::implGetDbFileFromPackage
return aExpandedURL;
}
-
-//===================================================================
// class JarFileIterator
Reference< XHierarchicalNameAccess > JarFileIterator::nextJarFile
@@ -1890,8 +1858,6 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage
return xNA;
}
-
-//===================================================================
// class IndexFolderIterator
OUString IndexFolderIterator::nextIndexFolder( bool& o_rbExtension, bool& o_rbTemporary )
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 5c424c0..46e04fd 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -44,17 +44,14 @@
// Forward declaration
-
namespace helpdatafileproxy {
class Hdf;
}
-
namespace chelp {
-
class Databases;
class URLParameter;
@@ -69,7 +66,6 @@ namespace chelp {
OUString m_aFulltext;
int m_nOrder;
-
public:
StaticModuleInformation( OUString aTitle,
@@ -97,8 +93,6 @@ namespace chelp {
int get_order() const { return m_nOrder; }
}; // end class StaticModuleInformation
-
-
class KeywordInfo
{
public:
@@ -125,7 +119,6 @@ namespace chelp {
void init( Databases *pDatabases,helpdatafileproxy::Hdf* pHdf,const OUString& ids );
};
-
KeywordInfo( const std::vector< KeywordElement >& aVector );
~KeywordInfo() { };
@@ -148,8 +141,6 @@ namespace chelp {
com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > listId,listAnchor,listTitle;
}; // end class KeywordInfo
-
-
class Databases
{
public:
@@ -170,7 +161,6 @@ namespace chelp {
}
};
-
/**
* Input is the installdirectory in system dependent notation
*/
@@ -202,7 +192,6 @@ namespace chelp {
const OUString& Language, bool helpText = false,
const OUString* pExtensionPath = NULL );
-
/**
* The following method returns the Collator for the given language-country combination
*/
@@ -218,7 +207,6 @@ namespace chelp {
void popupDocument( URLParameter* urlPar,char **buffer,int *byteCount );
-
/**
* Returns the cascading stlye sheet used to format the HTML-output.
* First try is language directory, second try is main installation directory.
@@ -228,14 +216,12 @@ namespace chelp {
char** buffer,
int* byteCount );
-
/**
* Changes the stylesheet for further reads.
*/
void changeCSS(const OUString& newStyleSheet);
-
/**
* Returns the active help text for the given module, language and id.
*/
@@ -265,7 +251,6 @@ namespace chelp {
OUString processLang( const OUString& Language );
-
/**
* Maps a given language-locale combination to locale.
* The returned string maybe empty
@@ -273,7 +258,6 @@ namespace chelp {
OUString country( const OUString& Language );
-
void replaceName( OUString& oustring ) const;
OUString getProductName() const { return m_vReplacement[0]; }
@@ -348,7 +332,6 @@ namespace chelp {
eq > CollatorTable;
CollatorTable m_aCollatorTable;
-
struct ostring_eq
{
bool operator()( const OString& rKey1, const OString& rKey2 ) const
@@ -372,15 +355,12 @@ namespace chelp {
ostring_eq > EmptyActiveTextSet;
EmptyActiveTextSet m_aEmptyActiveTextSet;
-
// methods
void setInstallPath( const OUString& aInstallDirectory );
}; // end class Databases
-
- //===================================================================
enum IteratorState
{
INITIAL_MODULE,
@@ -401,7 +381,6 @@ namespace chelp {
>
ExtensionHelpExistanceMap;
-
class ExtensionIteratorBase
{
static ExtensionHelpExistanceMap aHelpExistanceMap;
@@ -458,8 +437,6 @@ namespace chelp {
}; // end class ExtensionIteratorBase
-
- //===================================================================
class DataBaseIterator : public ExtensionIteratorBase
{
public:
@@ -476,7 +453,6 @@ namespace chelp {
helpdatafileproxy::Hdf* nextHdf( OUString* o_pExtensionPath = NULL, OUString* o_pExtensionRegistryPath = NULL );
-
private:
helpdatafileproxy::Hdf* implGetHdfFromPackage(
com::sun::star::uno::Reference< com::sun::star::deployment::XPackage > xPackage,
@@ -486,7 +462,6 @@ namespace chelp {
}; // end class DataBaseIterator
- //===================================================================
class KeyDataBaseFileIterator : public ExtensionIteratorBase
{
public:
@@ -503,7 +478,6 @@ namespace chelp {
}; // end class KeyDataBaseFileIterator
- //===================================================================
class JarFileIterator : public ExtensionIteratorBase
{
public:
@@ -523,7 +497,6 @@ namespace chelp {
}; // end class JarFileIterator
- //===================================================================
class IndexFolderIterator : public ExtensionIteratorBase
{
public:
@@ -540,11 +513,8 @@ namespace chelp {
}; // end class KeyDataBaseFileIterator
- //===================================================================
-
} // end namespace chelp
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 58d9cc8..892d8a7 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
/**************************************************************************
TODO
**************************************************************************
@@ -48,13 +47,7 @@
using namespace com::sun::star;
using namespace chelp;
-//=========================================================================
-//=========================================================================
-//
// ContentProvider Implementation.
-//
-//=========================================================================
-//=========================================================================
ContentProvider::ContentProvider(
const uno::Reference< uno::XComponentContext >& rxContext )
@@ -65,18 +58,13 @@ ContentProvider::ContentProvider(
{
}
-//=========================================================================
// virtual
ContentProvider::~ContentProvider()
{
delete m_pDatabases;
}
-//=========================================================================
-//
// XInterface methods.
-//
-//=========================================================================
XINTERFACE_IMPL_6( ContentProvider,
lang::XTypeProvider,
@@ -86,11 +74,7 @@ XINTERFACE_IMPL_6( ContentProvider,
lang::XEventListener, /* base of XContainerListener */
container::XContainerListener);
-//=========================================================================
-//
// XTypeProvider methods.
-//
-//=========================================================================
XTYPEPROVIDER_IMPL_5( ContentProvider,
lang::XTypeProvider,
@@ -99,11 +83,7 @@ XTYPEPROVIDER_IMPL_5( ContentProvider,
lang::XComponent,
container::XContainerListener);
-//=========================================================================
-//
// XServiceInfo methods.
-//
-//=========================================================================
OUString SAL_CALL ContentProvider::getImplementationName()
throw( uno::RuntimeException )
@@ -162,19 +142,11 @@ ContentProvider::getSupportedServiceNames_Static()
return aSNS;
}
-//=========================================================================
-//
// Service factory implementation.
-//
-//=========================================================================
ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
-//=========================================================================
-//
// XContentProvider methods.
-//
-//=========================================================================
// virtual
uno::Reference< ucb::XContent > SAL_CALL
@@ -393,8 +365,6 @@ ContentProvider::getHierAccess(
return xHierAccess;
}
-
-
OUString
ContentProvider::getKey(
const uno::Reference< container::XHierarchicalNameAccess >& xHierAccess,
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index a02b6f1..9d30689 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -28,11 +28,8 @@
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-
namespace chelp {
-//=========================================================================
-
// UNO service name for the provider. This name will be used by the UCB to
// create instances of the provider.
@@ -50,12 +47,8 @@ namespace chelp {
#define MYUCP_URL_SCHEME_LENGTH 18
#define MYUCP_CONTENT_TYPE "application/vnd.sun.star.xmlhelp" // UCB Content Type.
-//=========================================================================
-
-
class Databases;
-
class ContentProvider :
public ::ucbhelper::ContentProviderImplHelper,
public ::com::sun::star::container::XContainerListener,
@@ -84,9 +77,7 @@ namespace chelp {
throw( ::com::sun::star::ucb::IllegalIdentifierException,
::com::sun::star::uno::RuntimeException );
- //////////////////////////////////////////////////////////////////////
// Additional interfaces
- //////////////////////////////////////////////////////////////////////
// XComponent
@@ -136,10 +127,7 @@ namespace chelp {
elementReplaced( const ::com::sun::star::container::ContainerEvent& Event )
throw (::com::sun::star::uno::RuntimeException);
-
- //////////////////////////////////////////////////////////////////////
// Non-interface methods.
- //////////////////////////////////////////////////////////////////////
private:
diff --git a/xmlhelp/source/cxxhelp/provider/resultset.cxx b/xmlhelp/source/cxxhelp/provider/resultset.cxx
index 64524eb..597392b 100644
--- a/xmlhelp/source/cxxhelp/provider/resultset.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultset.cxx
@@ -27,16 +27,9 @@ using namespace com::sun::star::sdbc;
using namespace com::sun::star::ucb;
using namespace com::sun::star::uno;
-
using namespace chelp;
-//=========================================================================
-//=========================================================================
-//
// DynamicResultSet Implementation.
-//
-//=========================================================================
-//=========================================================================
DynamicResultSet::DynamicResultSet(
const Reference< XComponentContext >& rxContext,
@@ -56,18 +49,13 @@ DynamicResultSet::~DynamicResultSet()
delete m_pFactory;
}
-//=========================================================================
-//
// Non-interface methods.
-//
-//=========================================================================
void DynamicResultSet::initStatic()
{
m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() );
}
-//=========================================================================
void DynamicResultSet::initDynamic()
{
m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() );
@@ -75,7 +63,4 @@ void DynamicResultSet::initDynamic()
m_xResultSet2 = m_xResultSet1;
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlhelp/source/cxxhelp/provider/services.cxx b/xmlhelp/source/cxxhelp/provider/services.cxx
index ec4e564..ee7c1f7 100644
--- a/xmlhelp/source/cxxhelp/provider/services.cxx
+++ b/xmlhelp/source/cxxhelp/provider/services.cxx
@@ -25,7 +25,6 @@
using namespace com::sun::star;
-//=========================================================================
extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpchelp_component_getFactory(
const sal_Char * pImplName,
void * pServiceManager,
@@ -37,9 +36,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpchelp_component_getFactory(
reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
- //////////////////////////////////////////////////////////////////////
// Create factory, if implementation name matches.
- //////////////////////////////////////////////////////////////////////
if ( ::chelp::ContentProvider::getImplementationName_Static().
compareToAscii( pImplName ) == 0 )
@@ -47,8 +44,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpchelp_component_getFactory(
xFactory = ::chelp::ContentProvider::createServiceFactory( xSMgr );
}
- //////////////////////////////////////////////////////////////////////
-
if ( xFactory.is() )
{
xFactory->acquire();
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index 5cee589..b4cee95 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 bc4b3da..988f207 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 0b2eb6e..5f48f25 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: */
More information about the Libreoffice-commits
mailing list