summaryrefslogtreecommitdiff
path: root/svl/source/misc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-29 12:44:31 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-29 11:18:10 +0000
commit95b22704e8452e6360d0acf846e8c967aab146d7 (patch)
tree267d1bc02e2ba65aef23a19d9bfb7d96a9af9ebf /svl/source/misc
parent457f8fd4d33053510b0e44d210b7febd2f07a4ff (diff)
com::sun::star->css in starmath,stoc,svgio,svl
Change-Id: If4308b358a55351f6e951ebf055df076ce4ad4ce Reviewed-on: https://gerrit.libreoffice.org/19667 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svl/source/misc')
-rw-r--r--svl/source/misc/documentlockfile.cxx8
-rw-r--r--svl/source/misc/ownlist.cxx4
-rw-r--r--svl/source/misc/strmadpt.cxx5
-rw-r--r--svl/source/misc/urihelper.cxx2
4 files changed, 8 insertions, 11 deletions
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index ba55fcb61272..9441c2924b95 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -107,7 +107,7 @@ bool DocumentLockFile::CreateOwnLockFile()
xSeekable->seek( 0 );
- uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
+ uno::Reference < css::ucb::XCommandEnvironment > xEnv;
::ucbhelper::Content aTargetContent( m_aURL, xEnv, comphelper::getProcessComponentContext() );
ucb::InsertCommandArgument aInsertArg;
@@ -159,7 +159,7 @@ uno::Reference< io::XInputStream > DocumentLockFile::OpenStream()
{
::osl::MutexGuard aGuard( m_aMutex );
- uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
+ uno::Reference < css::ucb::XCommandEnvironment > xEnv;
::ucbhelper::Content aSourceContent( m_aURL, xEnv, comphelper::getProcessComponentContext() );
// the file can be opened readonly, no locking will be done
@@ -172,7 +172,7 @@ bool DocumentLockFile::OverwriteOwnLockFile()
// allows to overwrite the lock file with the current data
try
{
- uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
+ uno::Reference < css::ucb::XCommandEnvironment > xEnv;
::ucbhelper::Content aTargetContent( m_aURL, xEnv, comphelper::getProcessComponentContext() );
LockFileEntry aNewEntry = GenerateOwnEntry();
@@ -207,7 +207,7 @@ void DocumentLockFile::RemoveFile()
|| !aFileData[LockFileComponent::USERURL].equals( aNewEntry[LockFileComponent::USERURL] ) )
throw io::IOException(); // not the owner, access denied
- uno::Reference < ::com::sun::star::ucb::XCommandEnvironment > xEnv;
+ uno::Reference < css::ucb::XCommandEnvironment > xEnv;
::ucbhelper::Content aCnt(m_aURL, xEnv, comphelper::getProcessComponentContext());
aCnt.executeCommand(OUString("delete"),
uno::makeAny(true));
diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index d2b87c9b8ad6..b174c67650c5 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.cxx
@@ -115,7 +115,7 @@ SvCommand & SvCommandList::Append
return aCommandList.back();
}
-bool SvCommandList::FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aCommandSequence )
+bool SvCommandList::FillFromSequence( const css::uno::Sequence < css::beans::PropertyValue >& aCommandSequence )
{
const sal_Int32 nCount = aCommandSequence.getLength();
OUString aCommand, aArg;
@@ -132,7 +132,7 @@ bool SvCommandList::FillFromSequence( const com::sun::star::uno::Sequence < com:
return true;
}
-void SvCommandList::FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& aCommandSequence )
+void SvCommandList::FillSequence( css::uno::Sequence < css::beans::PropertyValue >& aCommandSequence )
{
const sal_Int32 nCount = aCommandList.size();
aCommandSequence.realloc( nCount );
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 367ea56db03f..399a4cc03efd 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.cxx
@@ -412,10 +412,7 @@ void SvInputStream::SetSize(sal_uInt64)
SetError(ERRCODE_IO_NOTSUPPORTED);
}
-SvInputStream::SvInputStream(
- com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
- const &
- rTheStream):
+SvInputStream::SvInputStream( css::uno::Reference< css::io::XInputStream > const & rTheStream):
m_xStream(rTheStream),
m_pPipe(0),
m_nSeekedFrom(STREAM_SEEK_TO_END)
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 3199e420a3de..ab47bb6de3b6 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -264,7 +264,7 @@ URIHelper::normalizedMakeRelative(
OUString URIHelper::simpleNormalizedMakeRelative(
OUString const & baseUriReference, OUString const & uriReference)
{
- com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > rel(
+ css::uno::Reference< css::uri::XUriReference > rel(
URIHelper::normalizedMakeRelative(
comphelper::getProcessComponentContext(), baseUriReference,
uriReference));