summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-20 21:36:29 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-21 09:03:20 +0200
commit78b2d8211112df0a5938efbc8db0f8e48ae9e2e7 (patch)
treeef848936c1f759e6734189ecde1bae317ff2e9a6
parentf133857cc61dba9505fc2aae23dcac2f47f4ef50 (diff)
comphelper: starbeans -> css::beans
Change-Id: Iedfc4460194f179b20d734cb7671894213c77008
-rw-r--r--comphelper/source/misc/numbers.cxx8
-rw-r--r--include/comphelper/proparrhlp.hxx2
-rw-r--r--include/comphelper/property.hxx11
3 files changed, 7 insertions, 14 deletions
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 5dd15acc28de..6df5a155fd1c 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -28,10 +28,6 @@
namespace comphelper
{
-
-namespace starbeans = ::com::sun::star::beans;
-
-
sal_Int16 getNumberFormatType(const css::uno::Reference<css::util::XNumberFormats>& xFormats, sal_Int32 nKey)
{
sal_Int16 nReturn(css::util::NumberFormat::UNDEFINED);
@@ -39,7 +35,7 @@ sal_Int16 getNumberFormatType(const css::uno::Reference<css::util::XNumberFormat
{
try
{
- css::uno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
+ css::uno::Reference<css::beans::XPropertySet> xFormat(xFormats->getByKey(nKey));
if (xFormat.is())
xFormat->getPropertyValue("Type") >>= nReturn;
}
@@ -68,7 +64,7 @@ css::uno::Any getNumberFormatDecimals(const css::uno::Reference<css::util::XNumb
{
try
{
- css::uno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey));
+ css::uno::Reference<css::beans::XPropertySet> xFormat( xFormats->getByKey(nKey));
if (xFormat.is())
{
static OUString PROPERTY_DECIMALS( "Decimals" );
diff --git a/include/comphelper/proparrhlp.hxx b/include/comphelper/proparrhlp.hxx
index ece8c3257534..2f7003a16f05 100644
--- a/include/comphelper/proparrhlp.hxx
+++ b/include/comphelper/proparrhlp.hxx
@@ -33,8 +33,6 @@ namespace cppu {
//... namespace comphelper ................................................
namespace comphelper
{
- namespace starbeans = ::com::sun::star::beans;
-
template <typename TYPE> struct OPropertyArrayUsageHelperMutex
: public rtl::Static< ::osl::Mutex, OPropertyArrayUsageHelperMutex<TYPE> > {};
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 71fd71c07e76..56c0f6a019b8 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -35,7 +35,6 @@
//... namespace comphelper .......................................................
namespace comphelper
{
- namespace starbeans = ::com::sun::star::beans;
/** compare two properties by name
*/
@@ -77,7 +76,7 @@ namespace comphelper
/// remove the property with the given name from the given sequence
-COMPHELPER_DLLPUBLIC void RemoveProperty(css::uno::Sequence<starbeans::Property>& seqProps, const OUString& _rPropName);
+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
@@ -86,19 +85,19 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(css::uno::Sequence<starbeans::Property>
@param _nAddAttrib the attributes which should be added
@param _nRemoveAttrib the attributes which should be removed
*/
-COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(css::uno::Sequence<starbeans::Property>& _rProps, const OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
+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<starbeans::XPropertySet>& _rxSet);
+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<starbeans::XPropertySet>& _rxSource,
- const css::uno::Reference<starbeans::XPropertySet>& _rxDest);
+COMPHELPER_DLLPUBLIC void copyProperties(const css::uno::Reference<css::beans::XPropertySet>& _rxSource,
+ const css::uno::Reference<css::beans::XPropertySet>& _rxDest);
//= property conversion helpers