summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/hierarchy
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 18:16:42 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-02-09 08:18:05 +0000
commita238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch)
tree083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /ucb/source/ucp/hierarchy
parent538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff)
Remove excess newlines
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'ucb/source/ucp/hierarchy')
-rw-r--r--ucb/source/ucp/hierarchy/dynamicresultset.cxx6
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.cxx20
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.hxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx11
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydata.cxx8
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydata.hxx2
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx45
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.hxx1
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx10
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.cxx16
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.hxx1
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyservices.cxx1
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyuri.cxx5
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyuri.hxx2
14 files changed, 0 insertions, 130 deletions
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
index f29b7008f9bc..dfa842af06e1 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx
@@ -34,13 +34,9 @@ using namespace com::sun::star;
using namespace hierarchy_ucp;
-
-
// DynamicResultSet Implementation.
-
-
DynamicResultSet::DynamicResultSet(
const uno::Reference< uno::XComponentContext >& rxContext,
const rtl::Reference< HierarchyContent >& rxContent,
@@ -51,11 +47,9 @@ DynamicResultSet::DynamicResultSet(
}
-
// Non-interface methods.
-
void DynamicResultSet::initStatic()
{
m_xResultSet1
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 1961ff559784..718de574a830 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -74,13 +74,9 @@ using namespace com::sun::star;
using namespace hierarchy_ucp;
-
-
// HierarchyContent Implementation.
-
-
// static ( "virtual" ctor )
HierarchyContent* HierarchyContent::create(
const uno::Reference< uno::XComponentContext >& rxContext,
@@ -151,11 +147,9 @@ HierarchyContent::~HierarchyContent()
}
-
// XInterface methods.
-
// virtual
void SAL_CALL HierarchyContent::acquire()
throw( )
@@ -195,11 +189,9 @@ uno::Any SAL_CALL HierarchyContent::queryInterface( const uno::Type & rType )
}
-
// XTypeProvider methods.
-
XTYPEPROVIDER_COMMON_IMPL( HierarchyContent );
@@ -279,11 +271,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes()
}
-
// XServiceInfo methods.
-
// virtual
OUString SAL_CALL HierarchyContent::getImplementationName()
throw( uno::RuntimeException, std::exception )
@@ -310,11 +300,9 @@ HierarchyContent::getSupportedServiceNames()
}
-
// XContent methods.
-
// virtual
OUString SAL_CALL HierarchyContent::getContentType()
throw( uno::RuntimeException, std::exception )
@@ -339,11 +327,9 @@ HierarchyContent::getIdentifier()
}
-
// XCommandProcessor methods.
-
// virtual
uno::Any SAL_CALL HierarchyContent::execute(
const ucb::Command& aCommand,
@@ -572,11 +558,9 @@ void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ )
}
-
// XContentCreator methods.
-
// virtual
uno::Sequence< ucb::ContentInfo > SAL_CALL
HierarchyContent::queryCreatableContentsInfo()
@@ -1847,13 +1831,9 @@ void HierarchyContent::transfer(
}
-
-
// HierarchyContentProperties Implementation.
-
-
uno::Sequence< ucb::ContentInfo >
HierarchyContentProperties::getCreatableContentsInfo() const
{
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index ff2d46cd66c8..19d813fdb9a0 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -44,7 +44,6 @@ namespace hierarchy_ucp
{
-
class HierarchyContentProperties
{
public:
@@ -92,7 +91,6 @@ private:
};
-
class HierarchyContentProvider;
class HierarchyContent : public ::ucbhelper::ContentImplHelper,
diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
index 1d053d2ac3f9..b30465ed1076 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx
@@ -62,11 +62,9 @@ using namespace com::sun::star;
using namespace hierarchy_ucp;
-
// HierarchyContent implementation.
-
#define MAKEPROPSEQUENCE( a ) \
uno::Sequence< beans::Property >( a, sizeof( a ) / sizeof( a[ 0 ] ) )
@@ -74,12 +72,10 @@ using namespace hierarchy_ucp;
uno::Sequence< ucb::CommandInfo >( a, sizeof( a ) / sizeof( a[ 0 ] ) )
-
// IMPORTANT: If any property data ( name / type / ... ) are changed, then
// HierarchyContent::getPropertyValues(...) must be adapted too!
-
// virtual
uno::Sequence< beans::Property > HierarchyContent::getProperties(
const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ )
@@ -93,7 +89,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
// Link: Supported properties
-
if ( isReadOnly() )
{
static const beans::Property aLinkPropertyInfoTable[] =
@@ -216,7 +211,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
// Folder: Supported properties
-
if ( isReadOnly() )
{
static const beans::Property aFolderPropertyInfoTable[] =
@@ -326,7 +320,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties(
// Root Folder: Supported properties
-
// Currently no difference between read-only/read-write
// -> all props ar read-only
@@ -395,7 +388,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
// Link: Supported commands
-
if ( isReadOnly() )
{
static const ucb::CommandInfo aLinkCommandInfoTable[] =
@@ -427,7 +419,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
// Optional standard commands
-
// New commands
};
@@ -487,7 +478,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
// Folder: Supported commands
-
if ( isReadOnly() )
{
static const ucb::CommandInfo aFolderCommandInfoTable[] =
@@ -598,7 +588,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands(
// Root Folder: Supported commands
-
if ( isReadOnly() )
{
static const ucb::CommandInfo aRootFolderCommandInfoTable[] =
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx
index 199ca0332e58..c027ec46f0dc 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx
@@ -94,13 +94,9 @@ void makeXMLName( const OUString & rIn, OUStringBuffer & rBuffer )
}
-
-
// HierarchyEntry Implementation.
-
-
#define READ_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadAccess"
#define READWRITE_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadWriteAccess"
@@ -1061,13 +1057,9 @@ HierarchyEntry::getRootReadAccess()
}
-
-
// HierarchyEntry::iterator Implementation.
-
-
HierarchyEntry::iterator::iterator()
: m_pImpl( new iterator_Impl )
{
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index d3800b139ed1..badca56297c6 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -39,7 +39,6 @@ namespace hierarchy_ucp
{
-
class HierarchyEntryData
{
public:
@@ -72,7 +71,6 @@ private:
};
-
class HierarchyContentProvider;
class HierarchyUri;
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index d9b9e8ce2e53..4739574f02b3 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -43,7 +43,6 @@ using namespace com::sun::star;
using namespace hierarchy_ucp;
-
// describe path of cfg entry
#define CFGPROPERTY_NODEPATH "nodepath"
// true->async. update; false->sync. update
@@ -56,16 +55,13 @@ using namespace hierarchy_ucp;
"/org.openoffice.ucb.Hierarchy/Root"
-
namespace hcp_impl
{
-
// HierarchyDataReadAccess Implementation.
-
class HierarchyDataAccess : public cppu::OWeakObject,
public lang::XServiceInfo,
public lang::XTypeProvider,
@@ -217,13 +213,9 @@ public:
using namespace hcp_impl;
-
-
// HierarchyDataSource Implementation.
-
-
HierarchyDataSource::HierarchyDataSource(
const uno::Reference< uno::XComponentContext > & rxContext )
: m_xContext( rxContext ),
@@ -239,7 +231,6 @@ HierarchyDataSource::~HierarchyDataSource()
}
-
// XInterface methods.
void SAL_CALL HierarchyDataSource::acquire()
throw()
@@ -268,7 +259,6 @@ css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const css::uno::Type
// XTypeProvider methods.
-
XTYPEPROVIDER_IMPL_4( HierarchyDataSource,
lang::XTypeProvider,
lang::XServiceInfo,
@@ -276,11 +266,9 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource,
lang::XMultiServiceFactory );
-
// XServiceInfo methods.
-
XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource,
OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) )
{
@@ -293,11 +281,9 @@ XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource,
ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource );
-
// XComponent methods.
-
// virtual
void SAL_CALL HierarchyDataSource::dispose()
throw( uno::RuntimeException, std::exception )
@@ -340,11 +326,9 @@ void SAL_CALL HierarchyDataSource::removeEventListener(
}
-
// XMultiServiceFactory methods.
-
// virtual
uno::Reference< uno::XInterface > SAL_CALL
HierarchyDataSource::createInstance( const OUString & aServiceSpecifier )
@@ -386,11 +370,9 @@ HierarchyDataSource::getAvailableServiceNames()
}
-
// Non-interface methods
-
uno::Reference< uno::XInterface > SAL_CALL
HierarchyDataSource::createInstanceWithArguments(
const OUString & ServiceSpecifier,
@@ -593,13 +575,9 @@ bool HierarchyDataSource::createConfigPath(
}
-
-
// HierarchyDataAccess Implementation.
-
-
#define ENSURE_ORIG_INTERFACE( interface_name, member_name ) \
m_xCfg##member_name; \
if ( !m_xCfg##member_name.is() ) \
@@ -626,7 +604,6 @@ HierarchyDataAccess::~HierarchyDataAccess()
}
-
// XInterface methods.
void SAL_CALL HierarchyDataAccess::acquire()
throw()
@@ -668,11 +645,9 @@ uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType )
}
-
// XTypeProvider methods.
-
XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess );
@@ -745,11 +720,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes()
}
-
// XServiceInfo methods.
-
XSERVICEINFO_NOFACTORY_IMPL_0(
HierarchyDataAccess,
OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) )
@@ -761,11 +734,9 @@ XSERVICEINFO_NOFACTORY_IMPL_0(
}
-
// XComponent methods.
-
// virtual
void SAL_CALL HierarchyDataAccess::dispose()
throw ( uno::RuntimeException, std::exception )
@@ -807,11 +778,9 @@ void SAL_CALL HierarchyDataAccess::removeEventListener(
}
-
// XHierarchicalNameAccess methods.
-
// virtual
uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName(
const OUString & aName )
@@ -842,11 +811,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName(
}
-
// XNameAccess methods.
-
// virtual
uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName )
throw ( container::NoSuchElementException,
@@ -888,11 +855,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName )
}
-
// XElementAccess methods.
-
// virtual
uno::Type SAL_CALL HierarchyDataAccess::getElementType()
throw ( uno::RuntimeException, std::exception )
@@ -919,11 +884,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements()
}
-
// XChangesNotifier methods.
-
// virtual
void SAL_CALL HierarchyDataAccess::addChangesListener(
const uno::Reference< util::XChangesListener > & aListener )
@@ -952,11 +915,9 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener(
}
-
// XSingleServiceFactory methods.
-
// virtual
uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance()
throw ( uno::Exception, uno::RuntimeException, std::exception )
@@ -985,11 +946,9 @@ HierarchyDataAccess::createInstanceWithArguments(
}
-
// XNameContainer methods.
-
// virtual
void SAL_CALL
HierarchyDataAccess::insertByName( const OUString & aName,
@@ -1024,11 +983,9 @@ HierarchyDataAccess::removeByName( const OUString & Name )
}
-
// XNameReplace methods.
-
// virtual
void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName,
const uno::Any & aElement )
@@ -1046,11 +1003,9 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName,
}
-
// XChangesBatch methods.
-
// virtual
void SAL_CALL HierarchyDataAccess::commitChanges()
throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception )
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index dc750fc2b0a1..2889bef40f87 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -34,7 +34,6 @@ namespace comphelper { class OInterfaceContainerHelper2; }
namespace hierarchy_ucp {
-
class HierarchyDataSource : public cppu::OWeakObject,
public css::lang::XServiceInfo,
public css::lang::XTypeProvider,
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
index 5789f72481c1..3796652a9e79 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx
@@ -37,11 +37,9 @@ namespace hierarchy_ucp
{
-
// struct ResultListEntry.
-
struct ResultListEntry
{
OUString aId;
@@ -54,19 +52,15 @@ struct ResultListEntry
};
-
// ResultList.
-
typedef std::vector< ResultListEntry* > ResultList;
-
// struct DataSupplier_Impl.
-
struct DataSupplier_Impl
{
osl::Mutex m_aMutex;
@@ -107,13 +101,9 @@ DataSupplier_Impl::~DataSupplier_Impl()
}
-
-
// HierarchyResultSetDataSupplier Implementation.
-
-
HierarchyResultSetDataSupplier::HierarchyResultSetDataSupplier(
const uno::Reference< uno::XComponentContext >& rxContext,
const rtl::Reference< HierarchyContent >& rContent,
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index b63fd36ca35b..66a0346744a0 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -41,13 +41,9 @@ using namespace com::sun::star;
using namespace hierarchy_ucp;
-
-
// HierarchyContentProvider Implementation.
-
-
HierarchyContentProvider::HierarchyContentProvider(
const uno::Reference< uno::XComponentContext >& rxContext )
: ::ucbhelper::ContentProviderImplHelper( rxContext )
@@ -61,7 +57,6 @@ HierarchyContentProvider::~HierarchyContentProvider()
}
-
// XInterface methods.
void SAL_CALL HierarchyContentProvider::acquire()
@@ -91,7 +86,6 @@ css::uno::Any SAL_CALL HierarchyContentProvider::queryInterface( const css::uno:
// XTypeProvider methods.
-
XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
lang::XTypeProvider,
lang::XServiceInfo,
@@ -99,29 +93,23 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
lang::XInitialization );
-
// XServiceInfo methods.
-
XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider,
OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ),
"com.sun.star.ucb.HierarchyContentProvider" );
-
// Service factory implementation.
-
ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyContentProvider );
-
// XContentProvider methods.
-
// virtual
uno::Reference< ucb::XContent > SAL_CALL
HierarchyContentProvider::queryContent(
@@ -154,11 +142,9 @@ HierarchyContentProvider::queryContent(
}
-
// XInitialization methods.
-
// virtual
void SAL_CALL HierarchyContentProvider::initialize(
const uno::Sequence< uno::Any >& aArguments )
@@ -169,11 +155,9 @@ void SAL_CALL HierarchyContentProvider::initialize(
}
-
// Non-interface methods.
-
uno::Reference< lang::XMultiServiceFactory >
HierarchyContentProvider::getConfigProvider(
const OUString & rServiceSpecifier )
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index aa6a93b11e44..d8c3ac184362 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star {
namespace hierarchy_ucp {
-
#define HIERARCHY_URL_SCHEME \
"vnd.sun.star.hier"
#define HIERARCHY_URL_SCHEME_LENGTH 17
diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
index 16c0405ff28a..76eecc876f1f 100644
--- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -57,7 +57,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory(
}
-
if ( xFactory.is() )
{
xFactory->acquire();
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
index 196992db664e..d76440f3a25e 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx
@@ -32,18 +32,13 @@
using namespace hierarchy_ucp;
-
#define DEFAULT_DATA_SOURCE_SERVICE \
"com.sun.star.ucb.DefaultHierarchyDataSource"
-
-
// HierarchyUri Implementation.
-
-
void HierarchyUri::init() const
{
// Already inited?
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index fac3a8e1d622..24dfb05f47c5 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -25,12 +25,10 @@
namespace hierarchy_ucp {
-
#define HIERARCHY_URL_SCHEME "vnd.sun.star.hier"
#define HIERARCHY_URL_SCHEME_LENGTH 17
-
class HierarchyUri
{
mutable OUString m_aUri;