sfx2/inc/bluthsndapi.hxx | 4
sfx2/inc/fwkhelper.hxx | 2
sfx2/inc/guisaveas.hxx | 27 ++---
sfx2/inc/inettbc.hxx | 6 -
sfx2/inc/sorgitm.hxx | 4
sfx2/qa/cppunit/test_metadatable.cxx | 3
sfx2/source/appl/app.cxx | 16 +-
sfx2/source/appl/appcfg.cxx | 4
sfx2/source/appl/appdde.cxx | 12 +-
sfx2/source/appl/appinit.cxx | 2
sfx2/source/appl/appopen.cxx | 27 ++---
sfx2/source/appl/appserv.cxx | 24 ++--
sfx2/source/appl/appuno.cxx | 10 -
sfx2/source/appl/childwin.cxx | 32 ++---
sfx2/source/appl/fileobj.cxx | 4
sfx2/source/appl/fileobj.hxx | 2
sfx2/source/appl/fwkhelper.cxx | 2
sfx2/source/appl/helpdispatch.cxx | 3
sfx2/source/appl/helpdispatch.hxx | 12 +-
sfx2/source/appl/helpinterceptor.cxx | 22 ++--
sfx2/source/appl/helpinterceptor.hxx | 86 +++++++--------
sfx2/source/appl/imagemgr.cxx | 15 +-
sfx2/source/appl/imestatuswindow.cxx | 22 ++--
sfx2/source/appl/imestatuswindow.hxx | 21 +--
sfx2/source/appl/impldde.cxx | 2
sfx2/source/appl/impldde.hxx | 4
sfx2/source/appl/linkmgr2.cxx | 10 -
sfx2/source/appl/linksrc.cxx | 6 -
sfx2/source/appl/lnkbase2.cxx | 2
sfx2/source/appl/macroloader.cxx | 2
sfx2/source/appl/module.cxx | 2
sfx2/source/appl/newhelp.cxx | 46 ++++----
sfx2/source/appl/newhelp.hxx | 35 +++---
sfx2/source/appl/sfxhelp.cxx | 16 +-
sfx2/source/appl/sfxpicklist.cxx | 2
sfx2/source/appl/shutdownicon.cxx | 96 ++++++++---------
sfx2/source/appl/shutdownicon.hxx | 58 +++++-----
sfx2/source/appl/workwin.cxx | 36 +++---
sfx2/source/bastyp/fltfnc.cxx | 14 +-
sfx2/source/bastyp/fltlst.cxx | 10 -
sfx2/source/bastyp/fltlst.hxx | 8 -
sfx2/source/config/evntconf.cxx | 6 -
sfx2/source/control/bindings.cxx | 58 +++++-----
sfx2/source/control/dispatch.cxx | 48 ++++----
sfx2/source/control/querystatus.cxx | 26 ++--
sfx2/source/control/request.cxx | 20 +--
sfx2/source/control/sfxstatuslistener.cxx | 8 -
sfx2/source/control/shell.cxx | 10 -
sfx2/source/control/sorgitm.cxx | 4
sfx2/source/control/statcach.cxx | 38 +++----
sfx2/source/control/templatelocalview.cxx | 4
sfx2/source/control/templateviewitem.cxx | 2
sfx2/source/control/thumbnailview.cxx | 38 +++----
sfx2/source/control/thumbnailviewacc.cxx | 18 +--
sfx2/source/control/thumbnailviewacc.hxx | 156 ++++++++++++++---------------
sfx2/source/control/thumbnailviewitem.cxx | 4
sfx2/source/control/unoctitm.cxx | 156 ++++++++++++++---------------
sfx2/source/dialog/backingcomp.cxx | 8 -
sfx2/source/dialog/backingwindow.cxx | 22 ++--
sfx2/source/dialog/basedlgs.cxx | 2
sfx2/source/dialog/bluthsnd.cxx | 4
sfx2/source/dialog/dinfdlg.cxx | 13 --
sfx2/source/dialog/filedlghelper.cxx | 14 +-
sfx2/source/dialog/filedlgimpl.hxx | 44 ++++----
sfx2/source/dialog/filtergrouping.cxx | 2
sfx2/source/dialog/filtergrouping.hxx | 8 -
sfx2/source/dialog/mailmodel.cxx | 13 +-
sfx2/source/dialog/partwnd.cxx | 8 -
sfx2/source/dialog/recfloat.cxx | 8 -
sfx2/source/dialog/tabdlg.cxx | 8 -
sfx2/source/dialog/taskpane.cxx | 2
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/dialog/tplpitem.cxx | 8 -
sfx2/source/doc/DocumentMetadataAccess.cxx | 10 -
sfx2/source/doc/Metadatable.cxx | 33 ++----
sfx2/source/doc/SfxDocumentMetaData.cxx | 54 ++++------
sfx2/source/doc/docfile.cxx | 124 +++++++++++------------
sfx2/source/doc/docfilt.cxx | 4
sfx2/source/doc/doctemplateslocal.hxx | 44 ++++----
sfx2/source/doc/graphhelp.hxx | 4
sfx2/source/doc/guisaveas.cxx | 18 +--
sfx2/source/doc/iframe.cxx | 26 ++--
sfx2/source/doc/objitem.cxx | 13 +-
sfx2/source/doc/objmisc.cxx | 6 -
sfx2/source/doc/objserv.cxx | 4
sfx2/source/doc/objstor.cxx | 44 ++++----
sfx2/source/doc/objstor.hxx | 2
sfx2/source/doc/objxtor.cxx | 24 ++--
sfx2/source/doc/oleprops.cxx | 8 -
sfx2/source/doc/oleprops.hxx | 16 +-
sfx2/source/doc/ownsubfilterservice.cxx | 6 -
sfx2/source/doc/plugin.cxx | 24 ++--
sfx2/source/doc/printhelper.cxx | 80 +++++++-------
sfx2/source/doc/printhelper.hxx | 24 ++--
sfx2/source/doc/sfxbasemodel.cxx | 4
sfx2/source/doc/templatedlg.cxx | 17 +--
sfx2/source/doc/zoomitem.cxx | 8 -
sfx2/source/inc/appbaslib.hxx | 12 +-
sfx2/source/inc/docundomanager.hxx | 44 ++++----
sfx2/source/inc/fltoptint.hxx | 32 ++---
sfx2/source/inc/macroloader.hxx | 2
sfx2/source/inc/objshimp.hxx | 22 ++--
sfx2/source/inc/recfloat.hxx | 2
sfx2/source/inc/sfxpicklist.hxx | 2
sfx2/source/inc/sfxurlrelocator.hxx | 8 -
sfx2/source/inc/statcach.hxx | 38 +++----
sfx2/source/inc/workwin.hxx | 26 ++--
sfx2/source/inet/inettbc.cxx | 4
sfx2/source/menu/mnumgr.cxx | 6 -
sfx2/source/menu/virtmenu.cxx | 12 +-
sfx2/source/sidebar/UnoDecks.cxx | 4
sfx2/source/sidebar/UnoPanels.cxx | 4
sfx2/source/statbar/stbitem.cxx | 14 +-
sfx2/source/toolbox/tbxitem.cxx | 66 ++++++------
sfx2/source/view/frame.cxx | 36 +++---
sfx2/source/view/frame2.cxx | 8 -
sfx2/source/view/impframe.hxx | 2
sfx2/source/view/ipclient.cxx | 30 ++---
sfx2/source/view/viewfrm.cxx | 122 +++++++++++-----------
sfx2/source/view/viewimp.hxx | 2
sfx2/source/view/viewprn.cxx | 4
121 files changed, 1269 insertions(+), 1303 deletions(-)
New commits:
commit 913a2d3692f0dc36c41bfeca2cad7e936b189a30
Author: Noel Grandin <n...@peralex.com>
Date: Wed Oct 28 15:38:06 2015 +0200
com::sun::star->css in sfx2
Change-Id: I20d9b45e4b28c2a4a511774d3154aceb0471d197
Reviewed-on: https://gerrit.libreoffice.org/19643
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx
index 4869173..8c6ccc1 100644
--- a/sfx2/inc/bluthsndapi.hxx
+++ b/sfx2/inc/bluthsndapi.hxx
@@ -23,9 +23,9 @@
class SFX2_DLLPUBLIC SfxBluetoothModel:public SfxMailModel
{
public:
- SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame,
+ SendMailResult SaveAndSend( const css::uno::Reference<
css::frame::XFrame >& xFrame,
const OUString& rType );
- SendMailResult Send( const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame );
+ SendMailResult Send( const css::uno::Reference< css::frame::XFrame >&
xFrame );
};
#endif
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index b29dfdf..ab1b7ff 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -28,7 +28,7 @@
#include <rtl/ustring.hxx>
SFX2_DLLPUBLIC void SAL_CALL RefreshToolbars(
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame
+ css::uno::Reference< css::frame::XFrame >& rFrame
);
#endif
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index c409f15..729f067 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -46,45 +46,44 @@ class SfxStoringHelper
friend class ModelData_Impl;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess
> m_xFilterCFG;
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XContainerQuery > m_xFilterQuery;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2
> m_xModuleManager;
+ css::uno::Reference< css::container::XNameAccess > m_xFilterCFG;
+ css::uno::Reference< css::container::XContainerQuery > m_xFilterQuery;
+ css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess
> GetFilterConfiguration();
- ::com::sun::star::uno::Reference<
::com::sun::star::container::XContainerQuery > GetFilterQuery();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager2
> GetModuleManager();
+ css::uno::Reference< css::container::XNameAccess >
GetFilterConfiguration();
+ css::uno::Reference< css::container::XContainerQuery > GetFilterQuery();
+ css::uno::Reference< css::frame::XModuleManager2 > GetModuleManager();
public:
SfxStoringHelper();
bool GUIStoreModel(
- ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > xModel,
+ css::uno::Reference< css::frame::XModel > xModel,
const OUString& aSlotName,
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& aArgsSequence,
+ css::uno::Sequence< css::beans::PropertyValue >&
aArgsSequence,
bool bPreselectPassword,
const OUString& aUserSelectedName,
SignatureState nDocumentSignatureState =
SignatureState::NOSIGNATURES );
static bool CheckFilterOptionsAppearence(
- const ::com::sun::star::uno::Reference<
::com::sun::star::container::XNameAccess >& xFilterCFG,
+ const css::uno::Reference< css::container::XNameAccess >&
xFilterCFG,
const OUString& aFilterName );
static void SetDocInfoState(
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties>& i_xOldDocInfo,
+ const css::uno::Reference< css::frame::XModel >& xModel,
+ const css::uno::Reference< css::document::XDocumentProperties>&
i_xOldDocInfo,
bool bNoModify );
static bool WarnUnacceptableFormat(
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel,
+ const css::uno::Reference<
css::frame::XModel >& xModel,
const OUString& aOldUIName,
const OUString& aDefUIName,
const OUString& aDefExtension,
bool bCanProceedFurther,
bool rDefaultIsAlien );
- static vcl::Window* GetModelWindow( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
+ static vcl::Window* GetModelWindow( const css::uno::Reference<
css::frame::XModel >& xModel );
};
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 0802a97..322f744 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -39,9 +39,9 @@ private:
struct ExecuteInfo
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
xDispatch;
- ::com::sun::star::util::URL
aTargetURL;
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs;
+ css::uno::Reference< css::frame::XDispatch > xDispatch;
+ css::util::URL aTargetURL;
+ css::uno::Sequence< css::beans::PropertyValue > aArgs;
};
DECL_STATIC_LINK_TYPED( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, void*,
void );
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 52f1b42..ad13cea 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -36,8 +36,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId
= 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8
nMemberId ) override;
OUString getLanguage() const { return aLanguage; };
};
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx
b/sfx2/qa/cppunit/test_metadatable.cxx
index 2034642..46360d8 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -83,8 +83,7 @@ public:
virtual bool IsInUndo() const override { return m_bInUndo; }
virtual bool IsInContent() const override { return m_bInContent; }
virtual ::sfx2::IXmlIdRegistry& GetRegistry() override { return
m_rRegistry; }
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject() override {
return 0; }
+ virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject()
override { return 0; }
};
static bool operator==(beans::StringPair p1, beans::StringPair p2)
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 055eaa3..6126a19 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -521,27 +521,23 @@ bool SfxApplication::IsXScriptURL( const OUString&
rScriptURL )
#if !HAVE_FEATURE_SCRIPTING
(void) rScriptURL;
#else
- ::com::sun::star::uno::Reference
- < ::com::sun::star::uno::XComponentContext > xContext =
+ css::uno::Reference< css::uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
- ::com::sun::star::uno::Reference
- < ::com::sun::star::uri::XUriReferenceFactory >
- xFactory = ::com::sun::star::uri::UriReferenceFactory::create(
xContext );
+ css::uno::Reference< css::uri::XUriReferenceFactory >
+ xFactory = css::uri::UriReferenceFactory::create( xContext );
try
{
- ::com::sun::star::uno::Reference
- < ::com::sun::star::uri::XVndSunStarScriptUrl >
- xUrl( xFactory->parse( rScriptURL ),
- ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::uri::XVndSunStarScriptUrl >
+ xUrl( xFactory->parse( rScriptURL ), css::uno::UNO_QUERY );
if ( xUrl.is() )
{
result = true;
}
}
- catch (const ::com::sun::star::uno::RuntimeException&)
+ catch (const css::uno::RuntimeException&)
{
// ignore, will just return FALSE
}
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index bd2b6d8..de657b3 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -364,7 +364,7 @@ bool SfxApplication::GetOptions( SfxItemSet& rSet )
bRet = true;
if
(!aSecurityOptions.IsReadOnly(SvtSecurityOptions::E_SECUREURLS))
{
- ::com::sun::star::uno::Sequence< OUString >
seqURLs = aSecurityOptions.GetSecureURLs();
+ css::uno::Sequence< OUString > seqURLs =
aSecurityOptions.GetSecureURLs();
std::vector<OUString> aList;
sal_uInt32 nCount = seqURLs.getLength();
for( sal_uInt32 nURL=0; nURL<nCount; ++nURL )
@@ -750,7 +750,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet&
rSet )
if ( SfxItemState::SET == rSet.GetItemState(SID_SECURE_URL, true, &pItem))
{
DBG_ASSERT(dynamic_cast< const SfxStringListItem *>( pItem ) !=
nullptr, "StringListItem expected");
- ::com::sun::star::uno::Sequence< OUString > seqURLs;
+ css::uno::Sequence< OUString > seqURLs;
static_cast<const SfxStringListItem*>(pItem)->GetStringList(seqURLs);
aSecurityOptions.SetSecureURLs( seqURLs );
}
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index c457103..ae1e1ab 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -213,7 +213,7 @@ class SfxDdeDocTopic_Impl : public DdeTopic
public:
SfxObjectShell* pSh;
DdeData aData;
- ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
+ css::uno::Sequence< sal_Int8 > aSeq;
explicit SfxDdeDocTopic_Impl( SfxObjectShell* pShell )
: DdeTopic( pShell->GetTitle(SFX_TITLE_FULLNAME) ), pSh( pShell )
@@ -370,7 +370,7 @@ long SfxObjectShell::DdeExecute( const OUString& rCmd )
// Expressed in our B
*/
bool SfxObjectShell::DdeGetData( const OUString&, // the Item to
be addressed
const OUString&, // in: Format
- ::com::sun::star::uno::Any& )// out:
requested data
+ css::uno::Any& )// out: requested data
{
return false;
}
@@ -386,7 +386,7 @@ bool SfxObjectShell::DdeGetData( const OUString&,
// the Item to be
*/
bool SfxObjectShell::DdeSetData( const OUString&, // the
Item to be addressed
const OUString&, // in:
Format
- const ::com::sun::star::uno::Any& )// out:
requested data
+ const css::uno::Any& )// out: requested data
{
return false;
}
@@ -530,7 +530,7 @@ DdeService* SfxApplication::GetDdeService()
DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat)
{
OUString sMimeType( SotExchange::GetFormatMimeType( nFormat ));
- ::com::sun::star::uno::Any aValue;
+ css::uno::Any aValue;
bool bRet = pSh->DdeGetData( GetCurItem(), sMimeType, aValue );
if( bRet && aValue.hasValue() && ( aValue >>= aSeq ) )
{
@@ -543,12 +543,12 @@ DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId
nFormat)
bool SfxDdeDocTopic_Impl::Put( const DdeData* pData )
{
- aSeq = ::com::sun::star::uno::Sequence< sal_Int8 >(
+ aSeq = css::uno::Sequence< sal_Int8 >(
(sal_Int8*)(const void*)*pData, (long)*pData );
bool bRet;
if( aSeq.getLength() )
{
- ::com::sun::star::uno::Any aValue;
+ css::uno::Any aValue;
aValue <<= aSeq;
OUString sMimeType( SotExchange::GetFormatMimeType( pData->GetFormat()
));
bRet = pSh->DdeSetData( GetCurItem(), sMimeType, aValue );
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 50ef158..4a038b5 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -88,7 +88,7 @@ public:
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw (RuntimeException,
std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName )
throw (RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (RuntimeException, std::exception) override;
};
void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& )
throw( RuntimeException, std::exception )
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index ca7cc1f..0bbe797 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -227,7 +227,7 @@ sal_uInt32 CheckPasswd_Impl
SfxItemSet *pSet = pFile->GetItemSet();
if( pSet )
{
- Reference< ::com::sun::star::task::XInteractionHandler
> xInteractionHandler = pFile->GetInteractionHandler();
+ Reference< css::task::XInteractionHandler >
xInteractionHandler = pFile->GetInteractionHandler();
if( xInteractionHandler.is() )
{
// use the comphelper password helper to request a
password
@@ -388,13 +388,13 @@ sal_uIntPtr SfxApplication::LoadTemplate(
SfxObjectShellLock& xDoc, const OUStri
xDoc->SetModified(false);
xDoc->ResetError();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
xModel ( xDoc->GetModel(), ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::frame::XModel > xModel ( xDoc->GetModel(),
css::uno::UNO_QUERY );
if ( xModel.is() )
{
SfxItemSet* pNew = xDoc->GetMedium()->GetItemSet()->Clone();
pNew->ClearItem( SID_PROGRESS_STATUSBAR_CONTROL );
pNew->ClearItem( SID_FILTER_NAME );
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > aArgs;
+ css::uno::Sequence< css::beans::PropertyValue > aArgs;
TransformItems( SID_OPENDOC, *pNew, aArgs );
sal_Int32 nLength = aArgs.getLength();
aArgs.realloc( nLength + 1 );
@@ -631,7 +631,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if ( pStandardDirItem )
sStandardDir = pStandardDirItem->GetValue();
- ::com::sun::star::uno::Sequence< OUString > aBlackList;
+ css::uno::Sequence< OUString > aBlackList;
const SfxStringListItem* pBlackListItem =
rReq.GetArg<SfxStringListItem>(SID_BLACK_LIST);
if ( pBlackListItem )
@@ -680,7 +680,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
pHandler->setHandler(xWrappedHandler);
else
pHandler->useDefaultUUIHandler();
- rReq.AppendItem(
SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHandler))
);
+ rReq.AppendItem(
SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHandler)) );
// define rules for this handler
css::uno::Type
aInteraction = ::cppu::UnoType<css::task::ErrorCodeRequest>::get();
@@ -808,10 +808,9 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
// Mark without URL cannot be handled by hyperlink code
if ( bHyperlinkUsed && !aFileName.isEmpty() && aFileName[0] != '#' )
{
- Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection(
-
::comphelper::getProcessServiceFactory()->createInstance(
-
OUString("com.sun.star.document.TypeDetection")),
- UNO_QUERY
);
+ Reference< css::document::XTypeDetection > xTypeDetection(
::comphelper::getProcessServiceFactory()->createInstance(
+
OUString("com.sun.star.document.TypeDetection")),
+ UNO_QUERY );
if ( xTypeDetection.is() )
{
URL aURL;
@@ -904,7 +903,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
sfx2::openUriExternally(
aURL.Complete, pFilter == 0);
}
- catch (
::com::sun::star::system::SystemShellExecuteException& )
+ catch ( css::system::SystemShellExecuteException& )
{
rReq.RemoveItem( SID_TARGETNAME );
rReq.AppendItem( SfxStringItem( SID_TARGETNAME,
OUString("_default") ) );
@@ -976,12 +975,12 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
if (!pInteractionItem)
{
Reference < task::XInteractionHandler2 > xHdl =
task::InteractionHandler::createWithParent(
::comphelper::getProcessComponentContext(), 0 );
- rReq.AppendItem(
SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) );
+ rReq.AppendItem(
SfxUnoAnyItem(SID_INTERACTIONHANDLER,css::uno::makeAny(xHdl)) );
}
if (!pMacroExecItem)
- rReq.AppendItem(
SfxUInt16Item(SID_MACROEXECMODE,::com::sun::star::document::MacroExecMode::USE_CONFIG)
);
+ rReq.AppendItem(
SfxUInt16Item(SID_MACROEXECMODE,css::document::MacroExecMode::USE_CONFIG) );
if (!pDocTemplateItem)
- rReq.AppendItem(
SfxUInt16Item(SID_UPDATEDOCMODE,::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG)
);
+ rReq.AppendItem(
SfxUInt16Item(SID_UPDATEDOCMODE,css::document::UpdateDocMode::ACCORDING_TO_CONFIG)
);
}
// extract target name
@@ -1062,7 +1061,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
{
throw;
}
- catch(const ::com::sun::star::uno::Exception&)
+ catch(const css::uno::Exception&)
{
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c684399..356d928 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -141,9 +141,9 @@ namespace
{
try
{
- // if we get com::sun::star::sdbc::DriverManager, libsdbc2 is there
+ // if we get css::sdbc::DriverManager, libsdbc2 is there
// and the bibliography is assumed to work
- return
com::sun::star::sdbc::DriverManager::create(comphelper::getProcessComponentContext()).is();
+ return
css::sdbc::DriverManager::create(comphelper::getProcessComponentContext()).is();
}
catch (Exception & e)
{
@@ -233,7 +233,7 @@ static void showDocument( const char* pBaseName )
checkURL ( pBaseName, "", aURL ) ) {
xDesktop->loadComponentFromURL( aURL, OUString("_blank"), 0, args
);
}
- } catch (const ::com::sun::star::uno::Exception &) {
+ } catch (const css::uno::Exception &) {
}
}
@@ -442,9 +442,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
"&LOlocale=" + utl::ConfigManager::getLocale() + "&LOmodule="
+ module.copy(module.lastIndexOf('.') + 1 ) );
try
{
- uno::Reference< com::sun::star::system::XSystemShellExecute >
xSystemShellExecute(
-
com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext())
);
- xSystemShellExecute->execute( sURL, OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+ uno::Reference< css::system::XSystemShellExecute >
xSystemShellExecute(
+
css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext())
);
+ xSystemShellExecute->execute( sURL, OUString(),
css::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch ( uno::Exception& )
{
@@ -639,8 +639,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Reference < XDesktop2 > xDesktop = Desktop::create (
::comphelper::getProcessComponentContext() );
Reference< XFrame > xFrame = xDesktop->getActiveFrame();
- Reference< com::sun::star::beans::XPropertySet > xPropSet(
xFrame, UNO_QUERY );
- Reference< ::com::sun::star::frame::XLayoutManager >
xLayoutManager;
+ Reference< css::beans::XPropertySet > xPropSet( xFrame,
UNO_QUERY );
+ Reference< css::frame::XLayoutManager > xLayoutManager;
if ( xPropSet.is() )
{
try
@@ -648,11 +648,11 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
Any aValue =
xPropSet->getPropertyValue("LayoutManager");
aValue >>= xLayoutManager;
}
- catch ( const ::com::sun::star::uno::RuntimeException& )
+ catch ( const css::uno::RuntimeException& )
{
throw;
}
- catch ( ::com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
}
}
@@ -1022,7 +1022,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
css::system::SystemShellExecuteFlags::URIS_ONLY );
}
}
- catch( const ::com::sun::star::uno::Exception& )
+ catch( const css::uno::Exception& )
{
SAL_WARN( "sfx.appl",
"SfxApplication::OfaExec_Impl(SID_MORE_DICTIONARIES): caught an exception!" );
}
@@ -1305,7 +1305,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
xDialog =
ui::dialogs::AddressBookSourcePilot::createWithParent(xORB, 0);
xDialog->execute();
}
- catch(const ::com::sun::star::uno::Exception&)
+ catch(const css::uno::Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 0055cea..94a3e4c 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1538,7 +1538,7 @@ void TransformItems( sal_uInt16 nSlotId, const
SfxItemSet& rSet, uno::Sequence<b
{
pValue[nActProp].Name = sBlackList;
- com::sun::star::uno::Sequence< OUString > aList;
+ css::uno::Sequence< OUString > aList;
static_cast<const SfxStringListItem*>(pItem)->GetStringList( aList
);
pValue[nActProp++].Value <<= aList ;
}
@@ -1772,9 +1772,9 @@ bool RequestPackageReparation::isApproved()
return pImp->isApproved();
}
-com::sun::star::uno::Reference < task::XInteractionRequest >
RequestPackageReparation::GetRequest()
+css::uno::Reference < task::XInteractionRequest >
RequestPackageReparation::GetRequest()
{
- return com::sun::star::uno::Reference < task::XInteractionRequest >(pImp);
+ return css::uno::Reference < task::XInteractionRequest >(pImp);
}
@@ -1828,9 +1828,9 @@ NotifyBrokenPackage::~NotifyBrokenPackage()
pImp->release();
}
-com::sun::star::uno::Reference < task::XInteractionRequest >
NotifyBrokenPackage::GetRequest()
+css::uno::Reference < task::XInteractionRequest >
NotifyBrokenPackage::GetRequest()
{
- return com::sun::star::uno::Reference < task::XInteractionRequest >(pImp);
+ return css::uno::Reference < task::XInteractionRequest >(pImp);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index e678f4e..7c5d308 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -56,8 +56,8 @@ SfxChildWinFactory::~SfxChildWinFactory()
struct SfxChildWindow_Impl
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
xFrame;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >
xListener;
+ css::uno::Reference< css::frame::XFrame > xFrame;
+ css::uno::Reference< css::lang::XEventListener > xListener;
SfxChildWinFactory* pFact;
bool bHideNotDelete;
bool bVisible;
@@ -69,7 +69,7 @@ struct SfxChildWindow_Impl
-class DisposeListener : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XEventListener >
+class DisposeListener : public ::cppu::WeakImplHelper<
css::lang::XEventListener >
{
public:
DisposeListener( SfxChildWindow* pOwner ,
@@ -78,22 +78,22 @@ class DisposeListener : public ::cppu::WeakImplHelper<
::com::sun::star::lang::X
, m_pData ( pData )
{}
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& aSource ) throw
(::com::sun::star::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL disposing( const css::lang::EventObject& aSource
) throw (css::uno::RuntimeException, std::exception) override
{
- ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener > xSelfHold( this );
+ css::uno::Reference< css::lang::XEventListener > xSelfHold( this );
- ::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent > xComp( aSource.Source,
::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::lang::XComponent > xComp(
aSource.Source, css::uno::UNO_QUERY );
if( xComp.is() )
xComp->removeEventListener( this );
if( m_pOwner && m_pData )
{
- m_pData->xListener = ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener >();
+ m_pData->xListener = css::uno::Reference<
css::lang::XEventListener >();
if ( m_pData->pWorkWin )
{
// m_pOwner and m_pData will be killed
- m_pData->xFrame = ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >();
+ m_pData->xFrame = css::uno::Reference<
css::frame::XFrame >();
m_pData->pWorkWin->GetBindings().Execute(
m_pOwner->GetType() );
}
else
@@ -180,13 +180,13 @@ void SfxChildWindow::Destroy()
ClearWorkwin();
try
{
- ::com::sun::star::uno::Reference <
::com::sun::star::util::XCloseable > xClose( GetFrame(),
::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference < css::util::XCloseable > xClose( GetFrame(),
css::uno::UNO_QUERY );
if ( xClose.is() )
xClose->close( sal_True );
else
GetFrame()->dispose();
}
- catch (const com::sun::star::uno::Exception&)
+ catch (const css::uno::Exception&)
{
}
}
@@ -319,7 +319,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo&
rInfo)
SvtViewOptions aWinOpt(E_WINDOW, sName);
aWinOpt.SetWindowState(OStringToOUString(rInfo.aWinState,
RTL_TEXTENCODING_UTF8));
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue >
aSeq(1);
+ css::uno::Sequence < css::beans::NamedValue > aSeq(1);
aSeq[0].Name = "Data";
aSeq[0].Value <<= aWinData.makeStringAndClear();
aWinOpt.SetUserData( aSeq );
@@ -389,7 +389,7 @@ void
SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinI
if (xWinOpt->Exists() && xWinOpt->HasVisible() )
rInfo.bVisible = xWinOpt->IsVisible(); // set state from
configuration. Can be overwritten by UserData, see below
- ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue >
aSeq = xWinOpt->GetUserData();
+ css::uno::Sequence < css::beans::NamedValue > aSeq =
xWinOpt->GetUserData();
OUString aTmp;
if ( aSeq.getLength() )
@@ -719,7 +719,7 @@ bool SfxChildWindow::QueryClose()
if ( pImp->xFrame.is() )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController
> xCtrl = pImp->xFrame->getController();
+ css::uno::Reference< css::frame::XController > xCtrl =
pImp->xFrame->getController();
if ( xCtrl.is() )
bAllow = xCtrl->suspend( sal_True );
}
@@ -730,12 +730,12 @@ bool SfxChildWindow::QueryClose()
return bAllow;
}
-::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
SfxChildWindow::GetFrame()
+css::uno::Reference< css::frame::XFrame > SfxChildWindow::GetFrame()
{
return pImp->xFrame;
}
-void SfxChildWindow::SetFrame( const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > & rFrame )
+void SfxChildWindow::SetFrame( const css::uno::Reference< css::frame::XFrame >
& rFrame )
{
// Do nothing if nothing will be changed ...
if( pImp->xFrame != rFrame )
@@ -748,7 +748,7 @@ void SfxChildWindow::SetFrame( const
::com::sun::star::uno::Reference< ::com::su
// Use already existing or create new one.
if( rFrame.is() )
if( !pImp->xListener.is() )
- pImp->xListener = ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener >( new DisposeListener( this, pImp ) );
+ pImp->xListener = css::uno::Reference<
css::lang::XEventListener >( new DisposeListener( this, pImp ) );
// Set new frame in data container
// and build new listener connection, if necessary.
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index e3ff4da..1c41d42 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -75,7 +75,7 @@ SvFileObject::~SvFileObject()
Application::RemoveUserEvent(nPostUserEventId);
}
-bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData,
+bool SvFileObject::GetData( css::uno::Any & rData,
const OUString & rMimeType,
bool bGetSynchron )
{
@@ -345,7 +345,7 @@ OUString impl_getFilter( const OUString& _rURL )
try
{
- css::uno::Reference< ::com::sun::star::document::XTypeDetection >
xTypeDetection(
+ css::uno::Reference< css::document::XTypeDetection > xTypeDetection(
::comphelper::getProcessServiceFactory()->createInstance(
OUString("com.sun.star.document.TypeDetection") ),
css::uno::UNO_QUERY );
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 6ba78b2..cc32b94 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -64,7 +64,7 @@ protected:
public:
SvFileObject();
- virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+ virtual bool GetData( css::uno::Any & rData /*out param*/,
const OUString & rMimeType,
bool bSynchron = false ) override;
diff --git a/sfx2/source/appl/fwkhelper.cxx b/sfx2/source/appl/fwkhelper.cxx
index af88e55..562ec96 100644
--- a/sfx2/source/appl/fwkhelper.cxx
+++ b/sfx2/source/appl/fwkhelper.cxx
@@ -30,7 +30,7 @@
#include "workwin.hxx"
#include <sfx2/frame.hxx>
-void SAL_CALL RefreshToolbars( ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame )
+void SAL_CALL RefreshToolbars( css::uno::Reference< css::frame::XFrame >&
xFrame )
{
SolarMutexGuard aGuard;
if ( xFrame.is() )
diff --git a/sfx2/source/appl/helpdispatch.cxx
b/sfx2/source/appl/helpdispatch.cxx
index 8ae6135..25ac27d 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -32,8 +32,7 @@ using namespace ::com::sun::star::util;
// class HelpInterceptor_Impl --------------------------------------------
HelpDispatch_Impl::HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XDispatch
>& _xDisp ) :
+ const css::uno::Reference<
css::frame::XDispatch >& _xDisp ) :
m_rInterceptor ( _rInterceptor ),
m_xRealDispatch ( _xDisp )
diff --git a/sfx2/source/appl/helpdispatch.hxx
b/sfx2/source/appl/helpdispatch.hxx
index 2830a02..55b970e 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -24,22 +24,22 @@
#include "helpinterceptor.hxx"
-class HelpDispatch_Impl : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XDispatch >
+class HelpDispatch_Impl : public ::cppu::WeakImplHelper< css::frame::XDispatch
>
{
private:
HelpInterceptor_Impl& m_rInterceptor;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
+ css::uno::Reference< css::frame::XDispatch >
m_xRealDispatch;
public:
HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor,
- const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch >& _xDisp );
+ const css::uno::Reference< css::frame::XDispatch >&
_xDisp );
virtual ~HelpDispatch_Impl();
// XDispatch
- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue
>& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual void SAL_CALL addStatusListener( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >&
xControl, const ::com::sun::star::util::URL& aURL )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeStatusListener( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >&
xControl, const ::com::sun::star::util::URL& aURL )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL, const
css::uno::Sequence< css::beans::PropertyValue >& aArgs )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xControl, const css::util::URL& aURL )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xControl, const css::util::URL& aURL )
throw(css::uno::RuntimeException, std::exception) override;
};
#endif // INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX
diff --git a/sfx2/source/appl/helpinterceptor.cxx
b/sfx2/source/appl/helpinterceptor.cxx
index 4840f57..070a3a9 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -91,11 +91,11 @@ void HelpInterceptor_Impl::addURL( const OUString& rURL )
// TODO ?
if ( m_xListener.is() )
{
- ::com::sun::star::frame::FeatureStateEvent aEvent;
+ css::frame::FeatureStateEvent aEvent;
URL aURL;
aURL.Complete = rURL;
aEvent.FeatureURL = aURL;
- aEvent.Source = static_cast<com::sun::star::frame::XDispatch*>(this);
+ aEvent.Source = static_cast<css::frame::XDispatch*>(this);
m_xListener->statusChanged( aEvent );
}
@@ -228,7 +228,7 @@ Sequence< OUString > SAL_CALL
HelpInterceptor_Impl::getInterceptedURLs()
// XDispatch
void SAL_CALL HelpInterceptor_Impl::dispatch(
- const URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue >&
) throw( RuntimeException, std::exception )
+ const URL& aURL, const Sequence< css::beans::PropertyValue >& ) throw(
RuntimeException, std::exception )
{
bool bBack = aURL.Complete == ".uno:Backward";
if ( bBack || aURL.Complete == ".uno:Forward" )
@@ -286,13 +286,13 @@ void SAL_CALL HelpInterceptor_Impl::removeStatusListener(
HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter )
{
pInterceptor = pInter;
- pInterceptor->addStatusListener( this, ::com::sun::star::util::URL() );
+ pInterceptor->addStatusListener( this, css::util::URL() );
}
-void SAL_CALL HelpListener_Impl::statusChanged( const
::com::sun::star::frame::FeatureStateEvent& Event )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL HelpListener_Impl::statusChanged( const
css::frame::FeatureStateEvent& Event )
+ throw( css::uno::RuntimeException, std::exception )
{
INetURLObject aObj( Event.FeatureURL.Complete );
aFactory = aObj.GetHost();
@@ -301,10 +301,10 @@ void SAL_CALL HelpListener_Impl::statusChanged( const
::com::sun::star::frame::F
-void SAL_CALL HelpListener_Impl::disposing( const
::com::sun::star::lang::EventObject& )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
+void SAL_CALL HelpListener_Impl::disposing( const css::lang::EventObject& )
+ throw( css::uno::RuntimeException, std::exception )
{
- pInterceptor->removeStatusListener( this, ::com::sun::star::util::URL() );
+ pInterceptor->removeStatusListener( this, css::util::URL() );
pInterceptor = NULL;
}
@@ -317,7 +317,7 @@ HelpStatusListener_Impl::HelpStatusListener_Impl(
HelpStatusListener_Impl::~HelpStatusListener_Impl()
{
if(xDispatch.is())
- xDispatch->removeStatusListener(this, com::sun::star::util::URL());
+ xDispatch->removeStatusListener(this, css::util::URL());
}
void HelpStatusListener_Impl::statusChanged(
@@ -328,7 +328,7 @@ void HelpStatusListener_Impl::statusChanged(
void HelpStatusListener_Impl::disposing( const EventObject& ) throw(
RuntimeException, std::exception )
{
- xDispatch->removeStatusListener(this, com::sun::star::util::URL());
+ xDispatch->removeStatusListener(this, css::util::URL());
xDispatch = 0;
}
diff --git a/sfx2/source/appl/helpinterceptor.hxx
b/sfx2/source/appl/helpinterceptor.hxx
index aabb95c..442b5fb 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -33,9 +33,9 @@
struct HelpHistoryEntry_Impl
{
OUString aURL;
- com::sun::star::uno::Any aViewData;
+ css::uno::Any aViewData;
- HelpHistoryEntry_Impl( const OUString& rURL, const
com::sun::star::uno::Any& rViewData ) :
+ HelpHistoryEntry_Impl( const OUString& rURL, const css::uno::Any&
rViewData ) :
aURL( rURL ), aViewData(rViewData) {}
};
@@ -43,10 +43,9 @@ typedef ::std::vector< HelpHistoryEntry_Impl* >
HelpHistoryList_Impl;
class SfxHelpWindow_Impl;
class HelpInterceptor_Impl : public ::cppu::WeakImplHelper<
-
- ::com::sun::star::frame::XDispatchProviderInterceptor,
- ::com::sun::star::frame::XInterceptorInfo,
- ::com::sun::star::frame::XDispatch >
+ css::frame::XDispatchProviderInterceptor,
+ css::frame::XInterceptorInfo,
+ css::frame::XDispatch >
{
private:
@@ -54,19 +53,19 @@ friend class HelpDispatch_Impl;
friend class SfxHelpWindow_Impl;
// the component which's dispatches we're intercepting
- ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProviderInterception > m_xIntercepted;
+ css::uno::Reference< css::frame::XDispatchProviderInterception >
m_xIntercepted;
// chaining
- ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher;
- ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher;
+ css::uno::Reference< css::frame::XDispatchProvider > m_xSlaveDispatcher;
+ css::uno::Reference< css::frame::XDispatchProvider > m_xMasterDispatcher;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener
> m_xListener;
+ css::uno::Reference< css::frame::XStatusListener > m_xListener;
HelpHistoryList_Impl* m_pHistory;
VclPtr<SfxHelpWindow_Impl> m_pWindow;
sal_uIntPtr m_nCurPos;
OUString m_aCurrentURL;
- com::sun::star::uno::Any m_aViewData;
+ css::uno::Any m_aViewData;
void addURL( const OUString& rURL );
@@ -74,38 +73,38 @@ public:
HelpInterceptor_Impl();
virtual ~HelpInterceptor_Impl();
- void setInterception( ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > xFrame );
+ void setInterception( css::uno::Reference<
css::frame::XFrame > xFrame );
OUString GetCurrentURL() const { return m_aCurrentURL; }
- const com::sun::star::uno::Any& GetViewData()const {return
m_aViewData;}
+ const css::uno::Any& GetViewData()const {return m_aViewData;}
bool HasHistoryPred() const; // is there a predecessor
for the current in the history
bool HasHistorySucc() const; // is there a successor
for the current in the history
// XDispatchProvider
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch > SAL_CALL
- queryDispatch( const ::com::sun::star::util::URL&
aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch > > SAL_CALL
- queryDispatches( const
::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >&
aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL
+ queryDispatch( const css::util::URL& aURL, const
OUString& aTargetFrameName, sal_Int32 nSearchFlags )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > >
SAL_CALL
+ queryDispatches( const css::uno::Sequence<
css::frame::DispatchDescriptor >& aDescripts )
throw(css::uno::RuntimeException, std::exception) override;
// XDispatchProviderInterceptor
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider > SAL_CALL
- getSlaveDispatchProvider( )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSlaveDispatchProvider( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >&
xNewSlave ) throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider > SAL_CALL
- getMasterDispatchProvider( )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMasterDispatchProvider( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >&
xNewMaster ) throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
+ getSlaveDispatchProvider( )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setSlaveDispatchProvider( const
css::uno::Reference< css::frame::XDispatchProvider >& xNewSlave )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
+ getMasterDispatchProvider( )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setMasterDispatchProvider( const
css::uno::Reference< css::frame::XDispatchProvider >& xNewMaster )
throw(css::uno::RuntimeException, std::exception) override;
// XInterceptorInfo
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
- getInterceptedURLs( )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL
+ getInterceptedURLs( )
throw(css::uno::RuntimeException, std::exception) override;
// XDispatch
- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue
>& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual void SAL_CALL addStatusListener( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >&
xControl, const ::com::sun::star::util::URL& aURL )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeStatusListener( const
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >&
xControl, const ::com::sun::star::util::URL& aURL )
throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL, const
css::uno::Sequence< css::beans::PropertyValue >& aArgs )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xControl, const css::util::URL& aURL )
throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeStatusListener( const css::uno::Reference<
css::frame::XStatusListener >& xControl, const css::util::URL& aURL )
throw(css::uno::RuntimeException, std::exception) override;
// extras
void InitWaiter( SfxHelpWindow_Impl* pWindow )
@@ -115,7 +114,7 @@ public:
// HelpListener_Impl -----------------------------------------------------
-class HelpListener_Impl : public ::cppu::WeakImplHelper<
::com::sun::star::frame::XStatusListener >
+class HelpListener_Impl : public ::cppu::WeakImplHelper<
css::frame::XStatusListener >
{
private:
HelpInterceptor_Impl* pInterceptor;
@@ -125,34 +124,33 @@ private:
public:
explicit HelpListener_Impl( HelpInterceptor_Impl* pInter );
- virtual void SAL_CALL statusChanged( const
::com::sun::star::frame::FeatureStateEvent& Event )
- throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& obj )
- throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const
css::frame::FeatureStateEvent& Event )
+ throw( css::uno::RuntimeException,
std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& obj )
+ throw( css::uno::RuntimeException,
std::exception ) override;
void SetChangeHdl( const Link<HelpListener_Impl&,void>&
rLink ) { aChangeLink = rLink; }
OUString GetFactory() const { return aFactory; }
};
// HelpStatusListener_Impl
-----------------------------------------------------
-class HelpStatusListener_Impl : public
-::cppu::WeakImplHelper< ::com::sun::star::frame::XStatusListener >
+class HelpStatusListener_Impl : public cppu::WeakImplHelper<
css::frame::XStatusListener >
{
private:
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch >
xDispatch;
- ::com::sun::star::frame::FeatureStateEvent
aStateEvent;
+ css::uno::Reference < css::frame::XDispatch > xDispatch;
+ css::frame::FeatureStateEvent aStateEvent;
public:
HelpStatusListener_Impl(
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch
> xDispatch,
- com::sun::star::util::URL& rURL);
+ css::uno::Reference < css::frame::XDispatch > xDispatch,
+ css::util::URL& rURL);
virtual ~HelpStatusListener_Impl();
- virtual void SAL_CALL statusChanged( const
::com::sun::star::frame::FeatureStateEvent& Event )
- throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& obj )
- throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- const ::com::sun::star::frame::FeatureStateEvent&
+ virtual void SAL_CALL statusChanged( const
css::frame::FeatureStateEvent& Event )
+ throw( css::uno::RuntimeException,
std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& obj )
+ throw( css::uno::RuntimeException,
std::exception ) override;
+ const css::frame::FeatureStateEvent&
GetStateEvent() const {return aStateEvent;}
};
diff --git a/sfx2/source/appl/imagemgr.cxx b/sfx2/source/appl/imagemgr.cxx
index 08a9453..ca42f41 100644
--- a/sfx2/source/appl/imagemgr.cxx
+++ b/sfx2/source/appl/imagemgr.cxx
@@ -56,7 +56,7 @@ typedef std::unordered_map< OUString,
Image SAL_CALL GetImage(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
rFrame,
+ const css::uno::Reference< css::frame::XFrame >& rFrame,
const OUString& aURL,
bool bBig
)
@@ -115,21 +115,20 @@ Image SAL_CALL GetImage(
}
}
- sal_Int16 nImageType( ::com::sun::star::ui::ImageType::COLOR_NORMAL|
- ::com::sun::star::ui::ImageType::SIZE_DEFAULT );
+ sal_Int16 nImageType( css::ui::ImageType::COLOR_NORMAL|
css::ui::ImageType::SIZE_DEFAULT );
if ( bBig )
- nImageType |= ::com::sun::star::ui::ImageType::SIZE_LARGE;
+ nImageType |= css::ui::ImageType::SIZE_LARGE;
if ( xDocImgMgr.is() )
{
- Sequence< Reference< ::com::sun::star::graphic::XGraphic > >
aGraphicSeq;
+ Sequence< Reference< css::graphic::XGraphic > > aGraphicSeq;
Sequence< OUString > aImageCmdSeq( 1 );
aImageCmdSeq[0] = aCommandURL;
try
{
aGraphicSeq = xDocImgMgr->getImages( nImageType, aImageCmdSeq );
- Reference< ::com::sun::star::graphic::XGraphic > xGraphic =
aGraphicSeq[0];
+ Reference< css::graphic::XGraphic > xGraphic = aGraphicSeq[0];
Image aImage( xGraphic );
if ( !!aImage )
@@ -181,13 +180,13 @@ Image SAL_CALL GetImage(
m_aModuleIdToImageMgrMap.insert(
ModuleIdToImagegMgr::value_type( aModuleId, xModuleImageManager ));
}
- Sequence< Reference< ::com::sun::star::graphic::XGraphic > >
aGraphicSeq;
+ Sequence< Reference< css::graphic::XGraphic > > aGraphicSeq;
Sequence< OUString > aImageCmdSeq( 1 );
aImageCmdSeq[0] = aCommandURL;
aGraphicSeq = xModuleImageManager->getImages( nImageType,
aImageCmdSeq );
- Reference< ::com::sun::star::graphic::XGraphic > xGraphic =
aGraphicSeq[0];
+ Reference< css::graphic::XGraphic > xGraphic = aGraphicSeq[0];
Image aImage( xGraphic );
if ( !!aImage )
diff --git a/sfx2/source/appl/imestatuswindow.cxx
b/sfx2/source/appl/imestatuswindow.cxx
index c774029..8b49136 100644
--- a/sfx2/source/appl/imestatuswindow.cxx
+++ b/sfx2/source/appl/imestatuswindow.cxx
@@ -44,13 +44,13 @@
#include <cppuhelper/implbase.hxx>
//TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver
-class WeakPropertyChangeListener : public
::cppu::WeakImplHelper<com::sun::star::beans::XPropertyChangeListener>
+class WeakPropertyChangeListener : public
::cppu::WeakImplHelper<css::beans::XPropertyChangeListener>
{
private:
-
com::sun::star::uno::WeakReference<com::sun::star::beans::XPropertyChangeListener>
mxOwner;
+ css::uno::WeakReference<css::beans::XPropertyChangeListener> mxOwner;
public:
- explicit
WeakPropertyChangeListener(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>
xOwner)
+ explicit
WeakPropertyChangeListener(css::uno::Reference<css::beans::XPropertyChangeListener>
xOwner)
: mxOwner(xOwner)
{
}
@@ -59,22 +59,22 @@ class WeakPropertyChangeListener : public
::cppu::WeakImplHelper<com::sun::star:
{
}
- virtual void SAL_CALL propertyChange(const
com::sun::star::beans::PropertyChangeEvent &rEvent )
- throw(com::sun::star::uno::RuntimeException, std::exception)
override
+ virtual void SAL_CALL propertyChange(const
css::beans::PropertyChangeEvent &rEvent )
+ throw(css::uno::RuntimeException, std::exception) override
{
-
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>
xOwner(mxOwner.get(),
- com::sun::star::uno::UNO_QUERY);
+ css::uno::Reference<css::beans::XPropertyChangeListener>
xOwner(mxOwner.get(),
+ css::uno::UNO_QUERY);
if (xOwner.is())
xOwner->propertyChange(rEvent);
}
// lang.XEventListener
- virtual void SAL_CALL disposing(const
com::sun::star::lang::EventObject& rEvent)
- throw(com::sun::star::uno::RuntimeException, std::exception)
override
+ virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
+ throw(css::uno::RuntimeException, std::exception) override
{
-
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>
xOwner(mxOwner.get(),
- com::sun::star::uno::UNO_QUERY);
+ css::uno::Reference<css::beans::XPropertyChangeListener>
xOwner(mxOwner.get(),
+ css::uno::UNO_QUERY);
if (xOwner.is())
xOwner->disposing(rEvent);
diff --git a/sfx2/source/appl/imestatuswindow.hxx
b/sfx2/source/appl/imestatuswindow.hxx
index 0d9e809..eb2b374e44 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -35,8 +35,7 @@ namespace sfx2 { namespace appl {
// The MS compiler needs this typedef work-around to accept the using
// declarations within ImeStatusWindow:
-typedef cppu::WeakImplHelper< com::sun::star::beans::XPropertyChangeListener >
-ImeStatusWindow_Impl;
+typedef cppu::WeakImplHelper< css::beans::XPropertyChangeListener >
ImeStatusWindow_Impl;
/** Control the behavior of any (platform-dependent) IME status windows.
@@ -48,7 +47,7 @@ ImeStatusWindow_Impl;
class ImeStatusWindow: private ImeStatusWindow_Impl
{
public:
- explicit ImeStatusWindow( com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext > const& rxContext );
+ explicit ImeStatusWindow( css::uno::Reference< css::uno::XComponentContext
> const& rxContext );
/** Set up VCL according to the configuration.
@@ -94,23 +93,23 @@ private:
virtual ~ImeStatusWindow();
virtual void SAL_CALL
- disposing(com::sun::star::lang::EventObject const & rSource)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ disposing(css::lang::EventObject const & rSource)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
- propertyChange(com::sun::star::beans::PropertyChangeEvent const & rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ propertyChange(css::beans::PropertyChangeEvent const & rEvent)
+ throw (css::uno::RuntimeException, std::exception) override;
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >
+ css::uno::Reference< css::beans::XPropertySet >
getConfig();
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+ css::uno::Reference< css::uno::XComponentContext >
m_xContext;
osl::Mutex m_aMutex;
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >
+ css::uno::Reference< css::beans::XPropertySet >
m_xConfig;
- com::sun::star::uno::Reference<
com::sun::star::beans::XPropertyChangeListener >
+ css::uno::Reference< css::beans::XPropertyChangeListener >
m_xConfigListener;
bool m_bDisposed;
};
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 494b730..cafabcd 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -134,7 +134,7 @@ SvDDEObject::~SvDDEObject()
delete pConnection;
}
-bool SvDDEObject::GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+bool SvDDEObject::GetData( css::uno::Any & rData /*out param*/,
const OUString & rMimeType,
bool bSynchron )
{
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index e1c1881..7e67adb 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -38,7 +38,7 @@ class SvDDEObject : public SvLinkSource
DdeConnection* pConnection;
DdeLink* pLink;
DdeRequest* pRequest;
- ::com::sun::star::uno::Any * pGetData;
+ css::uno::Any * pGetData;
sal_uInt8 bWaitForData : 1; // waiting for data?
sal_uInt8 nError : 7; // Error code for dialogue
@@ -54,7 +54,7 @@ protected:
public:
SvDDEObject();
- virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+ virtual bool GetData( css::uno::Any & rData /*out param*/,
const OUString & aMimeType,
bool bSynchron = false ) override;
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 12a04bd..dfabbf4 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -445,7 +445,7 @@ void LinkManager::LinkServerShell(const OUString& rPath,
SfxObjectShell& rServer
::sfx2::SvLinkSource* pSrvSrc = rServer.DdeCreateLinkSource(rPath);
if (pSrvSrc)
{
- ::com::sun::star::datatransfer::DataFlavor aFl;
+ css::datatransfer::DataFlavor aFl;
SotExchange::GetFormatDataFlavor(rLink.GetContentType(), aFl);
rLink.SetObj(pSrvSrc);
pSrvSrc->AddDataAdvise(
@@ -512,11 +512,11 @@ SotClipboardFormatId LinkManager::RegisterStatusInfoId()
bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
- const ::com::sun::star::uno::Any & rValue,
+ const css::uno::Any & rValue,
Graphic& rGrf )
{
bool bRet = false;
- ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
+ css::uno::Sequence< sal_Int8 > aSeq;
if( rValue.hasValue() && ( rValue >>= aSeq ) )
{
SvMemoryStream aMemStm( const_cast<sal_Int8 *>(aSeq.getConstArray()),
aSeq.getLength(),
@@ -569,7 +569,7 @@ OUString lcl_DDE_RelToAbs( const OUString& rTopic, const
OUString& rBaseURL )
bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
{
SfxObjectShell* pFndShell = 0;
- sal_uInt16 nUpdateMode =
com::sun::star::document::UpdateDocMode::NO_UPDATE;
+ sal_uInt16 nUpdateMode = css::document::UpdateDocMode::NO_UPDATE;
OUString sTopic, sItem, sReferer;
LinkManager* pLinkMgr = pLink->GetLinkManager();
if (pLinkMgr && sfx2::LinkManager::GetDisplayNames(pLink, 0, &sTopic,
&sItem) && !sTopic.isEmpty())
@@ -634,7 +634,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
sfx2::SvLinkSource* pNewSrc = pFndShell->DdeCreateLinkSource( sItem );
if( pNewSrc )
{
- ::com::sun::star::datatransfer::DataFlavor aFl;
+ css::datatransfer::DataFlavor aFl;
SotExchange::GetFormatDataFlavor( pLink->GetContentType(), aFl );
pLink->SetObj( pNewSrc );
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 7b1359f..4bcabbe 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -222,7 +222,7 @@ SvLinkSource::StreamToLoadFrom
SvLinkSource::getStreamToLoadFrom()
pImpl->m_bIsReadOnly);
}
-void SvLinkSource::setStreamToLoadFrom(const
com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,
bool bIsReadOnly )
+void SvLinkSource::setStreamToLoadFrom(const
css::uno::Reference<css::io::XInputStream>& xInputStream, bool bIsReadOnly )
{
pImpl->m_xInputStreamToLoadFrom = xInputStream;
pImpl->m_bIsReadOnly = bIsReadOnly;
@@ -327,7 +327,7 @@ void SvLinkSource::NotifyDataChanged()
// notify the sink, the mime type is not
// a selection criterion
void SvLinkSource::DataChanged( const OUString & rMimeType,
- const ::com::sun::star::uno::Any & rVal )
+ const css::uno::Any & rVal )
{
if( pImpl->nTimeout && !rVal.hasValue() )
{ // only when no data was included
@@ -430,7 +430,7 @@ bool SvLinkSource::Connect( SvBaseLink* )
return true;
}
-bool SvLinkSource::GetData( ::com::sun::star::uno::Any &, const OUString &,
bool )
+bool SvLinkSource::GetData( css::uno::Any &, const OUString &, bool )
{
return false;
}
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index a613da9..0282b7b 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -459,7 +459,7 @@ void SvBaseLink::Disconnect()
}
}
-SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const
::com::sun::star::uno::Any & )
+SvBaseLink::UpdateResult SvBaseLink::DataChanged( const OUString &, const
css::uno::Any & )
{
switch( nObjType )
{
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index c18accc..05130ba 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -188,7 +188,7 @@ void SAL_CALL SfxMacroLoader::removeStatusListener(
{
}
-ErrCode SfxMacroLoader::loadMacro( const OUString& rURL,
com::sun::star::uno::Any& rRetval, SfxObjectShell* pSh )
+ErrCode SfxMacroLoader::loadMacro( const OUString& rURL, css::uno::Any&
rRetval, SfxObjectShell* pSh )
throw ( ucb::ContentCreationException, uno::RuntimeException,
std::exception )
{
#if !HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index b551fb4..b0fbd49 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -385,7 +385,7 @@ SfxModule* SfxModule::GetActiveModule( SfxViewFrame* pFrame
)
return pSh ? pSh->GetModule() : 0;
}
-FieldUnit SfxModule::GetModuleFieldUnit( ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame > const & i_frame )
+FieldUnit SfxModule::GetModuleFieldUnit( css::uno::Reference<
css::frame::XFrame > const & i_frame )
{
ENSURE_OR_RETURN( i_frame.is(), "SfxModule::GetModuleFieldUnit: invalid
frame!", FUNIT_100TH_MM );
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index aac1f46..e515a0a 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -628,24 +628,24 @@ void IndexTabPage_Impl::InitializeIndex()
aURL.append(sFactory);
AppendConfigToken(aURL, true);
- Content aCnt( aURL.makeStringAndClear(), Reference<
::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties();
+ Content aCnt( aURL.makeStringAndClear(), Reference<
css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ css::uno::Reference< css::beans::XPropertySetInfo > xInfo =
aCnt.getProperties();
if ( xInfo->hasPropertyByName( PROPERTY_ANCHORREF ) )
{
- ::com::sun::star::uno::Sequence< OUString > aPropSeq( 4 );
+ css::uno::Sequence< OUString > aPropSeq( 4 );
aPropSeq[0] = PROPERTY_KEYWORDLIST;
aPropSeq[1] = PROPERTY_KEYWORDREF;
aPropSeq[2] = PROPERTY_ANCHORREF;
aPropSeq[3] = PROPERTY_TITLEREF;
// abi: use one possibly remote call only
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
aAnySeq =
+ css::uno::Sequence< css::uno::Any > aAnySeq =
aCnt.getPropertyValues( aPropSeq );
- ::com::sun::star::uno::Sequence< OUString > aKeywordList;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence<
OUString > > aKeywordRefList;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence<
OUString > > aAnchorRefList;
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence<
OUString > > aTitleRefList;
+ css::uno::Sequence< OUString > aKeywordList;
+ css::uno::Sequence< css::uno::Sequence< OUString > >
aKeywordRefList;
+ css::uno::Sequence< css::uno::Sequence< OUString > >
aAnchorRefList;
+ css::uno::Sequence< css::uno::Sequence< OUString > > aTitleRefList;
if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>=
aKeywordRefList ) &&
( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>=
aTitleRefList ) )
@@ -661,9 +661,9 @@ void IndexTabPage_Impl::InitializeIndex()
// abi: Do not copy, but use references
const OUString& aKeywordPair = aKeywordList[i];
DBG_ASSERT( !aKeywordPair.isEmpty(), "invalid help index"
);
- const ::com::sun::star::uno::Sequence< OUString >&
aRefList = aKeywordRefList[i];
- const ::com::sun::star::uno::Sequence< OUString >&
aAnchorList = aAnchorRefList[i];
- const ::com::sun::star::uno::Sequence< OUString >&
aTitleList = aTitleRefList[i];
+ const css::uno::Sequence< OUString >& aRefList =
aKeywordRefList[i];
+ const css::uno::Sequence< OUString >& aAnchorList =
aAnchorRefList[i];
+ const css::uno::Sequence< OUString >& aTitleList =
aTitleRefList[i];
DBG_ASSERT( aRefList.getLength() ==
aAnchorList.getLength(),"reference list and title list of different length" );
@@ -2516,7 +2516,7 @@ void SfxHelpTextWindow_Impl::GetFocus()
{
if( xFrame.is() )
{
- Reference< ::com::sun::star::awt::XWindow > xWindow =
xFrame->getComponentWindow();
+ Reference< css::awt::XWindow > xWindow =
xFrame->getComponentWindow();
if( xWindow.is() )
xWindow->setFocus();
}
@@ -2637,11 +2637,11 @@ void SfxHelpTextWindow_Impl::CloseFrame()
bIsInClose = true;
try
{
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable >
xCloseable ( xFrame, ::com::sun::star::uno::UNO_QUERY );
+ css::uno::Reference< css::util::XCloseable > xCloseable ( xFrame,
css::uno::UNO_QUERY );
if (xCloseable.is())
xCloseable->close(sal_True);
}
- catch( ::com::sun::star::util::CloseVetoException& )
+ catch( css::util::CloseVetoException& )
{
}
}
@@ -2738,10 +2738,10 @@ void SfxHelpWindow_Impl::MakeLayout()
Some VCL-patches could not solve this problem so I've established
the
workaround: resize the help window if it's visible .-)
*/
- ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize();
+ css::awt::Rectangle aRect = xWindow->getPosSize();
sal_Int32 nOldWidth = bIndex ? nCollapseWidth : nExpandWidth;
sal_Int32 nWidth = bIndex ? nExpandWidth : nCollapseWidth;
- xWindow->setPosSize( aRect.X, aRect.Y, nWidth, nHeight,
::com::sun::star::awt::PosSize::SIZE );
+ xWindow->setPosSize( aRect.X, aRect.Y, nWidth, nHeight,
css::awt::PosSize::SIZE );
if ( aRect.Width > 0 && aRect.Height > 0 )
{
@@ -2778,7 +2778,7 @@ void SfxHelpWindow_Impl::InitSizes()
{
if ( xWindow.is() )
{
- ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize();
+ css::awt::Rectangle aRect = xWindow->getPosSize();
nHeight = aRect.Height;
if ( bIndex )
@@ -2841,7 +2841,7 @@ void SfxHelpWindow_Impl::SaveConfig()
if ( xWindow.is() )
{
- ::com::sun::star::awt::Rectangle aRect = xWindow->getPosSize();
+ css::awt::Rectangle aRect = xWindow->getPosSize();
nW = aRect.Width;
nH = aRect.Height;
}
@@ -3010,7 +3010,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL
,
SfxHelpWindow_Impl::SfxHelpWindow_Impl(
- const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2
>& rFrame,
+ const css::uno::Reference < css::frame::XFrame2 >& rFrame,
vcl::Window* pParent, WinBits ) :
SplitWindow( pParent, WB_3DLOOK | WB_NOSPLITDRAW ),
@@ -3089,7 +3089,7 @@ bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt )
return bHandled || Window::PreNotify( rNEvt );
}
-void SfxHelpWindow_Impl::setContainerWindow( Reference <
::com::sun::star::awt::XWindow > xWin )
+void SfxHelpWindow_Impl::setContainerWindow( Reference < css::awt::XWindow >
xWin )
{
xWindow = xWin;
MakeLayout();
@@ -3181,11 +3181,11 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId
)
{
try
{
- Content aCnt( aURL, Reference<
::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties();
+ Content aCnt( aURL, Reference<
css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
+ css::uno::Reference< css::beans::XPropertySetInfo > xInfo
= aCnt.getProperties();
if ( xInfo->hasPropertyByName( PROPERTY_TITLE ) )
{
- ::com::sun::star::uno::Any aAny =
aCnt.getPropertyValue( PROPERTY_TITLE );
+ css::uno::Any aAny = aCnt.getPropertyValue(
PROPERTY_TITLE );
OUString aValue;
if ( aAny >>= aValue )
{
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 6604706..a6dcb73 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -206,10 +206,10 @@ private:
VclPtr<SearchResultsBox_Impl> m_pResultsLB;
VclPtr<PushButton> m_pOpenBtn;
- OUString aFactory;
+ OUString aFactory;
- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
- xBreakIterator;
+ css::uno::Reference< css::i18n::XBreakIterator >
+ xBreakIterator;
void ClearSearchResults();
void RememberSearchText( const OUString& rSearchText );
@@ -430,11 +430,11 @@ private:
VclPtr<SfxHelpWindow_Impl> pHelpWin;
VclPtr<vcl::Window> pTextWin;
VclPtr<sfx2::SearchDialog> pSrchDlg;
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
+ css::uno::Reference < css::frame::XFrame2 >
xFrame;
- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
+ css::uno::Reference< css::i18n::XBreakIterator >
xBreakIterator;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+ css::uno::Reference< css::uno::XInterface >
xConfiguration;
long nMinPos;
bool bIsDebug;
@@ -447,9 +447,9 @@ private:
void InitOnStartupBox( bool bOnlyText );
void SetOnStartupBoxPosition();
- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
+ css::uno::Reference< css::i18n::XBreakIterator >
GetBreakIterator();
- ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >
+ css::uno::Reference< css::text::XTextRange >
getCursor() const;
bool isHandledKey( const vcl::KeyCode& _rKeyCode );
@@ -470,7 +470,7 @@ public:
virtual void GetFocus() override;
virtual void DataChanged( const DataChangedEvent& rDCEvt )
override;
- inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2
>
+ inline css::uno::Reference < css::frame::XFrame2 >
getFrame() const { return xFrame; }
inline void SetSelectHdl( const Link<ToolBox *, void>& rLink )
{ aToolBox->SetSelectHdl( rLink ); }
@@ -491,11 +491,11 @@ class SfxHelpWindow_Impl : public SplitWindow
private:
friend class SfxHelpIndexWindow_Impl;
- ::com::sun::star::uno::Reference < ::com::sun::star::awt::XWindow >
+ css::uno::Reference < css::awt::XWindow >
xWindow;
- ::com::sun::star::uno::Reference <
::com::sun::star::frame::XDispatchResultListener >
+ css::uno::Reference < css::frame::XDispatchResultListener >
xOpenListener;
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >
+ css::uno::Reference < css::frame::XFrame2 >
xFrame;
VclPtr<SfxHelpIndexWindow_Impl> pIndexWin;
@@ -508,8 +508,8 @@ friend class SfxHelpIndexWindow_Impl;
sal_Int32 nHeight;
long nIndexSize;
long nTextSize;
- bool bIndex;
- bool bGrabFocusToToolBox;
+ bool bIndex;
+ bool bGrabFocusToToolBox;
Point aWinPos;
OUString sTitle;
@@ -529,16 +529,15 @@ friend class SfxHelpIndexWindow_Impl;
DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void );
public:
- SfxHelpWindow_Impl( const ::com::sun::star::uno::Reference <
::com::sun::star::frame::XFrame2 >& rFrame,
+ SfxHelpWindow_Impl( const css::uno::Reference < css::frame::XFrame2 >&
rFrame,
vcl::Window* pParent, WinBits nBits );
virtual ~SfxHelpWindow_Impl();
virtual void dispose() override;
virtual bool PreNotify( NotifyEvent& rNEvt ) override;
- void setContainerWindow(
- ::com::sun::star::uno::Reference <
::com::sun::star::awt::XWindow > xWin );
- inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2
>
+ void setContainerWindow( css::uno::Reference <
css::awt::XWindow > xWin );
+ inline css::uno::Reference < css::frame::XFrame2 >
getTextFrame() const { return pTextWin->getFrame(); }
void SetFactory( const OUString& rFactory );
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index b80f5a5..1032d95 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -173,7 +173,7 @@ bool GetHelpAnchor_Impl( const OUString& _rURL, OUString&
_rAnchor )
try
{
::ucbhelper::Content aCnt( INetURLObject( _rURL ).GetMainURL(
INetURLObject::NO_DECODE ),
- Reference<
::com::sun::star::ucb::XCommandEnvironment >(),
+ Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
if ( ( aCnt.getPropertyValue("AnchorName") >>= sAnchor ) )
{
@@ -189,7 +189,7 @@ bool GetHelpAnchor_Impl( const OUString& _rURL, OUString&
_rAnchor )
SAL_WARN( "sfx.appl", "Property 'AnchorName' is missing" );
}
}
- catch (const ::com::sun::star::uno::Exception&)
+ catch (const css::uno::Exception&)
{
}
@@ -277,7 +277,7 @@ OUString getCurrentModuleIdentifier_Impl()
{
sIdentifier = xModuleManager->identify( xCurrentFrame );
}
- catch (const ::com::sun::star::frame::UnknownModuleException&)
+ catch (const css::frame::UnknownModuleException&)
{
SAL_INFO( "sfx2.appl",
"SfxHelp::getCurrentModuleIdentifier_Impl(): unknown module (help in help?)" );
}
@@ -401,10 +401,10 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame2 >&
rHelpTask ,
return 0;
// create all internal windows and sub frames ...
- Reference< ::com::sun::star::awt::XWindow > xParentWindow =
xHelpTask->getContainerWindow();
- vcl::Window* pParentWindow =
VCLUnoHelper::GetWindow( xParentWindow );
- VclPtrInstance<SfxHelpWindow_Impl> pHelpWindow( xHelpTask,
pParentWindow, WB_DOCKBORDER );
- Reference< ::com::sun::star::awt::XWindow > xHelpWindow =
VCLUnoHelper::GetInterface( pHelpWindow );
+ Reference< css::awt::XWindow > xParentWindow =
xHelpTask->getContainerWindow();
+ vcl::Window* pParentWindow =
VCLUnoHelper::GetWindow( xParentWindow );
+ VclPtrInstance<SfxHelpWindow_Impl> pHelpWindow( xHelpTask, pParentWindow,
WB_DOCKBORDER );
+ Reference< css::awt::XWindow > xHelpWindow =
VCLUnoHelper::GetInterface( pHelpWindow );
Reference< XFrame > xHelpContent;
if (xHelpTask->setComponent( xHelpWindow, Reference< XController >() ))
@@ -637,7 +637,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const
vcl::Window* pWindow, const
if (!rKeyword.isEmpty())
pHelpWindow->OpenKeyword( rKeyword );
- Reference < ::com::sun::star::awt::XTopWindow > xTopWindow(
xHelp->getContainerWindow(), UNO_QUERY );
+ Reference < css::awt::XTopWindow > xTopWindow(
xHelp->getContainerWindow(), UNO_QUERY );
if ( xTopWindow.is() )
xTopWindow->toFront();
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index b8969a1..412ae04 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -72,7 +72,7 @@ class StringLength : public ::cppu::WeakImplHelper<
XStringWidth >
// XStringWidth
sal_Int32 SAL_CALL queryStringWidth( const OUString& aString )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
override
+ throw (css::uno::RuntimeException, std::exception) override
{
return aString.getLength();
}
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index c20ba2b..5fe8763 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -212,7 +212,7 @@ void ShutdownIcon::deInitSystray()
}
-ShutdownIcon::ShutdownIcon( const ::com::sun::star::uno::Reference<
XComponentContext > & rxContext ) :
+ShutdownIcon::ShutdownIcon( const css::uno::Reference< XComponentContext > &
rxContext ) :
ShutdownIconServiceBase( m_aMutex ),
m_bVeto ( false ),
m_bListenForTermination ( false ),
@@ -236,27 +236,27 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const
OUString& rTarget, const
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
- ::com::sun::star::uno::Reference < XDispatchProvider >
xDispatchProvider( getInstance()->m_xDesktop, UNO_QUERY );
+ css::uno::Reference < XDispatchProvider > xDispatchProvider(
getInstance()->m_xDesktop, UNO_QUERY );
if ( xDispatchProvider.is() )
{
- com::sun::star::util::URL aDispatchURL;
+ css::util::URL aDispatchURL;
aDispatchURL.Complete = aURL;
- ::com::sun::star::uno::Reference< util::XURLTransformer >
xURLTransformer( util::URLTransformer::create(
::comphelper::getProcessComponentContext() ) );
+ css::uno::Reference< util::XURLTransformer > xURLTransformer(
util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
try
{
- ::com::sun::star::uno::Reference<
com::sun::star::frame::XDispatch > xDispatch;
+ css::uno::Reference< css::frame::XDispatch > xDispatch;
xURLTransformer->parseStrict( aDispatchURL );
xDispatch = xDispatchProvider->queryDispatch( aDispatchURL,
rTarget, 0 );
if ( xDispatch.is() )
xDispatch->dispatch( aDispatchURL, aArgs );
}
- catch ( com::sun::star::uno::RuntimeException& )
+ catch ( css::uno::RuntimeException& )
{
throw;
}
- catch ( com::sun::star::uno::Exception& )
+ catch ( css::uno::Exception& )
{
}
}
@@ -281,18 +281,18 @@ void ShutdownIcon::FromTemplate()
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
- ::com::sun::star::uno::Reference <
::com::sun::star::frame::XFramesSupplier > xDesktop (
getInstance()->m_xDesktop, UNO_QUERY);
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >
xFrame( xDesktop->getActiveFrame() );
+ css::uno::Reference < css::frame::XFramesSupplier > xDesktop (
getInstance()->m_xDesktop, UNO_QUERY);
+ css::uno::Reference < css::frame::XFrame > xFrame(
xDesktop->getActiveFrame() );
if ( !xFrame.is() )
- xFrame = ::com::sun::star::uno::Reference <
::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY );
+ xFrame = css::uno::Reference < css::frame::XFrame >( xDesktop,
UNO_QUERY );
URL aTargetURL;
aTargetURL.Complete = ".uno:NewDoc";
- ::com::sun::star::uno::Reference< util::XURLTransformer > xTrans(
util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
+ css::uno::Reference< util::XURLTransformer > xTrans(
util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
xTrans->parseStrict( aTargetURL );
- ::com::sun::star::uno::Reference <
::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY );
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch
> xDisp;
+ css::uno::Reference < css::frame::XDispatchProvider > xProv( xFrame,
UNO_QUERY );
+ css::uno::Reference < css::frame::XDispatch > xDisp;
if ( xProv.is() )
{
xDisp = xProv->queryDispatch( aTargetURL, OUString("_self"), 0 );
@@ -303,7 +303,7 @@ void ShutdownIcon::FromTemplate()
PropertyValue* pArg = aArgs.getArray();
pArg[0].Name = "Referer";
pArg[0].Value <<= OUString("private:user");
- ::com::sun::star::uno::Reference<
::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
+ css::uno::Reference< css::frame::XNotifyingDispatch > xNotifyer(
xDisp, UNO_QUERY );
if ( xNotifyer.is() )
{
EnterModalMode();
@@ -372,7 +372,7 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl,
FileDialogHelper*, /*unused
// use constructor for filling up filters automatically!
if ( ERRCODE_NONE == m_pFileDlg->GetError() )
{
- ::com::sun::star::uno::Reference< XFilePicker2 > xPicker =
m_pFileDlg->GetFilePicker();
+ css::uno::Reference< XFilePicker2 > xPicker =
m_pFileDlg->GetFilePicker();
try
{
@@ -380,8 +380,8 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl,
FileDialogHelper*, /*unused
if ( xPicker.is() )
{
- ::com::sun::star::uno::Reference < XFilePickerControlAccess >
xPickerControls ( xPicker, UNO_QUERY );
- ::com::sun::star::uno::Reference < XFilterManager >
xFilterManager ( xPicker, UNO_QUERY );
+ css::uno::Reference < XFilePickerControlAccess >
xPickerControls ( xPicker, UNO_QUERY );
+ css::uno::Reference < XFilterManager > xFilterManager (
xPicker, UNO_QUERY );
Sequence< OUString > sFiles =
xPicker->getSelectedFiles();
int nFiles = sFiles.getLength();
@@ -389,17 +389,17 @@ IMPL_LINK_TYPED( ShutdownIcon, DialogClosedHdl_Impl,
FileDialogHelper*, /*unused
int nArgs=3;
Sequence< PropertyValue > aArgs(3);
- ::com::sun::star::uno::Reference <
com::sun::star::task::XInteractionHandler2 > xInteraction(
+ css::uno::Reference < css::task::XInteractionHandler2 >
xInteraction(
task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(),
0) );
aArgs[0].Name = "InteractionHandler";
aArgs[0].Value <<= xInteraction;
- sal_Int16 nMacroExecMode =
::com::sun::star::document::MacroExecMode::USE_CONFIG;
+ sal_Int16 nMacroExecMode =
css::document::MacroExecMode::USE_CONFIG;
aArgs[1].Name = "MacroExecutionMode";
aArgs[1].Value <<= nMacroExecMode;
- sal_Int16 nUpdateDoc =
::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG;
+ sal_Int16 nUpdateDoc =
css::document::UpdateDocMode::ACCORDING_TO_CONFIG;
aArgs[2].Name = "UpdateDocMode";
aArgs[2].Value <<= nUpdateDoc;
@@ -517,7 +517,7 @@ void ShutdownIcon::addTerminateListener()
if (pInst->m_bListenForTermination)
return;
- ::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
+ css::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
if ( ! xDesktop.is())
return;
@@ -533,7 +533,7 @@ void ShutdownIcon::terminateDesktop()
if ( ! pInst)
return;
- ::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
+ css::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
if ( ! xDesktop.is())
return;
@@ -542,7 +542,7 @@ void ShutdownIcon::terminateDesktop()
xDesktop->removeTerminateListener( pInst );
// terminate desktop only if no tasks exist
- ::com::sun::star::uno::Reference< XIndexAccess > xTasks (
xDesktop->getFrames(), UNO_QUERY );
+ css::uno::Reference< XIndexAccess > xTasks ( xDesktop->getFrames(),
UNO_QUERY );
if( xTasks.is() && xTasks->getCount() < 1 )
Application::Quit();
@@ -577,7 +577,7 @@ ShutdownIcon* ShutdownIcon::createInstance()
return pShutdownIcon;
}
-void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception,
std::exception )
+void ShutdownIcon::init() throw( css::uno::Exception, std::exception )
{
// access resource system and sfx only protected by solarmutex
::SolarMutexGuard aSolarGuard;
@@ -586,7 +586,7 @@ void ShutdownIcon::init() throw(
::com::sun::star::uno::Exception, std::exceptio
::osl::ResettableMutexGuard aGuard( m_aMutex );
m_pResMgr = pResMgr;
aGuard.clear();
- ::com::sun::star::uno::Reference < XDesktop2 > xDesktop = Desktop::create(
m_xContext );
+ css::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
aGuard.reset();
m_xDesktop = xDesktop;
}
@@ -604,37 +604,37 @@ void SAL_CALL ShutdownIcon::disposing()
// XEventListener
-void SAL_CALL ShutdownIcon::disposing( const
::com::sun::star::lang::EventObject& )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& )
+ throw(css::uno::RuntimeException, std::exception)
{
}
// XTerminateListener
-void SAL_CALL ShutdownIcon::queryTermination( const
::com::sun::star::lang::EventObject& )
-throw(::com::sun::star::frame::TerminationVetoException,
::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ShutdownIcon::queryTermination( const css::lang::EventObject& )
+throw(css::frame::TerminationVetoException, css::uno::RuntimeException,
std::exception)
{
SAL_INFO("sfx.appl", "ShutdownIcon::queryTermination: veto is " <<
m_bVeto);
::osl::ClearableMutexGuard aGuard( m_aMutex );
if ( m_bVeto )
- throw ::com::sun::star::frame::TerminationVetoException();
+ throw css::frame::TerminationVetoException();
}
-void SAL_CALL ShutdownIcon::notifyTermination( const
::com::sun::star::lang::EventObject& )
-throw(::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL ShutdownIcon::notifyTermination( const css::lang::EventObject& )
+throw(css::uno::RuntimeException, std::exception)
{
}
-void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any>& aArguments )
- throw( ::com::sun::star::uno::Exception, std::exception )
+void SAL_CALL ShutdownIcon::initialize( const css::uno::Sequence<
css::uno::Any>& aArguments )
+ throw( css::uno::Exception, std::exception )
{
::osl::ResettableMutexGuard aGuard( m_aMutex );
@@ -665,7 +665,7 @@ void SAL_CALL ShutdownIcon::initialize( const
::com::sun::star::uno::Sequence< :
ShutdownIcon::pShutdownIcon = this;
initSystray();
}
- catch(const ::com::sun::star::lang::IllegalArgumentException&)
+ catch(const css::lang::IllegalArgumentException&)
{
}
}
@@ -852,12 +852,12 @@ static const ::sal_Int32 PROPHANDLE_TERMINATEVETOSTATE =
0;
// XFastPropertySet
void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32
nHandle,
- const
::com::sun::star::uno::Any& aValue )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception)
+ const css::uno::Any& aValue )
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception)
{
switch(nHandle)
{
@@ -875,17 +875,17 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue(
::sal_Int32
break;
default :
- throw ::com::sun::star::beans::UnknownPropertyException();
+ throw css::beans::UnknownPropertyException();
}
}
// XFastPropertySet
-::com::sun::star::uno::Any SAL_CALL ShutdownIcon::getFastPropertyValue(
::sal_Int32 nHandle )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL ShutdownIcon::getFastPropertyValue( ::sal_Int32 nHandle
)
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aValue;
+ css::uno::Any aValue;
switch(nHandle)
{
case PROPHANDLE_TERMINATEVETOSTATE :
@@ -896,7 +896,7 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue(
::sal_Int32
break;
default :
- throw ::com::sun::star::beans::UnknownPropertyException();
+ throw css::beans::UnknownPropertyException();
}
return aValue;
diff --git a/sfx2/source/appl/shutdownicon.hxx
b/sfx2/source/appl/shutdownicon.hxx
index c2b27b3..7a8f462 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -41,10 +41,10 @@ namespace sfx2
}
typedef ::cppu::WeakComponentImplHelper<
- ::com::sun::star::lang::XInitialization,
- ::com::sun::star::frame::XTerminateListener,
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::beans::XFastPropertySet > ShutdownIconServiceBase;
+ css::lang::XInitialization,
+ css::frame::XTerminateListener,
+ css::lang::XServiceInfo,
+ css::beans::XFastPropertySet > ShutdownIconServiceBase;
#if defined(USE_APP_SHORTCUTS)
#define WRITER_URL "private:factory/swriter"
@@ -65,7 +65,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public
ShutdownIconServiceBase
bool m_bSystemDialogs;
ResMgr* m_pResMgr;
sfx2::FileDialogHelper* m_pFileDlg;
- ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
static ShutdownIcon *pShutdownIcon; // one instance
@@ -80,7 +80,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public
ShutdownIconServiceBase
friend class SfxNotificationListener_Impl;
public:
- explicit ShutdownIcon( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & rxContext );
+ explicit ShutdownIcon( const css::uno::Reference<
css::uno::XComponentContext > & rxContext );
virtual ~ShutdownIcon();
@@ -100,15 +100,15 @@ class SFX2_DLLPUBLIC ShutdownIcon : public
ShutdownIconServiceBase
static void addTerminateListener();
static void FileOpen();
- static void OpenURL( const OUString& aURL, const OUString& rTarget,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue
>& =
- ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >( 0 ) );
+ static void OpenURL( const OUString& aURL, const OUString& rTarget,
const css::uno::Sequence< css::beans::PropertyValue >& =
+ css::uno::Sequence< css::beans::PropertyValue >( 0 ) );
static void FromTemplate();
static void SetAutostart( bool bActivate );
static bool GetAutostart();
static bool bModalMode;
- void init() throw( ::com::sun::star::uno::Exception, std::exception );
+ void init() throw( css::uno::Exception, std::exception );
OUString GetResString( int id );
static OUString GetUrlDescription( const OUString& aUrl );
@@ -124,33 +124,33 @@ class SFX2_DLLPUBLIC ShutdownIcon : public
ShutdownIconServiceBase
virtual void SAL_CALL disposing() override;
// XEventListener
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& Source )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+ throw(css::uno::RuntimeException, std::exception) override;
// XTerminateListener
- virtual void SAL_CALL queryTermination( const
::com::sun::star::lang::EventObject& aEvent )
- throw(::com::sun::star::frame::TerminationVetoException,
::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL notifyTermination( const
::com::sun::star::lang::EventObject& aEvent )
- throw(::com::sun::star::uno::RuntimeException, std::exception)
override;
+ virtual void SAL_CALL queryTermination( const css::lang::EventObject&
aEvent )
+ throw(css::frame::TerminationVetoException,
css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL notifyTermination( const css::lang::EventObject&
aEvent )
+ throw(css::uno::RuntimeException, std::exception) override;
// XInitialization
- virtual void SAL_CALL initialize( const
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw( ::com::sun::star::uno::Exception, std::exception ) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence<
css::uno::Any >& aArguments )
+ throw( css::uno::Exception, std::exception ) override;
// XFastPropertySet
virtual void SAL_CALL setFastPropertyValue( ::sal_Int32
nHandle,
- const
::com::sun::star::uno::Any& aValue )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::beans::PropertyVetoException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception)
override;
- virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(
::sal_Int32 nHandle )
- throw (::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException, std::exception)
override;
-
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2 >
m_xDesktop;
+ const css::uno::Any&
aValue )
+ throw (css::beans::UnknownPropertyException,
+ css::beans::PropertyVetoException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32
nHandle )
+ throw (css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException, std::exception) override;
+
+ css::uno::Reference< css::frame::XDesktop2 > m_xDesktop;
#ifdef WNT
static void EnableAutostartW32( const OUString &aShortcutName );
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index d77c181..d157fa9 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -215,14 +215,14 @@ void LayoutManagerListener::setFrame( const
css::uno::Reference< css::frame::XFr
void SAL_CALL LayoutManagerListener::addEventListener(
const css::uno::Reference< css::lang::XEventListener >& )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
// do nothing, only internal class
}
void SAL_CALL LayoutManagerListener::removeEventListener(
const css::uno::Reference< css::lang::XEventListener >& )
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
