[Libreoffice-commits] core.git: 2 commits - unotools/source uui/source
Noel Grandin
noel at peralex.com
Tue Nov 17 22:51:07 PST 2015
unotools/source/accessibility/accessiblerelationsethelper.cxx | 16 -
unotools/source/accessibility/accessiblestatesethelper.cxx | 16 -
unotools/source/config/cmdoptions.cxx | 12
unotools/source/config/compatibility.cxx | 2
unotools/source/config/configitem.cxx | 6
unotools/source/config/defaultoptions.cxx | 6
unotools/source/config/eventcfg.cxx | 20 -
unotools/source/config/fltrcfg.cxx | 2
unotools/source/config/fontcfg.cxx | 8
unotools/source/config/lingucfg.cxx | 10
unotools/source/config/misccfg.cxx | 6
unotools/source/config/moduleoptions.cxx | 6
unotools/source/config/optionsdlg.cxx | 2
unotools/source/config/pathoptions.cxx | 2
unotools/source/config/printwarningoptions.cxx | 2
unotools/source/config/saveopt.cxx | 6
unotools/source/config/searchopt.cxx | 2
unotools/source/config/securityoptions.cxx | 2
unotools/source/config/syslocaleoptions.cxx | 2
unotools/source/i18n/calendarwrapper.cxx | 28 +-
unotools/source/i18n/charclass.cxx | 6
unotools/source/i18n/intlwrapper.cxx | 4
unotools/source/i18n/localedatawrapper.cxx | 57 ++--
unotools/source/i18n/nativenumberwrapper.cxx | 4
unotools/source/i18n/numberformatcodewrapper.cxx | 14 -
unotools/source/i18n/textsearch.cxx | 16 -
unotools/source/i18n/transliterationwrapper.cxx | 2
unotools/source/misc/ServiceDocumenter.hxx | 4
unotools/source/misc/desktopterminationobserver.cxx | 2
unotools/source/misc/eventlisteneradapter.cxx | 2
unotools/source/misc/mediadescriptor.cxx | 6
unotools/source/misc/sharedunocomponent.cxx | 2
unotools/source/ucbhelper/XTempFile.hxx | 70 ++---
unotools/source/ucbhelper/localfilehelper.cxx | 10
unotools/source/ucbhelper/progresshandlerwrap.cxx | 2
unotools/source/ucbhelper/tempfile.cxx | 6
unotools/source/ucbhelper/ucbhelper.cxx | 7
unotools/source/ucbhelper/ucblockbytes.cxx | 2
unotools/source/ucbhelper/ucblockbytes.hxx | 28 +-
unotools/source/ucbhelper/xtempfile.cxx | 2
uui/source/fltdlg.cxx | 6
uui/source/getcontinuations.hxx | 43 +--
uui/source/iahndl.cxx | 4
uui/source/iahndl.hxx | 131 +++-------
uui/source/interactionhandler.cxx | 39 +-
uui/source/masterpassworddlg.cxx | 6
uui/source/masterpassworddlg.hxx | 6
uui/source/passwordcontainer.hxx | 57 +---
uui/source/passworddlg.hxx | 6
uui/source/requeststringresolver.hxx | 30 --
50 files changed, 325 insertions(+), 405 deletions(-)
New commits:
commit 319c9b90048d894f16236917a509d770a734e0dc
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 17 16:01:54 2015 +0200
com::sun::star->css in uui/
Change-Id: I1be458bd5f22014f4720583ff87cf8aad4a07dc8
Reviewed-on: https://gerrit.libreoffice.org/20021
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index d898feb..c45605d 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -165,7 +165,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem )
@seealso method InetURLObject::getAbbreviated()
@threadsafe no
*//*-*************************************************************************************************************/
-class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringWidth >
+class StringCalculator : public ::cppu::WeakImplHelper< css::util::XStringWidth >
{
public:
explicit StringCalculator( const OutputDevice* pDevice )
@@ -173,7 +173,7 @@ class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util::
{
}
- sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override
+ sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( css::uno::RuntimeException, std::exception ) override
{
return (sal_Int32)(m_pDevice->GetTextWidth(sString));
}
@@ -207,7 +207,7 @@ OUString FilterDialog::impl_buildUIFileName( const OUString& sName )
else
{
// otherwise its really a url ... build short name by using INetURLObject
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > xStringCalculator( new StringCalculator(m_pFtURL) );
+ css::uno::Reference< css::util::XStringWidth > xStringCalculator( new StringCalculator(m_pFtURL) );
if( xStringCalculator.is() )
{
INetURLObject aBuilder ( sName );
diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx
index d7e80cb..8175b00 100644
--- a/uui/source/getcontinuations.hxx
+++ b/uui/source/getcontinuations.hxx
@@ -31,13 +31,12 @@ namespace com { namespace sun { namespace star {
template< class t1 >
bool setContinuation(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > const & rContinuation,
- com::sun::star::uno::Reference< t1 > * pContinuation)
+ css::uno::Reference< css::task::XInteractionContinuation > const & rContinuation,
+ css::uno::Reference< t1 > * pContinuation)
{
if (pContinuation && !pContinuation->is())
{
- pContinuation->set(rContinuation, com::sun::star::uno::UNO_QUERY);
+ pContinuation->set(rContinuation, css::uno::UNO_QUERY);
if (pContinuation->is())
return true;
}
@@ -46,12 +45,10 @@ bool setContinuation(
template< class t1, class t2 >
void getContinuations(
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations,
- com::sun::star::uno::Reference< t1 > * pContinuation1,
- com::sun::star::uno::Reference< t2 > * pContinuation2)
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
+ css::uno::Reference< t1 > * pContinuation1,
+ css::uno::Reference< t2 > * pContinuation2)
{
for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i)
{
@@ -64,13 +61,11 @@ void getContinuations(
template< class t1, class t2, class t3 >
void getContinuations(
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations,
- com::sun::star::uno::Reference< t1 > * pContinuation1,
- com::sun::star::uno::Reference< t2 > * pContinuation2,
- com::sun::star::uno::Reference< t3 > * pContinuation3)
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
+ css::uno::Reference< t1 > * pContinuation1,
+ css::uno::Reference< t2 > * pContinuation2,
+ css::uno::Reference< t3 > * pContinuation3)
{
for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i)
{
@@ -85,14 +80,12 @@ void getContinuations(
template< class t1, class t2, class t3, class t4 >
void getContinuations(
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations,
- com::sun::star::uno::Reference< t1 > * pContinuation1,
- com::sun::star::uno::Reference< t2 > * pContinuation2,
- com::sun::star::uno::Reference< t3 > * pContinuation3,
- com::sun::star::uno::Reference< t4 > * pContinuation4)
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
+ css::uno::Reference< t1 > * pContinuation1,
+ css::uno::Reference< t2 > * pContinuation2,
+ css::uno::Reference< t3 > * pContinuation3,
+ css::uno::Reference< t4 > * pContinuation4)
{
for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i)
{
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 3652d79..19e63ef 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -302,7 +302,7 @@ namespace
static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation )
{
- const ::com::sun::star::uno::TypeDescription aTypeDesc( i_rTypeName );
+ const css::uno::TypeDescription aTypeDesc( i_rTypeName );
const typelib_TypeDescription* pTypeDesc = aTypeDesc.get();
if ( !pTypeDesc || !pTypeDesc->pWeakRef )
{
@@ -315,7 +315,7 @@ namespace
#endif
return false;
}
- const ::com::sun::star::uno::Type aType( pTypeDesc->pWeakRef );
+ const css::uno::Type aType( pTypeDesc->pWeakRef );
const bool bExactMatch = i_rPropagation == "named-only";
if ( bExactMatch )
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index ffd4060..7aade5b 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -80,150 +80,128 @@ typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap;
class UUIInteractionHelper
{
private:
- mutable osl::Mutex m_aPropertyMutex;
- ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
- ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xWindowParam;
- const OUString m_aContextParam;
- StringHashMap m_aTypedCustomHandlers;
+ mutable osl::Mutex m_aPropertyMutex;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::awt::XWindow > m_xWindowParam;
+ const OUString m_aContextParam;
+ StringHashMap m_aTypedCustomHandlers;
UUIInteractionHelper(UUIInteractionHelper &) = delete;
void operator =(const UUIInteractionHelper&) = delete;
public:
UUIInteractionHelper(
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > const & rxContext,
- com::sun::star::uno::Reference<
- com::sun::star::awt::XWindow > const & rxWindow,
+ css::uno::Reference< css::uno::XComponentContext > const & rxContext,
+ css::uno::Reference< css::awt::XWindow > const & rxWindow,
const OUString & rContextParam);
explicit UUIInteractionHelper(
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > const & rxContext);
+ css::uno::Reference< css::uno::XComponentContext > const & rxContext);
~UUIInteractionHelper();
- bool
- handleRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ bool handleRequest( css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
- com::sun::star::beans::Optional< OUString >
+ css::beans::Optional< OUString >
getStringFromRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
// Helper.
static OUString
replaceMessageWithArguments(
- const OUString& aMessage,
+ const OUString& aMessage,
std::vector< OUString > const & rArguments );
- ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
+ css::uno::Reference< css::uno::XComponentContext >
getORB() const
{ return m_xContext; }
private:
bool
handleRequest_impl(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest,
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest,
bool bObtainErrorStringOnly,
bool & bHasErrorString,
OUString & rErrorString);
static void handlerequest(void* pHandleData, void* pInteractionHandler);
- com::sun::star::beans::Optional< OUString >
+ css::beans::Optional< OUString >
getStringFromRequest_impl(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
static void getstringfromrequest(void* pHandleData, void* pInteractionHandler);
vcl::Window *
getParentProperty();
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>
+ css::uno::Reference< css::awt::XWindow>
getParentXWindow() const;
OUString
getContextProperty();
- com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler2 >
+ css::uno::Reference< css::task::XInteractionHandler2 >
getInteractionHandler();
bool handleTypedHandlerImplementations(
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest > const & rRequest
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest
);
bool
tryOtherInteractionHandler(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
void
getInteractionHandlerList(InteractionHandlerDataList &rdataList);
static bool
isInformationalErrorMessageRequest(
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations);
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations);
bool
handleInteractiveIOException(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest,
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest,
bool bObtainErrorStringOnly,
bool & bHasErrorString,
OUString & rErrorString);
bool
handleAuthenticationRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
bool
handleCertificateValidationRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
void
handleNameClashResolveRequest(
- com::sun::star::ucb::NameClashResolveRequest const & rRequest,
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations);
+ css::ucb::NameClashResolveRequest const & rRequest,
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations);
bool
handleMasterPasswordRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
bool
handlePasswordRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
bool
handleNoSuchFilterRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
bool
handleFilterOptionsRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference<
+ css::task::XInteractionRequest > const & rRequest);
void
handleErrorHandlerRequest(
- com::sun::star::task::InteractionClassification eClassification,
+ css::task::InteractionClassification eClassification,
ErrCode nErrorCode,
std::vector< OUString > const & rArguments,
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations,
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
bool bObtainErrorStringOnly,
bool & bHasErrorString,
OUString & rErrorString);
@@ -231,10 +209,8 @@ private:
void
handleGenericErrorRequest(
sal_Int32 nErrorCode,
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations,
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
bool bObtainErrorStringOnly,
bool & bHasErrorString,
OUString & rErrorString);
@@ -242,42 +218,33 @@ private:
void
handleMacroConfirmRequest(
const OUString& aDocumentURL,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::embed::XStorage >& xZipStorage,
+ const css::uno::Reference< css::embed::XStorage >& xZipStorage,
const OUString& aDocumentVersion,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::security::DocumentSignatureInformation >&
- aSignInfo,
- com::sun::star::uno::Sequence<
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionContinuation > > const &
- rContinuations);
+ const css::uno::Sequence< css::security::DocumentSignatureInformation >& aSignInfo,
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations);
void
handleBrokenPackageRequest(
std::vector< OUString > const & rArguments,
- ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
- ::com::sun::star::task::XInteractionContinuation > > const &
- rContinuations,
+ css::uno::Sequence<
+ css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
bool bObtainErrorStringOnly,
bool & bHasErrorString,
OUString & rErrorString);
bool handleLockedDocumentRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
bool handleChangedByOthersRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference<
+ css::task::XInteractionRequest > const & rRequest);
bool handleLockFileIgnoreRequest(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const & rRequest);
+ css::uno::Reference< css::task::XInteractionRequest > const & rRequest);
bool handleCustomRequest(
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest,
+ const css::uno::Reference< css::task::XInteractionRequest >& i_rRequest,
const OUString& i_rServiceName
) const;
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index dbd2701..56b6088 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -35,53 +35,46 @@ using namespace com::sun::star;
namespace {
class UUIInteractionHandler:
- public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo,
- com::sun::star::lang::XInitialization,
- com::sun::star::task::XInteractionHandler2 >,
+ public cppu::WeakImplHelper< css::lang::XServiceInfo,
+ css::lang::XInitialization,
+ css::task::XInteractionHandler2 >,
private boost::noncopyable
{
private:
UUIInteractionHelper * m_pImpl;
public:
- explicit UUIInteractionHandler(com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >
- const & rxContext);
+ explicit UUIInteractionHandler(css::uno::Reference< css::uno::XComponentContext > const & rxContext);
virtual ~UUIInteractionHandler();
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(OUString const &
- rServiceName)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName)
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
initialize(
- com::sun::star::uno::Sequence< com::sun::star::uno::Any > const &
- rArguments)
- throw (com::sun::star::uno::Exception, std::exception) override;
+ css::uno::Sequence< css::uno::Any > const & rArguments)
+ throw (css::uno::Exception, std::exception) override;
virtual void SAL_CALL
- handle(com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest > const &
- rRequest)
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ handle(css::uno::Reference< css::task::XInteractionRequest > const & rRequest)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
handleInteractionRequest(
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _Request
- ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::task::XInteractionRequest >& _Request
+ ) throw ( css::uno::RuntimeException, std::exception ) override;
};
UUIInteractionHandler::UUIInteractionHandler(
- uno::Reference< uno::XComponentContext > const &
- rxContext)
+ uno::Reference< uno::XComponentContext > const & rxContext)
: m_pImpl(new UUIInteractionHelper(rxContext))
{
}
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index b45f588..5b58094 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -35,8 +35,8 @@ IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void)
MasterPasswordDialog::MasterPasswordDialog
(
- vcl::Window* pParent,
- ::com::sun::star::task::PasswordRequestMode aDialogMode,
+ vcl::Window* pParent,
+ css::task::PasswordRequestMode aDialogMode,
ResMgr* pResMgr
)
: ModalDialog(pParent, "MasterPasswordDialog", "uui/ui/masterpassworddlg.ui")
@@ -45,7 +45,7 @@ MasterPasswordDialog::MasterPasswordDialog
{
get(m_pEDMasterPassword, "password");
get(m_pOKBtn, "ok");
- if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER )
+ if( nDialogMode == css::task::PasswordRequestMode_PASSWORD_REENTER )
{
OUString aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, *pResourceMgr ));
ScopedVclPtrInstance< MessageDialog > aErrorBox(pParent, aErrorMsg);
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index ccc1d60..bff1996 100644
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
@@ -36,15 +36,15 @@ class MasterPasswordDialog : public ModalDialog
DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
public:
- MasterPasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
+ MasterPasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr );
virtual ~MasterPasswordDialog();
virtual void dispose() override;
OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); }
private:
- ::com::sun::star::task::PasswordRequestMode nDialogMode;
- ResMgr* pResourceMgr;
+ css::task::PasswordRequestMode nDialogMode;
+ ResMgr* pResourceMgr;
};
#endif // INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index 8ddd3e0..a638a9e 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -48,9 +48,7 @@ class PasswordContainerHelper
{
public:
explicit PasswordContainerHelper(
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > const &
- xContext );
+ css::uno::Reference< css::uno::XComponentContext > const & xContext );
@@ -84,13 +82,10 @@ public:
False, otherwise.
*/
bool handleAuthenticationRequest(
- com::sun::star::ucb::AuthenticationRequest const & rRequest,
- com::sun::star::uno::Reference<
- com::sun::star::ucb::XInteractionSupplyAuthentication > const &
- xSupplyAuthentication,
+ css::ucb::AuthenticationRequest const & rRequest,
+ css::uno::Reference< css::ucb::XInteractionSupplyAuthentication > const & xSupplyAuthentication,
OUString const & rURL,
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionHandler2 > const & xIH );
+ css::uno::Reference< css::task::XInteractionHandler2 > const & xIH );
/** This member function adds credentials for the given URL to the password
container.
@@ -121,69 +116,59 @@ public:
*/
bool addRecord( OUString const & rURL,
OUString const & rUsername,
- com::sun::star::uno::Sequence< OUString > const &
- rPasswords,
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionHandler2 > const & xIH,
+ css::uno::Sequence< OUString > const & rPasswords,
+ css::uno::Reference< css::task::XInteractionHandler2 > const & xIH,
bool bPersist );
private:
- com::sun::star::uno::Reference<
- com::sun::star::task::XPasswordContainer2 > m_xPasswordContainer;
+ css::uno::Reference< css::task::XPasswordContainer2 > m_xPasswordContainer;
};
class PasswordContainerInteractionHandler :
- public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo,
- com::sun::star::task::XInteractionHandler2 >
+ public cppu::WeakImplHelper< css::lang::XServiceInfo,
+ css::task::XInteractionHandler2 >
{
public:
explicit PasswordContainerInteractionHandler(
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& xContext );
+ const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~PasswordContainerInteractionHandler();
// 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
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw ( com::sun::star::uno::RuntimeException, std::exception ) override;
+ throw ( css::uno::RuntimeException, std::exception ) override;
// XInteractionHandler2
virtual void SAL_CALL
- handle( const ::com::sun::star::uno::Reference<
- ::com::sun::star::task::XInteractionRequest >& Request )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ handle( const css::uno::Reference< css::task::XInteractionRequest >& Request )
+ throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL
- handleInteractionRequest( const ::com::sun::star::uno::Reference<
- ::com::sun::star::task::XInteractionRequest >& Request )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request )
+ throw (css::uno::RuntimeException, std::exception) override;
// Non-UNO interfaces
static OUString
getImplementationName_Static();
- static com::sun::star::uno::Sequence< OUString >
+ static css::uno::Sequence< OUString >
getSupportedServiceNames_Static();
- static com::sun::star::uno::Reference<
- com::sun::star::lang::XSingleServiceFactory >
- createServiceFactory( const com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory > & rxServiceMgr );
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxServiceMgr );
private:
- //com::sun::star::uno::Reference<
- // com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
PasswordContainerHelper m_aPwContainerHelper;
};
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index ffc99a5..6dfaed4 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -44,7 +44,7 @@ class PasswordDialog : public ModalDialog
DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
public:
- PasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL,
+ PasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL,
bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
virtual ~PasswordDialog();
virtual void dispose() override;
@@ -53,8 +53,8 @@ public:
OUString GetPassword() const { return m_pEDPassword->GetText(); }
private:
- ::com::sun::star::task::PasswordRequestMode nDialogMode;
- ResMgr* pResourceMgr;
+ css::task::PasswordRequestMode nDialogMode;
+ ResMgr* pResourceMgr;
};
#endif // INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 8d7c21e..77d25e8 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -31,20 +31,19 @@ class UUIInteractionHelper;
class UUIInteractionRequestStringResolver:
public cppu::WeakImplHelper<
- com::sun::star::lang::XServiceInfo,
- com::sun::star::task::XInteractionRequestStringResolver >
+ css::lang::XServiceInfo,
+ css::task::XInteractionRequestStringResolver >
{
public:
static char const m_aImplementationName[];
- static com::sun::star::uno::Sequence< OUString >
+ static css::uno::Sequence< OUString >
getSupportedServiceNames_static();
- static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
+ static css::uno::Reference< css::uno::XInterface >
SAL_CALL
createInstance(
- com::sun::star::uno::Reference<
- com::sun::star::lang::XMultiServiceFactory > const &
+ css::uno::Reference< css::lang::XMultiServiceFactory > const &
rServiceFactory);
private:
@@ -54,28 +53,25 @@ private:
void operator =(UUIInteractionRequestStringResolver&) = delete;
explicit UUIInteractionRequestStringResolver(
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >
- const & rxContext);
+ css::uno::Reference< css::uno::XComponentContext > const & rxContext);
virtual ~UUIInteractionRequestStringResolver();
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(OUString const &
rServiceName)
- 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
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- virtual com::sun::star::beans::Optional< OUString > SAL_CALL
+ virtual css::beans::Optional< OUString > SAL_CALL
getStringFromInformationalRequest(
- const com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionRequest >& Request )
- throw (com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::task::XInteractionRequest >& Request )
+ throw (css::uno::RuntimeException, std::exception) override;
};
#endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
commit 7f5c879310ce5add04a7f5d84c9a55e9ffbb5855
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 17 15:53:18 2015 +0200
com::sun::star->css in unotools/
Change-Id: Ie36efe4abe7f5c505f564147eb52e0222c1ce955
Reviewed-on: https://gerrit.libreoffice.org/20019
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index e411a9c..726943c 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -228,23 +228,19 @@ void AccessibleRelationSetHelper::AddRelation(const AccessibleRelation& rRelatio
//===== XTypeProvider =======================================================
-uno::Sequence< ::com::sun::star::uno::Type>
- AccessibleRelationSetHelper::getTypes()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence< css::uno::Type> AccessibleRelationSetHelper::getTypes()
+ throw (css::uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard (maMutex);
- const ::com::sun::star::uno::Type aTypeList[] = {
+ css::uno::Sequence< css::uno::Type> aTypeSequence {
cppu::UnoType<XAccessibleRelationSet>::get(),
cppu::UnoType<lang::XTypeProvider>::get()
- };
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>
- aTypeSequence (aTypeList, 2);
+ };
return aTypeSequence;
}
-uno::Sequence<sal_Int8> SAL_CALL
- AccessibleRelationSetHelper::getImplementationId()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL AccessibleRelationSetHelper::getImplementationId()
+ throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 7c0e100..1608b97 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -241,22 +241,18 @@ void AccessibleStateSetHelper::RemoveState(sal_Int16 aState)
//===== XTypeProvider =======================================================
-uno::Sequence< ::com::sun::star::uno::Type>
- AccessibleStateSetHelper::getTypes()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence< css::uno::Type> AccessibleStateSetHelper::getTypes()
+ throw (css::uno::RuntimeException, std::exception)
{
- const ::com::sun::star::uno::Type aTypeList[] = {
+ css::uno::Sequence< css::uno::Type> aTypeSequence {
cppu::UnoType<XAccessibleStateSet>::get(),
cppu::UnoType<lang::XTypeProvider>::get()
- };
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type>
- aTypeSequence (aTypeList, 2);
+ };
return aTypeSequence;
}
-uno::Sequence<sal_Int8> SAL_CALL
- AccessibleStateSetHelper::getImplementationId()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL AccessibleStateSetHelper::getImplementationId()
+ throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 230af07..5bd0e82 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -85,7 +85,7 @@ class SvtCmdOptions
CommandHashMap m_aCommandHashMap;
};
-typedef ::std::vector< ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > > SvtFrameVector;
+typedef ::std::vector< css::uno::WeakReference< css::frame::XFrame > > SvtFrameVector;
class SvtCommandOptions_Impl : public ConfigItem
{
@@ -115,7 +115,7 @@ class SvtCommandOptions_Impl : public ConfigItem
bool HasEntries ( SvtCommandOptions::CmdOption eOption ) const;
bool Lookup ( SvtCommandOptions::CmdOption eCmdOption, const OUString& ) const;
- void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
+ void EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame);
private:
@@ -215,7 +215,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
pIt != m_lFrames.end();
++pIt )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame(pIt->get(), ::com::sun::star::uno::UNO_QUERY);
+ css::uno::Reference< css::frame::XFrame > xFrame(pIt->get(), css::uno::UNO_QUERY);
if (xFrame.is())
xFrame->contextChanged();
}
@@ -257,12 +257,12 @@ bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, co
// public method
-void SvtCommandOptions_Impl::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame)
+void SvtCommandOptions_Impl::EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame)
{
// check if frame already exists inside list
// ignore double registrations
// every frame must be notified one times only!
- ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > xWeak(xFrame);
+ css::uno::WeakReference< css::frame::XFrame > xWeak(xFrame);
SvtFrameVector::const_iterator pIt = ::std::find(m_lFrames.begin(), m_lFrames.end(), xWeak);
if (pIt == m_lFrames.end())
m_lFrames.push_back(xWeak);
@@ -344,7 +344,7 @@ bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandUR
// public method
-void SvtCommandOptions::EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame)
+void SvtCommandOptions::EstablisFrameCallback(const css::uno::Reference< css::frame::XFrame >& xFrame)
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->EstablisFrameCallback(xFrame);
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 69f52ec..096a7f0 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -351,7 +351,7 @@ SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl()
if ( !bDefaultFound && aItem.sName == COMPATIBILITY_DEFAULT_NAME )
{
SvtSysLocale aSysLocale;
- com::sun::star::lang::Locale aLocale = aSysLocale.GetLanguageTag().getLocale();
+ css::lang::Locale aLocale = aSysLocale.GetLanguageTag().getLocale();
if ( aLocale.Language == "zh" || aLocale.Language == "ja" || aLocale.Language == "ko" )
aItem.bExpandWordSpace = false;
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index bd45e39..554c18b 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -80,7 +80,7 @@ catch(const Exception& rEx) \
namespace utl{
class ConfigChangeListener_Impl : public cppu::WeakImplHelper
<
- com::sun::star::util::XChangesListener
+ css::util::XChangesListener
>
{
public:
@@ -193,7 +193,7 @@ ConfigItem::~ConfigItem()
ConfigManager::getConfigManager().removeConfigItem(*this);
}
-void ConfigItem::CallNotify( const com::sun::star::uno::Sequence<OUString>& rPropertyNames )
+void ConfigItem::CallNotify( const css::uno::Sequence<OUString>& rPropertyNames )
{
// the call is forwarded to the virtual Notify() method
// it is pure virtual, so all classes deriving from ConfigItem have to decide how they
@@ -344,7 +344,7 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString >
}
}
-Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames)
+Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const css::uno::Sequence< OUString >& rNames)
{
sal_Int32 i;
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 081848d..ee3731b 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -93,7 +93,7 @@ public:
SvtDefaultOptions_Impl();
OUString GetDefaultPath( sal_uInt16 nId ) const;
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+ virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
private:
virtual void ImplCommit() override;
@@ -234,7 +234,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Pa
{
switch ( pValues[nProp].getValueTypeClass() )
{
- case ::com::sun::star::uno::TypeClass_STRING :
+ case css::uno::TypeClass_STRING :
{
// multi paths
if ( pValues[nProp] >>= aTempStr )
@@ -246,7 +246,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Pa
break;
}
- case ::com::sun::star::uno::TypeClass_SEQUENCE :
+ case css::uno::TypeClass_SEQUENCE :
{
// single paths
aFullPath.clear();
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index a10c74c..eda8048 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -96,14 +96,14 @@ public:
GlobalEventConfig_Impl( );
virtual ~GlobalEventConfig_Impl( );
- void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
-
- 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);
- ::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);
- ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException);
- bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException);
- bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException);
+ void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
+
+ 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);
+ css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException);
+ bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException);
+ static css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException);
+ bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException);
OUString GetEventName( GlobalEventId nID );
};
@@ -150,7 +150,7 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& )
pIt != m_lFrames.end();
++pIt )
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame(pIt->get(), ::com::sun::star::uno::UNO_QUERY);
+ css::uno::Reference< css::frame::XFrame > xFrame(pIt->get(), css::uno::UNO_QUERY);
if (xFrame.is())
xFrame->contextChanged();
}
@@ -336,7 +336,7 @@ GlobalEventConfig::~GlobalEventConfig()
}
}
-Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents() throw (::com::sun::star::uno::RuntimeException, std::exception)
+Reference< container::XNameReplace > SAL_CALL GlobalEventConfig::getEvents() throw (css::uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetOwnStaticMutex() );
Reference< container::XNameReplace > ret(this);
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index ed9350c..1a9dbb0 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -68,7 +68,7 @@ public:
bLoadVBA(false),
bSaveVBA(false) {}
virtual ~SvtAppFilterOptions_Impl();
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+ virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
void Load();
bool IsLoad() const {return bLoadVBA;}
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 483af6f..0409768 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -872,7 +872,7 @@ static const enum_convert pWidthNames[] =
{ "ultraexpanded", WIDTH_ULTRA_EXPANDED }
};
-void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+void FontSubstConfiguration::fillSubstVector( const css::uno::Reference< XNameAccess >& rFont,
const OUString& rType,
std::vector< OUString >& rSubstVector ) const
{
@@ -921,7 +921,7 @@ void FontSubstConfiguration::fillSubstVector( const com::sun::star::uno::Referen
}
}
-FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+FontWeight FontSubstConfiguration::getSubstWeight( const css::uno::Reference< XNameAccess >& rFont,
const OUString& rType ) const
{
int weight = -1;
@@ -953,7 +953,7 @@ FontWeight FontSubstConfiguration::getSubstWeight( const com::sun::star::uno::Re
return (FontWeight)( weight >= 0 ? pWeightNames[weight].nEnum : WEIGHT_DONTKNOW );
}
-FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+FontWidth FontSubstConfiguration::getSubstWidth( const css::uno::Reference< XNameAccess >& rFont,
const OUString& rType ) const
{
int width = -1;
@@ -985,7 +985,7 @@ FontWidth FontSubstConfiguration::getSubstWidth( const com::sun::star::uno::Refe
return (FontWidth)( width >= 0 ? pWidthNames[width].nEnum : WIDTH_DONTKNOW );
}
-ImplFontAttrs FontSubstConfiguration::getSubstType( const com::sun::star::uno::Reference< XNameAccess >& rFont,
+ImplFontAttrs FontSubstConfiguration::getSubstType( const css::uno::Reference< XNameAccess >& rFont,
const OUString& rType ) const
{
unsigned long type = 0;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 271abe3..aa50fe9 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -160,7 +160,7 @@ public:
virtual ~SvtLinguConfigItem();
// utl::ConfigItem
- virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
// make some protected functions of utl::ConfigItem public
using utl::ConfigItem::GetNodeNames;
@@ -170,15 +170,15 @@ public:
using utl::ConfigItem::ReplaceSetProperties;
//using utl::ConfigItem::GetReadOnlyStates;
- com::sun::star::uno::Any
+ css::uno::Any
GetProperty( const OUString &rPropertyName ) const;
- com::sun::star::uno::Any
+ css::uno::Any
GetProperty( sal_Int32 nPropertyHandle ) const;
bool SetProperty( const OUString &rPropertyName,
- const com::sun::star::uno::Any &rValue );
+ const css::uno::Any &rValue );
bool SetProperty( sal_Int32 nPropertyHandle,
- const com::sun::star::uno::Any &rValue );
+ const css::uno::Any &rValue );
const SvtLinguOptions& GetOptions() const;
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 527b8eb..f5d128b 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -45,7 +45,7 @@ private:
bool bNotFound;
sal_Int32 nYear2000; // two digit year representation
- static const com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static const css::uno::Sequence<OUString> GetPropertyNames();
void Load();
virtual void ImplCommit() override;
@@ -54,7 +54,7 @@ public:
SfxMiscCfg( );
virtual ~SfxMiscCfg( );
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override;
+ virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override;
bool IsNotFoundWarning() const {return bNotFound;}
void SetNotFoundWarning( bool bSet);
@@ -151,7 +151,7 @@ void SfxMiscCfg::Load()
}
}
-void SfxMiscCfg::Notify( const com::sun::star::uno::Sequence<OUString>& )
+void SfxMiscCfg::Notify( const css::uno::Sequence<OUString>& )
{
Load();
}
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index fc29b32..7170389 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -294,7 +294,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
// public interface
bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const;
- ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames();
+ css::uno::Sequence < OUString > GetAllServiceNames();
OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const;
OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const;
static OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory );
@@ -474,7 +474,7 @@ bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule
return bInstalled;
}
-::com::sun::star::uno::Sequence < OUString > SvtModuleOptions_Impl::GetAllServiceNames()
+css::uno::Sequence < OUString > SvtModuleOptions_Impl::GetAllServiceNames()
{
std::vector<OUString> aVec;
@@ -1163,7 +1163,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u
return EFactory::UNKNOWN_FACTORY;
}
-::com::sun::star::uno::Sequence < OUString > SvtModuleOptions::GetAllServiceNames()
+css::uno::Sequence < OUString > SvtModuleOptions::GetAllServiceNames()
{
::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() );
return m_pDataContainer->GetAllServiceNames();
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 5b963b0..f99b138 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -57,7 +57,7 @@ private:
public:
SvtOptionsDlgOptions_Impl();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
static ::osl::Mutex & getInitMutex();
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 33fd230..42fcd81 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -404,7 +404,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
NameToHandleMap aTempHashMap;
for ( sal_Int32 n = 0; n < aPathPropSeq.getLength(); n++ )
{
- const com::sun::star::beans::Property& aProperty = aPathPropSeq[n];
+ const css::beans::Property& aProperty = aPathPropSeq[n];
aTempHashMap.insert( NameToHandleMap::value_type( aProperty.Name, aProperty.Handle ));
}
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index 1b56508..4cc0f26 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -59,7 +59,7 @@ public:
// override methods of baseclass
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
// public interface
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 38dff41..809522f 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -99,7 +99,7 @@ public:
SvtSaveOptions_Impl();
virtual ~SvtSaveOptions_Impl();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
sal_Int32 GetAutoSaveTime() const { return nAutoSaveTime; }
bool IsUseUserData() const { return bUseUserData; }
@@ -772,7 +772,7 @@ public:
SvtLoadOptions_Impl();
virtual ~SvtLoadOptions_Impl();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
void SetLoadUserSettings(bool b){bLoadUserDefinedSettings = b; SetModified();}
bool IsLoadUserSettings() const {return bLoadUserDefinedSettings;}
@@ -789,7 +789,7 @@ SvtLoadOptions_Impl::SvtLoadOptions_Impl()
EnableNotification( aNames );
const Any* pValues = aValues.getConstArray();
DBG_ASSERT( aValues.getLength() == aNames.getLength(), "GetProperties failed" );
- if (pValues[0].getValueTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
+ if (pValues[0].getValueTypeClass() == css::uno::TypeClass_BOOLEAN)
bLoadUserDefinedSettings = *static_cast<sal_Bool const *>(pValues[0].getValue());
}
diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 5f8cda2..6c1a2b3 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.cxx
@@ -59,7 +59,7 @@ public:
SvtSearchOptions_Impl();
virtual ~SvtSearchOptions_Impl();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
bool GetFlag( sal_uInt16 nOffset ) const;
void SetFlag( sal_uInt16 nOffset, bool bVal );
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index fad440b..795d768 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -681,7 +681,7 @@ void SvtSecurityOptions_Impl::ImplCommit()
OUString aPrefix(
PROPERTYNAME_MACRO_TRUSTEDAUTHORS "/a"
+ OUString::number(i) + "/");
- Sequence< com::sun::star::beans::PropertyValue > lPropertyValues( 3 );
+ Sequence< css::beans::PropertyValue > lPropertyValues( 3 );
lPropertyValues[ 0 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
lPropertyValues[ 0 ].Value <<= m_seqTrustedAuthors[ i ][0];
lPropertyValues[ 1 ].Name = aPrefix + PROPERTYNAME_TRUSTEDAUTHOR_SERIALNUMBER;
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 6de88a67..d3bbfbe 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -74,7 +74,7 @@ public:
SvtSysLocaleOptions_Impl();
virtual ~SvtSysLocaleOptions_Impl();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
const OUString& GetLocaleString() const
{ return m_aLocaleString; }
diff --git a/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index 647e705..117eac5 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.cxx
@@ -40,7 +40,7 @@ CalendarWrapper::~CalendarWrapper()
{
}
-void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale& rLocale )
+void CalendarWrapper::loadDefaultCalendar( const css::lang::Locale& rLocale )
{
try
{
@@ -53,7 +53,7 @@ void CalendarWrapper::loadDefaultCalendar( const ::com::sun::star::lang::Locale&
}
}
-void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun::star::lang::Locale& rLocale )
+void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const css::lang::Locale& rLocale )
{
try
{
@@ -67,7 +67,7 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun:
}
}
-::com::sun::star::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const ::com::sun::star::lang::Locale& rLocale ) const
+css::uno::Sequence< OUString > CalendarWrapper::getAllCalendars( const css::lang::Locale& rLocale ) const
{
try
{
@@ -79,7 +79,7 @@ void CalendarWrapper::loadCalendar( const OUString& rUniqueID, const ::com::sun:
SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< OUString > (0);
+ return css::uno::Sequence< OUString > (0);
}
OUString CalendarWrapper::getUniqueID() const
@@ -250,7 +250,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
return 0;
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getMonths() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getMonths() const
{
try
{
@@ -261,10 +261,10 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
{
SAL_WARN( "unotools.i18n", "getMonths: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+ return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getDays() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getDays() const
{
try
{
@@ -275,7 +275,7 @@ sal_Int16 CalendarWrapper::getNumberOfDaysInWeek() const
{
SAL_WARN( "unotools.i18n", "getDays: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+ return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
OUString CalendarWrapper::getDisplayName( sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType ) const
@@ -310,7 +310,7 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
// --- XCalendar3 ------------------------------------------------------------
-::com::sun::star::i18n::Calendar2 CalendarWrapper::getLoadedCalendar() const
+css::i18n::Calendar2 CalendarWrapper::getLoadedCalendar() const
{
try
{
@@ -321,10 +321,10 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
{
SAL_WARN( "unotools.i18n", "getLoadedCalendar2: Exception caught " << e.Message );
}
- return ::com::sun::star::i18n::Calendar2();
+ return css::i18n::Calendar2();
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getGenitiveMonths() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getGenitiveMonths() const
{
try
{
@@ -335,10 +335,10 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
{
SAL_WARN( "unotools.i18n", "getGenitiveMonths: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+ return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > CalendarWrapper::getPartitiveMonths() const
+css::uno::Sequence< css::i18n::CalendarItem2 > CalendarWrapper::getPartitiveMonths() const
{
try
{
@@ -349,7 +349,7 @@ OUString CalendarWrapper::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_
{
SAL_WARN( "unotools.i18n", "getPartitiveMonths: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > (0);
+ return css::uno::Sequence< css::i18n::CalendarItem2 > (0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index a83b5f7..47aeffa 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -62,7 +62,7 @@ const LanguageTag& CharClass::getLanguageTag() const
return maLanguageTag;
}
-const ::com::sun::star::lang::Locale& CharClass::getMyLocale() const
+const css::lang::Locale& CharClass::getMyLocale() const
{
::osl::MutexGuard aGuard( aMutex );
return maLanguageTag.getLocale();
@@ -385,7 +385,7 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In
}
}
-::com::sun::star::i18n::ParseResult CharClass::parseAnyToken(
+css::i18n::ParseResult CharClass::parseAnyToken(
const OUString& rStr,
sal_Int32 nPos,
sal_Int32 nStartCharFlags,
@@ -409,7 +409,7 @@ sal_Int32 CharClass::getStringType( const OUString& rStr, sal_Int32 nPos, sal_In
}
}
-::com::sun::star::i18n::ParseResult CharClass::parsePredefinedToken(
+css::i18n::ParseResult CharClass::parsePredefinedToken(
sal_Int32 nTokenType,
const OUString& rStr,
sal_Int32 nPos,
diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index 95bfa1e..d8e3760 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.cxx
@@ -23,7 +23,7 @@
#include <comphelper/processfactory.hxx>
IntlWrapper::IntlWrapper(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rxContext,
+ const css::uno::Reference< css::uno::XComponentContext > & rxContext,
const LanguageTag& rLanguageTag )
:
maLanguageTag( rLanguageTag ),
@@ -68,7 +68,7 @@ void IntlWrapper::ImplNewCollator( bool bCaseSensitive ) const
else
{
p->loadDefaultCollator( maLanguageTag.getLocale(),
- ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
+ css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE );
const_cast<IntlWrapper*>(this)->pCollator = p;
}
}
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 30cfbcf..f520655 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -109,7 +109,7 @@ const LanguageTag& LocaleDataWrapper::getLanguageTag() const
return maLanguageTag;
}
-const ::com::sun::star::lang::Locale& LocaleDataWrapper::getMyLocale() const
+const css::lang::Locale& LocaleDataWrapper::getMyLocale() const
{
::utl::ReadWriteGuard aGuard( aMutex );
return maLanguageTag.getLocale();
@@ -144,7 +144,7 @@ void LocaleDataWrapper::invalidateData()
/* FIXME-BCP47: locale data should provide a language tag instead that could be
* passed on. */
-::com::sun::star::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const
+css::i18n::LanguageCountryInfo LocaleDataWrapper::getLanguageCountryInfo() const
{
try
{
@@ -154,10 +154,10 @@ void LocaleDataWrapper::invalidateData()
{
SAL_WARN( "unotools.i18n", "getLanguageCountryInfo: Exception caught " << e.Message );
}
- return ::com::sun::star::i18n::LanguageCountryInfo();
+ return css::i18n::LanguageCountryInfo();
}
-::com::sun::star::i18n::LocaleDataItem LocaleDataWrapper::getLocaleItem() const
+css::i18n::LocaleDataItem LocaleDataWrapper::getLocaleItem() const
{
try
{
@@ -167,10 +167,10 @@ void LocaleDataWrapper::invalidateData()
{
SAL_WARN( "unotools.i18n", "getLocaleItem: Exception caught " << e.Message );
}
- return ::com::sun::star::i18n::LocaleDataItem();
+ return css::i18n::LocaleDataItem();
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > LocaleDataWrapper::getAllCurrencies() const
+css::uno::Sequence< css::i18n::Currency2 > LocaleDataWrapper::getAllCurrencies() const
{
try
{
@@ -180,10 +180,10 @@ void LocaleDataWrapper::invalidateData()
{
SAL_WARN( "unotools.i18n", "getAllCurrencies: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 >(0);
+ return css::uno::Sequence< css::i18n::Currency2 >(0);
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > LocaleDataWrapper::getAllFormats() const
+css::uno::Sequence< css::i18n::FormatElement > LocaleDataWrapper::getAllFormats() const
{
try
{
@@ -193,10 +193,10 @@ void LocaleDataWrapper::invalidateData()
{
SAL_WARN( "unotools.i18n", "getAllFormats: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement >(0);
+ return css::uno::Sequence< css::i18n::FormatElement >(0);
}
-::com::sun::star::i18n::ForbiddenCharacters LocaleDataWrapper::getForbiddenCharacters() const
+css::i18n::ForbiddenCharacters LocaleDataWrapper::getForbiddenCharacters() const
{
try
{
@@ -206,10 +206,10 @@ void LocaleDataWrapper::invalidateData()
{
SAL_WARN( "unotools.i18n", "getForbiddenCharacters: Exception caught " << e.Message );
}
- return ::com::sun::star::i18n::ForbiddenCharacters();
+ return css::i18n::ForbiddenCharacters();
}
-::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const
+css::uno::Sequence< OUString > LocaleDataWrapper::getReservedWord() const
{
try
{
@@ -219,10 +219,10 @@ void LocaleDataWrapper::invalidateData()
{
SAL_WARN( "unotools.i18n", "getReservedWord: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< OUString >(0);
+ return css::uno::Sequence< OUString >(0);
}
-::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > LocaleDataWrapper::getAllInstalledLocaleNames() const
+css::uno::Sequence< css::lang::Locale > LocaleDataWrapper::getAllInstalledLocaleNames() const
{
uno::Sequence< lang::Locale > &rInstalledLocales = InstalledLocales::get();
@@ -243,7 +243,7 @@ void LocaleDataWrapper::invalidateData()
// --- Impl and helpers ----------------------------------------------------
// static
-::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > LocaleDataWrapper::getInstalledLocaleNames()
+css::uno::Sequence< css::lang::Locale > LocaleDataWrapper::getInstalledLocaleNames()
{
const uno::Sequence< lang::Locale > &rInstalledLocales =
InstalledLocales::get();
@@ -257,7 +257,7 @@ void LocaleDataWrapper::invalidateData()
}
// static
-::com::sun::star::uno::Sequence< sal_uInt16 > LocaleDataWrapper::getInstalledLanguageTypes()
+css::uno::Sequence< sal_uInt16 > LocaleDataWrapper::getInstalledLanguageTypes()
{
uno::Sequence< sal_uInt16 > &rInstalledLanguageTypes =
InstalledLanguageTypes::get();
@@ -265,10 +265,9 @@ void LocaleDataWrapper::invalidateData()
if ( rInstalledLanguageTypes.getLength() )
return rInstalledLanguageTypes;
- ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > xLoc =
- getInstalledLocaleNames();
+ css::uno::Sequence< css::lang::Locale > xLoc = getInstalledLocaleNames();
sal_Int32 nCount = xLoc.getLength();
- ::com::sun::star::uno::Sequence< sal_uInt16 > xLang( nCount );
+ css::uno::Sequence< sal_uInt16 > xLang( nCount );
sal_Int32 nLanguages = 0;
for ( sal_Int32 i=0; i<nCount; i++ )
{
@@ -469,7 +468,7 @@ void LocaleDataWrapper::getDefaultCalendarImpl()
}
}
-const std::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getDefaultCalendar() const
+const std::shared_ptr< css::i18n::Calendar2 > LocaleDataWrapper::getDefaultCalendar() const
{
::utl::ReadWriteGuard aGuard( aMutex );
if (!xDefaultCalendar)
@@ -480,12 +479,12 @@ const std::shared_ptr< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::ge
return xDefaultCalendar;
}
-const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarDays() const
+const css::uno::Sequence< css::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarDays() const
{
return getDefaultCalendar()->Days;
}
-const ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarMonths() const
+const css::uno::Sequence< css::i18n::CalendarItem2 > LocaleDataWrapper::getDefaultCalendarMonths() const
{
return getDefaultCalendar()->Months;
}
@@ -1030,7 +1029,7 @@ void LocaleDataWrapper::getDigitGroupingImpl()
}
}
-const ::com::sun::star::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGrouping() const
+const css::uno::Sequence< sal_Int32 > LocaleDataWrapper::getDigitGrouping() const
{
::utl::ReadWriteGuard aGuard( aMutex );
if (!aGrouping.getLength() || aGrouping[0] == 0)
@@ -1366,7 +1365,7 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa
sal_Int16 nDisplayMonth, bool bTwoDigitYear ) const
{
::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical );
- using namespace ::com::sun::star::i18n;
+ using namespace css::i18n;
sal_Unicode aBuf[20];
sal_Unicode* pBuf;
OUString aStr;
@@ -1737,7 +1736,7 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
// --- XLocaleData3 ----------------------------------------------------------
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 > LocaleDataWrapper::getAllCalendars() const
+css::uno::Sequence< css::i18n::Calendar2 > LocaleDataWrapper::getAllCalendars() const
{
try
{
@@ -1747,12 +1746,12 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
{
SAL_WARN( "unotools.i18n", "getAllCalendars: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar2 >(0);
+ return css::uno::Sequence< css::i18n::Calendar2 >(0);
}
// --- XLocaleData4 ----------------------------------------------------------
-::com::sun::star::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const
+css::uno::Sequence< OUString > LocaleDataWrapper::getDateAcceptancePatterns() const
{
::utl::ReadWriteGuard aGuard( aMutex );
@@ -1771,13 +1770,13 @@ void LocaleDataWrapper::evaluateLocaleDataChecking()
{
SAL_WARN( "unotools.i18n", "getDateAcceptancePatterns: Exception caught " << e.Message );
}
- return ::com::sun::star::uno::Sequence< OUString >(0);
+ return css::uno::Sequence< OUString >(0);
}
// --- Override layer --------------------------------------------------------
void LocaleDataWrapper::setDateAcceptancePatterns(
- const ::com::sun::star::uno::Sequence< OUString > & rPatterns )
+ const css::uno::Sequence< OUString > & rPatterns )
{
::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nWrite );
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx
index 8597ee0..102e765 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.cxx
@@ -39,7 +39,7 @@ NativeNumberWrapper::~NativeNumberWrapper()
OUString
NativeNumberWrapper::getNativeNumberString(
const OUString& rNumberString,
- const ::com::sun::star::lang::Locale& rLocale,
+ const css::lang::Locale& rLocale,
sal_Int16 nNativeNumberMode ) const
{
try
@@ -56,7 +56,7 @@ NativeNumberWrapper::getNativeNumberString(
i18n::NativeNumberXmlAttributes
NativeNumberWrapper::convertToXmlAttributes(
- const ::com::sun::star::lang::Locale& rLocale,
+ const css::lang::Locale& rLocale,
sal_Int16 nNativeNumberMode ) const
{
try
diff --git a/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx
index ff27654..652c757 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.cxx
@@ -40,12 +40,12 @@ NumberFormatCodeWrapper::~NumberFormatCodeWrapper()
{
}
-void NumberFormatCodeWrapper::setLocale( const ::com::sun::star::lang::Locale& rLocale )
+void NumberFormatCodeWrapper::setLocale( const css::lang::Locale& rLocale )
{
aLocale = rLocale;
}
-::com::sun::star::i18n::NumberFormatCode
+css::i18n::NumberFormatCode
NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
{
try
@@ -56,10 +56,10 @@ NumberFormatCodeWrapper::getFormatCode( sal_Int16 formatIndex ) const
{
SAL_WARN( "unotools.i18n", "getFormatCode: Exception caught!" );
}
- return ::com::sun::star::i18n::NumberFormatCode();
+ return css::i18n::NumberFormatCode();
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >
+css::uno::Sequence< css::i18n::NumberFormatCode >
NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const
{
try
@@ -70,10 +70,10 @@ NumberFormatCodeWrapper::getAllFormatCode( sal_Int16 formatUsage ) const
{
SAL_WARN( "unotools.i18n", "getAllFormatCode: Exception caught!" );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
+ return css::uno::Sequence< css::i18n::NumberFormatCode > (0);
}
-::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >
+css::uno::Sequence< css::i18n::NumberFormatCode >
NumberFormatCodeWrapper::getAllFormatCodes() const
{
try
@@ -84,7 +84,7 @@ NumberFormatCodeWrapper::getAllFormatCodes() const
{
SAL_WARN( "unotools.i18n", "getAllFormatCodes: Exception caught!" );
}
- return ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > (0);
+ return css::uno::Sequence< css::i18n::NumberFormatCode > (0);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index b469126..d1b4678 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.cxx
@@ -98,8 +98,8 @@ namespace
struct CachedTextSearch
{
::osl::Mutex mutex;
- ::com::sun::star::util::SearchOptions Options;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XTextSearch > xTextSearch;
+ css::util::SearchOptions Options;
+ css::uno::Reference< css::util::XTextSearch > xTextSearch;
};
struct theCachedTextSearch
@@ -127,7 +127,7 @@ TextSearch::TextSearch(const SearchParam & rParam, LanguageType eLang )
{
if( LANGUAGE_NONE == eLang )
eLang = LANGUAGE_SYSTEM;
- ::com::sun::star::lang::Locale aLocale( LanguageTag::convertToLocale( eLang ) );
+ css::lang::Locale aLocale( LanguageTag::convertToLocale( eLang ) );
Init( rParam, aLocale);
}
@@ -143,7 +143,7 @@ TextSearch::TextSearch( const SearchOptions& rPara )
}
void TextSearch::Init( const SearchParam & rParam,
- const ::com::sun::star::lang::Locale& rLocale )
+ const css::lang::Locale& rLocale )
{
// convert SearchParam to the UNO SearchOptions
SearchOptions aSOpt;
@@ -180,14 +180,14 @@ void TextSearch::Init( const SearchParam & rParam,
if( !rParam.IsCaseSensitive() )
{
aSOpt.searchFlag |= SearchFlags::ALL_IGNORE_CASE;
- aSOpt.transliterateFlags |= ::com::sun::star::i18n::TransliterationModules_IGNORE_CASE;
+ aSOpt.transliterateFlags |= css::i18n::TransliterationModules_IGNORE_CASE;
}
xTextSearch = getXTextSearch( aSOpt );
}
-void TextSearch::SetLocale( const ::com::sun::star::util::SearchOptions& rOptions,
- const ::com::sun::star::lang::Locale& rLocale )
+void TextSearch::SetLocale( const css::util::SearchOptions& rOptions,
+ const css::lang::Locale& rLocale )
{
// convert SearchParam to the UNO SearchOptions
SearchOptions aSOpt( rOptions );
@@ -207,7 +207,7 @@ TextSearch::~TextSearch()
*/
bool TextSearch::SearchForward( const OUString &rStr,
sal_Int32* pStart, sal_Int32* pEnd,
- ::com::sun::star::util::SearchResult* pRes)
+ css::util::SearchResult* pRes)
{
bool bRet = false;
try
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index a83f173..a62e54e 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -163,7 +163,7 @@ void TransliterationWrapper::loadModuleByImplName(const OUString& rModuleName,
try
{
setLanguageLocaleImpl( nLang );
- com::sun::star::lang::Locale aLocale( aLanguageTag.getLocale());
+ css::lang::Locale aLocale( aLanguageTag.getLocale());
// Reset LanguageTag, so the next call to loadModuleIfNeeded() forces
// new settings.
aLanguageTag.reset( LANGUAGE_DONTKNOW);
diff --git a/unotools/source/misc/ServiceDocumenter.hxx b/unotools/source/misc/ServiceDocumenter.hxx
index 031a7efc..fd62461 100644
--- a/unotools/source/misc/ServiceDocumenter.hxx
+++ b/unotools/source/misc/ServiceDocumenter.hxx
@@ -16,10 +16,10 @@
namespace unotools { namespace misc {
class ServiceDocumenter : public ::cppu::WeakImplHelper<
- ::com::sun::star::script::XServiceDocumenter>
+ css::script::XServiceDocumenter>
{
public:
- ServiceDocumenter(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const& xContext)
+ ServiceDocumenter(css::uno::Reference< css::uno::XComponentContext> const& xContext)
: m_xContext(xContext)
, m_sCoreBaseUrl("http://example.com")
, m_sServiceBaseUrl("http://api.libreoffice.org/docs/idl/ref")
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index 3c9114f..08e353f 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -71,7 +71,7 @@ namespace utl
virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException, std::exception) 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;
};
OObserverImpl::OObserverImpl()
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index ef825ea..9eaa1bd 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -107,7 +107,7 @@ namespace utl
stopAllComponentListening( );
}
- void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp )
+ void OEventListenerAdapter::stopComponentListening( const css::uno::Reference< css::lang::XComponent >& _rxComp )
{
if ( m_pImpl->aListeners.empty() )
return;
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 41bb5b5..9734347 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -446,7 +446,7 @@ void MediaDescriptor::clearComponentDataEntry( const OUString& rName )
}
}
-::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > MediaDescriptor::requestAndVerifyDocPassword(
+css::uno::Sequence< css::beans::NamedValue > MediaDescriptor::requestAndVerifyDocPassword(
comphelper::IDocPasswordVerifier& rVerifier,
comphelper::DocPasswordRequestType eRequestType,
const ::std::vector< OUString >* pDefaultPasswords )
@@ -526,7 +526,7 @@ bool MediaDescriptor::impl_addInputStream( bool bLockFile )
}
bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
if ( !_rxPostData.is() )
throw css::lang::IllegalArgumentException("Found invalid PostData.",
@@ -596,7 +596,7 @@ bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< cs
/*-----------------------------------------------*/
bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFile )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(css::uno::RuntimeException)
{
OUString referer(getUnpackedValueOrDefault(PROP_REFERRER(), OUString()));
if (SvtSecurityOptions().isUntrustedReferer(referer)) {
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 8cdde62..cbe74f9 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -91,7 +91,7 @@ namespace utl
virtual void SAL_CALL notifyClosing( const EventObject& Source ) throw (RuntimeException, std::exception) override;
// XEventListener overridables
- 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;
private:
/** starts or stops being a CloseListener at the component
diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index f655217..5d54883 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.hxx
@@ -35,13 +35,13 @@ class SvStream;
namespace utl { class TempFile; }
-typedef ::cppu::WeakImplHelper< ::com::sun::star::io::XTempFile
- , ::com::sun::star::io::XInputStream
- , ::com::sun::star::io::XOutputStream
- , ::com::sun::star::io::XTruncate > OTempFileBase;
+typedef ::cppu::WeakImplHelper< css::io::XTempFile
+ , css::io::XInputStream
+ , css::io::XOutputStream
+ , css::io::XTruncate > OTempFileBase;
class OTempFileService : public OTempFileBase
- , public ::cppu::PropertySetMixin< ::com::sun::star::io::XTempFile >
+ , public ::cppu::PropertySetMixin< css::io::XTempFile >
{
protected:
::utl::TempFile* mpTempFile;
@@ -58,65 +58,65 @@ protected:
void checkConnected ();
public:
- explicit OTempFileService (::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
+ explicit OTempFileService (css::uno::Reference< css::uno::XComponentContext > const & context);
//Methods
// 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 ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( )
- 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;
+ virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( )
+ throw (css::uno::RuntimeException, std::exception) override;
// XTempFile
virtual sal_Bool SAL_CALL getRemoveFile()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setRemoveFile( sal_Bool _removefile )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getUri()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getResourceName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
// XInputStream
- virtual ::sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL readBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead )
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead )
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual ::sal_Int32 SAL_CALL available( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL closeInput( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
// XOutputStream
- virtual void SAL_CALL writeBytes( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aData )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData )
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL flush( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL closeOutput( )
- throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
// XSeekable
virtual void SAL_CALL seek( sal_Int64 location )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int64 SAL_CALL getPosition( )
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual sal_Int64 SAL_CALL getLength( )
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
// XStream
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( )
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( )
+ throw (css::uno::RuntimeException, std::exception) override;
// XTruncate
virtual void SAL_CALL truncate()
- throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
virtual ~OTempFileService ();
};
diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 266f20f..4566851 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.cxx
@@ -38,7 +38,7 @@ namespace utl
typedef ::std::vector< OUString* > StringList_Impl;
-::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
+css::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder )
{
StringList_Impl* pFiles = nullptr;
try
@@ -46,15 +46,15 @@ typedef ::std::vector< OUString* > StringList_Impl;
::ucbhelper::Content aCnt(
rFolder, Reference< XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
- Reference< ::com::sun::star::sdbc::XResultSet > xResultSet;
- ::com::sun::star::uno::Sequence< OUString > aProps { "Url" };
+ Reference< css::sdbc::XResultSet > xResultSet;
+ css::uno::Sequence< OUString > aProps { "Url" };
try
{
::ucbhelper::ResultSetInclude eInclude = bFolder ? ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ::ucbhelper::INCLUDE_DOCUMENTS_ONLY;
xResultSet = aCnt.createCursor( aProps, eInclude );
}
- catch( ::com::sun::star::ucb::CommandAbortedException& )
+ catch( css::ucb::CommandAbortedException& )
{
}
catch( Exception& )
@@ -74,7 +74,7 @@ typedef ::std::vector< OUString* > StringList_Impl;
pFiles->push_back( pFile );
}
}
- catch( ::com::sun::star::ucb::CommandAbortedException& )
+ catch( css::ucb::CommandAbortedException& )
{
}
catch( Exception& )
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 60f2c78..b84882f 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::task;
using namespace ::com::sun::star::ucb;
-ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > xSI )
+ProgressHandlerWrap::ProgressHandlerWrap( css::uno::Reference< css::task::XStatusIndicator > xSI )
: m_xStatusIndicator( xSI )
{
}
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index fa093d7..53be962 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -114,10 +114,8 @@ OUString ConstructTempDir_Impl( const OUString* pParent )
OUString aName;
if ( pParent && !pParent->isEmpty() )
{
- com::sun::star::uno::Reference<
- com::sun::star::ucb::XUniversalContentBroker > pBroker(
- com::sun::star::ucb::UniversalContentBroker::create(
- comphelper::getProcessComponentContext() ) );
+ css::uno::Reference< css::ucb::XUniversalContentBroker > pBroker(
+ css::ucb::UniversalContentBroker::create( comphelper::getProcessComponentContext() ) );
// test for valid filename
OUString aRet;
diff --git a/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 11b7867..5519419 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.cxx
@@ -85,11 +85,8 @@ std::vector<OUString> getContents(OUString const & url) {
std::vector<OUString> cs;
ucbhelper::Content c(content(url));
css::uno::Sequence<OUString> args { "Title" };
- css::uno::Reference<css::sdbc::XResultSet> res(
- c.createCursor(args),
- css::uno::UNO_SET_THROW);
- css::uno::Reference<com::sun::star::ucb::XContentAccess> acc(
- res, css::uno::UNO_QUERY_THROW);
+ css::uno::Reference<css::sdbc::XResultSet> res( c.createCursor(args), css::uno::UNO_SET_THROW);
+ css::uno::Reference<css::ucb::XContentAccess> acc( res, css::uno::UNO_QUERY_THROW);
while (res->next()) {
cs.push_back(acc->queryContentIdentifierString());
}
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 6c825bd..107aa83 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1209,7 +1209,7 @@ ErrCode UcbLockBytes::ReadAt(sal_uInt64 const nPos,
{
return ERRCODE_IO_CANTSEEK;
}
- catch (const com::sun::star::lang::IllegalArgumentException&)
+ catch (const css::lang::IllegalArgumentException&)
{
return ERRCODE_IO_CANTSEEK;
}
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx
index 00805d1..cf1636e 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -86,9 +86,9 @@ class UcbLockBytes : public virtual SvLockBytes
OUString m_aRealURL;
DateTime m_aExpireDate;
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInputStream;
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > m_xOutputStream;
- ::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable;
+ css::uno::Reference < css::io::XInputStream > m_xInputStream;
+ css::uno::Reference < css::io::XOutputStream > m_xOutputStream;
+ css::uno::Reference < css::io::XSeekable > m_xSeekable;
UcbLockBytesHandlerRef m_xHandler;
ErrCode m_nError;
@@ -103,14 +103,14 @@ protected:
public:
// properties: Referer, PostMimeType
- static UcbLockBytesRef CreateLockBytes( const ::com::sun::star::uno::Reference < ::com::sun::star::ucb::XContent >& xContent,
- const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& rProps,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list