[Libreoffice-commits] core.git: include/comphelper
Tor Lillqvist
tml at collabora.com
Sat Mar 28 17:14:33 PDT 2015
include/comphelper/broadcasthelper.hxx | 13 +++++--------
include/comphelper/enumhelper.hxx | 16 ----------------
include/comphelper/proparrhlp.hxx | 10 ----------
include/comphelper/property.hxx | 22 ----------------------
include/comphelper/propertysethelper.hxx | 9 ---------
include/comphelper/propertysetinfo.hxx | 8 --------
include/comphelper/stl_types.hxx | 14 +-------------
7 files changed, 6 insertions(+), 86 deletions(-)
New commits:
commit 9eeee5466fba5a3ff1de6d47b6341d83cf14c275
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Mar 29 02:08:01 2015 +0200
Bin superfluous whitespace, ASCII art and useless comments
Change-Id: Ic70fe69f407e49604b056cdcb92aa3d656e1aeaf
diff --git a/include/comphelper/broadcasthelper.hxx b/include/comphelper/broadcasthelper.hxx
index 70dae21..61e7244 100644
--- a/include/comphelper/broadcasthelper.hxx
+++ b/include/comphelper/broadcasthelper.hxx
@@ -23,16 +23,12 @@
#include <osl/mutex.hxx>
#include <cppuhelper/interfacecontainer.h>
-//... namespace comphelper .......................................................
namespace comphelper
{
-
-
-
- //= OMutexAndBroadcastHelper - a class which holds a Mutex and a OBroadcastHelper;
- //= needed because when deriving from OPropertySetHelper,
- //= the OBroadcastHelper has to be initialized before
- //= the OPropertySetHelper
+ // OMutexAndBroadcastHelper - a class which holds a Mutex and a OBroadcastHelper;
+ // needed because when deriving from OPropertySetHelper,
+ // the OBroadcastHelper has to be initialized before
+ // the OPropertySetHelper
class OMutexAndBroadcastHelper
{
@@ -58,6 +54,7 @@ namespace comphelper
mutable ::osl::Mutex m_aMutex;
};
}
+
#endif // INCLUDED_COMPHELPER_BROADCASTHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index 3983a29..6e0f982 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -30,21 +30,15 @@
#include <osl/mutex.hxx>
#include <comphelper/comphelperdllapi.h>
-
namespace comphelper
{
-//= OEnumerationLock
-
struct OEnumerationLock
{
public:
::osl::Mutex m_aLock;
};
-
-//= OEnumerationByName
-
/** provides an com.sun.star.container::XEnumeration access based
on an object implementing the com.sun.star.container::XNameAccess interface
*/
@@ -74,9 +68,6 @@ private:
COMPHELPER_DLLPRIVATE void impl_stopDisposeListening();
};
-
-//= OEnumerationByIndex
-
/** provides an com.sun.star.container::XEnumeration access based
on an object implementing the com.sun.star.container::XNameAccess interface
*/
@@ -103,9 +94,6 @@ private:
COMPHELPER_DLLPRIVATE void impl_stopDisposeListening();
};
-
-//= OAnyEnumeration
-
/** provides an com.sun.star.container::XEnumeration
for an outside set vector of Any's.
@@ -126,12 +114,8 @@ public:
};
-
}
-//... namespace comphelper .......................................................
#endif // INCLUDED_COMPHELPER_ENUMHELPER_HXX
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index 2f7003a..eb28598 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -30,14 +30,12 @@ namespace cppu {
class IPropertyArrayHelper;
}
-//... namespace comphelper ................................................
namespace comphelper
{
template <typename TYPE> struct OPropertyArrayUsageHelperMutex
: public rtl::Static< ::osl::Mutex, OPropertyArrayUsageHelperMutex<TYPE> > {};
-
template <class TYPE>
class OPropertyArrayUsageHelper
{
@@ -78,7 +76,6 @@ protected:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const = 0;
};
-
/** a OPropertyArrayUsageHelper which will create an OPropertyArrayAggregationHelper
*/
template <class TYPE>
@@ -114,14 +111,12 @@ protected:
virtual sal_Int32 getFirstAggregateId() const { return DEFAULT_AGGREGATE_PROPERTY_ID; }
};
-
template<class TYPE>
sal_Int32 OPropertyArrayUsageHelper< TYPE >::s_nRefCount = 0;
template<class TYPE>
::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper< TYPE >::s_pProps = NULL;
-
template <class TYPE>
OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper()
{
@@ -129,7 +124,6 @@ OPropertyArrayUsageHelper<TYPE>::OPropertyArrayUsageHelper()
++s_nRefCount;
}
-
template <class TYPE>
::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYPE>::getArrayHelper()
{
@@ -146,7 +140,6 @@ template <class TYPE>
return s_pProps;
}
-
template <class TYPE> inline
::cppu::IPropertyArrayHelper* OAggregationArrayUsageHelper<TYPE>::createArrayHelper() const
{
@@ -157,11 +150,8 @@ template <class TYPE> inline
return new OPropertyArrayAggregationHelper(aProps, aAggregateProps, getInfoService(), getFirstAggregateId());
}
-
}
-//... namespace comphelper ................................................
#endif // INCLUDED_COMPHELPER_PROPARRHLP_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 56c0f6a..7be8761 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -28,17 +28,9 @@
#include <comphelper/comphelperdllapi.h>
#include <cppu/unotype.hxx>
-
-//= property helper classes
-
-
-//... namespace comphelper .......................................................
namespace comphelper
{
-/** compare two properties by name
-*/
-
// comparing two property instances
struct PropertyCompareByName : public ::std::binary_function< ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, bool >
{
@@ -48,9 +40,6 @@ namespace comphelper
}
};
-
- /** compare two properties by name
- */
struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, OUString, bool >
{
@@ -65,7 +54,6 @@ namespace comphelper
}
};
- // comparing two property instances
struct PropertyEqualByName : public ::std::binary_function< ::com::sun::star::beans::Property, ::com::sun::star::beans::Property, bool >
{
bool operator() (const ::com::sun::star::beans::Property& x, const ::com::sun::star::beans::Property& y) const
@@ -74,11 +62,9 @@ namespace comphelper
}
};
-
/// remove the property with the given name from the given sequence
COMPHELPER_DLLPUBLIC void RemoveProperty(css::uno::Sequence<css::beans::Property>& seqProps, const OUString& _rPropName);
-
/** within the given property sequence, modify attributes of a special property
@param _rProps the sequence of properties to search in
@param _sPropName the name of the property which's attributes should be modified
@@ -87,22 +73,16 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(css::uno::Sequence<css::beans::Property
*/
COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(css::uno::Sequence<css::beans::Property>& _rProps, const OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
-
/** check if the given set has the given property.
*/
COMPHELPER_DLLPUBLIC bool hasProperty(const OUString& _rName, const css::uno::Reference<css::beans::XPropertySet>& _rxSet);
-
/** copy properties between property sets, in compliance with the property
attributes of the target object
*/
COMPHELPER_DLLPUBLIC void copyProperties(const css::uno::Reference<css::beans::XPropertySet>& _rxSource,
const css::uno::Reference<css::beans::XPropertySet>& _rxDest);
-
-//= property conversion helpers
-
-
/** helper for implementing ::cppu::OPropertySetHelper::convertFastPropertyValue
@param _rConvertedValue the conversion result (if successful)
@param _rOldValue the old value of the property, calculated from _rCurrentValue
@@ -192,9 +172,7 @@ inline bool tryPropertyValue(css::uno::Any& /*out*/_rConvertedValue, css::uno::A
*/
COMPHELPER_DLLPUBLIC bool tryPropertyValue(css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, const css::uno::Any& _rValueToSet, const css::uno::Any& _rCurrentValue, const css::uno::Type& _rExpectedType);
-
}
-//... namespace comphelper .......................................................
#endif // INCLUDED_COMPHELPER_PROPERTY_HXX
diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx
index 55650ed..506346e 100644
--- a/include/comphelper/propertysethelper.hxx
+++ b/include/comphelper/propertysethelper.hxx
@@ -25,15 +25,8 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <comphelper/comphelperdllapi.h>
-
-//= property helper classes
-
-
-//... namespace comphelper ................................................
namespace comphelper
{
-
-
class PropertySetInfo;
struct PropertyMapEntry;
class PropertySetHelperImpl;
@@ -82,9 +75,7 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-
}
-//... namespace comphelper..................................................
#endif // _UTL_PROPERTYSETHELPER_HXX_
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index 8b89fc3..06bba8c 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -28,15 +28,9 @@
#include <cppuhelper/implbase1.hxx>
#include <comphelper/comphelperdllapi.h>
-
-//= property helper classes
-
-
-//... namespace comphelper .......................................................
namespace comphelper
{
-
struct PropertyMapEntry
{
OUString maName;
@@ -80,9 +74,7 @@ public:
virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-
}
-//... namespace comphelper .......................................................
#endif // _UTL_PROPERTSETINFO_HXX_
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index b9bfbe3..df6922c 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -26,19 +26,15 @@
#include <math.h>
#include <functional>
-
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-//... namespace comphelper ................................................
namespace comphelper
{
-
-
// comparison functors
struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool>
@@ -57,7 +53,6 @@ public:
bool isCaseSensitive() const {return m_bCaseSensitive;}
};
-
class UStringMixEqual: public std::binary_function<OUString, OUString, bool>
{
bool m_bCaseSensitive;
@@ -93,10 +88,7 @@ public:
}
};
-
-//= OInterfaceCompare
-
-/** is stl-compliant structure for comparing Reference< <iface> > instances
+/** STL-compliant structure for comparing Reference< <iface> > instances
*/
template < class IAFCE >
struct OInterfaceCompare
@@ -132,7 +124,6 @@ inline mem_fun1_t<_Tp,_Arg> mem_fun(void (_Tp::*__f)(_Arg))
return mem_fun1_t<_Tp,_Arg>(__f);
}
-
/** output iterator that appends OUStrings into an OUStringBuffer.
*/
class OUStringBufferAppender :
@@ -161,7 +152,6 @@ private:
OUStringBuffer & m_rBuffer;
};
-
/** algorithm similar to std::copy, but inserts a separator between elements.
*/
template< typename ForwardIter, typename OutputIter, typename T >
@@ -185,9 +175,7 @@ OutputIter intersperse(
return out;
}
-
}
-//... namespace comphelper ................................................
#endif // INCLUDED_COMPHELPER_STL_TYPES_HXX
More information about the Libreoffice-commits
mailing list