summaryrefslogtreecommitdiff
path: root/framework/source/services
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/services
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/services')
-rw-r--r--framework/source/services/desktop.cxx2
-rw-r--r--framework/source/services/frame.cxx2
-rw-r--r--framework/source/services/pathsettings.cxx4
-rw-r--r--framework/source/services/sessionlistener.cxx14
-rw-r--r--framework/source/services/substitutepathvars.cxx26
-rw-r--r--framework/source/services/uriabbreviation.cxx2
6 files changed, 25 insertions, 25 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 7a5a71155b01..7d09db7ca614 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -1470,7 +1470,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue ,
@return reference to object with information [XPropertySetInfo]
@threadsafe yes
*//*-*************************************************************************************************************/
-css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropertySetInfo() throw (css::uno::RuntimeException, std::exception)
{
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 9d3aec94af4b..74d7f51c6d57 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2670,7 +2670,7 @@ void Frame::impl_initializePropInfo()
css::beans::Property(
FRAME_PROPNAME_LAYOUTMANAGER,
FRAME_PROPHANDLE_LAYOUTMANAGER,
- cppu::UnoType<com::sun::star::frame::XLayoutManager>::get(),
+ cppu::UnoType<css::frame::XLayoutManager>::get(),
css::beans::PropertyAttribute::TRANSIENT));
impl_addPropertyInfo(
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index f87ac62ab072..6764d1e1cbe7 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -443,8 +443,8 @@ private:
virtual void SAL_CALL getFastPropertyValue( css::uno::Any& aValue,
sal_Int32 nHandle ) const override;
// Avoid:
- // warning: ‘virtual com::sun::star::uno::Any cppu::OPropertySetHelper::getFastPropertyValue(sal_Int32)’ was hidden [-Woverloaded-virtual]
- // warning: by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(com::sun::star::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual]
+ // warning: ‘virtual css::uno::Any cppu::OPropertySetHelper::getFastPropertyValue(sal_Int32)’ was hidden [-Woverloaded-virtual]
+ // warning: by ‘virtual void {anonymous}::PathSettings::getFastPropertyValue(css::uno::Any&, sal_Int32) const’ [-Woverloaded-virtual]
using cppu::OPropertySetHelper::getFastPropertyValue;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx
index f02d3902207e..e3fdf1c59582 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -131,7 +131,7 @@ public:
return aSeq;
}
- virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject&) throw (css::uno::RuntimeException, std::exception) override;
// XInitialization
virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& args) throw (css::uno::RuntimeException, std::exception) override;
@@ -148,10 +148,10 @@ public:
// XSessionManagerListener2
virtual void SAL_CALL doQuit()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XStatusListener
- virtual void SAL_CALL statusChanged(const com::sun::star::frame::FeatureStateEvent& event)
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& event)
throw (css::uno::RuntimeException, std::exception) override;
};
@@ -199,7 +199,7 @@ void SessionListener::StoreSession( bool bAsync )
Sequence< PropertyValue > args(1);
args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(bAsync),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
- } catch (const com::sun::star::uno::Exception& e) {
+ } catch (const css::uno::Exception& e) {
SAL_WARN("fwk.session",e.Message);
// save failed, but tell manager to go on if we havent yet dispatched the request
// in case of synchronous saving the notification is done by the caller
@@ -227,12 +227,12 @@ void SessionListener::QuitSessionQuietly()
Sequence< PropertyValue > args(1);
args[0] = PropertyValue(OUString("DispatchAsynchron"),-1,makeAny(sal_False),PropertyState_DIRECT_VALUE);
xDispatch->dispatch(aURL, args);
- } catch (const com::sun::star::uno::Exception& e) {
+ } catch (const css::uno::Exception& e) {
SAL_WARN("fwk.session",e.Message);
}
}
-void SAL_CALL SessionListener::disposing(const com::sun::star::lang::EventObject&) throw (RuntimeException, std::exception)
+void SAL_CALL SessionListener::disposing(const css::lang::EventObject&) throw (RuntimeException, std::exception)
{
SAL_INFO("fwk.session", "SessionListener::disposing");
}
@@ -309,7 +309,7 @@ sal_Bool SAL_CALL SessionListener::doRestore()
xDispatch->dispatch(aURL, args);
m_bRestored = true;
- } catch (const com::sun::star::uno::Exception& e) {
+ } catch (const css::uno::Exception& e) {
SAL_WARN("fwk.session",e.Message);
}
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index db337135a543..9f40be23b408 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -92,7 +92,7 @@ struct SubstituteRule
SubstituteRule( const OUString& aVarName,
const OUString& aValue,
- const com::sun::star::uno::Any& aVal,
+ const css::uno::Any& aVal,
EnvironmentType aType )
: aSubstVariable(aVarName)
, aSubstValue(aValue)
@@ -102,8 +102,8 @@ struct SubstituteRule
OUString aSubstVariable;
OUString aSubstValue;
- com::sun::star::uno::Any aEnvValue;
- EnvironmentType aEnvType;
+ css::uno::Any aEnvValue;
+ EnvironmentType aEnvType;
};
typedef std::unordered_map<OUString, SubstituteRule, OUStringHash>
@@ -123,7 +123,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
/** is called from the ConfigManager before application ends or from the
PropertyChangeListener if the sub tree broadcasts changes. */
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
private:
@@ -137,7 +137,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem
bool FilterRuleSet(const SubstituteRuleVector& aRuleSet, SubstituteRule& aActiveRule);
- void ReadSharePointsFromConfiguration(com::sun::star::uno::Sequence< OUString >& aSharePointsSeq);
+ void ReadSharePointsFromConfiguration(css::uno::Sequence< OUString >& aSharePointsSeq);
void ReadSharePointRuleSetFromConfiguration(const OUString& aSharePointName,
const OUString& aSharePointNodeName,
SubstituteRuleVector& aRuleSet);
@@ -227,7 +227,7 @@ class SubstitutePathVariables : private cppu::BaseMutex,
friend class SubstitutePathVariables_Impl;
public:
- SubstitutePathVariables( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
+ SubstitutePathVariables( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~SubstitutePathVariables();
virtual OUString SAL_CALL getImplementationName()
@@ -252,11 +252,11 @@ public:
// XStringSubstitution
virtual OUString SAL_CALL substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
- throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL reSubstituteVariables( const OUString& aText )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getSubstituteVariableValue( const OUString& variable )
- throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
protected:
void SetPredefinedPathVariables();
@@ -271,11 +271,11 @@ protected:
// XStringSubstitution implementation methods
OUString impl_substituteVariable( const OUString& aText, bool bSustRequired )
- throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ throw (css::container::NoSuchElementException, css::uno::RuntimeException);
OUString impl_reSubstituteVariables( const OUString& aText )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
OUString impl_getSubstituteVariableValue( const OUString& variable )
- throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+ throw (css::container::NoSuchElementException, css::uno::RuntimeException);
private:
typedef std::unordered_map<OUString, PreDefVariable, OUStringHash>
@@ -448,7 +448,7 @@ void SubstitutePathVariables_Impl::GetSharePointsRules( SubstituteVariables& aSu
}
}
-void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& /*aPropertyNames*/ )
+void SubstitutePathVariables_Impl::Notify( const css::uno::Sequence< OUString >& /*aPropertyNames*/ )
{
// NOT implemented yet!
}
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 1ef9391ac134..2491471cf17e 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -48,7 +48,7 @@ UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContex
{
}
-// ::com::sun::star::util::XStringAbbreviation:
+// css::util::XStringAbbreviation:
OUString SAL_CALL UriAbbreviation::abbreviateString(const css::uno::Reference< css::util::XStringWidth > & xStringWidth, ::sal_Int32 nWidth, const OUString & aString) throw (css::uno::RuntimeException, std::exception)
{
OUString aResult( aString );