summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-07-28 13:43:24 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-07-29 06:44:57 +0000
commit171990764eedee708ce458be2239466307b2dc6a (patch)
tree2c4821ca3b8a0ad0bbd4478c0a190b8be246c068 /cppu
parent62e2fae93e8894f73560a30ae1e752cbd4c001ad (diff)
com::sun::star-css in cppu,cppuhelper
Change-Id: I84a412f587fd66f6c0610f083e61cf0fa079d4d9 Reviewed-on: https://gerrit.libreoffice.org/17384 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cppu')
-rw-r--r--cppu/qa/cppumaker/test_cppumaker.cxx16
-rw-r--r--cppu/source/LogBridge/LogBridge.cxx2
-rw-r--r--cppu/source/uno/IdentityMapping.hxx2
3 files changed, 10 insertions, 10 deletions
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx
index 691e2a8c86be..a775bcf7990e 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -369,7 +369,7 @@ namespace com { namespace sun { namespace star { namespace uno {
std::ostream & operator <<(
std::ostream & out,
- SAL_UNUSED_PARAMETER com::sun::star::uno::Exception const &)
+ SAL_UNUSED_PARAMETER css::uno::Exception const &)
{
return out << "<UNO exception>";
}
@@ -442,7 +442,7 @@ void Test::testBigStruct() {
CPPUNIT_ASSERT_EQUAL(guard.p->m11, static_cast< sal_Unicode >(0));
CPPUNIT_ASSERT_EQUAL(guard.p->m12.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
- +guard.p->m13.getTypeClass(), +com::sun::star::uno::TypeClass_VOID);
+ +guard.p->m13.getTypeClass(), +css::uno::TypeClass_VOID);
CPPUNIT_ASSERT_EQUAL(guard.p->m14.hasValue(), false);
CPPUNIT_ASSERT_EQUAL(guard.p->m15.getLength(), static_cast< sal_Int32 >(0));
CPPUNIT_ASSERT_EQUAL(
@@ -470,7 +470,7 @@ void Test::testBigStruct() {
#endif
#endif
- com::sun::star::uno::Type t(
+ css::uno::Type t(
cppu::UnoType< test::codemaker::cppumaker::BigStruct >::get());
typelib_TypeDescription * td = NULL;
t.getDescription(&td);
@@ -488,11 +488,11 @@ void Test::testPolyStruct() {
CPPUNIT_ASSERT_EQUAL(
rtl::OUString(
"test.codemaker.cppumaker.Struct<char,short>"),
- (com::sun::star::uno::makeAny(
+ (css::uno::makeAny(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
getValueType().getTypeName()));
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+ css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
aEmptySequence;
CPPUNIT_ASSERT_EQUAL(
@@ -502,12 +502,12 @@ void Test::testPolyStruct() {
}
void Test::testExceptions() {
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >
+ css::uno::Sequence< css::uno::Sequence< css::uno::Any > >
aEmptySequence;
test::codemaker::cppumaker::TestException1 e11(
rtl::OUString("abc"), 0, 1,
- com::sun::star::uno::makeAny(123.0),
+ css::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException1 e12(e11);
@@ -517,7 +517,7 @@ void Test::testExceptions() {
CPPUNIT_ASSERT_EQUAL(e11, e13);
test::codemaker::cppumaker::TestException2 e21(
rtl::OUString("abc"), 0, 1,
- com::sun::star::uno::makeAny(123.0),
+ css::uno::makeAny(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct<sal_Int32, sal_Int32>(5, aEmptySequence), 2);
test::codemaker::cppumaker::TestException2 e22(e21);
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index f79bedcd2f1c..ba1bd2be2d14 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -169,7 +169,7 @@ bool LogBridge::v_isValid(rtl::OUString * pReason)
break;
case typelib_TypeClass_TYPE:
{
- const ::rtl::OString sValue( ::rtl::OUStringToOString(static_cast<com::sun::star::uno::Type*>(pArg)->getTypeName(),osl_getThreadTextEncoding()));
+ const ::rtl::OString sValue( ::rtl::OUStringToOString(static_cast<css::uno::Type*>(pArg)->getTypeName(),osl_getThreadTextEncoding()));
SAL_INFO("cppu.log", "" << sValue.getStr());
}
break;
diff --git a/cppu/source/uno/IdentityMapping.hxx b/cppu/source/uno/IdentityMapping.hxx
index ce93e2a7d646..74d900200740 100644
--- a/cppu/source/uno/IdentityMapping.hxx
+++ b/cppu/source/uno/IdentityMapping.hxx
@@ -26,7 +26,7 @@ namespace com { namespace sun { namespace star { namespace uno {
class Environment;
}}}}
-uno_Mapping * createIdentityMapping(const ::com::sun::star::uno::Environment & rEnv);
+uno_Mapping * createIdentityMapping(const css::uno::Environment & rEnv);
#endif