summaryrefslogtreecommitdiff
path: root/framework/source/fwi
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-13 16:59:57 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-14 06:37:16 +0000
commitd191d1f9b684c6229f3651361c92ff39ffb350f1 (patch)
treee670ba0105d974b3a68c17b42366eec1d35ebae4 /framework/source/fwi
parentba974ccc8c49766542ddd727c95ecc5db1cff198 (diff)
com::sun::star->css in framework
Change-Id: If5a77db83fcbef5ed436f2043ddeb7c515a840dc Reviewed-on: https://gerrit.libreoffice.org/19356 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/source/fwi')
-rw-r--r--framework/source/fwi/helper/mischelper.cxx8
-rw-r--r--framework/source/fwi/uielement/constitemcontainer.cxx44
-rw-r--r--framework/source/fwi/uielement/itemcontainer.cxx6
-rw-r--r--framework/source/fwi/uielement/rootitemcontainer.cxx36
4 files changed, 47 insertions, 47 deletions
diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx
index 06cc06131f29..7201de053ba9 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -122,7 +122,7 @@ OUString RetrieveLabelFromCommand(
aLabel = aStr;
}
}
- catch ( const com::sun::star::uno::Exception& )
+ catch ( const css::uno::Exception& )
{
}
}
@@ -166,7 +166,7 @@ void FillLangItems( std::set< OUString > &rLangItems,
uno::Reference< linguistic2::XLanguageGuessing > xLangGuesser( rLangGuessHelper.GetGuesser() );
if ( xLangGuesser.is() && !rGuessedTextLang.isEmpty())
{
- ::com::sun::star::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( rGuessedTextLang, 0, rGuessedTextLang.getLength()) );
+ css::lang::Locale aLocale(xLangGuesser->guessPrimaryLanguage( rGuessedTextLang, 0, rGuessedTextLang.getLength()) );
LanguageType nLang = LanguageTag( aLocale ).makeFallback().getLanguageType();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_NONE && nLang != LANGUAGE_SYSTEM
&& IsScriptTypeMatchingToLanguage( nScriptType, nLang ))
@@ -181,10 +181,10 @@ void FillLangItems( std::set< OUString > &rLangItems,
}
//6--all languages used in current document
- Reference< com::sun::star::frame::XModel > xModel;
+ Reference< css::frame::XModel > xModel;
if ( rxFrame.is() )
{
- Reference< com::sun::star::frame::XController > xController( rxFrame->getController(), UNO_QUERY );
+ Reference< css::frame::XController > xController( rxFrame->getController(), UNO_QUERY );
if ( xController.is() )
xModel = xController->getModel();
}
diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx
index d2a4b07f3c90..75e1e0e991c9 100644
--- a/framework/source/fwi/uielement/constitemcontainer.cxx
+++ b/framework/source/fwi/uielement/constitemcontainer.cxx
@@ -163,7 +163,7 @@ Reference< XIndexAccess > ConstItemContainer::deepCopyContainer( const Reference
}
// XUnoTunnel
-sal_Int64 ConstItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int64 ConstItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
{
if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ConstItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
{
@@ -182,9 +182,9 @@ const Sequence< sal_Int8 >& ConstItemContainer::GetUnoTunnelId() throw()
return theConstItemContainerUnoTunnelId::get().getSeq();
}
-ConstItemContainer* ConstItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw()
+ConstItemContainer* ConstItemContainer::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw()
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY );
return xUT.is() ? reinterpret_cast< ConstItemContainer* >(sal::static_int_cast< sal_IntPtr >(
xUT->getSomething( ConstItemContainer::GetUnoTunnelId() ))) : NULL;
}
@@ -214,7 +214,7 @@ throw ( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std
// XPropertySet
Reference< XPropertySetInfo > SAL_CALL ConstItemContainer::getPropertySetInfo()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
@@ -239,12 +239,12 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
}
void SAL_CALL ConstItemContainer::setPropertyValue( const OUString&, const Any& )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
}
Any SAL_CALL ConstItemContainer::getPropertyValue( const OUString& PropertyName )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
if ( PropertyName == PROPNAME_UINAME )
return makeAny( m_aUIName );
@@ -252,37 +252,37 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang
throw UnknownPropertyException();
}
-void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ConstItemContainer::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
+throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ConstItemContainer::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& )
+throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// Only read-only properties - do nothing
}
-void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ConstItemContainer::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
+throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// Only read-only properties - do nothing
}
-void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ConstItemContainer::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& )
+throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
// Only read-only properties - do nothing
}
// XFastPropertySet
-void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const ::com::sun::star::uno::Any& )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ConstItemContainer::setFastPropertyValue( sal_Int32, const css::uno::Any& )
+throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
}
Any SAL_CALL ConstItemContainer::getFastPropertyValue( sal_Int32 nHandle )
-throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception)
{
if ( nHandle == PROPHANDLE_UINAME )
return makeAny( m_aUIName );
@@ -316,7 +316,7 @@ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang
return(*pInfoHelper);
}
-const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItemContainer::impl_getStaticPropertyDescriptor()
+const css::uno::Sequence< css::beans::Property > ConstItemContainer::impl_getStaticPropertyDescriptor()
{
// Create a property array to initialize sequence!
// Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
@@ -325,14 +325,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > ConstItem
// ATTENTION:
// YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
- const com::sun::star::beans::Property pProperties[] =
+ const css::beans::Property pProperties[] =
{
- com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME ,
+ css::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME ,
cppu::UnoType<OUString>::get(),
- com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
+ css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY )
};
// Use it to initialize sequence!
- const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
+ const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
// Return "PropertyDescriptor"
return lPropertyDescriptor;
}
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index e2bfbb5490c2..92e96a493fd0 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -27,7 +27,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >";
+const char WRONG_TYPE_EXCEPTION[] = "Type must be css::uno::Sequence< css::beans::PropertyValue >";
namespace framework
{
@@ -139,9 +139,9 @@ const Sequence< sal_Int8 >& ItemContainer::GetUnoTunnelId() throw()
return theItemContainerUnoTunnelId::get().getSeq();
}
-ItemContainer* ItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw()
+ItemContainer* ItemContainer::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw()
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY );
return xUT.is() ? reinterpret_cast< ItemContainer* >(sal::static_int_cast< sal_IntPtr >(
xUT->getSomething( ItemContainer::GetUnoTunnelId() ))) : NULL;
}
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 2b2cf4e2ab4e..c08a1ca58e73 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >";
+const char WRONG_TYPE_EXCEPTION[] = "Type must be css::uno::Sequence< css::beans::PropertyValue >";
const int PROPHANDLE_UINAME = 1;
const int PROPCOUNT = 1;
@@ -140,7 +140,7 @@ Reference< XIndexAccess > RootItemContainer::deepCopyContainer( const Reference<
}
// XUnoTunnel
-sal_Int64 RootItemContainer::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int64 RootItemContainer::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier ) throw(css::uno::RuntimeException, std::exception)
{
if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( RootItemContainer::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr >( this ));
@@ -157,9 +157,9 @@ const Sequence< sal_Int8 >& RootItemContainer::GetUnoTunnelId() throw()
return theRootItemContainerUnoTunnelId::get().getSeq();
}
-RootItemContainer* RootItemContainer::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw()
+RootItemContainer* RootItemContainer::GetImplementation( const css::uno::Reference< css::uno::XInterface >& rxIFace ) throw()
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XUnoTunnel > xUT( rxIFace, css::uno::UNO_QUERY );
return xUT.is() ? reinterpret_cast< RootItemContainer* >(sal::static_int_cast< sal_IntPtr >(
xUT->getSomething( RootItemContainer::GetUnoTunnelId() ))) : NULL;
}
@@ -258,7 +258,7 @@ sal_Bool SAL_CALL RootItemContainer::convertFastPropertyValue( Any& aConve
Any& aOldValue ,
sal_Int32 nHandle ,
const Any& aValue )
-throw( com::sun::star::lang::IllegalArgumentException )
+throw( css::lang::IllegalArgumentException )
{
// Initialize state with sal_False !!!
// (Handle can be invalid)
@@ -268,7 +268,7 @@ throw( com::sun::star::lang::IllegalArgumentException )
{
case PROPHANDLE_UINAME:
bReturn = PropHelper::willPropertyBeChanged(
- com::sun::star::uno::makeAny(m_aUIName),
+ css::uno::makeAny(m_aUIName),
aValue,
aOldValue,
aConvertedValue);
@@ -280,8 +280,8 @@ throw( com::sun::star::lang::IllegalArgumentException )
}
void SAL_CALL RootItemContainer::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle ,
- const com::sun::star::uno::Any& aValue )
-throw( com::sun::star::uno::Exception, std::exception )
+ const css::uno::Any& aValue )
+throw( css::uno::Exception, std::exception )
{
switch( nHandle )
{
@@ -291,7 +291,7 @@ throw( com::sun::star::uno::Exception, std::exception )
}
}
-void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any& aValue ,
+void SAL_CALL RootItemContainer::getFastPropertyValue( css::uno::Any& aValue ,
sal_Int32 nHandle ) const
{
switch( nHandle )
@@ -328,13 +328,13 @@ void SAL_CALL RootItemContainer::getFastPropertyValue( com::sun::star::uno::Any&
return(*pInfoHelper);
}
-com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL RootItemContainer::getPropertySetInfo()
+throw (css::uno::RuntimeException, std::exception)
{
// Optimize this method !
// We initialize a static variable only one time. And we don't must use a mutex at every call!
// For the first call; pInfo is NULL - for the second call pInfo is different from NULL!
- static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >* pInfo = NULL;
+ static css::uno::Reference< css::beans::XPropertySetInfo >* pInfo = NULL;
if( pInfo == NULL )
{
@@ -345,7 +345,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
// Create structure of propertysetinfo for baseclass "OPropertySetHelper".
// (Use method "getInfoHelper()".)
- static com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
+ static css::uno::Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
pInfo = &xInfo;
}
}
@@ -353,7 +353,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
return (*pInfo);
}
-const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemContainer::impl_getStaticPropertyDescriptor()
+const css::uno::Sequence< css::beans::Property > RootItemContainer::impl_getStaticPropertyDescriptor()
{
// Create a property array to initialize sequence!
// Table of all predefined properties of this class. Its used from OPropertySetHelper-class!
@@ -362,14 +362,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > RootItemC
// ATTENTION:
// YOU MUST SORT FOLLOW TABLE BY NAME ALPHABETICAL !!!
- const com::sun::star::beans::Property pProperties[] =
+ const css::beans::Property pProperties[] =
{
- com::sun::star::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME ,
+ css::beans::Property( OUString(PROPNAME_UINAME), PROPHANDLE_UINAME ,
cppu::UnoType<OUString>::get(),
- com::sun::star::beans::PropertyAttribute::TRANSIENT )
+ css::beans::PropertyAttribute::TRANSIENT )
};
// Use it to initialize sequence!
- const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
+ const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, PROPCOUNT );
// Return "PropertyDescriptor"
return lPropertyDescriptor;
}