[Libreoffice-commits] core.git: eventattacher/source extensions/source extensions/test extensions/workben
Noel Grandin
noel at peralex.com
Thu Oct 1 03:19:47 PDT 2015
eventattacher/source/eventattacher.cxx | 8
extensions/source/abpilot/abspage.hxx | 2
extensions/source/abpilot/abspilot.hxx | 6
extensions/source/abpilot/admininvokationimpl.cxx | 2
extensions/source/abpilot/admininvokationimpl.hxx | 10
extensions/source/abpilot/datasourcehandling.hxx | 8
extensions/source/abpilot/fieldmappingimpl.hxx | 12
extensions/source/abpilot/unodialogabp.cxx | 2
extensions/source/abpilot/unodialogabp.hxx | 28 -
extensions/source/bibliography/bibbeam.hxx | 14
extensions/source/bibliography/bibconfig.cxx | 2
extensions/source/bibliography/bibconfig.hxx | 16
extensions/source/bibliography/bibcont.hxx | 8
extensions/source/bibliography/bibload.cxx | 10
extensions/source/bibliography/bibview.hxx | 16
extensions/source/bibliography/datman.cxx | 24 -
extensions/source/bibliography/datman.hxx | 94 ++---
extensions/source/bibliography/formcontrolcontainer.cxx | 10
extensions/source/bibliography/formcontrolcontainer.hxx | 21 -
extensions/source/bibliography/framectr.cxx | 62 +--
extensions/source/bibliography/framectr.hxx | 92 ++---
extensions/source/bibliography/general.cxx | 6
extensions/source/bibliography/general.hxx | 28 -
extensions/source/bibliography/loadlisteneradapter.hxx | 39 +-
extensions/source/bibliography/toolbar.cxx | 6
extensions/source/bibliography/toolbar.hxx | 36 +-
extensions/source/config/ldap/ldapaccess.hxx | 2
extensions/source/dbpilots/commonpagesdbp.hxx | 8
extensions/source/dbpilots/controlwizard.hxx | 26 -
extensions/source/dbpilots/dbptools.hxx | 2
extensions/source/dbpilots/gridwizard.hxx | 6
extensions/source/dbpilots/groupboxwiz.hxx | 4
extensions/source/dbpilots/listcombowizard.hxx | 10
extensions/source/dbpilots/optiongrouplayouter.cxx | 8
extensions/source/dbpilots/optiongrouplayouter.hxx | 6
extensions/source/dbpilots/unoautopilot.hxx | 29 -
extensions/source/dbpilots/wizardcontext.hxx | 18 -
extensions/source/dbpilots/wizardservices.hxx | 6
extensions/source/inc/componentmodule.hxx | 32 -
extensions/source/logging/consolehandler.cxx | 4
extensions/source/logging/csvformatter.cxx | 6
extensions/source/logging/filehandler.cxx | 4
extensions/source/logging/loggerconfig.cxx | 2
extensions/source/logging/loggerconfig.hxx | 2
extensions/source/logging/loghandler.hxx | 18 -
extensions/source/logging/logrecord.hxx | 4
extensions/source/ole/oleobjw.hxx | 12
extensions/source/plugin/base/context.cxx | 142 ++++----
extensions/source/plugin/base/evtlstnr.cxx | 2
extensions/source/plugin/base/manager.cxx | 36 +-
extensions/source/plugin/base/multiplx.cxx | 184 +++++------
extensions/source/plugin/base/nfuncs.cxx | 22 -
extensions/source/plugin/base/plctrl.cxx | 128 +++----
extensions/source/plugin/base/plmodel.cxx | 54 +--
extensions/source/plugin/base/service.cxx | 6
extensions/source/plugin/base/xplugin.cxx | 46 +-
extensions/source/plugin/inc/plugin/impl.hxx | 112 +++---
extensions/source/plugin/inc/plugin/model.hxx | 32 -
extensions/source/plugin/inc/plugin/multiplx.hxx | 88 ++---
extensions/source/plugin/inc/plugin/plctrl.hxx | 124 +++----
extensions/source/propctrlr/MasterDetailLinkDialog.hxx | 24 -
extensions/source/propctrlr/browserline.hxx | 23 -
extensions/source/propctrlr/browserlistbox.cxx | 6
extensions/source/propctrlr/browserlistbox.hxx | 30 -
extensions/source/propctrlr/browserview.cxx | 4
extensions/source/propctrlr/browserview.hxx | 2
extensions/source/propctrlr/buttonnavigationhandler.hxx | 32 -
extensions/source/propctrlr/cellbindinghandler.hxx | 23 -
extensions/source/propctrlr/cellbindinghelper.hxx | 60 +--
extensions/source/propctrlr/commoncontrol.hxx | 58 +--
extensions/source/propctrlr/composeduiupdate.cxx | 2
extensions/source/propctrlr/composeduiupdate.hxx | 16
extensions/source/propctrlr/controlfontdialog.hxx | 24 -
extensions/source/propctrlr/defaultforminspection.hxx | 20 -
extensions/source/propctrlr/defaulthelpprovider.hxx | 26 -
extensions/source/propctrlr/editpropertyhandler.hxx | 20 -
extensions/source/propctrlr/eformshelper.cxx | 2
extensions/source/propctrlr/eformshelper.hxx | 50 +-
extensions/source/propctrlr/eformspropertyhandler.hxx | 40 +-
extensions/source/propctrlr/enumrepresentation.hxx | 4
extensions/source/propctrlr/eventhandler.cxx | 8
extensions/source/propctrlr/eventhandler.hxx | 86 ++---
extensions/source/propctrlr/fontdialog.cxx | 22 -
extensions/source/propctrlr/fontdialog.hxx | 6
extensions/source/propctrlr/formbrowsertools.hxx | 22 -
extensions/source/propctrlr/formcomponenthandler.cxx | 2
extensions/source/propctrlr/formcomponenthandler.hxx | 100 ++---
extensions/source/propctrlr/formcontroller.cxx | 4
extensions/source/propctrlr/formcontroller.hxx | 38 +-
extensions/source/propctrlr/formgeometryhandler.cxx | 16
extensions/source/propctrlr/formlinkdialog.hxx | 46 +-
extensions/source/propctrlr/formmetadata.hxx | 8
extensions/source/propctrlr/genericpropertyhandler.cxx | 4
extensions/source/propctrlr/genericpropertyhandler.hxx | 74 ++--
extensions/source/propctrlr/handlerhelper.hxx | 62 +--
extensions/source/propctrlr/inspectormodelbase.cxx | 6
extensions/source/propctrlr/inspectormodelbase.hxx | 36 +-
extensions/source/propctrlr/linedescriptor.hxx | 12
extensions/source/propctrlr/listselectiondlg.hxx | 14
extensions/source/propctrlr/pcrcommon.hxx | 20 -
extensions/source/propctrlr/pcrcommontypes.hxx | 2
extensions/source/propctrlr/pcrunodialogs.hxx | 24 -
extensions/source/propctrlr/propcontroller.cxx | 12
extensions/source/propctrlr/propcontroller.hxx | 142 ++++----
extensions/source/propctrlr/propcontrolobserver.hxx | 4
extensions/source/propctrlr/propertycomposer.hxx | 64 +--
extensions/source/propctrlr/propertycontrolextender.hxx | 10
extensions/source/propctrlr/propertyeditor.hxx | 10
extensions/source/propctrlr/propertyhandler.hxx | 136 ++++----
extensions/source/propctrlr/propeventtranslation.hxx | 16
extensions/source/propctrlr/proplinelistener.hxx | 2
extensions/source/propctrlr/pushbuttonnavigation.hxx | 18 -
extensions/source/propctrlr/selectlabeldialog.hxx | 22 -
extensions/source/propctrlr/sqlcommanddesign.hxx | 26 -
extensions/source/propctrlr/standardcontrol.cxx | 4
extensions/source/propctrlr/standardcontrol.hxx | 130 +++----
extensions/source/propctrlr/submissionhandler.hxx | 40 +-
extensions/source/propctrlr/taborder.hxx | 26 -
extensions/source/propctrlr/unourl.hxx | 6
extensions/source/propctrlr/usercontrol.cxx | 4
extensions/source/propctrlr/usercontrol.hxx | 26 -
extensions/source/propctrlr/xsddatatypes.hxx | 23 -
extensions/source/propctrlr/xsdvalidationhelper.hxx | 12
extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx | 34 +-
extensions/source/resource/ResourceIndexAccess.cxx | 14
extensions/source/resource/ResourceIndexAccess.hxx | 16
extensions/source/resource/oooresourceloader.cxx | 18 -
extensions/source/resource/oooresourceloader.hxx | 14
extensions/source/scanner/scanner.cxx | 2
extensions/source/scanner/scanner.hxx | 6
extensions/source/scanner/scanunx.cxx | 14
extensions/source/scanner/scnserv.cxx | 8
extensions/source/update/check/download.cxx | 2
extensions/source/update/check/download.hxx | 4
extensions/source/update/check/updatecheck.hxx | 10
extensions/source/update/check/updatecheckconfig.cxx | 7
extensions/source/update/check/updatecheckconfig.hxx | 84 ++---
extensions/source/update/check/updatecheckjob.cxx | 4
extensions/source/update/check/updatehdl.cxx | 2
extensions/source/update/check/updatehdl.hxx | 60 +--
extensions/source/update/check/updateprotocol.hxx | 22 -
extensions/source/update/check/updateprotocoltest.cxx | 2
extensions/source/update/feed/updatefeed.cxx | 4
extensions/test/ole/DCOM/scriptComponents/WriterDemo.wsc | 4
extensions/test/ole/cpnt/cpnt.cxx | 12
extensions/workben/testpgp.cxx | 6
146 files changed, 1947 insertions(+), 1960 deletions(-)
New commits:
commit f1de3e14df9665ce48d676ac6f3439506d2b81f2
Author: Noel Grandin <noel at peralex.com>
Date: Wed Sep 30 11:48:44 2015 +0200
com::sun::star->css in extensions/
Change-Id: I64af9f5ae444e1f7bc6c0e8c29df383a9531dba9
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 207626d..48e0728 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -241,7 +241,7 @@ public:
// XEventAttacher2
virtual Sequence< Reference<XEventListener> > SAL_CALL attachMultipleEventListeners(
- const Reference<XInterface>& xObject, const Sequence<com::sun::star::script::EventListener>& aListeners )
+ const Reference<XInterface>& xObject, const Sequence<css::script::EventListener>& aListeners )
throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception ) SAL_OVERRIDE;
// used by FilterAllListener_Impl
@@ -262,7 +262,7 @@ private:
Sequence< Reference<XEventListener> > attachListeners(
const Reference<XInterface>& xObject,
const Sequence< Reference<XAllListener> >& AllListeners,
- const Sequence<com::sun::star::script::EventListener>& aListeners );
+ const Sequence<css::script::EventListener>& aListeners );
private:
Mutex m_aMutex;
@@ -702,7 +702,7 @@ Reference<XEventListener> EventAttacherImpl::attachListenerForTarget(
Sequence< Reference<XEventListener> > EventAttacherImpl::attachListeners(
const Reference<XInterface>& xObject,
const Sequence< Reference<XAllListener> >& AllListeners,
- const Sequence<com::sun::star::script::EventListener>& aListeners )
+ const Sequence<css::script::EventListener>& aListeners )
{
sal_Int32 nCount = aListeners.getLength();
if (nCount != AllListeners.getLength())
@@ -872,7 +872,7 @@ void EventAttacherImpl::removeListener
}
Sequence< Reference<XEventListener> > EventAttacherImpl::attachMultipleEventListeners(
- const Reference<XInterface>& xObject, const Sequence<com::sun::star::script::EventListener>& aListeners )
+ const Reference<XInterface>& xObject, const Sequence<css::script::EventListener>& aListeners )
throw( IllegalArgumentException, ServiceNotRegisteredException, CannotCreateAdapterException, IntrospectionException, RuntimeException, std::exception )
{
sal_Int32 nCount = aListeners.getLength();
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 9203d9e..f67d103 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -45,7 +45,7 @@ namespace abp
// helper
OAddessBookSourcePilot* getDialog();
const OAddessBookSourcePilot* getDialog() const;
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &
+ const css::uno::Reference< css::uno::XComponentContext > &
getORB();
AddressSettings& getSettings();
const AddressSettings& getSettings() const;
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 93ed1989..cc31b20 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -33,7 +33,7 @@ namespace abp
class OAddessBookSourcePilot : public OAddessBookSourcePilot_Base
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+ css::uno::Reference< css::uno::XComponentContext >
m_xORB;
AddressSettings m_aSettings;
@@ -44,10 +44,10 @@ namespace abp
/// ctor
OAddessBookSourcePilot(
vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
+ const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
/// get the service factory which was used to create the dialog
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&
+ const css::uno::Reference< css::uno::XComponentContext >&
getORB() { return m_xORB; }
AddressSettings& getSettings() { return m_aSettings; }
const AddressSettings& getSettings() const { return m_aSettings; }
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index ce37d52..33cdc09 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -43,7 +43,7 @@ namespace abp
using namespace ::com::sun::star::sdbc;
OAdminDialogInvokation::OAdminDialogInvokation(const Reference< XComponentContext >& _rxContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource
+ const css::uno::Reference< css::beans::XPropertySet >& _rxDataSource
, vcl::Window* _pMessageParent)
:m_xContext(_rxContext)
,m_xDataSource(_rxDataSource)
diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx
index 9dc5d3b..5e1e38a 100644
--- a/extensions/source/abpilot/admininvokationimpl.hxx
+++ b/extensions/source/abpilot/admininvokationimpl.hxx
@@ -34,15 +34,15 @@ namespace abp
class OAdminDialogInvokation
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- m_xContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource;
+ css::uno::Reference< css::uno::XComponentContext >
+ m_xContext;
+ css::uno::Reference< css::beans::XPropertySet > m_xDataSource;
VclPtr<vcl::Window> m_pMessageParent;
public:
OAdminDialogInvokation(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rDataSource,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
+ const css::uno::Reference< css::beans::XPropertySet >& _rDataSource,
vcl::Window* _pMessageParent
);
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 656409f..c2b83ae 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -49,7 +49,7 @@ namespace abp
public:
explicit ODataSourceContext(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
+ const css::uno::Reference< css::uno::XComponentContext >& _rxORB
);
~ODataSourceContext();
@@ -113,7 +113,7 @@ namespace abp
/// constructs an object which is initially invalid
explicit ODataSource(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB
+ const css::uno::Reference< css::uno::XComponentContext >& _rxORB
);
/// copy ctor
@@ -176,7 +176,7 @@ namespace abp
bool hasTable( const OUString& _rTableName ) const;
/// return the intern data source object
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDataSource() const;
+ css::uno::Reference< css::beans::XPropertySet > getDataSource() const;
@@ -184,7 +184,7 @@ namespace abp
<p>Available to selected clients only</p>
*/
void setDataSource(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDS
+ const css::uno::Reference< css::beans::XPropertySet >& _rxDS
,const OUString& _sName
,PackageAccessControl
);
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index 7ac1e5f..5f1b539 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -60,9 +60,9 @@ namespace abp
field mapping dialog.
*/
bool invokeDialog(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxORB,
class vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDataSource,
+ const css::uno::Reference< css::beans::XPropertySet >& _rxDataSource,
AddressSettings& _rSettings
);
@@ -72,7 +72,7 @@ namespace abp
and this function creates a mapping which uses this configuration information.</p>
*/
void defaultMapping(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
MapString2String& /* [out] */ _rFieldAssignment
);
@@ -80,7 +80,7 @@ namespace abp
/** writes a field mapping for the template document address source
*/
void writeTemplateAddressFieldMapping(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
const MapString2String& _rFieldAssignment
);
@@ -98,7 +98,7 @@ namespace abp
expect it.
*/
void writeTemplateAddressSource(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
const OUString& _rDataSourceName,
const OUString& _rTableName
);
@@ -106,7 +106,7 @@ namespace abp
/** writes the configuration entry which states the pilot has been completed successfully
*/
void markPilotSuccess(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 6077f01..43ee209 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -165,7 +165,7 @@ namespace abp
// User has one chance to accept it or not.
// (or he can start it again by using wizard-menu!)
// So we should deregister it on our general job execution service by using right protocol parameters.
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lProtocol(1);
+ css::uno::Sequence< css::beans::NamedValue > lProtocol(1);
lProtocol[0].Name = "Deactivate";
lProtocol[0].Value <<= sal_True;
return makeAny( lProtocol );
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index ba4c620..7bc0520 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -32,7 +32,7 @@ namespace abp
class OABSPilotUno;
typedef ::svt::OGenericUnoDialog OABSPilotUno_DBase;
- typedef ::cppu::ImplHelper1< ::com::sun::star::task::XJob > OABSPilotUno_JBase;
+ typedef ::cppu::ImplHelper1< css::task::XJob > OABSPilotUno_JBase;
typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno > OABSPilotUno_PBase;
/// the UNO wrapper for the address book source pilot
class OABSPilotUno
@@ -42,40 +42,40 @@ namespace abp
,public OABSPilotUno_PBase
{
OUString m_sDataSourceName;
- OABSPilotUno(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
+ OABSPilotUno(const css::uno::Reference< css::uno::XComponentContext >& _rxORB);
public:
// XInterface (disambiguation)
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE;
virtual void SAL_CALL release( ) throw () SAL_OVERRIDE;
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo - static methods
- static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( ::com::sun::star::uno::RuntimeException );
- static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&);
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw( css::uno::RuntimeException );
+ static OUString getImplementationName_Static() throw( css::uno::RuntimeException );
+ static css::uno::Reference< css::uno::XInterface >
+ SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&);
// XPropertySet
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE;
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE;
// XJob
- virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& lArgs ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL execute( const css::uno::Sequence< css::beans::NamedValue >& lArgs ) throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XInitialisation
- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
using OABSPilotUno_DBase::execute;
protected:
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index 9d165bb..3726f7a 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -44,10 +44,10 @@ namespace bib
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xController;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xToolBarRef;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xGridRef;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xGridWin;
+ css::uno::Reference< css::frame::XController > m_xController;
+ css::uno::Reference< css::frame::XFrame > m_xToolBarRef;
+ css::uno::Reference< css::frame::XFrame > m_xGridRef;
+ css::uno::Reference< css::awt::XWindow > m_xGridWin;
BibDataManager* pDatMan;
VclPtr<BibToolBar> pToolBar;
@@ -61,17 +61,17 @@ namespace bib
void createGridWin();
// FormControlContainer ----------
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+ virtual css::uno::Reference< css::awt::XControlContainer >
getControlContainer() SAL_OVERRIDE;
public:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception >
+ css::uno::Reference< css::frame::XDispatchProviderInterception >
getDispatchProviderInterception();
BibBeamer(vcl::Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK );
virtual ~BibBeamer();
virtual void dispose() SAL_OVERRIDE;
- void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
+ void SetXController(const css::uno::Reference< css::frame::XController > &);
virtual void GetFocus() SAL_OVERRIDE;
};
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 649ff8a..0a8b0ac 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -213,7 +213,7 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc)
SetModified();
};
-void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& )
+void BibConfig::Notify( const css::uno::Sequence<OUString>& )
{
}
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index 341f05d..b2a36de 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -101,7 +101,7 @@ class BibConfig : public utl::ConfigItem
OUString aColumnDefaults[COLUMN_COUNT];
- static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+ static css::uno::Sequence<OUString> GetPropertyNames();
virtual void ImplCommit() SAL_OVERRIDE;
@@ -109,7 +109,7 @@ public:
BibConfig();
virtual ~BibConfig();
- virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE;
+ virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE;
BibDBDescriptor GetBibliographyURL();
void SetBibliographyURL(const BibDBDescriptor& rDesc);
@@ -117,7 +117,7 @@ public:
const Mapping* GetMapping(const BibDBDescriptor& rDesc) const;
void SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping);
- const OUString& GetDefColumnName(sal_uInt16 nIndex) const
+ const OUString& GetDefColumnName(sal_uInt16 nIndex) const
{return aColumnDefaults[nIndex];}
@@ -126,13 +126,13 @@ public:
void setViewSize(long nSize) {SetModified(); nViewSize = nSize;}
long getViewSize() {return nViewSize;}
- const OUString& getQueryField() const {return sQueryField;}
+ const OUString& getQueryField() const {return sQueryField;}
void setQueryField(const OUString& rSet) {SetModified(); sQueryField = rSet;}
- const OUString& getQueryText() const {return sQueryText;}
+ const OUString& getQueryText() const {return sQueryText;}
void setQueryText(const OUString& rSet) {SetModified(); sQueryText = rSet;}
- bool IsShowColumnAssignmentWarning() const
+ bool IsShowColumnAssignmentWarning() const
{ return bShowColumnAssignmentWarning;}
void SetShowColumnAssignmentWarning(bool bSet)
{ bShowColumnAssignmentWarning = bSet;}
@@ -140,12 +140,12 @@ public:
class DBChangeDialogConfig_Impl
{
- com::sun::star::uno::Sequence<OUString> aSourceNames;
+ css::uno::Sequence<OUString> aSourceNames;
public:
DBChangeDialogConfig_Impl();
~DBChangeDialogConfig_Impl();
- const com::sun::star::uno::Sequence<OUString>& GetDataSourceNames();
+ const css::uno::Sequence<OUString>& GetDataSourceNames();
};
#endif
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 580e722..a79a394 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -64,11 +64,11 @@ class BibBookContainer: public BibSplitWindow
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xTopFrameRef;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xBottomFrameRef;
+ css::uno::Reference< css::frame::XFrame > xTopFrameRef;
+ css::uno::Reference< css::frame::XFrame > xBottomFrameRef;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xTopPeerRef;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xBottomPeerRef;
+ css::uno::Reference< css::awt::XWindow > xTopPeerRef;
+ css::uno::Reference< css::awt::XWindow > xBottomPeerRef;
VclPtr<BibWindowContainer> pTopWin;
VclPtr<BibWindowContainer> pBottomWin;
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index cb3b7f8..0292af0 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -133,8 +133,8 @@ public:
// XLoader
virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL,
const Sequence< PropertyValue >& aArgs,
- const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ const Reference< XLoadEventListener > & aListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
BibliographyLoader::BibliographyLoader() :
@@ -213,7 +213,7 @@ extern "C"
}
-void BibliographyLoader::cancel() throw (::com::sun::star::uno::RuntimeException, std::exception)
+void BibliographyLoader::cancel() throw (css::uno::RuntimeException, std::exception)
{
//!
//!
@@ -221,7 +221,7 @@ void BibliographyLoader::cancel() throw (::com::sun::star::uno::RuntimeException
void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL,
const Sequence< PropertyValue >& rArgs,
- const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException, std::exception)
+ const Reference< XLoadEventListener > & rListener) throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -308,7 +308,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUSt
// attach menu bar
Reference< XPropertySet > xPropSet( rFrame, UNO_QUERY );
- Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
+ Reference< css::frame::XLayoutManager > xLayoutManager;
if ( xPropSet.is() )
{
try
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index bfa6f57..37b970c 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -41,11 +41,11 @@ namespace bib
VclPtr<BibView> mpBibView;
protected:
// FormControlContainer
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+ virtual css::uno::Reference< css::awt::XControlContainer >
getControlContainer() SAL_OVERRIDE;
// XLoadListener equivalents
- virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
- virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
+ virtual void _loaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE;
+ virtual void _reloaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE;
public:
using FormControlContainer::connectForm;
using FormControlContainer::disconnectForm;
@@ -56,11 +56,11 @@ namespace bib
class BibView : public BibWindow
{
private:
- BibDataManager* m_pDatMan;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable> m_xDatMan;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener> m_xGeneralPage;
- VclPtr<BibGeneralPage> m_pGeneralPage;
- BibViewFormControlContainer m_aFormControlContainer;
+ BibDataManager* m_pDatMan;
+ css::uno::Reference< css::form::XLoadable> m_xDatMan;
+ css::uno::Reference< css::awt::XFocusListener> m_xGeneralPage;
+ VclPtr<BibGeneralPage> m_pGeneralPage;
+ BibViewFormControlContainer m_aFormControlContainer;
private:
DECL_LINK_TYPED(CallMappingHdl, void*, void);
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 961be40..c61520d 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -535,7 +535,7 @@ OUString DBChangeDialog_Impl::GetCurrentURL()const
}
// XDispatchProvider
-BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch)
+BibInterceptorHelper::BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, css::uno::Reference< css::frame::XDispatch > xDispatch)
{
if( pBibBeamer )
{
@@ -558,8 +558,8 @@ void BibInterceptorHelper::ReleaseInterceptor()
xInterception.clear();
}
-::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL
- BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XDispatch > SAL_CALL
+ BibInterceptorHelper::queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (css::uno::RuntimeException, std::exception)
{
Reference< XDispatch > xReturn;
@@ -573,8 +573,8 @@ void BibInterceptorHelper::ReleaseInterceptor()
return xReturn;
}
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL
- BibInterceptorHelper::queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
+ BibInterceptorHelper::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw (css::uno::RuntimeException, std::exception)
{
Sequence< Reference< XDispatch> > aReturn( aDescripts.getLength() );
Reference< XDispatch >* pReturn = aReturn.getArray();
@@ -587,24 +587,24 @@ void BibInterceptorHelper::ReleaseInterceptor()
}
// XDispatchProviderInterceptor
-::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL
- BibInterceptorHelper::getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
+ BibInterceptorHelper::getSlaveDispatchProvider( ) throw (css::uno::RuntimeException, std::exception)
{
return xSlaveDispatchProvider;
}
-void SAL_CALL BibInterceptorHelper::setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL BibInterceptorHelper::setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (css::uno::RuntimeException, std::exception)
{
xSlaveDispatchProvider = xNewSlaveDispatchProvider;
}
-::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL
- BibInterceptorHelper::getMasterDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL
+ BibInterceptorHelper::getMasterDispatchProvider( ) throw (css::uno::RuntimeException, std::exception)
{
return xMasterDispatchProvider;
}
-void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (css::uno::RuntimeException, std::exception)
{
xMasterDispatchProvider = xNewMasterDispatchProvider;
}
@@ -1419,7 +1419,7 @@ void SAL_CALL BibDataManager::disposing()
}
-void BibDataManager::disposing( const EventObject& /*Source*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
+void BibDataManager::disposing( const EventObject& /*Source*/ ) throw( css::uno::RuntimeException, std::exception )
{
// not interested in
}
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 967af88..b5816a6 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -47,78 +47,78 @@ class BibToolBar;
struct BibDBDescriptor;
class BibInterceptorHelper
- :public cppu::WeakImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor >
+ :public cppu::WeakImplHelper< css::frame::XDispatchProviderInterceptor >
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xMasterDispatchProvider;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xSlaveDispatchProvider;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xFormDispatch;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > xInterception;
+ css::uno::Reference< css::frame::XDispatchProvider > xMasterDispatchProvider;
+ css::uno::Reference< css::frame::XDispatchProvider > xSlaveDispatchProvider;
+ css::uno::Reference< css::frame::XDispatch > xFormDispatch;
+ css::uno::Reference< css::frame::XDispatchProviderInterception > xInterception;
protected:
virtual ~BibInterceptorHelper( );
public:
- BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch);
+ BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, css::uno::Reference< css::frame::XDispatch > xDispatch);
void ReleaseInterceptor();
// 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) SAL_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) SAL_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) SAL_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) SAL_OVERRIDE;
// XDispatchProviderInterceptor
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-typedef cppu::WeakComponentImplHelper < ::com::sun::star::beans::XPropertyChangeListener
- , ::com::sun::star::form::XLoadable
+typedef cppu::WeakComponentImplHelper < css::beans::XPropertyChangeListener
+ , css::form::XLoadable
> BibDataManager_Base;
class BibDataManager
:public ::comphelper::OMutexAndBroadcastHelper
,public BibDataManager_Base
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xForm;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > m_xGridModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSourceProps;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xParser;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xFormCtrl;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xFormDispatch;
- BibInterceptorHelper* m_pInterceptorHelper;
+ css::uno::Reference< css::form::XForm > m_xForm;
+ css::uno::Reference< css::awt::XControlModel > m_xGridModel;
+ css::uno::Reference< css::beans::XPropertySet > m_xSourceProps;
+ css::uno::Reference< css::sdb::XSingleSelectQueryComposer > m_xParser;
+ css::uno::Reference< css::form::runtime::XFormController > m_xFormCtrl;
+ css::uno::Reference< css::frame::XDispatch > m_xFormDispatch;
+ BibInterceptorHelper* m_pInterceptorHelper;
OUString aActiveDataTable;
OUString aDataSourceURL;
OUString aQuoteChar;
- ::com::sun::star::uno::Any aUID;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xBibCursor;
+ css::uno::Any aUID;
+ css::uno::Reference< css::sdbc::XResultSet > xBibCursor;
::cppu::OInterfaceContainerHelper m_aLoadListeners;
VclPtr< ::bib::BibView> pBibView;
- VclPtr<BibToolBar> pToolbar;
+ VclPtr<BibToolBar> pToolbar;
- OUString sIdentifierMapping;
+ OUString sIdentifierMapping;
protected:
- void InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid);
+ void InsertFields(const css::uno::Reference< css::form::XFormComponent > & xGrid);
void SetMeAsUidListener();
void RemoveMeAsUidListener();
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
- updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm);
- static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
+ css::uno::Reference< css::awt::XControlModel >
+ updateGridModel(const css::uno::Reference< css::form::XForm > & xDbForm);
+ static css::uno::Reference< css::awt::XControlModel >
createGridModel( const OUString& rName );
// XLoadable
- virtual void SAL_CALL load( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL unload( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL reload( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL isLoaded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL addLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL load( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL unload( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL reload( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL isLoaded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeLoadListener( const css::uno::Reference< css::form::XLoadListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL disposing() SAL_OVERRIDE;
@@ -127,18 +127,18 @@ public:
BibDataManager();
virtual ~BibDataManager();
- virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt)
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc);
+ css::uno::Reference< css::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc);
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel();
+ css::uno::Reference< css::awt::XControlModel > updateGridModel();
- ::com::sun::star::uno::Sequence< OUString> getDataSources();
+ css::uno::Sequence< OUString> getDataSources();
OUString getActiveDataSource() {return aDataSourceURL;}
void setActiveDataSource(const OUString& rURL);
@@ -149,17 +149,17 @@ public:
void setFilter(const OUString& rQuery);
OUString getFilter();
- ::com::sun::star::uno::Sequence< OUString> getQueryFields();
+ css::uno::Sequence< OUString> getQueryFields();
OUString getQueryField();
void startQueryWith(const OUString& rQuery);
- const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; }
- const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& getForm() { return m_xForm; }
+ const css::uno::Reference< css::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; }
+ const css::uno::Reference< css::form::XForm >& getForm() { return m_xForm; }
static OUString getControlName(sal_Int32 nFormatKey );
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const OUString& rName,
+ css::uno::Reference< css::awt::XControlModel > loadControlModel(const OUString& rName,
bool bForceListBox = false);
void CreateMappingDialog(vcl::Window* pParent);
@@ -175,7 +175,7 @@ public:
const OUString& GetIdentifierMapping();
void ResetIdentifierMapping() {sIdentifierMapping.clear();}
- ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController();
+ css::uno::Reference< css::form::runtime::XFormController > GetFormController();
void RegisterInterceptor( ::bib::BibBeamer* pBibBeamer);
bool HasActiveConnection();
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 51265d4..b74ac8b 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -114,26 +114,26 @@ namespace bib
implSetDesignMode( !m_xForm.is() || !m_xForm->isLoaded() );
}
- void FormControlContainer::_loaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
+ void FormControlContainer::_loaded( const css::lang::EventObject& /*_rEvent*/ )
{
implSetDesignMode( false );
}
- void FormControlContainer::_unloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
+ void FormControlContainer::_unloading( const css::lang::EventObject& /*_rEvent*/ )
{
implSetDesignMode( true );
}
- void FormControlContainer::_unloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
+ void FormControlContainer::_unloaded( const css::lang::EventObject& /*_rEvent*/ )
{
}
- void FormControlContainer::_reloading( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
+ void FormControlContainer::_reloading( const css::lang::EventObject& /*_rEvent*/ )
{
implSetDesignMode( true );
}
- void FormControlContainer::_reloaded( const ::com::sun::star::lang::EventObject& /*_rEvent*/ )
+ void FormControlContainer::_reloaded( const css::lang::EventObject& /*_rEvent*/ )
{
implSetDesignMode( false );
}
diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx
index c7f512e..8a81dcc 100644
--- a/extensions/source/bibliography/formcontrolcontainer.hxx
+++ b/extensions/source/bibliography/formcontrolcontainer.hxx
@@ -33,9 +33,8 @@ namespace bib
,public ::bib::OLoadListener
{
private:
- OLoadListenerAdapter* m_pFormAdapter;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >
- m_xForm;
+ OLoadListenerAdapter* m_pFormAdapter;
+ css::uno::Reference< css::form::XLoadable > m_xForm;
private:
void implSetDesignMode( bool _bDesign );
@@ -43,22 +42,22 @@ namespace bib
FormControlContainer( );
virtual ~FormControlContainer( );
- bool isFormConnected() const { return NULL != m_pFormAdapter; }
- void connectForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxForm );
+ bool isFormConnected() const { return NULL != m_pFormAdapter; }
+ void connectForm( const css::uno::Reference< css::form::XLoadable >& _rxForm );
void disconnectForm();
void ensureDesignMode();
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+ virtual css::uno::Reference< css::awt::XControlContainer >
getControlContainer() = 0;
protected:
// XLoadListener equivalents
- virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
- virtual void _unloading( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
- virtual void _unloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
- virtual void _reloading( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
- virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE;
+ virtual void _loaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE;
+ virtual void _unloading( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE;
+ virtual void _unloaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE;
+ virtual void _reloading( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE;
+ virtual void _reloaded( const css::lang::EventObject& _rEvent ) SAL_OVERRIDE;
};
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index af476f6..0486e9b 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -146,7 +146,7 @@ public:
virtual ~BibFrameCtrl_Impl();
virtual void SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -159,7 +159,7 @@ void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& ) throw( uno::Runtim
}
void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ )
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
::SolarMutexGuard aGuard;
if ( pController )
@@ -191,37 +191,37 @@ BibFrameController_Impl::~BibFrameController_Impl()
CloseBibModul(pBibMod);
}
-OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception)
+OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (css::uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.comp.extensions.Bibliography");
}
-sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService( this, sServiceName );
}
-::com::sun::star::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception)
{
// return only top level services ...
// base services are included there and should be asked by uno-rtti.
- ::com::sun::star::uno::Sequence< OUString > lNames(1);
+ css::uno::Sequence< OUString > lNames(1);
lNames[0] = "com.sun.star.frame.Bibliography";
return lNames;
}
-void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg ) throw (css::uno::RuntimeException, std::exception)
{
xFrame = xArg;
xFrame->addFrameActionListener( pImp );
}
-sal_Bool BibFrameController_Impl::attachModel( const uno::Reference< XModel > & /*xModel*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool BibFrameController_Impl::attachModel( const uno::Reference< XModel > & /*xModel*/ ) throw (css::uno::RuntimeException, std::exception)
{
return sal_False;
}
-sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (css::uno::RuntimeException, std::exception)
{
if ( bSuspend )
getFrame()->removeFrameActionListener( pImp );
@@ -230,26 +230,26 @@ sal_Bool BibFrameController_Impl::suspend( sal_Bool bSuspend ) throw (::com::sun
return sal_True;
}
-uno::Any BibFrameController_Impl::getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Any BibFrameController_Impl::getViewData() throw (css::uno::RuntimeException, std::exception)
{
return uno::Any();
}
-void BibFrameController_Impl::restoreViewData( const uno::Any& /*Value*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::restoreViewData( const uno::Any& /*Value*/ ) throw (css::uno::RuntimeException, std::exception)
{
}
-uno::Reference< XFrame > BibFrameController_Impl::getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Reference< XFrame > BibFrameController_Impl::getFrame() throw (css::uno::RuntimeException, std::exception)
{
return xFrame;
}
-uno::Reference< XModel > BibFrameController_Impl::getModel() throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Reference< XModel > BibFrameController_Impl::getModel() throw (css::uno::RuntimeException, std::exception)
{
return uno::Reference< XModel > ();
}
-void BibFrameController_Impl::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::dispose() throw (css::uno::RuntimeException, std::exception)
{
bDisposing = true;
lang::EventObject aObject;
@@ -260,17 +260,17 @@ void BibFrameController_Impl::dispose() throw (::com::sun::star::uno::RuntimeExc
aStatusListeners.clear();
}
-void BibFrameController_Impl::addEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::addEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception)
{
pImp->aLC.addInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
-void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception)
{
pImp->aLC.removeInterface( cppu::UnoType<lang::XEventListener>::get(), aListener );
}
-uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (css::uno::RuntimeException, std::exception)
{
if ( !bDisposing )
{
@@ -287,7 +287,7 @@ uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( cons
return uno::Reference< frame::XDispatch > ();
}
-uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispatches( const uno::Sequence<DispatchDescriptor>& aDescripts ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispatches( const uno::Sequence<DispatchDescriptor>& aDescripts ) throw (css::uno::RuntimeException, std::exception)
{
uno::Sequence< uno::Reference< XDispatch > > aDispatches( aDescripts.getLength() );
for ( sal_Int32 i=0; i<aDescripts.getLength(); ++i )
@@ -296,7 +296,7 @@ uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispat
}
uno::Sequence< ::sal_Int16 > SAL_CALL BibFrameController_Impl::getSupportedCommandGroups()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
uno::Sequence< ::sal_Int16 > aDispatchInfo( 4 );
@@ -309,7 +309,7 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
}
uno::Sequence< frame::DispatchInformation > SAL_CALL BibFrameController_Impl::getConfigurableDispatchInformation( ::sal_Int16 nCommandGroup )
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::uno::RuntimeException, std::exception)
{
const CmdToInfoCache& rCmdCache = GetCommandToInfoCache();
@@ -339,8 +339,8 @@ throw (::com::sun::star::uno::RuntimeException, std::exception)
}
}
- ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > aSeq =
- comphelper::containerToSequence< ::com::sun::star::frame::DispatchInformation, std::list< ::com::sun::star::frame::DispatchInformation > >( aDispatchInfoList );
+ css::uno::Sequence< css::frame::DispatchInformation > aSeq =
+ comphelper::containerToSequence< css::frame::DispatchInformation, std::list< css::frame::DispatchInformation > >( aDispatchInfoList );
return aSeq;
}
@@ -405,7 +405,7 @@ static vcl::Window* lcl_GetFocusChild( vcl::Window* pParent )
//class XDispatch
void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequence< beans::PropertyValue >& aArgs)
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception)
{
if ( !bDisposing )
@@ -541,9 +541,9 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
else if(aCommand == "Bib/DeleteRecord")
{
- Reference< ::com::sun::star::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY);
- Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY);
- Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY);
+ Reference< css::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY);
+ Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY);
+ Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY);
bool bIsNew = ::comphelper::getBOOL(xSet->getPropertyValue("IsNew"));
if(!bIsNew)
{
@@ -638,7 +638,7 @@ IMPL_LINK_NOARG_TYPED( BibFrameController_Impl, DisposeHdl, void*, void )
void BibFrameController_Impl::addStatusListener(
const uno::Reference< frame::XStatusListener > & aListener,
const util::URL& aURL)
- throw (::com::sun::star::uno::RuntimeException,
+ throw (css::uno::RuntimeException,
std::exception)
{
BibConfig* pConfig = BibModul::GetConfig();
@@ -750,9 +750,9 @@ void BibFrameController_Impl::addStatusListener(
}
else if(aURL.Path == "Bib/DeleteRecord")
{
- Reference< ::com::sun::star::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY);
- Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY);
- Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY);
+ Reference< css::sdbc::XResultSet > xCursor(pDatMan->getForm(), UNO_QUERY);
+ Reference< XResultSetUpdate > xUpdateCursor(xCursor, UNO_QUERY);
+ Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY);
bool bIsNew = ::comphelper::getBOOL(xSet->getPropertyValue("IsNew"));
if(!bIsNew)
{
@@ -771,7 +771,7 @@ void BibFrameController_Impl::addStatusListener(
void BibFrameController_Impl::removeStatusListener(
const uno::Reference< frame::XStatusListener > & aObject, const util::URL& aURL)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
// search listener array for given listener
// for checking equality always "cast" to XInterface
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index f56e561..514b5d9 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -40,9 +40,9 @@ namespace com{namespace sun{namespace star{
class BibStatusDispatch
{
public:
- ::com::sun::star::util::URL aURL;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener;
- BibStatusDispatch( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& rRef )
+ css::util::URL aURL;
+ css::uno::Reference< css::frame::XStatusListener > xListener;
+ BibStatusDispatch( const css::util::URL& rURL, const css::uno::Reference< css::frame::XStatusListener >& rRef )
: aURL( rURL )
, xListener( rRef )
{}
@@ -51,71 +51,71 @@ public:
typedef boost::ptr_vector<BibStatusDispatch> BibStatusDispatchArr;
class BibFrameController_Impl : public cppu::WeakImplHelper <
- ::com::sun::star::lang::XServiceInfo,
- ::com::sun::star::frame::XController,
- ::com::sun::star::frame::XDispatch,
- ::com::sun::star::frame::XDispatchProvider,
- ::com::sun::star::frame::XDispatchInformationProvider
+ css::lang::XServiceInfo,
+ css::frame::XController,
+ css::frame::XDispatch,
+ css::frame::XDispatchProvider,
+ css::frame::XDispatchInformationProvider
>
{
friend class BibFrameCtrl_Impl;
BibFrameCtrl_Impl* pImp;
BibStatusDispatchArr aStatusListeners;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame;
+ css::uno::Reference< css::awt::XWindow > xWindow;
+ css::uno::Reference< css::frame::XFrame > xFrame;
bool bDisposing;
bool bHierarchical;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xDatMan;
+ css::uno::Reference< css::form::XLoadable > m_xDatMan;
BibDataManager* pDatMan;
HdlBibModul pBibMod;
DECL_LINK_TYPED( DisposeHdl, void*, void );
- static bool SaveModified(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& xController);
+ static bool SaveModified(const css::uno::Reference< css::form::runtime::XFormController>& xController);
public:
- BibFrameController_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > & xComponent,
+ BibFrameController_Impl( const css::uno::Reference< css::awt::XWindow > & xComponent,
BibDataManager* pDatMan);
virtual ~BibFrameController_Impl();
- void ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs);
+ void ChangeDataSource(const css::uno::Sequence< css::beans::PropertyValue >& aArgs);
void RemoveFilter();
- // ::com::sun::star::lang::XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
- // ::com::sun::star::frame::XController
- virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
- // ::com::sun::star::lang::XComponent
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
- // ::com::sun::star::frame::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) SAL_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) SAL_OVERRIDE;
-
- //class ::com::sun::star::frame::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,
+ // css::lang::XServiceInfo
+ virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+ // css::frame::XController
+ virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Any SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL restoreViewData( const css::uno::Any& Value ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+ // css::lang::XComponent
+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+
+ // css::frame::XDispatchProvider
+ 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) SAL_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) SAL_OVERRIDE;
+
+ //class css::frame::XDispatch
+ virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs)
+ throw (css::uno::RuntimeException,
std::exception) SAL_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,
+ virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL)
+ throw (css::uno::RuntimeException,
std::exception) SAL_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) SAL_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) SAL_OVERRIDE;
- // ::com::sun::star::frame::XDispatchInformationProvider
- virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ // css::frame::XDispatchInformationProvider
+ virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
#endif
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index d613df6..ab2bc19 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -695,17 +695,17 @@ bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
BibGeneralPageFocusListener::BibGeneralPageFocusListener(BibGeneralPage *pBibGeneralPage): mpBibGeneralPage(pBibGeneralPage)
{}
-void BibGeneralPageFocusListener::focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception )
+void BibGeneralPageFocusListener::focusGained( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception )
{
mpBibGeneralPage->focusGained(e);
}
-void BibGeneralPageFocusListener::focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception )
+void BibGeneralPageFocusListener::focusLost( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception )
{
mpBibGeneralPage->focusLost(e);
}
-void BibGeneralPageFocusListener::disposing( const ::com::sun::star::lang::EventObject& ) throw( com::sun::star::uno::RuntimeException, std::exception )
+void BibGeneralPageFocusListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
{}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 44ee591..58b789e 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -45,15 +45,15 @@ class BibDataManager;
* We need to split off the listener because both it and the vcl::Window baseclass are ref-counted
*/
class BibGeneralPage;
-class BibGeneralPageFocusListener : public cppu::WeakAggImplHelper1 < ::com::sun::star::awt::XFocusListener >
+class BibGeneralPageFocusListener : public cppu::WeakAggImplHelper1 < css::awt::XFocusListener >
{
private:
VclPtr<BibGeneralPage> mpBibGeneralPage;
public:
explicit BibGeneralPageFocusListener(BibGeneralPage *pBibGeneralPage);
- virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -107,7 +107,7 @@ class BibGeneralPage: public BibTabPage
VclPtr<FixedText> aFixedTexts[ FIELD_COUNT ];
sal_Int16 nFT2CtrlMap[ FIELD_COUNT ];
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
+ css::uno::Reference< css::awt::XWindow >
aControls[ FIELD_COUNT ];
OUString sErrorPrefix;
@@ -115,23 +115,23 @@ class BibGeneralPage: public BibTabPage
OUString sTypeColumnName;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >
+ css::uno::Reference< css::awt::XControlContainer >
xCtrlContnr;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >
+ css::uno::Reference< css::form::XBoundComponent >
xCurrentBoundComponent;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >
+ css::uno::Reference< css::form::XBoundComponent >
xLBModel;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSetListener >
+ css::uno::Reference< css::sdbc::XRowSetListener >
xPosListener;
rtl::Reference<BibGeneralPageFocusListener> mxBibGeneralPageFocusListener;
BibDataManager* pDatMan;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
+ css::uno::Reference< css::awt::XControlModel >
AddXControl( const OUString& rName, FixedText& rLabel, const OString& sHelpId,
sal_Int16& rIndex, std::vector<vcl::Window*>& rChildren );
@@ -149,9 +149,9 @@ public:
inline const OUString& GetErrorString() const;
- inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >&
+ inline const css::uno::Reference< css::form::XBoundComponent >&
GetTypeListBoxModel() const;
- inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >&
+ inline const css::uno::Reference< css::awt::XControlContainer >&
GetControlContainer() const;
inline BibDataManager* GetDataManager();
@@ -177,13 +177,13 @@ inline const OUString& BibGeneralPage::GetErrorString() const
return sTableErrorString;
}
-inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >&
+inline const css::uno::Reference< css::form::XBoundComponent >&
BibGeneralPage::GetTypeListBoxModel() const
{
return xLBModel;
}
-inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >&
+inline const css::uno::Reference< css::awt::XControlContainer >&
BibGeneralPage::GetControlContainer() const
{
return xCtrlContnr;
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index bff35f2..ec7399d 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -57,19 +57,18 @@ namespace bib
friend class OComponentListener;
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
- m_xComponent;
+ css::uno::Reference< css::lang::XComponent > m_xComponent;
OComponentListener* m_pListener;
sal_Int32 m_nLockCount;
- bool m_bListening : 1;
- bool m_bAutoRelease : 1;
+ bool m_bListening : 1;
+ bool m_bAutoRelease : 1;
// impl method for dispose - virtual, 'cause you at least need to remove the listener from the broadcaster
virtual void disposing() = 0;
protected:
// attribute access for derivees
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >&
+ const css::uno::Reference< css::lang::XComponent >&
getComponent() const { return m_xComponent; }
OComponentListener* getListener() { return m_pListener; }
@@ -80,7 +79,7 @@ namespace bib
public:
OComponentAdapterBase(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp,
+ const css::uno::Reference< css::lang::XComponent >& _rxComp,
bool _bAutoRelease = true
);
@@ -102,7 +101,7 @@ namespace bib
protected:
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception);
};
class OLoadListener : public OComponentListener
@@ -113,14 +112,14 @@ namespace bib
explicit OLoadListener( ::osl::Mutex& _rMutex ) : OComponentListener( _rMutex ) { }
// XLoadListener equivalents
- virtual void _loaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0;
- virtual void _unloading( const ::com::sun::star::lang::EventObject& aEvent ) = 0;
- virtual void _unloaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0;
- virtual void _reloading( const ::com::sun::star::lang::EventObject& aEvent ) = 0;
- virtual void _reloaded( const ::com::sun::star::lang::EventObject& aEvent ) = 0;
+ virtual void _loaded( const css::lang::EventObject& aEvent ) = 0;
+ virtual void _unloading( const css::lang::EventObject& aEvent ) = 0;
+ virtual void _unloaded( const css::lang::EventObject& aEvent ) = 0;
+ virtual void _reloading( const css::lang::EventObject& aEvent ) = 0;
+ virtual void _reloaded( const css::lang::EventObject& aEvent ) = 0;
};
- typedef ::cppu::WeakImplHelper< ::com::sun::star::form::XLoadListener > OLoadListenerAdapter_Base;
+ typedef ::cppu::WeakImplHelper< css::form::XLoadListener > OLoadListenerAdapter_Base;
class OLoadListenerAdapter
:public OLoadListenerAdapter_Base
,public OComponentAdapterBase
@@ -134,7 +133,7 @@ namespace bib
public:
OLoadListenerAdapter(
- const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxLoadable,
+ const css::uno::Reference< css::form::XLoadable >& _rxLoadable,
bool _bAutoRelease = true
);
@@ -144,14 +143,14 @@ namespace bib
protected:
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& _rSource ) throw( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XLoadListener
- virtual void SAL_CALL loaded( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL unloading( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL unloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL reloading( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 7504e28..8fa2b4e 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -57,14 +57,14 @@ BibToolBarListener::~BibToolBarListener()
{
}
-void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvt)throw( ::com::sun::star::uno::RuntimeException, std::exception )
+void BibToolBarListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)throw( css::uno::RuntimeException, std::exception )
{
if(rEvt.FeatureURL.Complete == aCommand)
{
SolarMutexGuard aGuard;
pToolBar->EnableItem(nIndex,rEvt.IsEnabled);
- ::com::sun::star::uno::Any aState=rEvt.State;
+ css::uno::Any aState=rEvt.State;
if(aState.getValueType()==cppu::UnoType<bool>::get())
{
bool bChecked= *static_cast<sal_Bool const *>(aState.getValue());
@@ -84,7 +84,7 @@ BibTBListBoxListener::~BibTBListBoxListener()
{
}
-void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& rEvt)throw( ::com::sun::star::uno::RuntimeException, std::exception )
+void BibTBListBoxListener::statusChanged(const css::frame::FeatureStateEvent& rEvt)throw( css::uno::RuntimeException, std::exception )
{
if(rEvt.FeatureURL.Complete == GetCommand())
{
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 5d8b514..a4b131a 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -35,7 +35,7 @@
class BibDataManager;
class BibToolBar;
-class BibToolBarListener: public cppu::WeakImplHelper < ::com::sun::star::frame::XStatusListener>
+class BibToolBarListener: public cppu::WeakImplHelper < css::frame::XStatusListener>
{
private:
@@ -53,14 +53,14 @@ public:
OUString GetCommand() const { return aCommand;}
- // ::com::sun::star::lang::XEventListener
+ // css::lang::XEventListener
// we do not hold References to dispatches, so there is nothing to do on disposal
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*Source*/)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE {};
+ virtual void SAL_CALL disposing(const css::lang::EventObject& /*Source*/)
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE {};
- // ::com::sun::star::frame::XStatusListener
- virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ // css::frame::XStatusListener
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -71,8 +71,8 @@ public:
BibTBListBoxListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
virtual ~BibTBListBoxListener();
- virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -83,8 +83,8 @@ public:
BibTBEditListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
virtual ~BibTBEditListener();
- virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -95,13 +95,13 @@ public:
BibTBQueryMenuListener(BibToolBar *pTB, const OUString& aStr, sal_uInt16 nId);
virtual ~BibTBQueryMenuListener();
- virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event)
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
-typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener> BibToolBarListenerRef;
+typedef css::uno::Reference< css::frame::XStatusListener> BibToolBarListenerRef;
typedef boost::ptr_vector<BibToolBarListenerRef> BibToolBarListenerArr;
class BibToolBar: public ToolBox
@@ -152,7 +152,7 @@ class BibToolBar: public ToolBox
virtual ~BibToolBar();
virtual void dispose() SAL_OVERRIDE;
- void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &);
+ void SetXController(const css::uno::Reference< css::frame::XController > &);
void ClearSourceList();
void UpdateSourceList(bool bFlag=true);
@@ -168,11 +168,11 @@ class BibToolBar: public ToolBox
sal_uInt16 InsertFilterItem(const OUString& );
void SelectFilterItem(sal_uInt16 nId);
- void statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
- throw( ::com::sun::star::uno::RuntimeException );
+ void statusChanged(const css::frame::FeatureStateEvent& Event)
+ throw( css::uno::RuntimeException );
void SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;}
- void SendDispatch(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs);
+ void SendDispatch(sal_uInt16 nId, const css::uno::Sequence< css::beans::PropertyValue >& rArgs);
};
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index b0c308c..3ca79a2 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -93,7 +93,7 @@ public:
@param aUserProfileMap Map containing LDAP->00o mapping
@param aUserProfile struct for holding OOo values
- @throws com::sun::star::ldap::LdapGenericException
+ @throws css::ldap::LdapGenericException
if an LDAP error occurs.
*/
void getUserProfile(const OUString& aUser, LdapData * data)
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index b8adf46..6e8267d 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -37,8 +37,8 @@ namespace dbp
VclPtr<PushButton> m_pSearchDatabase;
VclPtr<ListBox> m_pTable;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDatabaseContext >
- m_xDSContext;
+ css::uno::Reference< css::sdb::XDatabaseContext >
+ m_xDSContext;
public:
explicit OTableSelectionPage(OControlWizard* _pParent);
@@ -59,8 +59,8 @@ namespace dbp
DECL_LINK_TYPED( OnSearchClicked, Button*, void );
void implCollectDatasource();
- void implFillTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >&
- _rxConn = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >());
+ void implFillTables(const css::uno::Reference< css::sdbc::XConnection >&
+ _rxConn = css::uno::Reference< css::sdbc::XConnection >());
// OControlWizardPage overridables
virtual bool canAdvance() const SAL_OVERRIDE;
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 413f5f3..2ceebad 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -61,8 +61,8 @@ namespace dbp
const OControlWizard* getDialog() const;
const OControlWizardContext& getContext();
bool updateContext();
- void setFormConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true );
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
+ void setFormConnection(const css::uno::Reference< css::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true );
+ css::uno::Reference< css::sdbc::XConnection >
getFormConnection() const;
public:
OControlWizardPage( OControlWizard* _pParent, const OString& rID, const OUString& rUIXMLDescription );
@@ -72,11 +72,11 @@ namespace dbp
protected:
static void fillListBox(
ListBox& _rList,
- const ::com::sun::star::uno::Sequence< OUString >& _rItems,
+ const css::uno::Sequence< OUString >& _rItems,
bool _bClear = true);
static void fillListBox(
ComboBox& _rList,
- const ::com::sun::star::uno::Sequence< OUString >& _rItems,
+ const css::uno::Sequence< OUString >& _rItems,
bool _bClear = true);
protected:
@@ -94,14 +94,14 @@ namespace dbp
{
private:
OControlWizardContext m_aContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
- m_xContext;
+ css::uno::Reference< css::uno::XComponentContext >
+ m_xContext;
public:
OControlWizard(
vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext
+ const css::uno::Reference< css::beans::XPropertySet >& _rxObjectModel,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
virtual ~OControlWizard();
@@ -109,19 +109,19 @@ namespace dbp
bool travelNext() { return OControlWizard_Base::travelNext(); }
public:
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
+ css::uno::Reference< css::uno::XComponentContext >
getComponentContext() const { return m_xContext; }
const OControlWizardContext& getContext() const { return m_aContext; }
bool updateContext(const OAccessRegulator&);
- void setFormConnection(const OAccessRegulator&, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true );
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
+ void setFormConnection(const OAccessRegulator&, const css::uno::Reference< css::sdbc::XConnection >& _rxConn, bool _bAutoDispose = true );
+ css::uno::Reference< css::sdbc::XConnection >
getFormConnection(const OAccessRegulator&) const;
/** returns the com.sun.star.task.InteractionHandler
@param _pWindow The window will be used when an error message has to be shown.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler(vcl::Window* _pWindow) const;
+ css::uno::Reference< css::task::XInteractionHandler > getInteractionHandler(vcl::Window* _pWindow) const;
protected:
// initialize the derivees settings (which have to be derived from OControlWizardSettings)
@@ -132,7 +132,7 @@ namespace dbp
bool needDatasourceSelection();
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
+ css::uno::Reference< css::sdbc::XConnection >
getFormConnection() const;
virtual bool approveControl(sal_Int16 _nClassId) = 0;
diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx
index 4a15509..63c0355 100644
--- a/extensions/source/dbpilots/dbptools.hxx
+++ b/extensions/source/dbpilots/dbptools.hxx
@@ -28,7 +28,7 @@ namespace dbp
void disambiguateName(
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer,
+ const css::uno::Reference< css::container::XNameAccess >& _rxContainer,
OUString& _rElementsName);
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index ca3a9b4..98c0aa4 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -28,7 +28,7 @@ namespace dbp
{
struct OGridSettings : public OControlWizardSettings
{
- ::com::sun::star::uno::Sequence< OUString > aSelectedFields;
+ css::uno::Sequence< OUString > aSelectedFields;
};
class OGridWizard : public OControlWizard
@@ -40,8 +40,8 @@ namespace dbp
public:
OGridWizard(
vcl::Window* _pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObjectModel,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext
+ const css::uno::Reference< css::beans::XPropertySet >& _rxObjectModel,
+ const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
OGridSettings& getSettings() { return m_aSettings; }
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 567eebf..0515544 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -47,8 +47,8 @@ namespace dbp
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list