[Libreoffice-commits] core.git: 2 commits - smoketest/smoketest.cxx sot/source starmath/inc starmath/source stoc/source svgio/inc svgio/source svl/qa svl/source
Noel Grandin
noel at peralex.com
Thu Oct 29 11:18:33 UTC 2015
smoketest/smoketest.cxx | 5
sot/source/base/exchange.cxx | 6
sot/source/sdstor/stgelem.cxx | 2
sot/source/sdstor/storage.cxx | 10
sot/source/sdstor/ucbstorage.cxx | 40 -
sot/source/unoolestorage/xolesimplestorage.cxx | 12
sot/source/unoolestorage/xolesimplestorage.hxx | 122 +--
starmath/inc/document.hxx | 4
starmath/inc/parse.hxx | 2
starmath/inc/unomodel.hxx | 30
starmath/source/accessibility.cxx | 28
starmath/source/accessibility.hxx | 160 ++--
starmath/source/cfgitem.cxx | 2
starmath/source/cfgitem.hxx | 2
starmath/source/document.cxx | 14
starmath/source/edit.cxx | 2
starmath/source/mathmlexport.cxx | 2
starmath/source/mathmlexport.hxx | 36 -
starmath/source/mathmlimport.cxx | 2
starmath/source/mathmlimport.hxx | 164 ++--
starmath/source/parse.cxx | 4
starmath/source/view.cxx | 2
stoc/source/security/permissions.h | 6
stoc/source/typeconv/convert.cxx | 6
stoc/source/uriproc/ExternalUriReferenceTranslator.cxx | 6
stoc/source/uriproc/UriReferenceFactory.cxx | 6
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 6
stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 6
stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 6
svgio/inc/svgio/svgreader/svgdocumenthandler.hxx | 18
svgio/inc/svgio/svgreader/svgnode.hxx | 2
svgio/source/svgreader/svgcharacternode.cxx | 2
svgio/source/svgreader/svgimagenode.cxx | 2
svgio/source/svgreader/svgnode.cxx | 2
svgio/source/svgreader/svgstyleattributes.cxx | 10
svgio/source/svguno/xsvgparser.hxx | 8
svl/qa/unit/test_URIHelper.cxx | 2
svl/source/config/cjkoptions.cxx | 2
svl/source/config/languageoptions.cxx | 10
svl/source/fsstor/fsstorage.hxx | 344 +++++-----
svl/source/fsstor/oinputstreamcontainer.hxx | 46 -
svl/source/fsstor/ostreamcontainer.hxx | 78 +-
svl/source/inc/fsfactory.hxx | 24
svl/source/inc/passwordcontainer.hxx | 142 ++--
svl/source/inc/strmadpt.hxx | 9
svl/source/items/cenumitm.cxx | 8
svl/source/items/cintitem.cxx | 16
svl/source/items/cntwall.cxx | 4
svl/source/items/ctypeitm.cxx | 4
svl/source/items/custritm.cxx | 4
svl/source/items/globalnameitem.cxx | 18
svl/source/items/ilstitem.cxx | 14
svl/source/items/imageitm.cxx | 18
svl/source/items/int64item.cxx | 4
svl/source/items/intitem.cxx | 4
svl/source/items/lckbitem.cxx | 10
svl/source/items/poolitem.cxx | 4
svl/source/items/rectitem.cxx | 8
svl/source/items/slstitm.cxx | 14
svl/source/items/srchitem.cxx | 6
svl/source/items/style.cxx | 19
svl/source/items/szitem.cxx | 8
svl/source/items/visitem.cxx | 4
svl/source/misc/documentlockfile.cxx | 8
svl/source/misc/ownlist.cxx | 4
svl/source/misc/strmadpt.cxx | 5
svl/source/misc/urihelper.cxx | 2
svl/source/numbers/numfmuno.cxx | 6
svl/source/numbers/numfmuno.hxx | 301 ++++----
svl/source/numbers/supservs.cxx | 8
svl/source/numbers/supservs.hxx | 37 -
svl/source/numbers/zforfind.cxx | 5
svl/source/numbers/zforfind.hxx | 2
svl/source/numbers/zforlist.cxx | 21
svl/source/numbers/zformat.cxx | 14
svl/source/passwordcontainer/passwordcontainer.cxx | 6
svl/source/passwordcontainer/syscreds.hxx | 15
svl/source/uno/pathservice.cxx | 6
78 files changed, 987 insertions(+), 1014 deletions(-)
New commits:
commit e26245b3e5fe6f7e46e57b80c890c7cafc5c4bb9
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 29 11:03:05 2015 +0200
com::sun::star->css in smoketest,sot
Change-Id: I59a083cd53baa76ea271cfc0470487899b92dca4
Reviewed-on: https://gerrit.libreoffice.org/19666
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/smoketest/smoketest.cxx b/smoketest/smoketest.cxx
index d5820f2..09c7e0c 100644
--- a/smoketest/smoketest.cxx
+++ b/smoketest/smoketest.cxx
@@ -142,8 +142,7 @@ void Test::test() {
css::uno::Sequence< css::beans::PropertyValue > args(2);
args[0].Name = "MacroExecutionMode";
args[0].Handle = -1;
- args[0].Value <<=
- com::sun::star::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
+ args[0].Value <<= css::document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN;
args[0].State = css::beans::PropertyState_DIRECT_VALUE;
args[1].Name = "ReadOnly";
args[1].Handle = -1;
@@ -170,7 +169,7 @@ void Test::test() {
css::uno::UNO_QUERY_THROW);
Result result;
// Shifted to main thread to work around potential deadlocks (i112867):
- com::sun::star::awt::AsyncCallback::create(
+ css::awt::AsyncCallback::create(
connection_.getComponentContext())->addCallback(
new Callback(
disp, url, css::uno::Sequence< css::beans::PropertyValue >(),
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 92c8bf37..ce7574d 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -45,9 +45,9 @@ using namespace::com::sun::star::datatransfer;
*/
struct DataFlavorRepresentation
{
- const char* pMimeType;
- const char* pName;
- const ::com::sun::star::uno::Type* pType;
+ const char* pMimeType;
+ const char* pName;
+ const css::uno::Type* pType;
};
namespace
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index c9ab475..ec5439e 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -285,7 +285,7 @@ bool StgEntry::Init()
static OUString ToUpperUnicode( const OUString & rStr )
{
// I don't know the locale, so en_US is hopefully fine
- static CharClass aCC( LanguageTag( com::sun::star::lang::Locale( "en", "US", "" )) );
+ static CharClass aCC( LanguageTag( css::lang::Locale( "en", "US", "" )) );
return aCC.uppercase( rStr );
}
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 77adacd..f8fb179 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -273,7 +273,7 @@ bool SotStorageStream::Commit()
return GetError() == SVSTREAM_OK;
}
-bool SotStorageStream::SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue )
+bool SotStorageStream::SetProperty( const OUString& rName, const css::uno::Any& rValue )
{
UCBStorageStream* pStg = dynamic_cast<UCBStorageStream*>( pOwnStm );
if ( pStg )
@@ -821,7 +821,7 @@ bool SotStorage::IsOLEStorage( SvStream* pStream )
return Storage::IsStorageFile( pStream );
}
-SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage,
+SotStorage* SotStorage::OpenOLEStorage( const css::uno::Reference < css::embed::XStorage >& xStorage,
const OUString& rEleName, StreamMode nMode )
{
sal_Int32 nEleMode = embed::ElementModes::SEEKABLEREAD;
@@ -858,7 +858,7 @@ SotStorage* SotStorage::OpenOLEStorage( const com::sun::star::uno::Reference < c
return new SotStorage( pStream, true );
}
-SotClipboardFormatId SotStorage::GetFormatID( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
+SotClipboardFormatId SotStorage::GetFormatID( const css::uno::Reference < css::embed::XStorage >& xStorage )
{
uno::Reference< beans::XPropertySet > xProps( xStorage, uno::UNO_QUERY );
if ( !xProps.is() )
@@ -868,7 +868,7 @@ SotClipboardFormatId SotStorage::GetFormatID( const com::sun::star::uno::Referen
xProps->getPropertyValue("MediaType") >>= aMediaType;
if ( !aMediaType.isEmpty() )
{
- ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
+ css::datatransfer::DataFlavor aDataFlavor;
aDataFlavor.MimeType = aMediaType;
return SotExchange::GetFormat( aDataFlavor );
}
@@ -876,7 +876,7 @@ SotClipboardFormatId SotStorage::GetFormatID( const com::sun::star::uno::Referen
return SotClipboardFormatId::NONE;
}
-sal_Int32 SotStorage::GetVersion( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage )
+sal_Int32 SotStorage::GetVersion( const css::uno::Reference < css::embed::XStorage >& xStorage )
{
SotClipboardFormatId nSotFormatID = SotStorage::GetFormatID( xStorage );
switch( nSotFormatID )
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 878af65..b07dd66 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -657,13 +657,13 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
try
{
// create the content
- Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
+ Reference< css::ucb::XCommandEnvironment > xComEnv;
OUString aTemp( rName );
if ( bRepair )
{
- xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), xProgress );
+ xComEnv = new ::ucbhelper::CommandEnvironment( Reference< css::task::XInteractionHandler >(), xProgress );
aTemp += "?repairpackage";
}
@@ -679,8 +679,8 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
if ( nErr == rtl_Digest_E_None )
{
sal_uInt8* pBuffer = aBuffer;
- ::com::sun::star::uno::Sequence < sal_Int8 > aSequ( reinterpret_cast<sal_Int8*>(pBuffer), RTL_DIGEST_LENGTH_SHA1 );
- ::com::sun::star::uno::Any aAny;
+ css::uno::Sequence < sal_Int8 > aSequ( reinterpret_cast<sal_Int8*>(pBuffer), RTL_DIGEST_LENGTH_SHA1 );
+ css::uno::Any aAny;
aAny <<= aSequ;
m_pContent->setPropertyValue("EncryptionKey", aAny );
}
@@ -1405,7 +1405,7 @@ bool UCBStorageStream::CopyTo( BaseStorageStream* pDestStm )
return true;
}
-bool UCBStorageStream::SetProperty( const OUString& rName, const ::com::sun::star::uno::Any& rValue )
+bool UCBStorageStream::SetProperty( const OUString& rName, const css::uno::Any& rValue )
{
if ( rName == "Title")
return false;
@@ -1676,11 +1676,11 @@ void UCBStorage_Impl::Init()
if ( !pStream->GetError() )
{
::utl::OInputStreamWrapper* pHelper = new ::utl::OInputStreamWrapper( *pStream );
- com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xInputStream( pHelper );
+ css::uno::Reference < css::io::XInputStream > xInputStream( pHelper );
// create a manifest reader object that will read in the manifest from the stream
- Reference < ::com::sun::star::packages::manifest::XManifestReader > xReader =
- ::com::sun::star::packages::manifest::ManifestReader::create(
+ Reference < css::packages::manifest::XManifestReader > xReader =
+ css::packages::manifest::ManifestReader::create(
::comphelper::getProcessComponentContext() ) ;
Sequence < Sequence < PropertyValue > > aProps = xReader->readManifestSequence( xInputStream );
@@ -1715,7 +1715,7 @@ void UCBStorage_Impl::Init()
if ( !m_aContentType.isEmpty() )
{
// get the clipboard format using the content type
- ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
+ css::datatransfer::DataFlavor aDataFlavor;
aDataFlavor.MimeType = m_aContentType;
m_nFormat = SotExchange::GetFormat( aDataFlavor );
@@ -1736,13 +1736,13 @@ void UCBStorage_Impl::CreateContent()
try
{
// create content; where to put StreamMode ?! ( already done when opening the file of the package ? )
- Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
+ Reference< css::ucb::XCommandEnvironment > xComEnv;
OUString aTemp( m_aURL );
if ( m_bRepairPackage )
{
- xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
+ xComEnv = new ::ucbhelper::CommandEnvironment( Reference< css::task::XInteractionHandler >(),
m_xProgressHandler );
aTemp += "?repairpackage";
}
@@ -1821,10 +1821,10 @@ void UCBStorage_Impl::ReadContent()
// streams can be external OLE objects, so they are now folders, but storages!
OUString aName( m_aURL + "/" + xRow->getString(1));
- Reference< ::com::sun::star::ucb::XCommandEnvironment > xComEnv;
+ Reference< css::ucb::XCommandEnvironment > xComEnv;
if ( m_bRepairPackage )
{
- xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
+ xComEnv = new ::ucbhelper::CommandEnvironment( Reference< css::task::XInteractionHandler >(),
m_xProgressHandler );
aName += "?repairpackage";
}
@@ -1968,7 +1968,7 @@ void UCBStorage_Impl::SetProps( const Sequence < Sequence < PropertyValue > >& r
if ( !m_aContentType.isEmpty() )
{
// get the clipboard format using the content type
- ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
+ css::datatransfer::DataFlavor aDataFlavor;
aDataFlavor.MimeType = m_aContentType;
m_nFormat = SotExchange::GetFormat( aDataFlavor );
@@ -2120,7 +2120,7 @@ sal_Int16 UCBStorage_Impl::Commit()
OUString aName( m_aURL );
aName += "/";
aName += pElement->m_aOriginalName;
- pContent = new ::ucbhelper::Content( aName, Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ pContent = new ::ucbhelper::Content( aName, Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
xDeleteContent.reset(pContent); // delete it later on exit scope
}
@@ -2251,11 +2251,11 @@ sal_Int16 UCBStorage_Impl::Commit()
// get the stream from the temp file and create an output stream wrapper
SvStream* pStream = pTempFile->GetStream( STREAM_STD_READWRITE );
::utl::OOutputStreamWrapper* pHelper = new ::utl::OOutputStreamWrapper( *pStream );
- com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > xOutputStream( pHelper );
+ css::uno::Reference < css::io::XOutputStream > xOutputStream( pHelper );
// create a manifest writer object that will fill the stream
- Reference < ::com::sun::star::packages::manifest::XManifestWriter > xWriter =
- ::com::sun::star::packages::manifest::ManifestWriter::create(
+ Reference < css::packages::manifest::XManifestWriter > xWriter =
+ css::packages::manifest::ManifestWriter::create(
::comphelper::getProcessComponentContext() );
sal_Int32 nCount = GetObjectCount() + 1;
Sequence < Sequence < PropertyValue > > aProps( nCount );
@@ -2422,7 +2422,7 @@ void UCBStorage::SetClass( const SvGlobalName & rClass, SotClipboardFormatId nOr
// in UCB storages only the content type will be stored, all other information can be reconstructed
// ( see the UCBStorage_Impl::Init() method )
- ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
+ css::datatransfer::DataFlavor aDataFlavor;
SotExchange::GetFormatDataFlavor( pImp->m_nFormat, aDataFlavor );
pImp->m_aContentType = aDataFlavor.MimeType;
}
@@ -2441,7 +2441,7 @@ void UCBStorage::SetClassId( const ClsId& rClsId )
pImp->m_nFormat = GetFormatId_Impl( pImp->m_aClassId );
if ( pImp->m_nFormat != SotClipboardFormatId::NONE )
{
- ::com::sun::star::datatransfer::DataFlavor aDataFlavor;
+ css::datatransfer::DataFlavor aDataFlavor;
SotExchange::GetFormatDataFlavor( pImp->m_nFormat, aDataFlavor );
pImp->m_aUserTypeName = aDataFlavor.HumanPresentableName;
pImp->m_aContentType = aDataFlavor.MimeType;
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 4a76aa7..53ff9b6 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -689,9 +689,9 @@ void SAL_CALL OLESimpleStorage::removeEventListener(
void SAL_CALL OLESimpleStorage::commit()
- throw ( ::com::sun::star::io::IOException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::io::IOException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -715,9 +715,9 @@ void SAL_CALL OLESimpleStorage::commit()
void SAL_CALL OLESimpleStorage::revert()
- throw ( ::com::sun::star::io::IOException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception )
+ throw ( css::io::IOException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index 5283cd2..7c58c19 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.hxx
@@ -39,147 +39,147 @@
class OLESimpleStorage : public ::cppu::WeakImplHelper
- < ::com::sun::star::embed::XOLESimpleStorage
- , ::com::sun::star::lang::XInitialization
- , ::com::sun::star::lang::XServiceInfo >
+ < css::embed::XOLESimpleStorage
+ , css::lang::XInitialization
+ , css::lang::XServiceInfo >
{
::osl::Mutex m_aMutex;
bool m_bDisposed;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream;
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xTempStream;
+ css::uno::Reference< css::io::XStream > m_xStream;
+ css::uno::Reference< css::io::XStream > m_xTempStream;
SvStream* m_pStream;
BaseStorage* m_pStorage;
::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
+ css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory;
bool m_bNoTemporaryCopy;
void UpdateOriginal_Impl();
- static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInputStream )
- throw ( ::com::sun::star::uno::Exception );
+ static void InsertInputStreamToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const css::uno::Reference< css::io::XInputStream >& xInputStream )
+ throw ( css::uno::Exception );
- static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xNameAccess )
- throw ( ::com::sun::star::uno::Exception );
+ static void InsertNameAccessToStorage_Impl( BaseStorage* pStorage, const OUString & aName, const css::uno::Reference< css::container::XNameAccess >& xNameAccess )
+ throw ( css::uno::Exception );
public:
- explicit OLESimpleStorage( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory );
+ explicit OLESimpleStorage( css::uno::Reference< css::lang::XMultiServiceFactory > xFactory );
virtual ~OLESimpleStorage();
- static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
+ static css::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
static OUString SAL_CALL impl_staticGetImplementationName();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL
impl_staticCreateSelfInstance(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
+ const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// XInitialization
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw ( ::com::sun::star::uno::Exception,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw ( css::uno::Exception,
+ css::uno::RuntimeException, std::exception) override;
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
+ throw ( css::lang::IllegalArgumentException,
+ css::container::ElementExistException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL removeByName( const OUString& Name )
- throw ( ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw ( css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
- throw ( ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement )
+ throw ( css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
- throw ( ::com::sun::star::container::NoSuchElementException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
+ throw ( css::container::NoSuchElementException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Type SAL_CALL getElementType()
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL hasElements()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
// XComponent
virtual void SAL_CALL dispose()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::lang::XEventListener >& xListener )
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::lang::XEventListener >& xListener )
+ throw ( css::uno::RuntimeException, std::exception ) override;
// XTransactedObject
virtual void SAL_CALL commit()
- throw ( ::com::sun::star::io::IOException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::io::IOException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL revert()
- throw ( ::com::sun::star::io::IOException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::io::IOException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception ) override;
// XClassifiedObject
- virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getClassID()
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL getClassName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setClassInfo( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aClassID,
+ virtual void SAL_CALL setClassInfo( const css::uno::Sequence< ::sal_Int8 >& aClassID,
const OUString& sClassName )
- throw ( ::com::sun::star::lang::NoSupportException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::lang::NoSupportException,
+ css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw ( css::uno::RuntimeException, std::exception ) override;
};
commit 95b22704e8452e6360d0acf846e8c967aab146d7
Author: Noel Grandin <noel at peralex.com>
Date: Thu Oct 29 12:44:31 2015 +0200
com::sun::star->css in starmath,stoc,svgio,svl
Change-Id: If4308b358a55351f6e951ebf055df076ce4ad4ce
Reviewed-on: https://gerrit.libreoffice.org/19667
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index fb07b18..a76538e 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -125,12 +125,12 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
virtual sal_uLong GetMiscStatus() const override;
virtual void OnDocumentPrinterChanged( Printer * ) override;
- virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
+ virtual bool InitNew( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
virtual bool Load( SfxMedium& rMedium ) override;
virtual bool Save() override;
virtual bool SaveAs( SfxMedium& rMedium ) override;
virtual bool ConvertTo( SfxMedium &rMedium ) override;
- virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage ) override;
+ virtual bool SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
Printer *GetPrt();
OutputDevice* GetRefDev();
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 0ae45d3..98733d2 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -48,7 +48,7 @@ class SmParser
std::set< OUString > m_aUsedSymbols;
//! locale where '.' is decimal separator!
- ::com::sun::star::lang::Locale m_aDotLoc;
+ css::lang::Locale m_aDotLoc;
SmParser(const SmParser&) = delete;
SmParser& operator=(const SmParser&) = delete;
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index c897e26..2227e20 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -50,45 +50,45 @@ public:
class SmModel : public SfxBaseModel,
public comphelper::PropertySetHelper,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::view::XRenderable,
+ public css::lang::XServiceInfo,
+ public css::view::XRenderable,
public oox::FormulaExportBase,
public oox::FormulaImportBase
{
std::unique_ptr<SmPrintUIOptions> m_pPrintUIOptions;
protected:
- virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues )
+ virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues )
throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, std::exception) override;
- virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue )
+ virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue )
throw (css::uno::RuntimeException, css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
public:
SmModel( SfxObjectShell *pObjSh = 0 );
virtual ~SmModel() throw ();
//XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw() override;
virtual void SAL_CALL release( ) throw() override;
//XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
//XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
//XRenderable
- virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& rSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rxOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& rSelection, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override;
// oox::FormulaExportBase
virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr m_pSerializer, oox::core::OoxmlVersion version ) override;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index cd04078..034b67e 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -675,7 +675,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
return aTxt.copy( nStart, nEnd - nStart );
}
-::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -683,7 +683,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
if (!(nIndex <= aTxt.getLength()))
throw IndexOutOfBoundsException();
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
if ( (AccessibleTextType::CHARACTER == aTextType) && (nIndex < aTxt.getLength()) )
@@ -695,7 +695,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
return aResult;
}
-::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -703,7 +703,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
if (!(nIndex <= aTxt.getLength()))
throw IndexOutOfBoundsException();
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
@@ -716,7 +716,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
return aResult;
}
-::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
OUString aTxt( GetAccessibleText_Impl() );
@@ -724,7 +724,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange(
if (!(nIndex <= aTxt.getLength()))
throw IndexOutOfBoundsException();
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
@@ -787,10 +787,10 @@ Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return Sequence< OUString >{
- "com::sun::star::accessibility::Accessible",
- "com::sun::star::accessibility::AccessibleComponent",
- "com::sun::star::accessibility::AccessibleContext",
- "com::sun::star::accessibility::AccessibleText"
+ "css::accessibility::Accessible",
+ "css::accessibility::AccessibleComponent",
+ "css::accessibility::AccessibleContext",
+ "css::accessibility::AccessibleText"
};
}
@@ -1304,7 +1304,7 @@ bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
{
- ESelection aRes = pEditEngine->GetWord( ESelection(nPara, nIndex, nPara, nIndex), com::sun::star::i18n::WordType::DICTIONARY_WORD );
+ ESelection aRes = pEditEngine->GetWord( ESelection(nPara, nIndex, nPara, nIndex), css::i18n::WordType::DICTIONARY_WORD );
if( aRes.nStartPara == nPara &&
aRes.nStartPara == aRes.nEndPara )
@@ -1918,9 +1918,9 @@ Sequence< OUString > SAL_CALL SmEditAccessible::getSupportedServiceNames()
throw (RuntimeException, std::exception)
{
return Sequence< OUString >{
- "com::sun::star::accessibility::Accessible",
- "com::sun::star::accessibility::AccessibleComponent",
- "com::sun::star::accessibility::AccessibleContext"
+ "css::accessibility::Accessible",
+ "css::accessibility::AccessibleComponent",
+ "css::accessibility::AccessibleContext"
};
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index b671b23..103989c 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -54,12 +54,12 @@ struct AccessibleEventObject;
typedef
cppu::WeakImplHelper
<
- com::sun::star::lang::XServiceInfo,
- com::sun::star::accessibility::XAccessible,
- com::sun::star::accessibility::XAccessibleComponent,
- com::sun::star::accessibility::XAccessibleContext,
- com::sun::star::accessibility::XAccessibleText,
- com::sun::star::accessibility::XAccessibleEventBroadcaster
+ css::lang::XServiceInfo,
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleText,
+ css::accessibility::XAccessibleEventBroadcaster
>
SmGraphicAccessibleBaseClass;
@@ -86,62 +86,62 @@ public:
void ClearWin(); // to be called when view is destroyed
void LaunchEvent(
const sal_Int16 nAccesibleEventId,
- const ::com::sun::star::uno::Any &rOldVal,
- const ::com::sun::star::uno::Any &rNewVal);
+ const css::uno::Any &rOldVal,
+ const css::uno::Any &rNewVal);
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleText
- virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getSelectedText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
};
@@ -302,11 +302,11 @@ public:
typedef
cppu::WeakImplHelper
<
- com::sun::star::lang::XServiceInfo,
- com::sun::star::accessibility::XAccessible,
- com::sun::star::accessibility::XAccessibleComponent,
- com::sun::star::accessibility::XAccessibleContext,
- com::sun::star::accessibility::XAccessibleEventBroadcaster
+ css::lang::XServiceInfo,
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleEventBroadcaster
>
SmEditAccessibleBaseClass;
@@ -335,39 +335,39 @@ public:
EditView * GetEditView() { return pWin ? pWin->GetEditView() : 0; }
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
// XAccessibleEventBroadcaster
- virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
};
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 14029a7..2272437 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -1138,7 +1138,7 @@ void SmMathConfig::SetShowFormulaCursor( bool bVal )
SetOtherIfNotEqual( pOther->bFormulaCursor, bVal );
}
-void SmMathConfig::Notify( const com::sun::star::uno::Sequence< OUString >& )
+void SmMathConfig::Notify( const css::uno::Sequence< OUString >& )
{}
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 16b1f84..c6c00de 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -146,7 +146,7 @@ public:
virtual ~SmMathConfig();
// utl::ConfigItem
- virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
SmSymbolManager & GetSymbolManager();
void GetSymbols( std::vector< SmSym > &rSymbols ) const;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index a5c8ad1..bd5f135 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -701,7 +701,7 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium)
pTree = 0;
InvalidateCursor();
}
- Reference<com::sun::star::frame::XModel> xModel(GetModel());
+ Reference<css::frame::XModel> xModel(GetModel());
SmXMLImportWrapper aEquation(xModel);
bSuccess = 0 == aEquation.Import(rMedium);
}
@@ -766,7 +766,7 @@ bool SmDocShell::Load( SfxMedium& rMedium )
)
{
// is this a fabulous math package ?
- Reference<com::sun::star::frame::XModel> xModel(GetModel());
+ Reference<css::frame::XModel> xModel(GetModel());
SmXMLImportWrapper aEquation(xModel);
sal_uLong nError = aEquation.Import(rMedium);
bRet = 0 == nError;
@@ -798,7 +798,7 @@ bool SmDocShell::Save()
if( pTree && !IsFormulaArranged() )
ArrangeFormula();
- Reference<com::sun::star::frame::XModel> xModel(GetModel());
+ Reference<css::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel);
aEquation.SetFlat(false);
return aEquation.Export(*GetMedium());
@@ -860,7 +860,7 @@ bool SmDocShell::SaveAs( SfxMedium& rMedium )
if( pTree && !IsFormulaArranged() )
ArrangeFormula();
- Reference<com::sun::star::frame::XModel> xModel(GetModel());
+ Reference<css::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel);
aEquation.SetFlat(false);
bRet = aEquation.Export(rMedium);
@@ -882,14 +882,14 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
const OUString& rFltName = pFlt->GetFilterName();
if(rFltName == STAROFFICE_XML)
{
- Reference<com::sun::star::frame::XModel> xModel(GetModel());
+ Reference<css::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel);
aEquation.SetFlat(false);
bRet = aEquation.Export(rMedium);
}
else if(rFltName == MATHML_XML)
{
- Reference<com::sun::star::frame::XModel> xModel(GetModel());
+ Reference<css::frame::XModel> xModel(GetModel());
SmXMLExportWrapper aEquation(xModel);
aEquation.SetFlat(true);
bRet = aEquation.Export(rMedium);
@@ -926,7 +926,7 @@ void SmDocShell::readFormulaOoxml( oox::formulaimport::XmlStream& stream )
SetText( aEquation.ConvertToStarMath());
}
-bool SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
+bool SmDocShell::SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage )
{
if( SfxObjectShell::SaveCompleted( xStorage ))
return true;
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 788708a..f5bf104 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -348,7 +348,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt)
// added for replaceability of context menus
Menu* pMenu = NULL;
- ::com::sun::star::ui::ContextMenuExecuteEvent aEvent;
+ css::ui::ContextMenuExecuteEvent aEvent;
aEvent.SourceWindow = VCLUnoHelper::GetInterface( this );
aEvent.ExecutePosition.X = aPoint.X();
aEvent.ExecutePosition.Y = aPoint.Y();
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 471e0e3..2e557a7 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -360,7 +360,7 @@ bool SmXMLExportWrapper::WriteThroughComponent(
}
SmXMLExport::SmXMLExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLExportFlags nExportFlags)
: SvXMLExport(util::MeasureUnit::INCH, rContext, implementationName, XML_MATH,
nExportFlags)
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index f04f416..44e9c57 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -40,35 +40,29 @@ namespace com { namespace sun { namespace star {
class SmXMLExportWrapper
{
- com::sun::star::uno::Reference<com::sun::star::frame::XModel> xModel;
+ css::uno::Reference<css::frame::XModel> xModel;
bool bFlat; //set true for export to flat .mml, set false for
//export to a .sxm (or whatever) package
public:
- explicit SmXMLExportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef)
+ explicit SmXMLExportWrapper(css::uno::Reference<css::frame::XModel> &rRef)
: xModel(rRef), bFlat(true) {}
bool Export(SfxMedium &rMedium);
void SetFlat(bool bIn) {bFlat = bIn;}
static bool WriteThroughComponent(
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >
- xOutputStream,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
- xComponent,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & rxContext,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & rPropSet,
+ css::uno::Reference< css::io::XOutputStream > xOutputStream,
+ css::uno::Reference< css::lang::XComponent > xComponent,
+ css::uno::Reference< css::uno::XComponentContext > & rxContext,
+ css::uno::Reference< css::beans::XPropertySet > & rPropSet,
const sal_Char* pComponentName );
static bool WriteThroughComponent(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xComponent,
+ const css::uno::Reference< css::embed::XStorage >& xStor,
+ css::uno::Reference< css::lang::XComponent > xComponent,
const sal_Char* pStreamName,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > & rxContext,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & rPropSet,
+ css::uno::Reference< css::uno::XComponentContext > & rxContext,
+ css::uno::Reference< css::beans::XPropertySet > & rPropSet,
const sal_Char* pComponentName );
};
@@ -104,21 +98,21 @@ protected:
public:
SmXMLExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLExportFlags nExportFlags);
virtual ~SmXMLExport() {};
// XUnoTunnel
- sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
void _ExportAutoStyles() override {}
void _ExportMasterStyles() override {}
void _ExportContent() override;
sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass) override;
- virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
- virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aProps) override;
+ virtual void GetViewSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
+ virtual void GetConfigurationSettings(css::uno::Sequence<css::beans::PropertyValue>& aProps) override;
bool GetSuccess() {return bSuccess;}
};
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 8e4f657..d8c6356 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -396,7 +396,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
SmXMLImport::SmXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags)
: SvXMLImport(rContext, implementationName, nImportFlags),
bSuccess(false)
diff --git a/starmath/source/mathmlimport.hxx b/starmath/source/mathmlimport.hxx
index b5ddc07..961efad 100644
--- a/starmath/source/mathmlimport.hxx
+++ b/starmath/source/mathmlimport.hxx
@@ -40,31 +40,29 @@ namespace com { namespace sun { namespace star {
class SmXMLImportWrapper
{
- com::sun::star::uno::Reference<com::sun::star::frame::XModel> xModel;
+ css::uno::Reference<css::frame::XModel> xModel;
public:
- explicit SmXMLImportWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rRef)
+ explicit SmXMLImportWrapper(css::uno::Reference<css::frame::XModel> &rRef)
: xModel(rRef) {}
sal_uLong Import(SfxMedium &rMedium);
static sal_uLong ReadThroughComponent(
- ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xInputStream,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & rPropSet,
+ css::uno::Reference< css::io::XInputStream > xInputStream,
+ css::uno::Reference< css::lang::XComponent > xModelComponent,
+ css::uno::Reference< css::uno::XComponentContext > & rxContext,
+ css::uno::Reference< css::beans::XPropertySet > & rPropSet,
const sal_Char* pFilterName,
bool bEncrypted );
static sal_uLong ReadThroughComponent(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > xModelComponent,
+ const css::uno::Reference< css::embed::XStorage >& xStorage,
+ css::uno::Reference< css::lang::XComponent > xModelComponent,
const sal_Char* pStreamName,
const sal_Char* pCompatibilityStreamName,
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
- ::com::sun::star::uno::Reference<
- ::com::sun::star::beans::XPropertySet > & rPropSet,
+ css::uno::Reference< css::uno::XComponentContext > & rxContext,
+ css::uno::Reference< css::beans::XPropertySet > & rPropSet,
const sal_Char* pFilterName );
};
@@ -89,146 +87,146 @@ class SmXMLImport : public SvXMLImport
public:
SmXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
+ const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags);
virtual ~SmXMLImport() throw ();
// XUnoTunnel
- sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) override;
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
void SAL_CALL endDocument()
- throw( ::com::sun::star::xml::sax::SAXException,
- ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw( css::xml::sax::SAXException,
+ css::uno::RuntimeException, std::exception ) override;
SvXMLImportContext *CreateContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList) override;
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList) override;
SvXMLImportContext *CreateRowContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateEncloseContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateFracContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateNumberContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTextContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateAnnotationContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateStringContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateIdentifierContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateOperatorContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSpaceContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSqrtContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateRootContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateStyleContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreatePaddedContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreatePhantomContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateFencedContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateErrorContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSubContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSupContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateSubSupContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateUnderContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateOverContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateUnderOverContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateMultiScriptsContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateNoneContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreatePrescriptsContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTableContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTableRowContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateTableCellContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateAlignGroupContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
SvXMLImportContext *CreateActionContext(sal_uInt16 nPrefix,
const OUString &rLocalName,
- const com::sun::star::uno::Reference <
- com::sun::star::xml::sax::XAttributeList> &xAttrList);
+ const css::uno::Reference <
+ css::xml::sax::XAttributeList> &xAttrList);
const SvXMLTokenMap &GetPresLayoutElemTokenMap();
const SvXMLTokenMap &GetPresLayoutAttrTokenMap();
@@ -251,8 +249,8 @@ public:
SAL_WARN_UNUSED_RESULT OUString GetText() { return aText; }
void SetText(const OUString &rStr) { aText = rStr; }
- virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override;
- virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) override;
+ virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
+ virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
};
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 02b1236..e2ae2e2 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -344,8 +344,8 @@ bool SmParser::IsDelimiter( const OUString &rTxt, sal_Int32 nPos )
sal_Int16 nTypJp = SM_MOD()->GetSysLocale().GetCharClass().getType( rTxt, nPos );
bool bIsDelim = (*pDelim != 0 ||
- nTypJp == com::sun::star::i18n::UnicodeType::SPACE_SEPARATOR ||
- nTypJp == com::sun::star::i18n::UnicodeType::CONTROL);
+ nTypJp == css::i18n::UnicodeType::SPACE_SEPARATOR ||
+ nTypJp == css::i18n::UnicodeType::CONTROL);
return bIsDelim;
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index c8f03b5..103ca38 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1387,7 +1387,7 @@ void SmViewShell::Insert( SfxMedium& rMedium )
if (xNameAccess->hasByName(OUString("content.xml")) || xNameAccess->hasByName(OUString("Content.xml")))
{
// is this a fabulous math package ?
- Reference<com::sun::star::frame::XModel> xModel(pDoc->GetModel());
+ Reference<css::frame::XModel> xModel(pDoc->GetModel());
SmXMLImportWrapper aEquation(xModel); //!! modifies the result of pDoc->GetText() !!
bRet = 0 == aEquation.Import(rMedium);
}
diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h
index e68de74..dbdf8a0 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -74,12 +74,12 @@ public:
: m_head( single )
{}
PermissionCollection(
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const & permissions,
+ css::uno::Sequence< css::uno::Any > const & permissions,
PermissionCollection const & addition = PermissionCollection() );
#ifdef __DIAGNOSE
- ::com::sun::star::uno::Sequence< OUString > toStrings() const;
+ css::uno::Sequence< OUString > toStrings() const;
#endif
- void checkPermission( ::com::sun::star::uno::Any const & perm ) const;
+ void checkPermission( css::uno::Any const & perm ) const;
};
}
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 70811dd..44bfe6c 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -894,9 +894,9 @@ Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestina
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_stoc_TypeConverter_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_stoc_TypeConverter_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
return ::cppu::acquire(new stoc_tcv::TypeConverter_Impl());
}
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index ac11701..0737c85 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -190,9 +190,9 @@ OUString Translator::translateToExternal(
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_uri_ExternalUriReferenceTranslator_get_implementation(::com::sun::star::uno::XComponentContext* rxContext,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_uri_ExternalUriReferenceTranslator_get_implementation(css::uno::XComponentContext* rxContext,
+ css::uno::Sequence<css::uno::Any> const &)
{
return ::cppu::acquire(new Translator(rxContext));
}
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 2d89e99..16ffe39 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -632,9 +632,9 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeRelative(
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_uri_UriReferenceFactory_get_implementation(::com::sun::star::uno::XComponentContext* rxContext,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_uri_UriReferenceFactory_get_implementation(css::uno::XComponentContext* rxContext,
+ css::uno::Sequence<css::uno::Any> const &)
{
return ::cppu::acquire(new Factory(rxContext));
}
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 7beab08..ac0ceec 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -210,9 +210,9 @@ css::uno::Reference< css::uri::XUriReference > Parser::parse(
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
//TODO: single instance
return ::cppu::acquire(new Parser());
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index d14e3f5..66e5644 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -431,9 +431,9 @@ Parser::parse(
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation(::com::sun::star::uno::XComponentContext*,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation(css::uno::XComponentContext*,
+ css::uno::Sequence<css::uno::Any> const &)
{
//TODO: single instance
return ::cppu::acquire(new Parser());
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 6452f41..48f36f7 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -118,9 +118,9 @@ Factory::createVndSunStarPkgUrlReference(
}
-extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL
-com_sun_star_comp_uri_VndSunStarPkgUrlReferenceFactory_get_implementation(::com::sun::star::uno::XComponentContext* rxContext,
- ::com::sun::star::uno::Sequence<css::uno::Any> const &)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+com_sun_star_comp_uri_VndSunStarPkgUrlReferenceFactory_get_implementation(css::uno::XComponentContext* rxContext,
+ css::uno::Sequence<css::uno::Any> const &)
{
return ::cppu::acquire(new Factory(rxContext));
}
diff --git a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
index 560dee3..bc1d10a 100644
--- a/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
+++ b/svgio/inc/svgio/svgreader/svgdocumenthandler.hxx
@@ -30,7 +30,7 @@ namespace svgio
{
namespace svgreader
{
- class SvgDocHdl : public cppu::WeakImplHelper< com::sun::star::xml::sax::XDocumentHandler >
+ class SvgDocHdl : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
{
private:
// the complete SVG Document
@@ -49,14 +49,14 @@ namespace svgio
virtual ~SvgDocHdl();
// Methods XDocumentHandler
- virtual void SAL_CALL startDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL endDocument( ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL startElement( const OUString& aName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL endElement( const OUString& aName ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL characters( const OUString& aChars ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDocumentLocator( const com::sun::star::uno::Reference< com::sun::star::xml::sax::XLocator >& xLocator ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL startDocument( ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL endDocument( ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
const SvgDocument& getSvgDocument() const { return maDocument; }
};
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx
index 043add3..4111ed3 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -141,7 +141,7 @@ namespace svgio
void readLocalCssStyle(const OUString& aContent);
/// style helpers
- void parseAttributes(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttribs);
+ void parseAttributes(const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs);
virtual const SvgStyleAttributes* getSvgStyleAttributes() const;
virtual void parseAttribute(const OUString& rTokenName, SVGToken aSVGToken, const OUString& aContent);
virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const;
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index 74d388d..1ad92ee 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list