summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/DocumentMetadataAccess.hxx173
-rw-r--r--include/sfx2/Metadatable.hxx36
-rw-r--r--include/sfx2/XmlIdRegistry.hxx5
-rw-r--r--include/sfx2/app.hxx4
-rw-r--r--include/sfx2/bindings.hxx14
-rw-r--r--include/sfx2/brokenpackageint.hxx4
-rw-r--r--include/sfx2/childwin.hxx2
-rw-r--r--include/sfx2/dinfdlg.hxx61
-rw-r--r--include/sfx2/dispatch.hxx2
-rw-r--r--include/sfx2/docfilt.hxx8
-rw-r--r--include/sfx2/docinf.hxx14
-rw-r--r--include/sfx2/dockwin.hxx4
-rw-r--r--include/sfx2/docmacromode.hxx27
-rw-r--r--include/sfx2/docstoragemodifylistener.hxx6
-rw-r--r--include/sfx2/event.hxx4
-rw-r--r--include/sfx2/evntconf.hxx2
-rw-r--r--include/sfx2/fcontnr.hxx6
-rw-r--r--include/sfx2/filedlghelper.hxx26
-rw-r--r--include/sfx2/frame.hxx36
-rw-r--r--include/sfx2/frmhtmlw.hxx5
-rw-r--r--include/sfx2/imagemgr.hxx2
-rw-r--r--include/sfx2/ipclient.hxx8
-rw-r--r--include/sfx2/linkmgr.hxx6
-rw-r--r--include/sfx2/linksrc.hxx10
-rw-r--r--include/sfx2/lnkbase.hxx8
-rw-r--r--include/sfx2/mailmodelapi.hxx14
-rw-r--r--include/sfx2/module.hxx2
-rw-r--r--include/sfx2/objsh.hxx122
-rw-r--r--include/sfx2/querystatus.hxx6
-rw-r--r--include/sfx2/recentdocsview.hxx6
-rw-r--r--include/sfx2/request.hxx6
-rw-r--r--include/sfx2/sfxbasemodel.hxx6
-rw-r--r--include/sfx2/sfxdlg.hxx18
-rw-r--r--include/sfx2/sfxmodelfactory.hxx6
-rw-r--r--include/sfx2/sfxstatuslistener.hxx20
-rw-r--r--include/sfx2/shell.hxx4
-rw-r--r--include/sfx2/sidebar/ILayoutableWindow.hxx2
-rw-r--r--include/sfx2/stbitem.hxx32
-rw-r--r--include/sfx2/tabdlg.hxx4
-rw-r--r--include/sfx2/taskpane.hxx4
-rw-r--r--include/sfx2/tbxctrl.hxx48
-rw-r--r--include/sfx2/templatedlg.hxx6
-rw-r--r--include/sfx2/templateinfodlg.hxx4
-rw-r--r--include/sfx2/templatelocalview.hxx4
-rw-r--r--include/sfx2/templateremoteview.hxx2
-rw-r--r--include/sfx2/thumbnailview.hxx6
-rw-r--r--include/sfx2/thumbnailviewitem.hxx4
-rw-r--r--include/sfx2/tplpitem.hxx6
-rw-r--r--include/sfx2/unoctitm.hxx80
-rw-r--r--include/sfx2/userinputinterception.hxx8
-rw-r--r--include/sfx2/viewfrm.hxx18
-rw-r--r--include/sfx2/viewsh.hxx28
-rw-r--r--include/sfx2/zoomitem.hxx4
53 files changed, 458 insertions, 485 deletions
diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index 8c180c0072eb..0433e4547a6c 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -59,12 +59,10 @@ namespace sfx2 {
@return a base URI suitable for XDocumentMetadataAccess::loadFromStorage
*/
-::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SFX2_DLLPUBLIC
+css::uno::Reference< css::rdf::XURI> SFX2_DLLPUBLIC
createBaseURI(
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>
- const & i_xContext,
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage>
- const & i_xStorage,
+ css::uno::Reference< css::uno::XComponentContext> const & i_xContext,
+ css::uno::Reference< css::embed::XStorage> const & i_xStorage,
OUString const & i_rPkgURI,
OUString const & i_rSubDocument = OUString());
@@ -75,125 +73,110 @@ struct DocumentMetadataAccess_Impl;
class SFX2_DLLPUBLIC DocumentMetadataAccess :
private boost::noncopyable,
- public ::cppu::WeakImplHelper1<
- ::com::sun::star::rdf::XDocumentMetadataAccess>
+ public ::cppu::WeakImplHelper1< css::rdf::XDocumentMetadataAccess>
{
public:
- explicit DocumentMetadataAccess(::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > const & i_xContext,
+ explicit DocumentMetadataAccess(css::uno::Reference< css::uno::XComponentContext > const & i_xContext,
IXmlIdRegistrySupplier const & i_rRegistrySupplier,
OUString const & i_rBaseURI);
// N.B.: in contrast to previous, this constructor does _not_ initialize!
// caller must immediately call loadFromStorage/Medium!
- explicit DocumentMetadataAccess(::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext > const & i_xContext,
+ explicit DocumentMetadataAccess(css::uno::Reference< css::uno::XComponentContext > const & i_xContext,
IXmlIdRegistrySupplier const & i_rRegistrySupplier);
virtual ~DocumentMetadataAccess();
- // ::com::sun::star::rdf::XNode:
+ // css::rdf::XNode:
virtual OUString SAL_CALL getStringValue()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::rdf::XURI:
+ // css::rdf::XURI:
virtual OUString SAL_CALL getNamespace()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getLocalName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::rdf::XRepositorySupplier:
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XRepository > SAL_CALL getRDFRepository()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::rdf::XRepositorySupplier:
+ virtual css::uno::Reference<
+ css::rdf::XRepository > SAL_CALL getRDFRepository()
+ throw (css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::rdf::XDocumentMetadataAccess:
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > SAL_CALL
+ // css::rdf::XDocumentMetadataAccess:
+ virtual css::uno::Reference<
+ css::rdf::XMetadatable > SAL_CALL
getElementByMetadataReference(
- const ::com::sun::star::beans::StringPair & i_rReference)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > SAL_CALL
- getElementByURI(const ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI > & i_xURI)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI > & i_xType)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI> SAL_CALL
+ const css::beans::StringPair & i_rReference)
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::rdf::XMetadatable > SAL_CALL
+ getElementByURI(const css::uno::Reference< css::rdf::XURI > & i_xURI)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > SAL_CALL getMetadataGraphsWithType(
+ const css::uno::Reference< css::rdf::XURI > & i_xType)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException, std::exception) override;
+ virtual css::uno::Reference< css::rdf::XURI> SAL_CALL
addMetadataFile(const OUString & i_rFileName,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI >
- > & i_rTypes)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException, std::exception) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI> SAL_CALL
+ const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::container::ElementExistException, std::exception) override;
+ virtual css::uno::Reference< css::rdf::XURI> SAL_CALL
importMetadataFile(::sal_Int16 i_Format,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::io::XInputStream > & i_xInStream,
+ const css::uno::Reference< css::io::XInputStream > & i_xInStream,
const OUString & i_rFileName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI > & i_xBaseURI,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI >
- > & i_rTypes)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::datatransfer::UnsupportedFlavorException,
- ::com::sun::star::container::ElementExistException,
- ::com::sun::star::rdf::ParseException,
- ::com::sun::star::io::IOException, std::exception) override;
+ const css::uno::Reference< css::rdf::XURI > & i_xBaseURI,
+ const css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > & i_rTypes)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::datatransfer::UnsupportedFlavorException,
+ css::container::ElementExistException,
+ css::rdf::ParseException,
+ css::io::IOException, std::exception) override;
virtual void SAL_CALL removeMetadataFile(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI > & i_xGraphName)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException, std::exception) override;
+ const css::uno::Reference<
+ css::rdf::XURI > & i_xGraphName)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException, std::exception) override;
virtual void SAL_CALL addContentOrStylesFile(
const OUString & i_rFileName)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::ElementExistException, std::exception) override;
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::container::ElementExistException, std::exception) override;
virtual void SAL_CALL removeContentOrStylesFile(
const OUString & i_rFileName)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::container::NoSuchElementException, std::exception) override;
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::container::NoSuchElementException, std::exception) override;
virtual void SAL_CALL loadMetadataFromStorage(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::embed::XStorage > & i_xStorage,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XURI > & i_xBaseURI,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::task::XInteractionHandler> & i_xHandler)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException, std::exception) override;
+ const css::uno::Reference<
+ css::embed::XStorage > & i_xStorage,
+ const css::uno::Reference<
+ css::rdf::XURI > & i_xBaseURI,
+ const css::uno::Reference<
+ css::task::XInteractionHandler> & i_xHandler)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException, std::exception) override;
virtual void SAL_CALL storeMetadataToStorage(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::embed::XStorage > & i_xStorage)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException, std::exception) override;
+ const css::uno::Reference<
+ css::embed::XStorage > & i_xStorage)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException, std::exception) override;
virtual void SAL_CALL loadMetadataFromMedium(
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue > & i_rMedium)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException, std::exception) override;
+ const css::uno::Sequence<
+ css::beans::PropertyValue > & i_rMedium)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException, std::exception) override;
virtual void SAL_CALL storeMetadataToMedium(
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue > & i_rMedium)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::lang::WrappedTargetException, std::exception) override;
+ const css::uno::Sequence<
+ css::beans::PropertyValue > & i_rMedium)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException,
+ css::lang::WrappedTargetException, std::exception) override;
private:
std::unique_ptr<DocumentMetadataAccess_Impl> m_pImpl;
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index 1bdba661873b..a6950e45fa92 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -73,9 +73,8 @@ public:
// for MetadatableMixin ----------------------------------------------
- ::com::sun::star::beans::StringPair GetMetadataReference() const;
- void SetMetadataReference(
- const ::com::sun::star::beans::StringPair & i_rReference);
+ css::beans::StringPair GetMetadataReference() const;
+ void SetMetadataReference( const css::beans::StringPair & i_rReference);
void EnsureMetadataReference();
// hooks -------------------------------------------------------------
@@ -116,8 +115,7 @@ public:
note: if IsInUndo or IsInClipboard return true,
MakeUnoObject <em>must not</em> be called!
*/
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable > MakeUnoObject() = 0;
+ virtual css::uno::Reference< css::rdf::XMetadatable > MakeUnoObject() = 0;
private:
Metadatable(const Metadatable&) = delete;
@@ -138,7 +136,7 @@ private:
*/
class SFX2_DLLPUBLIC MetadatableMixin :
public ::cppu::WeakImplHelper1<
- ::com::sun::star::rdf::XMetadatable>
+ css::rdf::XMetadatable>
{
public:
@@ -146,31 +144,31 @@ public:
virtual ~MetadatableMixin() {}
- // ::com::sun::star::rdf::XNode:
+ // css::rdf::XNode:
virtual OUString SAL_CALL getStringValue()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::rdf::XURI:
+ // css::rdf::XURI:
virtual OUString SAL_CALL getLocalName()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getNamespace()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::rdf::XMetadatable:
- virtual ::com::sun::star::beans::StringPair SAL_CALL getMetadataReference()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::rdf::XMetadatable:
+ virtual css::beans::StringPair SAL_CALL getMetadataReference()
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setMetadataReference(
- const ::com::sun::star::beans::StringPair & i_rReference)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IllegalArgumentException, std::exception) override;
+ const css::beans::StringPair & i_rReference)
+ throw (css::uno::RuntimeException,
+ css::lang::IllegalArgumentException, std::exception) override;
virtual void SAL_CALL ensureMetadataReference()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
protected:
/// get the core object corresponding to this UNO object.
virtual Metadatable * GetCoreObject() = 0;
/// get the XModel for the document
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ virtual css::uno::Reference< css::frame::XModel >
GetModel() = 0;
};
diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx
index 68d61993e685..54fd77c973d7 100644
--- a/include/sfx2/XmlIdRegistry.hxx
+++ b/include/sfx2/XmlIdRegistry.hxx
@@ -52,10 +52,9 @@ class SFX2_DLLPUBLIC IXmlIdRegistry
public:
virtual ~IXmlIdRegistry() { }
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::rdf::XMetadatable >
+ virtual css::uno::Reference< css::rdf::XMetadatable >
GetElementByMetadataReference(
- const ::com::sun::star::beans::StringPair & i_rXmlId) const = 0;
+ const css::beans::StringPair & i_rXmlId) const = 0;
};
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index c045223dd225..af3edfc376c1 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -175,8 +175,8 @@ public:
static ErrCode CallAppBasic( const OUString& i_macroName, SbxArray* i_args = NULL, SbxValue* i_ret = NULL )
{ return CallBasic( i_macroName, SfxApplication::GetBasicManager(), i_args, i_ret ); }
static BasicManager* GetBasicManager();
- com::sun::star::script::XLibraryContainer * GetDialogContainer();
- com::sun::star::script::XLibraryContainer * GetBasicContainer();
+ css::script::XLibraryContainer * GetDialogContainer();
+ css::script::XLibraryContainer * GetBasicContainer();
static StarBASIC* GetBasic();
sal_uInt16 SaveBasicAndDialogContainer() const;
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index eba4dd6b26dd..5bcaf6e77e20 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -175,9 +175,9 @@ public:
SfxCallMode nCall = SfxCallMode::SLOT,
const SfxPoolItem **pInternalArgs = 0);
- SAL_DLLPRIVATE void SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rFrame );
- void SetActiveFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & rFrame );
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetActiveFrame() const;
+ SAL_DLLPRIVATE void SetDispatchProvider_Impl( const css::uno::Reference< css::frame::XDispatchProvider > & rFrame );
+ void SetActiveFrame( const css::uno::Reference< css::frame::XFrame > & rFrame );
+ const css::uno::Reference< css::frame::XFrame > GetActiveFrame() const;
// Reconfig
sal_uInt16 EnterRegistrations(const char *pFile = 0, int nLine = 0);
void LeaveRegistrations( sal_uInt16 nLevel = USHRT_MAX, const char *pFile = 0, int nLine = 0 );
@@ -185,9 +185,9 @@ public:
void Release( SfxControllerItem& rBinding );
SfxDispatcher* GetDispatcher() const
{ return pDispatcher; }
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetRecorder() const;
- com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
- GetDispatch( const SfxSlot*, const com::sun::star::util::URL& aURL, bool bMasterCommand );
+ css::uno::Reference< css::frame::XDispatchRecorder > GetRecorder() const;
+ css::uno::Reference < css::frame::XDispatch >
+ GetDispatch( const SfxSlot*, const css::util::URL& aURL, bool bMasterCommand );
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
@@ -202,7 +202,7 @@ public:
SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE bool ExecuteCommand_Impl( const OUString& rCommand );
- SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& );
+ SAL_DLLPRIVATE void SetRecorder_Impl( css::uno::Reference< css::frame::XDispatchRecorder >& );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
};
diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx
index d198da65c2db..68cb33022608 100644
--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -34,7 +34,7 @@ public:
RequestPackageReparation( const OUString& aName );
~RequestPackageReparation();
bool isApproved();
- com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+ css::uno::Reference < css::task::XInteractionRequest > GetRequest();
};
class NotifyBrokenPackage_Impl;
@@ -44,7 +44,7 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage
public:
NotifyBrokenPackage( const OUString& aName );
~NotifyBrokenPackage();
- com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
+ css::uno::Reference < css::task::XInteractionRequest > GetRequest();
};
#endif // INCLUDED_SFX2_BROKENPACKAGEINT_HXX
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 87d1e388b7e2..e1fb523cdfe1 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -151,7 +151,7 @@ class SFX2_DLLPUBLIC SfxChildWindow
VclPtr<vcl::Window> pParent; // parent window ( Topwindow )
sal_uInt16 nType; // ChildWindow-Id
VclPtr<vcl::Window> pWindow; // actual contents
- SfxChildAlignment eChildAlignment; // Current ::com::sun::star::drawing::Alignment
+ SfxChildAlignment eChildAlignment; // Current css::drawing::Alignment
SfxChildWindow_Impl* pImp; // Implementation data
SfxChildWindowContext* pContext; // With context-sensitive ChildWindows:
// Annother window in pWindow
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 783d396548e2..2f81aa39f38f 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -67,11 +67,11 @@ private:
OUString m_DefaultTarget;
OUString m_TemplateName;
OUString m_Author;
- ::com::sun::star::util::DateTime m_CreationDate;
+ css::util::DateTime m_CreationDate;
OUString m_ModifiedBy;
- ::com::sun::star::util::DateTime m_ModificationDate;
+ css::util::DateTime m_ModificationDate;
OUString m_PrintedBy;
- ::com::sun::star::util::DateTime m_PrintDate;
+ css::util::DateTime m_PrintDate;
sal_Int16 m_EditingCycles;
sal_Int32 m_EditingDuration;
OUString m_Description;
@@ -82,24 +82,21 @@ private:
bool m_bDeleteUserData;
bool m_bUseUserData;
std::vector< CustomProperty* > m_aCustomProperties;
- ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > m_aCmisProperties;
+ css::uno::Sequence< css::document::CmisProperty > m_aCmisProperties;
public:
TYPEINFO_OVERRIDE();
SfxDocumentInfoItem();
SfxDocumentInfoItem( const OUString &rFileName,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties> & i_xDocProps,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::document::CmisProperty> & i_cmisProps,
+ const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps,
+ const css::uno::Sequence< css::document::CmisProperty> & i_cmisProps,
bool bUseUserData );
SfxDocumentInfoItem( const SfxDocumentInfoItem& );
virtual ~SfxDocumentInfoItem();
/// update i_xDocProps with the data in this object
void UpdateDocumentInfo(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties> & i_xDocProps,
+ const css::uno::Reference< css::document::XDocumentProperties> & i_xDocProps,
bool i_bDoNotUpdateUserDefined = false)
const;
bool isCmisDocument() const { return m_aCmisProperties.getLength() > 0;}
@@ -116,7 +113,7 @@ public:
OUString getAuthor() const { return m_Author; }
void setAuthor(const OUString& i_val) { m_Author = i_val; }
- ::com::sun::star::util::DateTime
+ css::util::DateTime
getCreationDate() const { return m_CreationDate; }
void setCreationDate(const css::util::DateTime& i_val) {
m_CreationDate = i_val;
@@ -124,14 +121,14 @@ public:
OUString getModifiedBy() const { return m_ModifiedBy; }
void setModifiedBy(const OUString& i_val) { m_ModifiedBy = i_val; }
- ::com::sun::star::util::DateTime
+ css::util::DateTime
getModificationDate() const { return m_ModificationDate; }
void setModificationDate(const css::util::DateTime& i_val) {
m_ModificationDate = i_val;
}
OUString getPrintedBy() const { return m_PrintedBy; }
void setPrintedBy(const OUString& i_val) { m_PrintedBy = i_val; }
- ::com::sun::star::util::DateTime
+ css::util::DateTime
getPrintDate() const { return m_PrintDate; }
void setPrintDate(const css::util::DateTime& i_val) {
m_PrintDate = i_val;
@@ -162,16 +159,16 @@ public:
std::vector< CustomProperty* > GetCustomProperties() const;
void ClearCustomProperties();
void AddCustomProperty( const OUString& sName,
- const com::sun::star::uno::Any& rValue );
+ const css::uno::Any& rValue );
- ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >
+ css::uno::Sequence< css::document::CmisProperty >
GetCmisProperties() const { return m_aCmisProperties;}
- void SetCmisProperties(const ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >& cmisProps );
+ void SetCmisProperties(const css::uno::Sequence< css::document::CmisProperty >& cmisProps );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
// class SfxDocumentPage -------------------------------------------------
@@ -321,14 +318,14 @@ public:
class CustomPropertiesDurationField : public Edit
{
CustomPropertyLine* m_pLine;
- com::sun::star::util::Duration m_aDuration;
+ css::util::Duration m_aDuration;
protected:
virtual void RequestHelp(const HelpEvent& rEvt) override;
public:
CustomPropertiesDurationField(vcl::Window* pParent, WinBits nStyle, CustomPropertyLine* pLine);
- void SetDuration( const com::sun::star::util::Duration& rDuration );
- const com::sun::star::util::Duration& GetDuration() const { return m_aDuration; }
+ void SetDuration( const css::util::Duration& rDuration );
+ const css::util::Duration& GetDuration() const { return m_aDuration; }
};
class CustomPropertiesEditButton : public PushButton
@@ -449,12 +446,12 @@ public:
bool InitControls( HeaderBar* pHeaderBar, const ScrollBar* pScrollBar );
sal_uInt16 GetVisibleLineCount() const;
inline sal_Int32 GetLineHeight() const { return m_nLineHeight; }
- void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny );
+ void AddLine( const OUString& sName, css::uno::Any& rAny );
bool AreAllLinesValid() const;
void ClearAllLines();
void DoScroll( sal_Int32 nNewPos );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+ css::uno::Sequence< css::beans::PropertyValue >
GetCustomProperties() const;
void SetRemovedHdl( const Link<void*,void>& rLink ) { m_aRemovedHdl = rLink; }
@@ -482,11 +479,11 @@ public:
virtual ~CustomPropertiesControl();
virtual void dispose() override;
- void AddLine( const OUString& sName, com::sun::star::uno::Any& rAny, bool bInteractive );
+ void AddLine( const OUString& sName, css::uno::Any& rAny, bool bInteractive );
inline bool AreAllLinesValid() const { return m_pPropertiesWin->AreAllLinesValid(); }
inline void ClearAllLines() { m_pPropertiesWin->ClearAllLines(); }
- inline ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+ inline css::uno::Sequence< css::beans::PropertyValue >
GetCustomProperties() const
{ return m_pPropertiesWin->GetCustomProperties(); }
void Init(VclBuilderContainer& rParent);
@@ -529,7 +526,7 @@ struct CmisDateTime : public VclBuilderContainer
VclPtr<DateField> m_aDateField;
VclPtr<TimeField> m_aTimeField;
- CmisDateTime( vcl::Window* pParent, const ::com::sun::star::util::DateTime& aDateTime );
+ CmisDateTime( vcl::Window* pParent, const css::util::DateTime& aDateTime );
};
struct CmisYesNo : public VclBuilderContainer
@@ -581,12 +578,12 @@ public:
const OUString& sType, const bool bUpdatable,
const bool bRequired, const bool bMultiValued,
const bool bOpenChoice,
- com::sun::star::uno::Any& aChoices,
- com::sun::star::uno::Any& rAny );
+ css::uno::Any& aChoices,
+ css::uno::Any& rAny );
void ClearAllLines();
void DoScroll( sal_Int32 nNewPos );
- ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >
+ css::uno::Sequence< css::document::CmisProperty >
GetCmisProperties() const;
};
@@ -610,11 +607,11 @@ public:
const OUString& sType, const bool bUpdatable,
const bool bRequired, const bool bMultiValude,
const bool bOpenChoice,
- com::sun::star::uno::Any& aChoices,
- com::sun::star::uno::Any& rAny );
+ css::uno::Any& aChoices,
+ css::uno::Any& rAny );
void ClearAllLines();
- inline ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty >
+ inline css::uno::Sequence< css::document::CmisProperty >
GetCmisProperties() const
{ return m_pPropertiesWin.GetCmisProperties(); }
};
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index d1ef4465e1c0..801d9f80ec53 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -174,7 +174,7 @@ public:
sal_uInt32 GetObjectBarId( sal_uInt16 nPos ) const;
SfxItemState QueryState( sal_uInt16 nSID, const SfxPoolItem* &rpState );
- SfxItemState QueryState( sal_uInt16 nSID, ::com::sun::star::uno::Any& rAny );
+ SfxItemState QueryState( sal_uInt16 nSID, css::uno::Any& rAny );
void SetDisableFlags( sal_uInt32 nFlags );
sal_uInt32 GetDisableFlags() const;
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 19e6ec0ce1e8..59e1ccbc14b1 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -109,11 +109,11 @@ public:
static OUString GetTypeFromStorage( const SotStorage& rStg );
static OUString GetTypeFromStorage(
- const com::sun::star::uno::Reference<com::sun::star::embed::XStorage>& xStorage,
+ const css::uno::Reference<css::embed::XStorage>& xStorage,
bool bTemplate = false, OUString* pName = NULL )
- throw ( com::sun::star::beans::UnknownPropertyException,
- com::sun::star::lang::WrappedTargetException,
- com::sun::star::uno::RuntimeException,
+ throw ( css::beans::UnknownPropertyException,
+ css::lang::WrappedTargetException,
+ css::uno::RuntimeException,
std::exception );
};
diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx
index 23e6d8f3631e..066b1e14a89e 100644
--- a/include/sfx2/docinf.hxx
+++ b/include/sfx2/docinf.hxx
@@ -43,8 +43,7 @@ namespace sfx2 {
@param i_pStorage OLE Storage
*/
sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties> i_xDocProps,
+ css::uno::Reference< css::document::XDocumentProperties> i_xDocProps,
SotStorage* i_pStorage );
/** save document meta-data to OLE stream
@@ -56,15 +55,14 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet(
@param i_pHyperlinks Blob: Hyperlink blob ("_PID_HLINKS")
*/
bool SFX2_DLLPUBLIC SaveOlePropertySet(
- ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties> i_xDocProps,
+ css::uno::Reference< css::document::XDocumentProperties> i_xDocProps,
SotStorage* i_pStorage,
- const ::com::sun::star::uno::Sequence<sal_uInt8> * i_pThumb = 0,
- const ::com::sun::star::uno::Sequence<sal_uInt8> * i_pGuid = 0,
- const ::com::sun::star::uno::Sequence<sal_uInt8> * i_pHyperlinks = 0);
+ const css::uno::Sequence<sal_uInt8> * i_pThumb = 0,
+ const css::uno::Sequence<sal_uInt8> * i_pGuid = 0,
+ const css::uno::Sequence<sal_uInt8> * i_pHyperlinks = 0);
-::com::sun::star::uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(
+css::uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile(
GDIMetaFile* i_pThumb);
} // namespace sfx2
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 186750529c83..e9ecf60cd5af 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -34,8 +34,8 @@ class SfxSplitWindow;
class SfxDockingWindow_Impl;
enum class SplitWindowItemFlags;
-void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
-bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
+void SFX2_DLLPUBLIC SAL_CALL SfxDockingWindowFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
+bool SFX2_DLLPUBLIC SAL_CALL IsDockingWindowVisible( const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rDockingWindowName );
class SFX2_DLLPUBLIC SfxDockingWindow : public DockingWindow
{
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 54a477f050ff..2a9efc8429a6 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -52,9 +52,9 @@ namespace sfx2
If no such mode was passed there, document implementations should return
MacroExecMode::NEVER_EXECUTE.
- @see ::com::sun::star::document::MediaDescriptor::MacroExecutionMode
- @see ::com::sun::star::frame::XComponentLoader::loadComponentFromURL
- @see ::com::sun::star::frame::XModel::attachResource
+ @see css::document::MediaDescriptor::MacroExecutionMode
+ @see css::frame::XComponentLoader::loadComponentFromURL
+ @see css::frame::XModel::attachResource
@see setCurrentMacroExecMode
@@ -77,9 +77,9 @@ namespace sfx2
Usually, a document implementation will simply put the macro execution mode
into its media descriptor, as returned by XModel::getArgs.
- @see ::com::sun::star::document::MediaDescriptor::MacroExecutionMode
- @see ::com::sun::star::frame::XComponentLoader::loadComponentFromURL
- @see ::com::sun::star::frame::XModel::attachResource
+ @see css::document::MediaDescriptor::MacroExecutionMode
+ @see css::frame::XComponentLoader::loadComponentFromURL
+ @see css::frame::XModel::attachResource
see getCurrentMacroExecMode
*/
@@ -121,7 +121,7 @@ namespace sfx2
can also be replaced with a call to the (to be introduced) getDocumentModel
method, and a queryInterface.
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts >
+ virtual css::uno::Reference< css::document::XEmbeddedScripts >
getEmbeddedDocumentScripts() const = 0;
/** returns the state of the signatures for the scripts embedded in the document
@@ -165,7 +165,7 @@ namespace sfx2
*/
virtual void
showBrokenSignatureWarning(
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
) const = 0;
protected:
@@ -179,7 +179,7 @@ namespace sfx2
/** encapsulates handling the macro mode of a document
- @see com::sun::star::document::MacroExecMode
+ @see css::document::MacroExecMode
*/
class SFX2_DLLPUBLIC DocumentMacroMode
{
@@ -232,7 +232,7 @@ namespace sfx2
<TRUE/> if and only if macro execution in this document is allowed.
*/
bool adjustMacroMode(
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
);
/** determines whether macro execution is disallowed
@@ -270,10 +270,9 @@ namespace sfx2
BeanShell-/JavaScript-/Python-Scripts are stored, and a sub storage named "Basic" (where
Basic scripts are stored).
*/
- static bool
- storageHasMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxStorage );
+ static bool storageHasMacros( const css::uno::Reference< css::embed::XStorage >& _rxStorage );
- static bool containerHasBasicMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xContainter );
+ static bool containerHasBasicMacros( const css::uno::Reference< css::script::XLibraryContainer >& xContainter );
/** checks the macro execution mode while loading the document.
This must be called when the loading is effectively finished, but before any macro action
@@ -298,7 +297,7 @@ namespace sfx2
*/
bool
checkMacrosOnLoading(
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction
+ const css::uno::Reference< css::task::XInteractionHandler >& _rxInteraction
);
private:
diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx
index 816d4cd4dcfc..e2ec5b47cc6b 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -51,7 +51,7 @@ namespace sfx2
//= DocumentStorageModifyListener
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::util::XModifyListener > DocumentStorageModifyListener_Base;
+ typedef ::cppu::WeakImplHelper1 < css::util::XModifyListener > DocumentStorageModifyListener_Base;
class SFX2_DLLPUBLIC DocumentStorageModifyListener : public DocumentStorageModifyListener_Base
{
@@ -64,10 +64,10 @@ namespace sfx2
void dispose();
// XModifyListener
- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
protected:
virtual ~DocumentStorageModifyListener();
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 0eb1d5d1a03b..95bd3cdbc433 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -62,7 +62,7 @@ public:
class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint
{
- ::com::sun::star::uno::Reference< css::frame::XController2 > xViewController;
+ css::uno::Reference< css::frame::XController2 > xViewController;
public:
SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const css::uno::Reference< css::frame::XController >& xController )
@@ -84,7 +84,7 @@ class Printer;
class SfxPrintingHint : public SfxViewEventHint
{
sal_Int32 mnPrintableState;
- com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts;
+ css::uno::Sequence < css::beans::PropertyValue > aOpts;
public:
SfxPrintingHint(
sal_Int32 nEvent,
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 92c478f1a0a0..d7cf357a2ce6 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -103,7 +103,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration
{
public:
static void ConfigureEvent( const OUString& aName, const SvxMacro&, SfxObjectShell* pObjSh);
- static SvxMacro* ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp );
+ static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, bool bBlowUp );
};
#endif
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index f7cfc446f84c..bb342d574fc3 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -85,8 +85,8 @@ public:
SAL_DLLPRIVATE static void ReadFilters_Impl( bool bUpdate=false );
SAL_DLLPRIVATE static void ReadSingleFilter_Impl( const OUString& rName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xTypeCFG,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG,
+ const css::uno::Reference< css::container::XNameAccess >& xTypeCFG,
+ const css::uno::Reference< css::container::XNameAccess >& xFilterCFG,
bool bUpdate );
SAL_DLLPRIVATE static const SfxFilter* GetDefaultFilter_Impl( const OUString& );
};
@@ -116,7 +116,7 @@ public:
const SfxFilter* GetFilter4Extension( const OUString& rExt, SfxFilterFlags nMust = SfxFilterFlags::IMPORT, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4FilterName( const OUString& rName, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetFilter4UIName( const OUString& rName, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
- const SfxFilter* GetFilterForProps( const com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue >& aSeq, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
+ const SfxFilter* GetFilterForProps( const css::uno::Sequence < css::beans::NamedValue >& aSeq, SfxFilterFlags nMust = SfxFilterFlags::NONE, SfxFilterFlags nDont = SFX_FILTER_NOTINSTALLED ) const;
const SfxFilter* GetAnyFilter( SfxFilterFlags nMust=SfxFilterFlags::NONE, SfxFilterFlags nDont=SFX_FILTER_NOTINSTALLED ) const;
};
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 7e31b5a23302..78c31fabbe82 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -93,7 +93,7 @@ private:
Link<FileDialogHelper*,void> m_aDialogClosedLink;
ErrCode m_nError;
- ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePickerListener > mxImp;
+ css::uno::Reference < css::ui::dialogs::XFilePickerListener > mxImp;
FileDialogHelper_Impl *mpImp;
@@ -115,14 +115,14 @@ public:
SfxFilterFlags nMust,
SfxFilterFlags nDont,
const OUString& rStandardDir,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList);
+ const css::uno::Sequence< OUString >& rBlackList);
FileDialogHelper( sal_Int16 nDialogType,
sal_Int64 nFlags,
const OUString& aFilterUIName,
const OUString& aExtName,
const OUString& rStandardDir,
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList,
+ const css::uno::Sequence< OUString >& rBlackList,
vcl::Window* _pPreferredParent = NULL );
@@ -143,10 +143,10 @@ public:
to different folders. As this method always provides the root folder for all selected
files this cannot work.
*/
- ::com::sun::star::uno::Sequence< OUString > GetMPath() const;
+ css::uno::Sequence< OUString > GetMPath() const;
/** Provides the selected files with full path information */
- ::com::sun::star::uno::Sequence< OUString > GetSelectedFiles() const;
+ css::uno::Sequence< OUString > GetSelectedFiles() const;
void AddFilter( const OUString& rFilterName, const OUString& rExtension );
void SetCurrentFilter( const OUString& rFilter );
@@ -169,7 +169,7 @@ public:
specifies the URL of the folder whose content is to be displayed.<br/>
If the URL doesn't denote a valid (existent and accessible) folder, the
request is silently dropped.
- @throws ::com::sun::star::uno::RuntimeException
+ @throws css::uno::RuntimeException
if the invocation of any of the file picker or UCB methods throws a RuntimeException.
*/
void SetDisplayFolder( const OUString& _rURL );
@@ -192,17 +192,17 @@ public:
OUString GetDisplayDirectory() const;
ErrCode GetGraphic( Graphic& rGraphic ) const;
- ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker2 > GetFilePicker() const;
+ css::uno::Reference < css::ui::dialogs::XFilePicker2 > GetFilePicker() const;
// XFilePickerListener methods
- void SAL_CALL FileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
- void SAL_CALL DirectoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
- virtual void SAL_CALL ControlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
+ void SAL_CALL FileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
+ void SAL_CALL DirectoryChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
+ virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
void SAL_CALL DialogSizeChanged();
- static OUString SAL_CALL HelpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent );
+ static OUString SAL_CALL HelpRequested( const css::ui::dialogs::FilePickerEvent& aEvent );
// XDialogClosedListener methods
- void SAL_CALL DialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent );
+ void SAL_CALL DialogClosed( const css::ui::dialogs::DialogClosedEvent& _rEvent );
/** sets help ids for the controls in the dialog
@param _pControlId
@@ -245,7 +245,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
const OUString* pPath = NULL,
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG,
const OUString& rStandardDir = OUString(),
- const ::com::sun::star::uno::Sequence< OUString >& rBlackList = ::com::sun::star::uno::Sequence< OUString >());
+ const css::uno::Sequence< OUString >& rBlackList = css::uno::Sequence< OUString >());
ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItemSet* pSet);
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 27ee54dc8503..15539aae8517 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -112,8 +112,8 @@ protected:
SAL_DLLPRIVATE SfxFrame( vcl::Window& i_rContainerWindow, bool bHidden );
public:
- static SfxFrame* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
- static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
+ static SfxFrame* Create( const css::uno::Reference< css::frame::XFrame >& xFrame );
+ static css::uno::Reference< css::frame::XFrame >
CreateBlankFrame();
static SfxFrame* Create( SfxObjectShell& rDoc, vcl::Window& rWindow, sal_uInt16 nViewId, bool bHidden );
@@ -132,7 +132,7 @@ public:
static SfxFrame* GetNext( SfxFrame& );
static const SfxPoolItem*
- OpenDocumentSynchron( SfxItemSet& aSet, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rTargetFrame );
+ OpenDocumentSynchron( SfxItemSet& aSet, const css::uno::Reference< css::frame::XFrame >& i_rTargetFrame );
SfxObjectShell* GetCurrentDocument() const;
SfxViewFrame* GetCurrentViewFrame() const;
@@ -144,17 +144,17 @@ public:
void GetTargetList( TargetList& ) const;
void UpdateDescriptor( SfxObjectShell *pDoc );
void Resize();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
+ css::uno::Reference< css::frame::XFrame >
GetFrameInterface() const;
void Appear();
void AppearWithUpdate();
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
+ css::uno::Reference< css::frame::XController >
GetController() const;
bool IsInPlace() const;
SAL_DLLPRIVATE bool DoClose_Impl();
- SAL_DLLPRIVATE void SetFrameInterface_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+ SAL_DLLPRIVATE void SetFrameInterface_Impl( const css::uno::Reference< css::frame::XFrame >& rFrame );
SAL_DLLPRIVATE void ReleasingComponent_Impl( bool bSet );
SAL_DLLPRIVATE void GetViewData_Impl();
SAL_DLLPRIVATE void SetFrameType_Impl( sal_uInt32 );
@@ -224,8 +224,8 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
SfxFrame* GetFrame() const
{ return wFrame; }
@@ -233,34 +233,34 @@ public:
class SFX2_DLLPUBLIC SfxUsrAnyItem : public SfxPoolItem
{
- ::com::sun::star::uno::Any aValue;
+ css::uno::Any aValue;
public:
TYPEINFO_OVERRIDE();
- SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny );
- ::com::sun::star::uno::Any GetValue() const
+ SfxUsrAnyItem( sal_uInt16 nWhich, const css::uno::Any& rAny );
+ css::uno::Any GetValue() const
{ return aValue; }
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem
{
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
+ css::uno::Reference< css::frame::XFrame >
m_xFrame;
public:
TYPEINFO_OVERRIDE();
SfxUnoFrameItem();
- SfxUnoFrameItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >&
+ SfxUnoFrameItem( sal_uInt16 nWhich, const css::uno::Reference< css::frame::XFrame >& i_rFrame );
+ const css::uno::Reference< css::frame::XFrame >&
GetFrame() const
{ return m_xFrame; }
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
typedef SfxUsrAnyItem SfxUnoAnyItem;
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index c6527bdf8ffd..e8de3ce05cd4 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -54,14 +54,13 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
public:
static void Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties>&,
+ const css::uno::Reference< css::document::XDocumentProperties>&,
const sal_Char *pIndent,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0 );
static void Out_FrameDescriptor(
- SvStream&, const OUString& rBaseURL, const com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet >& xSet,
+ SvStream&, const OUString& rBaseURL, const css::uno::Reference < css::beans::XPropertySet >& xSet,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0 );
};
diff --git a/include/sfx2/imagemgr.hxx b/include/sfx2/imagemgr.hxx
index e4962bf47edd..36f914c53cdf 100644
--- a/include/sfx2/imagemgr.hxx
+++ b/include/sfx2/imagemgr.hxx
@@ -29,7 +29,7 @@
#include <vcl/image.hxx>
SFX2_DLLPUBLIC Image SAL_CALL GetImage(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const css::uno::Reference< css::frame::XFrame >& rFrame,
const OUString& aURL,
bool bBig
);
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index 9f798d5dff64..b836bf41ca58 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -56,13 +56,13 @@ friend class SfxInPlaceClient_Impl;
SAL_DLLPRIVATE virtual void ViewChanged();
public:
- SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect = com::sun::star::embed::Aspects::MSOLE_CONTENT );
+ SfxInPlaceClient( SfxViewShell* pViewShell, vcl::Window* pDraw, sal_Int64 nAspect = css::embed::Aspects::MSOLE_CONTENT );
virtual ~SfxInPlaceClient();
SfxViewShell* GetViewShell() const { return m_pViewSh; }
vcl::Window* GetEditWin() const { return m_pEditWin; }
- com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() const;
- void SetObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rObject );
+ css::uno::Reference < css::embed::XEmbeddedObject > GetObject() const;
+ void SetObject( const css::uno::Reference < css::embed::XEmbeddedObject >& rObject );
void SetObjectState( sal_Int32 );
bool IsObjectUIActive() const;
bool IsObjectInPlaceActive() const;
@@ -75,7 +75,7 @@ public:
const Fraction& GetScaleWidth() const;
const Fraction& GetScaleHeight() const;
void Invalidate();
- static SfxInPlaceClient* GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject );
+ static SfxInPlaceClient* GetClient( SfxObjectShell* pDoc, const css::uno::Reference < css::embed::XEmbeddedObject >& xObject );
sal_Int64 GetAspect() const;
sal_Int64 GetObjectMiscStatus() const;
ErrCode DoVerb( long nVerb );
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 24a23dfa6e02..ace7f8f401cf 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -50,7 +50,7 @@ typedef std::set<SvLinkSource*> SvLinkSources;
class SFX2_DLLPUBLIC LinkManager
{
- typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > >
+ typedef ::std::vector< css::uno::Reference< css::lang::XComponent > >
CompVector;
CompVector maCachedComps;
@@ -79,7 +79,7 @@ public:
*
* @param xComp component loaded during link update.
*/
- void InsertCachedComp(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp);
+ void InsertCachedComp(const css::uno::Reference< css::lang::XComponent >& xComp);
void CloseCachedComps();
@@ -156,7 +156,7 @@ public:
// if the mimetype says graphic/bitmap/gdimetafile then get the
// graphic from the Any. Return says no errors
static bool GetGraphicFromAny( const OUString& rMimeType,
- const ::com::sun::star::uno::Any & rValue,
+ const css::uno::Any & rValue,
Graphic& rGrf );
private:
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index 3b26d3a5e2c4..30c065757c46 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -70,12 +70,12 @@ public:
// notify the sink, the mime type is not
// a selection criterion
void DataChanged( const rtl::OUString & rMimeType,
- const ::com::sun::star::uno::Any & rVal );
+ const css::uno::Any & rVal );
void SendDataChanged();
void NotifyDataChanged();
virtual bool Connect( SvBaseLink* );
- virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/,
+ virtual bool GetData( css::uno::Any & rData /*out param*/,
const rtl::OUString & rMimeType,
bool bSynchron = false );
@@ -96,19 +96,19 @@ public:
struct StreamToLoadFrom{
StreamToLoadFrom(
- const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, bool bIsReadOnly )
+ const css::uno::Reference<css::io::XInputStream>& xInputStream, bool bIsReadOnly )
:m_xInputStreamToLoadFrom(xInputStream),
m_bIsReadOnly(bIsReadOnly)
{
}
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
+ css::uno::Reference<css::io::XInputStream>
m_xInputStreamToLoadFrom;
bool m_bIsReadOnly;
};
StreamToLoadFrom getStreamToLoadFrom();
- void setStreamToLoadFrom(const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream, bool bIsReadOnly );
+ void setStreamToLoadFrom(const css::uno::Reference<css::io::XInputStream>& xInputStream, bool bIsReadOnly );
void clearStreamToLoadFrom();
};
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index a4255cfb8d0c..2458c9b2a21a 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -91,8 +91,8 @@ protected:
ImplBaseLinkData* pImplData;
bool m_bIsReadOnly;
- com::sun::star::uno::Reference<com::sun::star::io::XInputStream>
- m_xInputStreamToLoadFrom;
+ css::uno::Reference<css::io::XInputStream>
+ m_xInputStreamToLoadFrom;
SvBaseLink();
SvBaseLink( SfxLinkUpdateMode nLinkType, SotClipboardFormatId nContentType = SotClipboardFormatId::STRING );
@@ -131,7 +131,7 @@ public:
};
virtual UpdateResult DataChanged(
- const OUString & rMimeType, const ::com::sun::star::uno::Any & rValue );
+ const OUString & rMimeType, const css::uno::Any & rValue );
void SetUpdateMode( SfxLinkUpdateMode );
SfxLinkUpdateMode GetUpdateMode() const;
@@ -157,7 +157,7 @@ public:
void SetUseCache( bool bFlag ) { bUseCache = bFlag; }
void setStreamToLoadFrom(
- const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInputStream,
+ const css::uno::Reference<css::io::XInputStream>& xInputStream,
bool bIsReadOnly )
{ m_xInputStreamToLoadFrom = xInputStream;
m_bIsReadOnly = bIsReadOnly; }
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index 80287e598439..3ffd522792c4 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -65,7 +65,7 @@ protected:
};
::std::vector< OUString > maAttachedDocuments;
static SaveResult SaveDocumentAsFormat( const OUString& aSaveFileName,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
+ const css::uno::Reference< css::uno::XInterface >& xFrameOrModel,
const OUString& rType,
OUString& rFileNamePath );
@@ -76,13 +76,13 @@ private:
OUString maFromAddress;
OUString maSubject;
- static SaveResult ShowFilterOptionsDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMGR,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel,
+ static SaveResult ShowFilterOptionsDialog( const css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR,
+ const css::uno::Reference< css::frame::XModel > xModel,
const OUString& rFilterName,
const OUString& rType,
bool bModified,
sal_Int32& rNumArgs,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
+ css::uno::Sequence< css::beans::PropertyValue >& rArgs );
public:
enum SendMailResult
@@ -110,12 +110,12 @@ public:
* \return @see error code
*/
SendMailResult AttachDocument( const OUString& sDocumentType,
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
+ const css::uno::Reference< css::uno::XInterface >& xFrameOrModel,
const OUString& sAttachmentTitle );
- SendMailResult SaveAndSend( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+ SendMailResult SaveAndSend( const css::uno::Reference< css::frame::XFrame >& xFrame,
const OUString& rType );
- SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
+ SendMailResult Send( const css::uno::Reference< css::frame::XFrame >& xFrame );
bool IsEmpty() const;
};
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 40801da49d98..b76a64c0acb1 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -99,7 +99,7 @@ public:
Failures in any of those steps are reported as assertion in non-product builds, and then FUNIT_100TH_MM is returned.
*/
- static FieldUnit GetModuleFieldUnit( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > const & i_frame );
+ static FieldUnit GetModuleFieldUnit( css::uno::Reference< css::frame::XFrame > const & i_frame );
FieldUnit GetFieldUnit() const;
SAL_DLLPRIVATE static SfxModuleArr_Impl& GetModules_Impl();
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index edbe6d10690d..9ad250491954 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -220,8 +220,8 @@ private:
bool CloseInternal();
private:
- SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties> & i_xDocProps);
+ SAL_DLLPRIVATE void UpdateTime_Impl(const css::uno::Reference<
+ css::document::XDocumentProperties> & i_xDocProps);
SAL_DLLPRIVATE bool SaveTo_Impl(SfxMedium &rMedium, const SfxItemSet* pSet );
@@ -252,7 +252,7 @@ private:
static void InitInterface_Impl();
public:
- static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
+ static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
/* Stampit disable/enable cancel button for print jobs
default = true = enable! */
void Stamp_SetPrintCancelState(bool bState);
@@ -267,9 +267,9 @@ public:
std::function<bool ( const SfxObjectShell* )> isObjectShell = nullptr,
bool bOnlyVisible = true );
static SfxObjectShell* Current();
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+ static css::uno::Reference< css::uno::XInterface >
GetCurrentComponent();
- static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
+ static void SetCurrentComponent( const css::uno::Reference< css::uno::XInterface >& _rxComponent );
virtual void Invalidate(sal_uInt16 nId = 0) override;
@@ -279,8 +279,8 @@ public:
virtual SfxObjectFactory& GetFactory() const=0;
SfxMedium * GetMedium() const { return pMedium; }
- ::com::sun::star::uno::Reference<
- ::com::sun::star::document::XDocumentProperties > getDocProperties();
+ css::uno::Reference< css::document::XDocumentProperties >
+ getDocProperties();
void UpdateDocInfoForSave( );
void FlushDocInfo();
bool HasName() const { return bHasName; }
@@ -306,8 +306,8 @@ public:
void SetSharedXMLFlag( bool bFlag ) const;
bool HasSharedXMLFlagSet() const;
- SAL_DLLPRIVATE void SetModalMode_Impl(bool bModal=true);
- SAL_DLLPRIVATE void SetMacroMode_Impl(bool bModal=true);
+ SAL_DLLPRIVATE void SetModalMode_Impl(bool bModal=true);
+ SAL_DLLPRIVATE void SetMacroMode_Impl(bool bModal=true);
void ResetError();
sal_uInt32 GetError() const;
@@ -337,14 +337,14 @@ public:
virtual bool SaveAsOwnFormat( SfxMedium& pMedium );
virtual bool ConvertFrom( SfxMedium &rMedium );
virtual bool ConvertTo( SfxMedium &rMedium );
- virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ virtual bool InitNew( const css::uno::Reference< css::embed::XStorage >& xStorage );
virtual bool Load( SfxMedium &rMedium );
virtual bool LoadFrom( SfxMedium& rMedium );
virtual bool Save();
virtual bool SaveAs( SfxMedium &rMedium );
- virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ virtual bool SaveCompleted( const css::uno::Reference< css::embed::XStorage >& xStorage );
bool SwitchPersistance(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ const css::uno::Reference< css::embed::XStorage >& xStorage );
virtual void UpdateLinks();
virtual bool LoadExternal( SfxMedium& rMedium );
/**
@@ -361,7 +361,7 @@ public:
bool SaveChildren(bool bObjectsOnly=false);
bool SaveAsChildren( SfxMedium &rMedium );
bool SwitchChildrenPersistance(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ const css::uno::Reference< css::embed::XStorage >& xStorage,
bool bForceNonModified = false );
bool SaveCompletedChildren( bool bSuccess );
@@ -387,22 +387,22 @@ public:
ErrCode CallXScript(
const OUString& rScriptURL,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
- ::com::sun::star::uno::Any& aRet,
- ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
+ const css::uno::Sequence< css::uno::Any >& aParams,
+ css::uno::Any& aRet,
+ css::uno::Sequence< sal_Int16 >& aOutParamIndex,
+ css::uno::Sequence< css::uno::Any >& aOutParam,
bool bRaiseError = true,
- const ::com::sun::star::uno::Any* aCaller = 0 );
+ const css::uno::Any* aCaller = 0 );
static ErrCode CallXScript(
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxScriptContext,
+ const css::uno::Reference< css::uno::XInterface >& _rxScriptContext,
const OUString& rScriptURL,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aParams,
- ::com::sun::star::uno::Any& aRet,
- ::com::sun::star::uno::Sequence< sal_Int16 >& aOutParamIndex,
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aOutParam,
+ const css::uno::Sequence< css::uno::Any >& aParams,
+ css::uno::Any& aRet,
+ css::uno::Sequence< sal_Int16 >& aOutParamIndex,
+ css::uno::Sequence< css::uno::Any >& aOutParam,
bool bRaiseError = true,
- const ::com::sun::star::uno::Any* aCaller = 0
+ const css::uno::Any* aCaller = 0
);
/** adjusts the internal macro mode, according to the current security settings
@@ -434,8 +434,8 @@ public:
sal_uInt32 GetModifyPasswordHash() const;
bool SetModifyPasswordHash( sal_uInt32 nHash );
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetModifyPasswordInfo() const;
- bool SetModifyPasswordInfo( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo );
+ css::uno::Sequence< css::beans::PropertyValue > GetModifyPasswordInfo() const;
+ bool SetModifyPasswordInfo( const css::uno::Sequence< css::beans::PropertyValue >& aInfo );
static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc );
@@ -455,12 +455,12 @@ public:
bool GenerateAndStoreThumbnail(
bool bEncrypted,
bool bIsTemplate,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStor );
+ const css::uno::Reference< css::embed::XStorage >& xStor );
bool WriteThumbnail(
bool bEncrypted,
bool bIsTemplate,
- const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream );
+ const css::uno::Reference< css::io::XStream >& xStream );
bool IsInGenerateAndStoreThumbnail() const {return bIsInGenerateThumbnail;}//optimize thumbnail generate and store procedure to improve odt saving performance, i120030
@@ -496,10 +496,10 @@ public:
long DdeExecute( const OUString& rCmd );
virtual bool DdeGetData( const OUString& rItem,
const OUString& rMimeType,
- ::com::sun::star::uno::Any & rValue );
+ css::uno::Any & rValue );
virtual bool DdeSetData( const OUString& rItem,
const OUString& rMimeType,
- const ::com::sun::star::uno::Any & rValue );
+ const css::uno::Any & rValue );
#endif
virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem );
virtual void ReconnectDdeLink(SfxObjectShell& rServer);
@@ -518,9 +518,9 @@ public:
sal_uInt16 GetAutoStyleFilterIndex();
bool HasBasic() const;
BasicManager* GetBasicManager() const;
- com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >
+ css::uno::Reference< css::script::XLibraryContainer >
GetBasicContainer();
- com::sun::star::uno::Reference< com::sun::star::script::XLibraryContainer >
+ css::uno::Reference< css::script::XLibraryContainer >
GetDialogContainer();
StarBASIC* GetBasic() const;
@@ -530,29 +530,29 @@ public:
virtual SfxObjectShell* GetObjectShell() override;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ css::uno::Reference< css::frame::XModel >
GetModel() const;
// Only temporarily for the applications!
void SetBaseModel( SfxBaseModel* pModel );
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetBaseModel() const;
+ css::uno::Reference< css::frame::XModel > GetBaseModel() const;
// Only temporarily for the applications!
- virtual ::com::sun::star::uno::Sequence< OUString > GetEventNames();
+ virtual css::uno::Sequence< OUString > GetEventNames();
vcl::Window* GetDialogParent( SfxMedium* pMedium=0 );
static SfxObjectShell* CreateObject( const OUString& rServiceName, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD );
static SfxObjectShell* CreateObjectByFactoryName( const OUString& rURL, SfxObjectCreateMode = SfxObjectCreateMode::STANDARD );
- static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+ static css::uno::Reference< css::lang::XComponent >
CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = NULL );
- static SfxObjectShell* GetShellFromComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp );
+ static SfxObjectShell* GetShellFromComponent( const css::uno::Reference< css::lang::XComponent >& xComp );
static OUString GetServiceNameFromFactory( const OUString& rFact );
bool IsInPlaceActive();
bool IsUIActive();
virtual void InPlaceActivate( bool );
static bool CopyStoragesOfUnknownMediaType(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xSource,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xTarget );
+ const css::uno::Reference< css::embed::XStorage >& xSource,
+ const css::uno::Reference< css::embed::XStorage >& xTarget );
// The functions from SvPersist
void EnableSetModified( bool bEnable = true );
@@ -564,16 +564,16 @@ public:
* @param bChart true if the file is a chart doc and FillClass should not be called
*/
void SetupStorage(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ const css::uno::Reference< css::embed::XStorage >& xStorage,
sal_Int32 nVersion, bool bTemplate, bool bChart = false ) const;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorage();
+ css::uno::Reference< css::embed::XStorage > GetStorage();
SvGlobalName GetClassName() const;
// comphelper::IEmbeddedHelper
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const override;
- virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const override
+ virtual css::uno::Reference< css::task::XInteractionHandler > getInteractionHandler() const override;
+ virtual css::uno::Reference < css::embed::XStorage > getStorage() const override
{
return const_cast<SfxObjectShell*>(this)->GetStorage();
}
@@ -625,7 +625,7 @@ public:
virtual bool HasChangeRecordProtection() const;
virtual void SetChangeRecording( bool bActivate );
virtual bool SetProtectionPassword( const OUString &rPassword );
- virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
+ virtual bool GetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > &rPasswordHash );
SAL_DLLPRIVATE std::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl( bool bFullContent ) const;
@@ -633,24 +633,24 @@ public:
SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const;
- SAL_DLLPRIVATE bool ConnectTmpStorage_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, SfxMedium* pMedium );
+ SAL_DLLPRIVATE bool ConnectTmpStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage, SfxMedium* pMedium );
SAL_DLLPRIVATE bool DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium );
SAL_DLLPRIVATE bool PutURLContentsToVersionStream_Impl(
const OUString& aURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xDocStorage,
+ const css::uno::Reference< css::embed::XStorage >& xDocStorage,
const OUString& aStreamName );
SAL_DLLPRIVATE OUString CreateTempCopyOfStorage_Impl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ const css::uno::Reference< css::embed::XStorage >& xStorage );
SAL_DLLPRIVATE void InitOwnModel_Impl();
SAL_DLLPRIVATE void BreakMacroSign_Impl( bool bBreakMacroSing );
SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl();
- SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
+ SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
SAL_DLLPRIVATE SignatureState ImplCheckSignaturesInformation(
- const ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >& aInfos );
- SAL_DLLPRIVATE void CheckEncryption_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
+ const css::uno::Sequence< css::security::DocumentSignatureInformation >& aInfos );
+ SAL_DLLPRIVATE void CheckEncryption_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
SAL_DLLPRIVATE void SetModifyPasswordEntered( bool bEntered = true );
SAL_DLLPRIVATE bool IsModifyPasswordEntered();
@@ -658,7 +658,7 @@ public:
SAL_DLLPRIVATE SfxObjectShell_Impl* Get_Impl() { return pImp; }
SAL_DLLPRIVATE static bool UseInteractionToHandleError(
- const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler,
+ const css::uno::Reference< css::task::XInteractionHandler >& xHandler,
sal_uInt32 nError );
SAL_DLLPRIVATE const SfxObjectShell_Impl* Get_Impl() const { return pImp; }
@@ -683,8 +683,8 @@ public:
// Load/Save public internals
SAL_DLLPRIVATE bool ImportFromGeneratedStream_Impl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr );
+ const css::uno::Reference< css::io::XStream >& xStream,
+ const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescr );
SAL_DLLPRIVATE void PositionView_Impl();
SAL_DLLPRIVATE void UpdateFromTemplate_Impl();
SAL_DLLPRIVATE bool CanReload_Impl();
@@ -695,7 +695,7 @@ public:
SAL_DLLPRIVATE bool APISaveAs_Impl(const OUString& aFileName, SfxItemSet& rItemSet);
SAL_DLLPRIVATE bool CommonSaveAs_Impl(const INetURLObject& aURL, const OUString& aFilterName, SfxItemSet& rItemSet);
SAL_DLLPRIVATE bool GeneralInit_Impl(
- const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+ const css::uno::Reference< css::embed::XStorage >& xStorage,
bool bTypeMustBeSetAlready );
SAL_DLLPRIVATE void PrepareSecondTryLoad_Impl();
SAL_DLLPRIVATE void SetInitialized_Impl( const bool i_fromInitNew );
@@ -710,19 +710,19 @@ public:
// configuration items
SAL_DLLPRIVATE SignatureState ImplGetSignatureState( bool bScriptingContent = false );
- SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation >
+ SAL_DLLPRIVATE css::uno::Sequence< css::security::DocumentSignatureInformation >
ImplAnalyzeSignature(
bool bScriptingContent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >& xSigner
- = ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures >() );
+ const css::uno::Reference< css::security::XDocumentDigitalSignatures >& xSigner
+ = css::uno::Reference< css::security::XDocumentDigitalSignatures >() );
SAL_DLLPRIVATE void ImplSign( bool bScriptingContent = false );
- SAL_DLLPRIVATE bool QuerySaveSizeExceededModules_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler );
+ SAL_DLLPRIVATE bool QuerySaveSizeExceededModules_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
SAL_DLLPRIVATE void CheckOut( );
SAL_DLLPRIVATE void CancelCheckOut( );
SAL_DLLPRIVATE void CheckIn( );
- SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisVersion > GetCmisVersions();
+ SAL_DLLPRIVATE css::uno::Sequence< css::document::CmisVersion > GetCmisVersions();
/**
* Interface shared by document shell. Allow LOK calls from sfx.
@@ -838,8 +838,8 @@ public:
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
#endif
diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx
index af071b107cac..4f7f5b588b39 100644
--- a/include/sfx2/querystatus.hxx
+++ b/include/sfx2/querystatus.hxx
@@ -35,7 +35,7 @@ class SfxQueryStatus_Impl;
class SFX2_DLLPUBLIC SfxQueryStatus
{
public:
- SfxQueryStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
+ SfxQueryStatus( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
~SfxQueryStatus();
// Query method
@@ -45,8 +45,8 @@ class SFX2_DLLPUBLIC SfxQueryStatus
SfxQueryStatus( const SfxQueryStatus& ) = delete;
SfxQueryStatus& operator=( const SfxQueryStatus& ) = delete;
- com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > m_xStatusListener;
- SfxQueryStatus_Impl* m_pSfxQueryStatusImpl;
+ css::uno::Reference< css::frame::XStatusListener > m_xStatusListener;
+ SfxQueryStatus_Impl* m_pSfxQueryStatusImpl;
};
#endif // INCLUDED_SFX2_QUERYSTATUS_HXX
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 130685331912..99934e40b528 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -20,9 +20,9 @@
struct LoadRecentFile
{
- ::com::sun::star::util::URL aTargetURL;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgSeq;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
+ css::util::URL aTargetURL;
+ css::uno::Sequence< css::beans::PropertyValue > aArgSeq;
+ css::uno::Reference< css::frame::XDispatch > xDispatch;
};
enum ApplicationType
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index a59a49e3b59e..4e46c7819469 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -50,7 +50,7 @@ friend struct SfxRequest_Impl;
public:
SAL_DLLPRIVATE void Record_Impl( SfxShell &rSh, const SfxSlot &rSlot,
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder,
+ css::uno::Reference< css::frame::XDispatchRecorder > xRecorder,
SfxViewFrame* );
private:
SAL_DLLPRIVATE void Done_Impl( const SfxItemSet *pSet );
@@ -60,7 +60,7 @@ private:
public:
SfxRequest( SfxViewFrame*, sal_uInt16 nSlotId );
SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, SfxItemPool &rPool );
- SfxRequest( const SfxSlot* pSlot, const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& rArgs,
+ SfxRequest( const SfxSlot* pSlot, const css::uno::Sequence < css::beans::PropertyValue >& rArgs,
SfxCallMode nCallMode, SfxItemPool &rPool );
SfxRequest( sal_uInt16 nSlot, SfxCallMode nCallMode, const SfxAllItemSet& rSfxArgs );
SfxRequest( const SfxRequest& rOrig );
@@ -94,7 +94,7 @@ public:
void SetReturnValue(const SfxPoolItem &);
const SfxPoolItem* GetReturnValue() const;
- static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
+ static css::uno::Reference< css::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
static bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
SfxCallMode GetCallMode() const;
void AllowRecording( bool );
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index f3e70d3ca073..07b2668193dd 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -462,7 +462,7 @@ public:
virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage,
const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor )
throw ( css::lang::IllegalArgumentException,
- com::sun::star::frame::DoubleInitializationException,
+ css::frame::DoubleInitializationException,
css::io::IOException,
css::uno::Exception,
css::uno::RuntimeException, std::exception ) override;
@@ -835,9 +835,9 @@ protected:
bool hasValidSignatures() const;
/* GrabBagItem for interim interop purposes */
- void getGrabBagItem(com::sun::star::uno::Any& rVal) const;
+ void getGrabBagItem(css::uno::Any& rVal) const;
- void setGrabBagItem(const com::sun::star::uno::Any& rVal);
+ void setGrabBagItem(const css::uno::Any& rVal);
// private methods
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index f6e87caf9a40..d6342bf41959 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -85,8 +85,8 @@ public:
class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog
{
public:
- virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()=0;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType )=0;
+ virtual css::uno::Reference < css::embed::XEmbeddedObject > GetObject()=0;
+ virtual css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType )=0;
virtual bool IsCreateNew()=0;
};
@@ -118,7 +118,7 @@ class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialog
public:
virtual ~SfxAbstractDialogFactory(); // needed for export of vtable
static SfxAbstractDialogFactory* Create();
- virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0;
+ virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt32 nResId, const rtl::OUString& rParameter ) = 0;
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
vcl::Window* pParent,
const SfxItemSet* pAttrSet,
@@ -128,25 +128,25 @@ public:
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
vcl::Window* pParent,
const SfxItemSet* pAttrSet,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
+ const css::uno::Reference< css::frame::XFrame >& xViewFrame,
bool bEditFmt=false,
const rtl::OUString *pUserButtonText=0 ) = 0;
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0;
virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0;
virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand,
- const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor,
+ const css::uno::Reference < css::embed::XStorage >& xStor,
const SvObjectServerList* pList = 0 )=0;
virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand,
- const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0;
- virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0;
- virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0;
+ const css::uno::Reference < css::embed::XEmbeddedObject >& xObj )=0;
+ virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent )=0;
+ virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML=false, sfx2::SvBaseLink* p=0 )=0;
virtual VclAbstractDialog * CreateSvxScriptOrgDialog( vcl::Window* pParent, const rtl::OUString& rLanguage ) = 0;
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
vcl::Window* pParent,
bool bShowSlots,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
+ const css::uno::Reference< css::frame::XFrame >& _rxFrame
) = 0;
virtual VclAbstractDialog* CreateScriptErrorDialog(
diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index 35ee309e5b7e..b4013a965d37 100644
--- a/include/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
@@ -56,12 +56,12 @@ namespace sfx2
factory evaluates certain creation arguments (passed to createInstanceWithArguments)
and passes them to the factory function of the derived class.
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory >
+ css::uno::Reference< css::lang::XSingleServiceFactory >
SFX2_DLLPUBLIC createSfxModelFactory(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceFactory,
+ const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxServiceFactory,
const OUString& _rImplementationName,
const SfxModelFactoryFunc _pComponentFactoryFunc,
- const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames
+ const css::uno::Sequence< OUString >& _rServiceNames
);
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 67c1abbb9c82..560a0e570f48 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -38,7 +38,7 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
{
public:
- SfxStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
+ SfxStatusListener( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& aCommand );
virtual ~SfxStatusListener();
// old methods from SfxControllerItem
@@ -49,24 +49,24 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
// XComponent
- virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- 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) override;
+ virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
// XEventListener
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
// XStatusListener
- virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
private:
SfxStatusListener( const SfxStatusListener& ) = delete;
SfxStatusListener& operator=( const SfxStatusListener& ) = delete;
- sal_uInt16 m_nSlotID;
- ::com::sun::star::util::URL m_aCommand;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
- ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > m_xDispatch;
+ sal_uInt16 m_nSlotID;
+ css::util::URL m_aCommand;
+ css::uno::Reference< css::frame::XDispatchProvider > m_xDispatchProvider;
+ css::uno::Reference< css::frame::XDispatch > m_xDispatch;
};
#endif // INCLUDED_SFX2_SFXSTATUSLISTENER_HXX
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 917e025af609..8d469aa307cd 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -439,8 +439,8 @@ public:
void PutItem( const SfxPoolItem& rItem );
// TODO/CLEANUP: still needed?!
- void SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs);
- const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbs() const;
+ void SetVerbs(const css::uno::Sequence < css::embed::VerbDescriptor >& aVerbs);
+ const css::uno::Sequence < css::embed::VerbDescriptor >& GetVerbs() const;
void VerbExec (SfxRequest&);
static void VerbState (SfxItemSet&);
SAL_DLLPRIVATE const SfxSlot* GetVerbSlot_Impl(sal_uInt16 nId) const;
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx
index 5f482786e7a8..957601a84632 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -37,7 +37,7 @@ public:
/** Return the preferred height with the constraint, that the
window will be set to the given width.
*/
- virtual ::com::sun::star::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) = 0;
+ virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) = 0;
};
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 1643f18cd4c0..8753d90599ae 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -31,7 +31,7 @@ class SfxStatusBarControl;
class SfxBindings;
svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const css::uno::Reference< css::frame::XFrame >& rFrame,
StatusBar* pStatusBar,
unsigned short nID,
const OUString& aCommandURL );
@@ -66,33 +66,33 @@ class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController
protected:
// new controller API
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
// XEventListener
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
// XComponent
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event )
+ throw ( css::uno::RuntimeException, std::exception ) override;
// XStatusbarController
- virtual sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos,
+ virtual sal_Bool SAL_CALL mouseButtonDown( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL mouseMove( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL mouseButtonUp( const css::awt::MouseEvent& aMouseEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL command( const css::awt::Point& aPos,
::sal_Int32 nCommand,
sal_Bool bMouseEvent,
- const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics,
- const ::com::sun::star::awt::Rectangle& rOutputRectangle,
- ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL paint( const css::uno::Reference< css::awt::XGraphics >& xGraphics,
+ const css::awt::Rectangle& rOutputRectangle,
+ ::sal_Int32 nStyle ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL click( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL doubleClick( const css::awt::Point& aPos ) throw (css::uno::RuntimeException, std::exception) override;
// Old sfx2 interface
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 00a823a0fd5f..8281c9399028 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -267,8 +267,8 @@ public:
virtual void ChangesApplied();
static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep = true );
- void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetFrame();
+ void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
+ css::uno::Reference< css::frame::XFrame > GetFrame();
};
#endif
diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 43be563a5b39..31b5e6eb0dff 100644
--- a/include/sfx2/taskpane.hxx
+++ b/include/sfx2/taskpane.hxx
@@ -91,13 +91,13 @@ namespace sfx2
*/
ModuleTaskPane(
vcl::Window& i_rParentWindow,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame
+ const css::uno::Reference< css::frame::XFrame >& i_rDocumentFrame
);
virtual ~ModuleTaskPane();
/** determines whether a given module has any registered tool panels
*/
- static bool ModuleHasToolPanels( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rDocumentFrame );
+ static bool ModuleHasToolPanels( const css::uno::Reference< css::frame::XFrame >& i_rDocumentFrame );
/** provides access to the Window aspect of the PanelDeck
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 4e89c22594aa..5043c0bcd436 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -41,7 +41,7 @@
class SfxToolBoxControl;
class SfxModule;
-svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL );
+svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolbox, unsigned short nID, const OUString& aCommandURL );
typedef SfxToolBoxControl* (*SfxToolBoxControlCtor)( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox );
@@ -74,9 +74,9 @@ friend class SfxFrameStatusListener;
bool m_bCascading;
Link<SfxPopupWindow*,void> m_aDeleteLink;
sal_uInt16 m_nId;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
+ css::uno::Reference< css::frame::XFrame > m_xFrame;
SfxFrameStatusListener* m_pStatusListener;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xStatusListener;
+ css::uno::Reference< css::lang::XComponent > m_xStatusListener;
private:
SfxFrameStatusListener* GetOrCreateStatusListener();
@@ -91,7 +91,7 @@ protected:
void DeleteFloatingWindow();
sal_uInt16 GetId() const { return m_nId; }
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; }
+ const css::uno::Reference< css::frame::XFrame >& GetFrame() const { return m_xFrame; }
void BindListener();
void UnbindListener();
@@ -104,7 +104,7 @@ protected:
public:
SfxPopupWindow( sal_uInt16 nId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const css::uno::Reference< css::frame::XFrame >& rFrame,
WinBits nBits );
SfxPopupWindow(sal_uInt16 nId,
const OString& rID, const OUString& rUIXMLDescription,
@@ -115,7 +115,7 @@ public:
const css::uno::Reference<css::frame::XFrame> &rFrame =
css::uno::Reference<css::frame::XFrame>());
SfxPopupWindow( sal_uInt16 nId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const css::uno::Reference< css::frame::XFrame >& rFrame,
vcl::Window* pParentWindow,
WinBits nBits );
virtual ~SfxPopupWindow();
@@ -178,33 +178,33 @@ protected:
public:
// XEventListener
using ::cppu::OPropertySetHelper::disposing;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
// XComponent
- virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
// new controller API
// XStatusListener
- virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
- throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event )
+ throw ( css::uno::RuntimeException, std::exception ) override;
// XToolbarController
virtual void SAL_CALL execute( sal_Int16 KeyModifier )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL click()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL doubleClick()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow()
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rParent )
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow()
+ throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& rParent )
+ throw (css::uno::RuntimeException, std::exception) override;
// XSubToolbarController
- virtual sal_Bool SAL_CALL opensSubToolbar( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSubToolbarName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL updateImage( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL opensSubToolbar( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getSubToolbarName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL updateImage( ) throw (css::uno::RuntimeException, std::exception) override;
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -217,10 +217,10 @@ public:
unsigned short GetSlotId() const;
void Dispatch( const OUString& aCommand,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
- static void Dispatch( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
+ css::uno::Sequence< css::beans::PropertyValue >& aArgs );
+ static void Dispatch( const css::uno::Reference< css::frame::XDispatchProvider >& rDispatchProvider,
const OUString& rCommand,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
+ css::uno::Sequence< css::beans::PropertyValue >& aArgs );
static SfxItemState GetItemState( const SfxPoolItem* pState );
static SfxToolBoxControl* CreateControl( sal_uInt16 nSlotId, sal_uInt16 nTbxId, ToolBox *pBox, SfxModule *pMod );
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index 40f0d181d78a..57cb6defaee2 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -55,7 +55,7 @@ public:
void setSaveMode();
- void setDocumentModel (const com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rModel);
+ void setDocumentModel (const css::uno::Reference<css::frame::XModel> &rModel);
DECL_LINK_TYPED(ActivatePageHdl, TabControl*, void);
@@ -161,8 +161,8 @@ private:
std::set<const ThumbnailViewItem*,selection_cmp_fn> maSelFolders;
bool mbIsSaveMode; ///< Flag that indicates if we are in save mode or not.
- com::sun::star::uno::Reference< com::sun::star::frame::XModel > m_xModel;
- com::sun::star::uno::Reference< com::sun::star::frame::XDesktop2 > mxDesktop;
+ css::uno::Reference< css::frame::XModel > m_xModel;
+ css::uno::Reference< css::frame::XDesktop2 > mxDesktop;
bool mbIsSynced; ///< Tells whether maRepositories is synchronized with the user config
std::vector<TemplateRepository*> maRepositories; ///< Stores the remote repositories for templates
diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx
index bd659f81ab41..af699ddd4095 100644
--- a/include/sfx2/templateinfodlg.hxx
+++ b/include/sfx2/templateinfodlg.hxx
@@ -44,8 +44,8 @@ private:
VclPtr<vcl::Window> mpPreviewView; // gets released when xWindows get destroyed (don't delete in constructor)
VclPtr<svtools::ODocumentInfoPreview> mpInfoView;
- ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > m_xFrame;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow;
+ css::uno::Reference < css::frame::XFrame2 > m_xFrame;
+ css::uno::Reference< css::awt::XWindow > xWindow;
};
#endif // INCLUDED_SFX2_TEMPLATEINFODLG_HXX
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index d7d866a2a0e0..60c0780620b1 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -84,11 +84,11 @@ public:
bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName);
bool saveTemplateAs (sal_uInt16 nItemId,
- com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rModel,
+ css::uno::Reference<css::frame::XModel> &rModel,
const OUString &rName);
bool saveTemplateAs (TemplateContainerItem *pDstItem,
- com::sun::star::uno::Reference<com::sun::star::frame::XModel> &rModel,
+ css::uno::Reference<css::frame::XModel> &rModel,
const OUString &rName);
bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString &rName) const;
diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx
index 50730180e6d8..7e5d7f69f960 100644
--- a/include/sfx2/templateremoteview.hxx
+++ b/include/sfx2/templateremoteview.hxx
@@ -37,7 +37,7 @@ public:
private:
- com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
+ css::uno::Reference< css::ucb::XCommandEnvironment > m_xCmdEnv;
};
#endif // INCLUDED_SFX2_TEMPLATEREMOTEVIEW_HXX
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index b7aa4d6ad81a..c58ddb99ae4f 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -259,7 +259,7 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
protected:
@@ -286,9 +286,9 @@ protected:
SFX2_DLLPRIVATE void ImplDeleteItems();
SFX2_DLLPRIVATE size_t ImplGetItem( const Point& rPoint ) const;
SFX2_DLLPRIVATE ThumbnailViewItem* ImplGetItem( size_t nPos );
- SFX2_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const;
+ SFX2_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const;
SFX2_DLLPRIVATE ThumbnailViewItem* ImplGetVisibleItem( sal_uInt16 nVisiblePos );
- SFX2_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue );
+ SFX2_DLLPRIVATE void ImplFireAccessibleEvent( short nEventId, const css::uno::Any& rOldValue, const css::uno::Any& rNewValue );
SFX2_DLLPRIVATE bool ImplHasAccessibleListeners();
DECL_DLLPRIVATE_LINK_TYPED( ImplScrollHdl, ScrollBar*, void );
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index 04a9b2dff70a..09340af9601b 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -76,7 +76,7 @@ public:
bool mbHover;
BitmapEx maPreview1;
OUString maTitle;
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
+ css::uno::Reference< css::accessibility::XAccessible >* mpxAcc;
ThumbnailViewItem (ThumbnailView &rView, sal_uInt16 nId);
@@ -107,7 +107,7 @@ public:
void updateTitleEditSize ();
void setTitle (const OUString& rTitle);
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
+ css::uno::Reference< css::accessibility::XAccessible >
GetAccessible( bool bIsTransientChildrenDisabled );
void setDrawArea (const Rectangle &area);
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index b7065b2d60a7..8d325d5fd179 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -41,9 +41,9 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual sal_uInt8 GetFlagCount() const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual sal_uInt8 GetFlagCount() const override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
#endif
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 0af84e07f443..863f880d5f0b 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.hxx
@@ -44,12 +44,12 @@ class SfxDispatcher;
class SfxUnoControllerItem : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
{
- ::com::sun::star::util::URL aCommand;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch;
+ css::util::URL aCommand;
+ css::uno::Reference< css::frame::XDispatch > xDispatch;
SfxControllerItem* pCtrlItem;
SfxBindings* pBindings;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > TryGetDispatch( SfxFrame* pFrame );
+ css::uno::Reference< css::frame::XDispatch > TryGetDispatch( SfxFrame* pFrame );
public:
@@ -57,10 +57,10 @@ public:
virtual ~SfxUnoControllerItem();
// XStatusListener
- virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& Event) throw( css::uno::RuntimeException, std::exception ) override;
// Something else
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override;
void UnBind();
void GetNewDispatch();
void ReleaseDispatch();
@@ -80,12 +80,12 @@ public:
SfxStatusDispatcher();
// XDispatch
- virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL,
+ const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
+ const css::uno::Reference< css::frame::XDispatchResultListener >& rListener ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL removeStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException, std::exception ) override;
// Something else
void ReleaseAll();
@@ -103,31 +103,31 @@ public:
SfxOfficeDispatch( SfxBindings& rBind,
SfxDispatcher* pDispat,
const SfxSlot* pSlot,
- const ::com::sun::star::util::URL& rURL );
+ const css::util::URL& rURL );
SfxOfficeDispatch( SfxDispatcher* pDispat,
const SfxSlot* pSlot,
- const ::com::sun::star::util::URL& rURL );
+ const css::util::URL& rURL );
virtual ~SfxOfficeDispatch();
- virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl,
- const ::com::sun::star::util::URL& aURL)
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL,
+ const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
+ const css::uno::Reference< css::frame::XDispatchResultListener >& rListener )
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL,
+ const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
+ throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener > & xControl,
+ const css::util::URL& aURL)
+ throw( css::uno::RuntimeException, std::exception ) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override ;
- static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier();
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override ;
+ static const css::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier();
- static bool IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL );
- static OUString GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL );
+ static bool IsMasterUnoCommand( const css::util::URL& aURL );
+ static OUString GetMasterUnoCommand( const css::util::URL& aURL );
- void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
+ void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
void SetMasterUnoCommand( bool bSet );
@@ -136,7 +136,7 @@ public:
class SfxDispatchController_Impl : public SfxControllerItem
{
- ::com::sun::star::util::URL aDispatchURL;
+ css::util::URL aDispatchURL;
SfxDispatcher* pDispatcher;
SfxBindings* pBindings;
const SfxPoolItem* pLastState;
@@ -145,10 +145,10 @@ class SfxDispatchController_Impl : public SfxControllerItem
bool bMasterSlave;
bool bVisible;
const char* pUnoName;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > xFrame;
+ css::uno::WeakReference< css::frame::XFrame > xFrame;
- static void addParametersToArgs( const com::sun::star::util::URL& aURL,
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs );
+ static void addParametersToArgs( const css::util::URL& aURL,
+ css::uno::Sequence< css::beans::PropertyValue >& rArgs );
static SfxMapUnit GetCoreMetric( SfxItemPool& rPool, sal_uInt16 nSlot );
public:
@@ -156,24 +156,24 @@ public:
SfxBindings* pBind,
SfxDispatcher* pDispat,
const SfxSlot* pSlot,
- const ::com::sun::star::util::URL& rURL );
+ const css::util::URL& rURL );
virtual ~SfxDispatchController_Impl();
- static OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL );
+ static OUString getSlaveCommand( const css::util::URL& rURL );
void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ );
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) override;
void setMasterSlaveCommand( bool bSet );
- void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener )
+ void SAL_CALL dispatch( const css::util::URL& aURL,
+ const css::uno::Sequence< css::beans::PropertyValue >& aArgs,
+ const css::uno::Reference< css::frame::XDispatchResultListener >& rListener )
throw (css::uno::RuntimeException, std::exception);
- 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 );
+ void SAL_CALL addStatusListener(const css::uno::Reference< css::frame::XStatusListener > & xControl, const css::util::URL& aURL) throw( css::uno::RuntimeException );
void UnBindController();
SfxDispatcher* GetDispatcher();
- void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
+ void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
- static void InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const ::com::sun::star::frame::FeatureStateEvent& aEvent);
+ static void InterceptLOKStateChangeEvent(const SfxObjectShell* objSh, const css::frame::FeatureStateEvent& aEvent);
};
#endif
diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx
index 539cdb1c8eb5..9f0cff06f879 100644
--- a/include/sfx2/userinputinterception.hxx
+++ b/include/sfx2/userinputinterception.hxx
@@ -50,10 +50,10 @@ namespace sfx2
~UserInputInterception();
// delegator functions for your XUserInputInterception implementation
- void addKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
- void removeKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
- void addMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
- void removeMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
+ void addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException);
+ void removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException);
+ void addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException);
+ void removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException);
// state
bool hasKeyHandlers() const;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index fd12ece0c1db..ce81492fc938 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -100,14 +100,14 @@ public:
static SfxViewFrame* LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
static SfxViewFrame* LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId );
static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId = 0 );
- static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrameItem, const sal_uInt16 i_nViewId = 0 );
+ static SfxViewFrame* LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const css::uno::Reference< css::frame::XFrame >& i_rFrameItem, const sal_uInt16 i_nViewId = 0 );
static SfxViewFrame* DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId = 0 );
static SfxViewFrame* Current();
static SfxViewFrame* GetFirst( const SfxObjectShell* pDoc = 0, bool bOnlyVisible = true );
static SfxViewFrame* GetNext( const SfxViewFrame& rPrev, const SfxObjectShell* pDoc = 0, bool bOnlyVisible = true );
- static SfxViewFrame* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL );
+ static SfxViewFrame* Get( const css::uno::Reference< css::frame::XController>& i_rController, const SfxObjectShell* i_pDoc = NULL );
void DoActivate(bool bMDI, SfxViewFrame *pOld=NULL);
void DoDeactivate(bool bMDI, SfxViewFrame *pOld=NULL);
@@ -141,7 +141,7 @@ public:
void UpdateTitle();
- static void ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL );
+ static void ActivateToolPanel( const css::uno::Reference< css::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL );
// interne Handler
SAL_DLLPRIVATE virtual bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
@@ -244,8 +244,8 @@ private:
*/
SAL_DLLPRIVATE static SfxViewShell* LoadViewIntoFrame_Impl(
const SfxObjectShell& i_rDoc,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
- const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rLoadArgs,
+ const css::uno::Reference< css::frame::XFrame >& i_rFrame,
+ const css::uno::Sequence< css::beans::PropertyValue >& i_rLoadArgs,
const sal_uInt16 i_nViewId,
const bool i_bHidden
);
@@ -267,7 +267,7 @@ private:
*/
SAL_DLLPRIVATE static SfxViewFrame* LoadViewIntoFrame_Impl_NoThrow(
const SfxObjectShell& i_rDoc,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame,
+ const css::uno::Reference< css::frame::XFrame >& i_rFrame,
const sal_uInt16 i_nViewId,
const bool i_bHidden
);
@@ -299,7 +299,7 @@ public:
class SfxVerbListItem : public SfxPoolItem
{
- com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aVerbs;
+ css::uno::Sequence < css::embed::VerbDescriptor > aVerbs;
public:
TYPEINFO_OVERRIDE();
@@ -307,12 +307,12 @@ public:
SfxPoolItem( nWhichId )
{}
- SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& );
+ SfxVerbListItem( sal_uInt16 nWhichId, const css::uno::Sequence < css::embed::VerbDescriptor >& );
virtual bool operator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
};
#endif
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index c0535aa0c373..61ac65d25041 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -178,7 +178,7 @@ public:
std::function<bool ( const SfxViewShell* )> isViewShell = nullptr );
static SfxViewShell* Current();
- static SfxViewShell* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController );
+ static SfxViewShell* Get( const css::uno::Reference< css::frame::XController>& i_rController );
// Initialize Constructors/Destructors
TYPEINFO_OVERRIDE();
@@ -195,7 +195,7 @@ public:
SfxInPlaceClient* GetIPClient() const;
SfxInPlaceClient* GetUIActiveClient() const;
- SfxInPlaceClient* FindIPClient( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, vcl::Window *pObjParentWin ) const;
+ SfxInPlaceClient* FindIPClient( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, vcl::Window *pObjParentWin ) const;
virtual ErrCode DoVerb(long nVerb);
@@ -251,8 +251,8 @@ public:
// Working set
virtual void WriteUserData( OUString&, bool bBrowse = false );
virtual void ReadUserData( const OUString&, bool bBrowse = false );
- virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false );
- virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false );
+ virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false );
+ virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse = false );
virtual void QueryObjAreaPixel( Rectangle& rRect ) const;
virtual SfxObjectShell* GetObjectShell() override;
@@ -262,7 +262,7 @@ public:
The default implementation simply returns the XModel of the associated SfxObjectShell. You will rarely
need to overwrite this behavior.
*/
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ virtual css::uno::Reference< css::frame::XModel >
GetCurrentDocument() const;
/** forwards the current document, as returned by ->GetCurrentDocument, to SfxObjectShell::SetWorkingDocument
@@ -271,7 +271,7 @@ public:
/** get an XRenderable instance that can render this document
*/
- virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable();
+ virtual css::uno::Reference< css::view::XRenderable > GetRenderable();
virtual void MarginChanged();
@@ -282,22 +282,22 @@ public:
void SetNewWindowAllowed( bool bSet ) { bNoNewWindow = !bSet; }
void SetController( SfxBaseController* pController );
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
+ css::uno::Reference< css::frame::XController >
GetController();
- bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, ::com::sun::star::ui::ContextMenuExecuteEvent aEvent );
+ bool TryContextMenuInterception( Menu& rIn, const OUString& rMenuIdentifier, Menu*& rpOut, css::ui::ContextMenuExecuteEvent aEvent );
- void ExecPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool, bool );
+ void ExecPrint( const css::uno::Sequence < css::beans::PropertyValue >&, bool, bool );
// Like ExecPrint(), but only sets up for printing. Use Printer::ExecutePrintJob() and Printer::FinishPrintJob() afterwards.
- void StartPrint( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, bool, bool );
+ void StartPrint( const css::uno::Sequence < css::beans::PropertyValue >&, bool, bool );
std::shared_ptr< vcl::PrinterController > GetPrinterController() const;
- void AddRemoveClipboardListener( const com::sun::star::uno::Reference < com::sun::star::datatransfer::clipboard::XClipboardListener>&, bool );
- ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier();
+ void AddRemoveClipboardListener( const css::uno::Reference < css::datatransfer::clipboard::XClipboardListener>&, bool );
+ css::uno::Reference< css::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier();
SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const;
- SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
- SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor );
+ SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor );
+ SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor );
SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient );
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index e770fbe9caf3..b0e82c66b98d 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -75,8 +75,8 @@ public:
virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const override;
virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};