diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-17 15:49:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-17 14:17:13 +0000 |
| commit | 9cde33eba193f23cf501acb108992bfcc5c16f52 (patch) | |
| tree | 108d5f32cb6f5d358a31127a543d38a4dd62839e /basctl | |
| parent | ad0c0f685b14119e2e564fe0074f5f0c557a5e5f (diff) | |
com::sun::star->css in basctl
Change-Id: If0013cdd734a58397ab4972f9cca5584f05d1715
Reviewed-on: https://gerrit.libreoffice.org/17164
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'basctl')
35 files changed, 283 insertions, 289 deletions
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index 3e4cc8045f04..0ff594c711b3 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -77,7 +77,7 @@ private: OUString aCurText; bool bIgnoreSelect; bool bFillBox; - com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + css::uno::Reference< css::frame::XFrame > m_xFrame; static void ReleaseFocus(); void InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLocation ); @@ -94,7 +94,7 @@ protected: public: LibBox( vcl::Window* pParent, - const com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + const css::uno::Reference< css::frame::XFrame >& rFrame ); virtual ~LibBox(); virtual void dispose() SAL_OVERRIDE; diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index 61b7d2f191d4..93f1acd5990d 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; using namespace com::sun::star::uno; Renderable::Renderable (BaseWindow* pWin) -: cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >( maMutex ) +: cppu::WeakComponentImplHelper< css::view::XRenderable >( maMutex ) , mpWindow( pWin ) { ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST ) ); diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx index dba38c85eff5..9fce279dd215 100644 --- a/basctl/source/basicide/basicrenderable.hxx +++ b/basctl/source/basicide/basicrenderable.hxx @@ -30,7 +30,7 @@ namespace basctl class BaseWindow; class Renderable : - public cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >, + public cppu::WeakComponentImplHelper< css::view::XRenderable >, public vcl::PrinterOptionsHelper { VclPtr<BaseWindow> mpWindow; @@ -43,21 +43,21 @@ public: // XRenderable virtual sal_Int32 SAL_CALL getRendererCount ( - const com::sun::star::uno::Any& aSelection, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue >& xOptions) - throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Any& aSelection, + const css::uno::Sequence<css::beans::PropertyValue >& xOptions) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> SAL_CALL getRenderer ( + virtual css::uno::Sequence<css::beans::PropertyValue> SAL_CALL getRenderer ( sal_Int32 nRenderer, - const com::sun::star::uno::Any& rSelection, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rxOptions) - throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Any& rSelection, + const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL render ( sal_Int32 nRenderer, - const com::sun::star::uno::Any& rSelection, - const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rxOptions) - throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + const css::uno::Any& rSelection, + const css::uno::Sequence<css::beans::PropertyValue>& rxOptions) + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index daa650aaaceb..76d81b733706 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -72,21 +72,21 @@ friend class CodeCompleteListBox; private: class ChangesListener; - boost::scoped_ptr<ExtTextView> pEditView; + boost::scoped_ptr<ExtTextView> pEditView; boost::scoped_ptr<ExtTextEngine> pEditEngine; - ModulWindow& rModulWindow; + ModulWindow& rModulWindow; rtl::Reference< ChangesListener > listener_; - osl::Mutex mutex_; - com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > - notifier_; + osl::Mutex mutex_; + css::uno::Reference< css::beans::XMultiPropertySet > + notifier_; long nCurTextWidth; SyntaxHighlighter aHighlighter; - Idle aSyntaxIdle; + Idle aSyntaxIdle; typedef std::set<sal_uInt16> SyntaxLineSet; - SyntaxLineSet aSyntaxLineTable; + SyntaxLineSet aSyntaxLineTable; DECL_LINK_TYPED(SyntaxTimerHdl, Idle *, void); // progress bar @@ -105,9 +105,7 @@ private: bool bDoSyntaxHighlight; bool bDelayHighlight; - virtual - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XWindowPeer > GetComponentInterface(bool bCreate = true) SAL_OVERRIDE; CodeCompleteDataCache aCodeCompleteCache; VclPtr<CodeCompleteWindow> pCodeCompleteWnd; OUString GetActualSubName( sal_uLong nLine ); // gets the actual subroutine name according to line number diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 237331a2a1e0..67a20c4b5b2d 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1034,7 +1034,7 @@ bool implImportDialog( vcl::Window* pWin, const OUString& rCurPath, const Script } // Resource? - ::com::sun::star::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + css::lang::Locale aLocale = Application::GetSettings().GetUILanguageTag().getLocale(); Reference< task::XInteractionHandler > xDummyHandler; bool bReadOnly = true; Reference< XStringResourceWithLocation > xImportStringResource = @@ -1360,9 +1360,9 @@ void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground) SetBackground( rStyleSettings.GetFieldColor() ); } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > DialogWindow::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > DialogWindow::CreateAccessible() { - return static_cast<com::sun::star::accessibility::XAccessible*>(new AccessibleDialogWindow( this )); + return static_cast<css::accessibility::XAccessible*>(new AccessibleDialogWindow( this )); } char const* DialogWindow::GetHid () const diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 783c4c0e5c17..1b8962ee206e 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1061,7 +1061,7 @@ void Shell::ManageToolbars() ( GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); if ( xFrameProps.is() ) { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::frame::XLayoutManager > xLayoutManager; uno::Any a = xFrameProps->getPropertyValue( "LayoutManager" ); a >>= xLayoutManager; if ( xLayoutManager.is() ) diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 8f98d3c1cea5..79e352e81cb9 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -114,8 +114,8 @@ public: if( mpShell && ( Event.Accessor >>= sModuleName ) ) mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true, false ); } - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { } - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { } + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index a37a028e6ff2..260e14a78593 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -196,7 +196,7 @@ namespace basctl xBroadcaster.set( m_xModel, UNO_QUERY_THROW ); else { - Reference< com::sun::star::uno::XComponentContext > aContext( + Reference< css::uno::XComponentContext > aContext( comphelper::getProcessComponentContext() ); xBroadcaster = theGlobalEventBroadcaster::get(aContext); } diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx index c20ee862b882..7fea9ada70c9 100644 --- a/basctl/source/basicide/documentenumeration.cxx +++ b/basctl/source/basicide/documentenumeration.cxx @@ -57,10 +57,10 @@ namespace basctl { namespace docs { // DocumentEnumeration_Data struct DocumentEnumeration_Data { - Reference< com::sun::star::uno::XComponentContext > aContext; + Reference< css::uno::XComponentContext > aContext; const IDocumentDescriptorFilter* pFilter; - DocumentEnumeration_Data( Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter ) + DocumentEnumeration_Data( Reference< css::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter ) :aContext( _rContext ) ,pFilter( _pFilter ) { @@ -68,7 +68,7 @@ namespace basctl { namespace docs { }; // DocumentEnumeration - DocumentEnumeration::DocumentEnumeration( Reference< com::sun::star::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter ) + DocumentEnumeration::DocumentEnumeration( Reference< css::uno::XComponentContext > const & _rContext, const IDocumentDescriptorFilter* _pFilter ) :m_pData( new DocumentEnumeration_Data( _rContext, _pFilter ) ) { } diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index 7fa7f8d5429d..2550f886d76d 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -75,7 +75,7 @@ void LocalizationMgr::handleTranslationbar () ( m_pShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY ); if ( xFrameProps.is() ) { - Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager; + Reference< css::frame::XLayoutManager > xLayoutManager; uno::Any a = xFrameProps->getPropertyValue( aLayoutManagerName ); a >>= xLayoutManager; if ( xLayoutManager.is() ) diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 8069443e648e..25bee8a36814 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -80,7 +80,7 @@ public: { } - virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( m_xHandler.is() ) { diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index ac7c56468da5..305acbb0d4a9 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -240,7 +240,7 @@ protected: void NewLib(); void InsertLib(); void implExportLib( const OUString& aLibName, const OUString& aTargetURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ); + const css::uno::Reference< css::task::XInteractionHandler >& Handler ); void Export(); void ExportAsPackage( const OUString& aLibName ); void ExportAsBasic( const OUString& aLibName ); @@ -248,7 +248,7 @@ protected: void FillListBox(); void InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocation eLocation ); void SetCurLib(); - SvTreeListEntry* ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos ); + SvTreeListEntry* ImpInsertLibEntry( const OUString& rLibName, sal_uLong nPos ); virtual void ActivatePage() SAL_OVERRIDE; virtual void DeactivatePage() SAL_OVERRIDE; diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index cd614e5515b0..4f218bdb565f 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -28,44 +28,44 @@ namespace basctl class SIDEModel : public SfxBaseModel, public com::sun::star::lang::XServiceInfo { - static void notImplemented() throw ( ::com::sun::star::io::IOException ); + static void notImplemented() throw ( css::io::IOException ); public: explicit SIDEModel(SfxObjectShell *pObjSh = 0); virtual ~SIDEModel(); //XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE; virtual void SAL_CALL release( ) throw() SAL_OVERRIDE; //XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStorable2 - virtual void SAL_CALL storeSelf( const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { notImplemented(); } + virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& ) + throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { notImplemented(); } // XStorable - virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL storeAsURL( const OUString& sURL, - const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL storeToURL( const OUString& sURL, - const ::com::sun::star::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL storeAsURL( const OUString& sURL, + const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) + throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL storeToURL( const OUString& sURL, + const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) + throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static OUString getImplementationName_Static(); }; -com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL SIDEModel_createInstance( - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > & rSMgr ) +css::uno::Reference< css::uno::XInterface > SAL_CALL SIDEModel_createInstance( + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( com::sun::star::uno::Exception ); } // namespace basctl diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index e56a876e7885..56c42c930f94 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -176,8 +176,8 @@ bool DlgEditor::RemarkDialog() DlgEditor::DlgEditor ( vcl::Window& rWindow_, DialogWindowLayout& rLayout_, - com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel, - com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel + css::uno::Reference<css::frame::XModel> const& xModel, + css::uno::Reference<css::container::XNameContainer> xDialogModel ) :pHScroll(NULL) ,pVScroll(NULL) @@ -363,7 +363,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr pDlgEdForm->StartListening(); // create controls - Reference< ::com::sun::star::container::XNameAccess > xNameAcc( m_xUnoControlDialogModel, UNO_QUERY ); + Reference< css::container::XNameAccess > xNameAcc( m_xUnoControlDialogModel, UNO_QUERY ); if ( xNameAcc.is() ) { // get sequence of control names @@ -381,7 +381,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr // get tab index sal_Int16 nTabIndex = -1; Any aCtrl = xNameAcc->getByName( aName ); - Reference< ::com::sun::star::beans::XPropertySet > xPSet; + Reference< css::beans::XPropertySet > xPSet; aCtrl >>= xPSet; if ( xPSet.is() ) xPSet->getPropertyValue( DLGED_PROP_TABINDEX ) >>= nTabIndex; @@ -394,7 +394,7 @@ void DlgEditor::SetDialog( uno::Reference< container::XNameContainer > xUnoContr for ( IndexToNameMap::iterator aIt = aIndexToNameMap.begin(); aIt != aIndexToNameMap.end(); ++aIt ) { Any aCtrl = xNameAcc->getByName( aIt->second ); - Reference< ::com::sun::star::awt::XControlModel > xCtrlModel; + Reference< css::awt::XControlModel > xCtrlModel; aCtrl >>= xCtrlModel; DlgEdObj* pCtrlObj = new DlgEdObj(); pCtrlObj->SetUnoControlModel( xCtrlModel ); @@ -905,7 +905,7 @@ void DlgEditor::Paste() } // get control models from clipboard dialog model - Reference< ::com::sun::star::container::XNameAccess > xNameAcc( xClipDialogModel, UNO_QUERY ); + Reference< css::container::XNameAccess > xNameAcc( xClipDialogModel, UNO_QUERY ); if ( xNameAcc.is() ) { Sequence< OUString > aNames = xNameAcc->getElementNames(); @@ -921,7 +921,7 @@ void DlgEditor::Paste() for( sal_uInt32 n = 0; n < nCtrls; n++ ) { Any aA = xNameAcc->getByName( pNames[n] ); - Reference< ::com::sun::star::awt::XControlModel > xCM; + Reference< css::awt::XControlModel > xCM; aA >>= xCM; // clone the control model @@ -1023,10 +1023,10 @@ void DlgEditor::Delete() } // remove control from dialog model - Reference< ::com::sun::star::container::XNameAccess > xNameAcc(pDlgEdObj->GetDlgEdForm()->GetUnoControlModel(), UNO_QUERY ); + Reference< css::container::XNameAccess > xNameAcc(pDlgEdObj->GetDlgEdForm()->GetUnoControlModel(), UNO_QUERY ); if ( xNameAcc.is() && xNameAcc->hasByName(aName) ) { - Reference< ::com::sun::star::container::XNameContainer > xCont(xNameAcc, UNO_QUERY ); + Reference< css::container::XNameContainer > xCont(xNameAcc, UNO_QUERY ); if ( xCont.is() ) { if( xCont->hasByName( aName ) ) diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx index cecadc9e2e14..0d60dc0be7ed 100644 --- a/basctl/source/dlged/dlgedfac.cxx +++ b/basctl/source/dlged/dlgedfac.cxx @@ -31,7 +31,7 @@ namespace basctl using namespace ::com::sun::star; -DlgEdFactory::DlgEdFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ) : mxModel( xModel ) +DlgEdFactory::DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel ) : mxModel( xModel ) { SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } @@ -168,7 +168,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) if (xPSet.is()) { uno::Any aValue; - aValue <<= (sal_Int32) ::com::sun::star::awt::ScrollBarOrientation::VERTICAL; + aValue <<= (sal_Int32) css::awt::ScrollBarOrientation::VERTICAL; xPSet->setPropertyValue( DLGED_PROP_ORIENTATION, aValue ); } } diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx index 4a4c290fa7e5..f94774998ae8 100644 --- a/basctl/source/dlged/dlgedlist.cxx +++ b/basctl/source/dlged/dlgedlist.cxx @@ -34,12 +34,12 @@ DlgEdPropListenerImpl::~DlgEdPropListenerImpl() } // XEventListener -void SAL_CALL DlgEdPropListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdPropListenerImpl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception) { } // XPropertyChangeListener -void SAL_CALL DlgEdPropListenerImpl::propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdPropListenerImpl::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException, std::exception) { rDlgEdObj._propertyChange( evt ); } @@ -55,22 +55,22 @@ DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl() } // XEventListener -void SAL_CALL DlgEdEvtContListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception) { } // XContainerListener -void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) { rDlgEdObj._elementInserted( Event ); } -void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) { rDlgEdObj._elementReplaced( Event ); } -void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) { rDlgEdObj._elementRemoved( Event ); } diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index 347d6f29014b..5aae79bd061d 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -70,7 +70,7 @@ DlgEdObj::DlgEdObj() } DlgEdObj::DlgEdObj(const OUString& rModelName, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac) + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac) :SdrUnoObj(rModelName, rxSFac, false) ,bIsListening(false) ,pDlgEdForm( NULL ) @@ -453,7 +453,7 @@ void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt ) SetRectFromProps(); } -void SAL_CALL DlgEdObj::NameChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (css::container::NoSuchElementException, css::uno::RuntimeException) +void SAL_CALL DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt ) throw (css::container::NoSuchElementException, css::uno::RuntimeException) { // get old name OUString aOldName; @@ -1124,7 +1124,7 @@ void DlgEdObj::EndListening(bool bRemoveListener) } } -void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) { if (isListening()) { @@ -1180,7 +1180,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const ::com::sun::star::beans::Propert } } -void SAL_CALL DlgEdObj::_elementInserted(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException) { if (isListening()) { @@ -1189,7 +1189,7 @@ void SAL_CALL DlgEdObj::_elementInserted(const ::com::sun::star::container::Cont } } -void SAL_CALL DlgEdObj::_elementReplaced(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException) { if (isListening()) { @@ -1198,7 +1198,7 @@ void SAL_CALL DlgEdObj::_elementReplaced(const ::com::sun::star::container::Cont } } -void SAL_CALL DlgEdObj::_elementRemoved(const ::com::sun::star::container::ContainerEvent& ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL DlgEdObj::_elementRemoved(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException) { if (isListening()) { @@ -1436,7 +1436,7 @@ void DlgEdForm::UpdateTabIndices() (*aIter)->EndListening( false ); } - Reference< ::com::sun::star::container::XNameAccess > xNameAcc( GetUnoControlModel() , UNO_QUERY ); + Reference< css::container::XNameAccess > xNameAcc( GetUnoControlModel() , UNO_QUERY ); if ( xNameAcc.is() ) { // get sequence of control names @@ -1454,7 +1454,7 @@ void DlgEdForm::UpdateTabIndices() // get tab index sal_Int16 nTabIndex = -1; Any aCtrl = xNameAcc->getByName( aName ); - Reference< ::com::sun::star::beans::XPropertySet > xPSet; + Reference< css::beans::XPropertySet > xPSet; aCtrl >>= xPSet; if ( xPSet.is() ) xPSet->getPropertyValue( DLGED_PROP_TABINDEX ) >>= nTabIndex; diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 5f89f2627a40..c6ac3fe9b1d7 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -163,8 +163,8 @@ void PropBrw::ImplReCreateController() if ( m_xBrowserComponentWindow.is() ) { m_xBrowserComponentWindow->setPosSize(aPropWinPos.X(), aPropWinPos.Y(), aPropWinSize.Width(), aPropWinSize.Height(), - ::com::sun::star::awt::PosSize::WIDTH | ::com::sun::star::awt::PosSize::HEIGHT | - ::com::sun::star::awt::PosSize::X | ::com::sun::star::awt::PosSize::Y); + css::awt::PosSize::WIDTH | css::awt::PosSize::HEIGHT | + css::awt::PosSize::X | css::awt::PosSize::Y); m_xBrowserComponentWindow->setVisible(true); } } @@ -433,7 +433,7 @@ void PropBrw::Resize() if (m_xBrowserComponentWindow.is()) { m_xBrowserComponentWindow->setPosSize(0, 0, aPropWinSize.Width(), aPropWinSize.Height(), - ::com::sun::star::awt::PosSize::WIDTH | ::com::sun::star::awt::PosSize::HEIGHT); + css::awt::PosSize::WIDTH | css::awt::PosSize::HEIGHT); } } diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index bc0d52b33eec..d0293c650c91 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -46,9 +46,9 @@ class DialogWindow; typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; typedef ::cppu::ImplHelper3< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE; + css::accessibility::XAccessible, + css::lang::XServiceInfo, + css::beans::XPropertyChangeListener > AccessibleDialogControlShape_BASE; class AccessibleDialogControlShape : public AccessibleExtendedComponentHelper_BASE, public AccessibleDialogControlShape_BASE @@ -62,8 +62,8 @@ private: bool m_bFocused; bool m_bSelected; - ::com::sun::star::awt::Rectangle m_aBounds; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; + css::awt::Rectangle m_aBounds; + css::uno::Reference< css::beans::XPropertySet > m_xControlModel; protected: bool IsFocused(); @@ -72,17 +72,17 @@ protected: void SetFocused (bool bFocused); void SetSelected (bool bSelected); - ::com::sun::star::awt::Rectangle GetBounds(); - void SetBounds( const ::com::sun::star::awt::Rectangle& aBounds ); + css::awt::Rectangle GetBounds(); + void SetBounds( const css::awt::Rectangle& aBounds ); - vcl::Window* GetWindow() const; + vcl::Window* GetWindow() const; OUString GetModelStringProperty( const sal_Char* pPropertyName ); - void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); + void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual ::com::sun::star::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -98,41 +98,41 @@ public: DECLARE_XTYPEPROVIDER() // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace basctl diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index bd2739440160..97a7ef722f19 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -51,9 +51,9 @@ class DlgEdObj; typedef ::comphelper::OAccessibleExtendedComponentHelper AccessibleExtendedComponentHelper_BASE; typedef ::cppu::ImplHelper3 < - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleSelection, - ::com::sun::star::lang::XServiceInfo > AccessibleDialogWindow_BASE; + css::accessibility::XAccessible, + css::accessibility::XAccessibleSelection, + css::lang::XServiceInfo > AccessibleDialogWindow_BASE; class AccessibleDialogWindow : public AccessibleExtendedComponentHelper_BASE, public AccessibleDialogWindow_BASE, @@ -64,8 +64,8 @@ private: class ChildDescriptor { public: - DlgEdObj* pDlgEdObj; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > rxAccessible; + DlgEdObj* pDlgEdObj; + css::uno::Reference< css::accessibility::XAccessible > rxAccessible; ChildDescriptor( DlgEdObj* _pDlgEdObj ); ~ChildDescriptor(); @@ -79,18 +79,18 @@ private: typedef ::std::vector< ChildDescriptor > AccessibleChildren; - AccessibleChildren m_aAccessibleChildren; - VCLExternalSolarLock* m_pExternalLock; + AccessibleChildren m_aAccessibleChildren; + VCLExternalSolarLock* m_pExternalLock; VclPtr<basctl::DialogWindow> m_pDialogWindow; - DlgEditor* m_pDlgEditor; - DlgEdModel* m_pDlgEdModel; + DlgEditor* m_pDlgEditor; + DlgEdModel* m_pDlgEdModel; protected: void UpdateFocused(); void UpdateSelected(); void UpdateBounds(); - bool IsChildVisible( const ChildDescriptor& rDesc ); + bool IsChildVisible( const ChildDescriptor& rDesc ); void InsertChild( const ChildDescriptor& rDesc ); void RemoveChild( const ChildDescriptor& rDesc ); @@ -104,7 +104,7 @@ protected: void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) SAL_OVERRIDE; // XComponent virtual void SAL_CALL disposing() SAL_OVERRIDE; @@ -123,46 +123,46 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTitledBorderText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getToolTipText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace basctl diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index d50481f94c18..1258fc778828 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -78,13 +78,13 @@ protected: void InitSettings(bool bFont, bool bForeground, bool bBackground); public: - DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel); + DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, css::uno::Reference<css::container::XNameContainer> const& xDialogModel); DialogWindow( DialogWindow* pCurView ); // never implemented virtual void ExecuteCommand( SfxRequest& rReq ) SAL_OVERRIDE; virtual void GetState( SfxItemSet& ) SAL_OVERRIDE; DlgEditor& GetEditor() const { return *pEditor; } - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const; + css::uno::Reference< css::container::XNameContainer > GetDialog() const; DlgEdModel& GetModel() const; DlgEdPage& GetPage() const; DlgEdView& GetView() const; @@ -112,7 +112,7 @@ public: virtual void Activating () SAL_OVERRIDE; virtual void Deactivating () SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; + virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; virtual char const* GetHid () const SAL_OVERRIDE; virtual ItemType GetType () const SAL_OVERRIDE; diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx index 13b22d83d64b..56eb1f105bd2 100644 --- a/basctl/source/inc/basidectrlr.hxx +++ b/basctl/source/inc/basidectrlr.hxx @@ -45,16 +45,16 @@ public: virtual ~Controller(); // 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) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XTypeProvider ( ::SfxBaseController ) - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 8c45020cbca2..3949209bee6a 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -88,7 +88,7 @@ private: bool m_bAppBasicModified; DocumentEventNotifier m_aNotifier; friend class ContainerListenerImpl; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xLibListener; + css::uno::Reference< css::container::XContainerListener > m_xLibListener; void Init(); void InitTabBar(); @@ -173,7 +173,7 @@ public: svl::IUndoManager* GetUndoManager() SAL_OVERRIDE; - virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable() SAL_OVERRIDE; + virtual css::uno::Reference< css::view::XRenderable > GetRenderable() SAL_OVERRIDE; // virtual sal_uInt16 Print( SfxProgress &rProgress, sal_Bool bIsAPI, PrintDialog *pPrintDialog = 0 ); virtual SfxPrinter* GetPrinter( bool bCreate ) SAL_OVERRIDE; @@ -204,11 +204,11 @@ public: // For Dialog Drag&Drop in Dialog Organizer: // (defined in moduldlg.cxx) static void CopyDialogResources( - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >& io_xISP, + css::uno::Reference< css::io::XInputStreamProvider >& io_xISP, const ScriptDocument& rSourceDoc, const OUString& rSourceLibName, const ScriptDocument& rDestDoc, const OUString& rDestLibName, const OUString& rDlgName ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + virtual css::uno::Reference< css::frame::XModel > GetCurrentDocument() const SAL_OVERRIDE; void UpdateObjectCatalog () { aObjectCatalog->UpdateEntries(); } diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index cea809ebd25b..6b27edb904a0 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -59,9 +59,9 @@ namespace basctl // libraries - ::com::sun::star::uno::Sequence< OUString > GetMergedLibraryNames( - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xModLibContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xDlgLibContainer ); + css::uno::Sequence< OUString > GetMergedLibraryNames( + const css::uno::Reference< css::script::XLibraryContainer >& xModLibContainer, + const css::uno::Reference< css::script::XLibraryContainer >& xDlgLibContainer ); /** renames a module @@ -74,10 +74,10 @@ namespace basctl // new methods for macros OUString ChooseMacro( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxLimitToDocument, + const css::uno::Reference< css::frame::XModel >& rxLimitToDocument, bool bChooseOnly, const OUString& rMacroDesc ); - ::com::sun::star::uno::Sequence< OUString > GetMethodNames( + css::uno::Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 1d4933a7693a..943679217082 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -302,15 +302,15 @@ bool QueryDelMacro( const OUString& rName, vcl::Window* pParent = 0 ); bool QueryDelDialog( const OUString& rName, vcl::Window* pParent = 0 ); bool QueryDelModule( const OUString& rName, vcl::Window* pParent = 0 ); bool QueryDelLib( const OUString& rName, bool bRef = false, vcl::Window* pParent = 0 ); -bool QueryPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false ); +bool QueryPassword( const css::uno::Reference< css::script::XLibraryContainer >& xLibContainer, const OUString& rLibName, OUString& rPassword, bool bRepeat = false, bool bNewTitle = false ); class ModuleInfoHelper { ModuleInfoHelper (const ModuleInfoHelper&) SAL_DELETED_FUNCTION; ModuleInfoHelper& operator = (const ModuleInfoHelper&) SAL_DELETED_FUNCTION; public: - static void getObjectName( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName ); - static sal_Int32 getModuleType( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& rLib, const OUString& rModName ); + static void getObjectName( const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName ); + static sal_Int32 getModuleType( const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName ); }; } // namespace basctl diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 9309b911e147..0e8ebe64ebb9 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -114,14 +114,14 @@ private: DlgEdPage* pDlgEdPage; // never nullptr boost::scoped_ptr<DlgEdView> pDlgEdView; // never nullptr DlgEdForm* pDlgEdForm; // never nullptr - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xUnoControlDialogModel; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xControlContainer; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavors; - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xSupplier; + css::uno::Reference< css::container::XNameContainer > m_xUnoControlDialogModel; + css::uno::Reference< css::awt::XControlContainer > m_xControlContainer; + css::uno::Sequence< css::datatransfer::DataFlavor > m_ClipboardDataFlavors; + css::uno::Sequence< css::datatransfer::DataFlavor > m_ClipboardDataFlavorsResource; + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xSupplier; boost::scoped_ptr<DlgEdFactory> pObjFac; // never nullptr - vcl::Window& rWindow; // DialogWindow - boost::scoped_ptr<DlgEdFunc> pFunc; + vcl::Window& rWindow; // DialogWindow + boost::scoped_ptr<DlgEdFunc> pFunc; DialogWindowLayout& rLayout; Mode eMode; sal_uInt16 eActObj; @@ -134,13 +134,13 @@ private: bool bDialogModelChanged; Idle aMarkIdle; long mnPaintGuard; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocument; + css::uno::Reference< css::frame::XModel > m_xDocument; public: DlgEditor ( vcl::Window&, DialogWindowLayout&, - com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& xModel, - com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xDialogModel + css::uno::Reference<css::frame::XModel> const& xModel, + css::uno::Reference<css::container::XNameContainer> xDialogModel ); virtual ~DlgEditor(); @@ -150,7 +150,7 @@ public: @see GetWindow @see SetWindow */ - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + css::uno::Reference< css::awt::XControlContainer > GetWindowControlContainer(); void SetScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ); @@ -160,12 +160,12 @@ public: void DoScroll( ScrollBar* pActScroll ); void UpdateScrollBars(); - void SetDialog (com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> xUnoControlDialogModel); + void SetDialog (css::uno::Reference<css::container::XNameContainer> xUnoControlDialogModel); void ResetDialog (); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetDialog() const + css::uno::Reference< css::container::XNameContainer > GetDialog() const {return m_xUnoControlDialogModel;} - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > const & GetNumberFormatsSupplier(); + css::uno::Reference< css::util::XNumberFormatsSupplier > const & GetNumberFormatsSupplier(); DlgEdModel& GetModel() const { return *pDlgEdModel; } DlgEdView& GetView() const { return *pDlgEdView; } diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index f671e50b256a..2178423d946f 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -30,28 +30,28 @@ namespace basctl // DlgEdTransferableImpl -typedef ::cppu::WeakImplHelper< ::com::sun::star::datatransfer::XTransferable, ::com::sun::star::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper; +typedef ::cppu::WeakImplHelper< css::datatransfer::XTransferable, css::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper; class DlgEdTransferableImpl : public DlgEdTransferableHelper { private: - ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > m_SeqFlavors; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > m_SeqData; + css::uno::Sequence< css::datatransfer::DataFlavor > m_SeqFlavors; + css::uno::Sequence< css::uno::Any > m_SeqData; protected: - static bool compareDataFlavors( const ::com::sun::star::datatransfer::DataFlavor& lFlavor, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + static bool compareDataFlavors( const css::datatransfer::DataFlavor& lFlavor, const css::datatransfer::DataFlavor& rFlavor ); public: - DlgEdTransferableImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aSeqFlavors, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aSeqData ); + DlgEdTransferableImpl( const css::uno::Sequence< css::datatransfer::DataFlavor >& aSeqFlavors, const css::uno::Sequence< css::uno::Any >& aSeqData ); virtual ~DlgEdTransferableImpl(); // XTransferable - virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XClipboardOwner - virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& xClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace basctl diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx index 6e8af7d6fded..13656a86e6ee 100644 --- a/basctl/source/inc/dlgedfac.hxx +++ b/basctl/source/inc/dlgedfac.hxx @@ -33,9 +33,9 @@ namespace basctl class DlgEdFactory { - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; + const css::uno::Reference< css::frame::XModel > mxModel; public: - DlgEdFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + DlgEdFactory( const css::uno::Reference< css::frame::XModel >& xModel ); ~DlgEdFactory(); DECL_LINK( MakeObject, SdrObjFactory * ); diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx index fed787ee517c..04a0de8dd4dd 100644 --- a/basctl/source/inc/dlgedlist.hxx +++ b/basctl/source/inc/dlgedlist.hxx @@ -33,7 +33,7 @@ class DlgEdObj; // DlgEdPropListenerImpl -typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener > PropertyChangeListenerHelper; +typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener > PropertyChangeListenerHelper; class DlgEdPropListenerImpl: public PropertyChangeListenerHelper { @@ -45,10 +45,10 @@ public: virtual ~DlgEdPropListenerImpl(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -56,7 +56,7 @@ public: // DlgEdEvtContListenerImpl -typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > ContainerListenerHelper; +typedef ::cppu::WeakImplHelper< css::container::XContainerListener > ContainerListenerHelper; class DlgEdEvtContListenerImpl: public ContainerListenerHelper { @@ -68,12 +68,12 @@ public: virtual ~DlgEdEvtContListenerImpl(); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace basctl diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 0bbd9d5fc7d5..5a576502acea 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -49,10 +49,10 @@ class DlgEdObj: public SdrUnoObj friend class DlgEdForm; private: - bool bIsListening; + bool bIsListening; DlgEdForm* pDlgEdForm; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener> m_xPropertyChangeListener; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener> m_xContainerListener; + css::uno::Reference< css::beans::XPropertyChangeListener> m_xPropertyChangeListener; + css::uno::Reference< css::container::XContainerListener> m_xContainerListener; private: DlgEditor& GetDialogEditor (); @@ -60,7 +60,7 @@ private: protected: DlgEdObj(); DlgEdObj(const OUString& rModelName, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac); + const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac); virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE; virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; @@ -114,22 +114,22 @@ public: virtual void SetRectFromProps(); virtual void SetPropsFromRect(); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > GetControl() const; + css::uno::Reference< css::awt::XControl > GetControl() const; - virtual void PositionAndSizeChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ); - void SAL_CALL NameChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException); - void SAL_CALL TabIndexChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException); + virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt ); + void SAL_CALL NameChange( const css::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException); + void SAL_CALL TabIndexChange( const css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException); // PropertyChangeListener void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception); // ContainerListener - void SAL_CALL _elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL _elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL _elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL _elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException); + void SAL_CALL _elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException); + void SAL_CALL _elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException); virtual void SetLayer(SdrLayerID nLayer) SAL_OVERRIDE; - bool MakeDataAware( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); + bool MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel ); }; @@ -146,7 +146,7 @@ private: DlgEditor& rDlgEditor; ::std::vector<DlgEdObj*> pChildren; - mutable ::boost::optional< ::com::sun::star::awt::DeviceInfo > mpDeviceInfo; + mutable ::boost::optional< css::awt::DeviceInfo > mpDeviceInfo; private: explicit DlgEdForm (DlgEditor&); @@ -172,14 +172,14 @@ public: virtual void SetRectFromProps() SAL_OVERRIDE; virtual void SetPropsFromRect() SAL_OVERRIDE; - virtual void PositionAndSizeChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) SAL_OVERRIDE; + virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt ) SAL_OVERRIDE; void UpdateTabIndices(); void UpdateTabOrder(); void UpdateGroups(); void UpdateTabOrderAndGroups(); - ::com::sun::star::awt::DeviceInfo getDeviceInfo() const; + css::awt::DeviceInfo getDeviceInfo() const; private: void ImplInvalidateDeviceInfo(); diff --git a/basctl/source/inc/doceventnotifier.hxx b/basctl/source/inc/doceventnotifier.hxx index d3fa1a574b34..9843639fdd3a 100644 --- a/basctl/source/inc/doceventnotifier.hxx +++ b/basctl/source/inc/doceventnotifier.hxx @@ -62,7 +62,7 @@ namespace basctl /** creates a notifier instance which notifies about events at a single document */ - DocumentEventNotifier (DocumentEventListener&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const& rxDocument); + DocumentEventNotifier (DocumentEventListener&, css::uno::Reference<css::frame::XModel> const& rxDocument); ~DocumentEventNotifier(); diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx index f118dfe9a101..9bf27109b537 100644 --- a/basctl/source/inc/localizationmgr.hxx +++ b/basctl/source/inc/localizationmgr.hxx @@ -32,15 +32,14 @@ class DlgEditor; class LocalizationMgr { - ::com::sun::star::uno::Reference - < ::com::sun::star::resource::XStringResourceManager > m_xStringResourceManager; + css::uno::Reference< css::resource::XStringResourceManager > m_xStringResourceManager; Shell* m_pShell; ScriptDocument m_aDocument; OUString m_aLibName; - ::com::sun::star::lang::Locale m_aLocaleBeforeBasicStart; + css::lang::Locale m_aLocaleBeforeBasicStart; enum HandleResourceMode { @@ -53,10 +52,11 @@ class LocalizationMgr COPY_RESOURCES }; static sal_Int32 implHandleControlResourceProperties(const css::uno::Any& rControlAny, - const OUString& aDialogName, const OUString& aCtrlName, - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > - xStringResourceManager, ::com::sun::star::uno::Reference< ::com::sun::star::resource:: - XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode ); + const OUString& aDialogName, + const OUString& aCtrlName, + css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager, + css::uno::Reference< css::resource::XStringResourceResolver > xSourceStringResolver, + HandleResourceMode eMode ); void enableResourceForAllLibraryDialogs() { @@ -70,10 +70,9 @@ class LocalizationMgr public: LocalizationMgr(Shell*, ScriptDocument const&, OUString const& aLibName, - const ::com::sun::star::uno::Reference - < ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager ); - ::com::sun::star::uno::Reference - < ::com::sun::star::resource::XStringResourceManager >getStringResourceManager() + const css::uno::Reference < css::resource::XStringResourceManager >& xStringResourceManager ); + + css::uno::Reference< css::resource::XStringResourceManager >getStringResourceManager() { return m_xStringResourceManager; } @@ -82,11 +81,11 @@ public: void handleTranslationbar(); - void handleAddLocales( const ::com::sun::star::uno::Sequence - < ::com::sun::star::lang::Locale >& aLocaleSeq ); + void handleAddLocales( const css::uno::Sequence + < css::lang::Locale >& aLocaleSeq ); - void handleRemoveLocales( const ::com::sun::star::uno::Sequence - < ::com::sun::star::lang::Locale >& aLocaleSeq ); + void handleRemoveLocales( const css::uno::Sequence + < css::lang::Locale >& aLocaleSeq ); void handleSetDefaultLocale(const css::lang::Locale& rLocale); @@ -106,43 +105,42 @@ public: const css::uno::Any& rControlAny, const OUString& aCtrlName); static void setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel ); + css::uno::Reference< css::container::XNameContainer > xDialogModel ); static void renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel ); + css::uno::Reference< css::container::XNameContainer > xDialogModel ); static void removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel ); + css::uno::Reference< css::container::XNameContainer > xDialogModel ); - static ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > - getStringResourceFromDialogLibrary( ::com::sun::star::uno::Reference - < ::com::sun::star::container::XNameContainer > xDialogLib ); + static css::uno::Reference< css::resource::XStringResourceManager > + getStringResourceFromDialogLibrary( css::uno::Reference + < css::container::XNameContainer > xDialogLib ); // Clipboard / Drag & Drop static void resetResourceForDialog( - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel, - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager ); + css::uno::Reference< css::container::XNameContainer > xDialogModel, + css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager ); static void setResourceIDsForDialog( - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel, - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager ); + css::uno::Reference< css::container::XNameContainer > xDialogModel, + css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager ); static void copyResourcesForPastedEditorObject( DlgEditor* pEditor, const css::uno::Any& rControlAny, const OUString& aCtrlName, - ::com::sun::star::uno::Reference< ::com::sun::star::resource:: - XStringResourceResolver > xSourceStringResolver ); + css::uno::Reference< css::resource::XStringResourceResolver > xSourceStringResolver ); static void copyResourceForDroppedDialog( - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel, + css::uno::Reference< css::container::XNameContainer > xDialogModel, const OUString& aDialogName, - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager, - ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > xSourceStringResolver ); + css::uno::Reference< css::resource::XStringResourceManager > xStringResourceManager, + css::uno::Reference< css::resource::XStringResourceResolver > xSourceStringResolver ); static void copyResourceForDialog( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xDialogModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::resource:: + const css::uno::Reference< css::container::XNameContainer >& xDialogModel, + const css::uno::Reference< css::resource:: XStringResourceResolver >& xSourceStringResolver, - const ::com::sun::star::uno::Reference< ::com::sun::star::resource:: + const css::uno::Reference< css::resource:: XStringResourceManager >& xTargetStringResourceManager ); }; diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index f7b9335e5e24..f7ffc6ed9d1e 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -35,19 +35,19 @@ class LocalizationMgr; struct LanguageEntry { OUString m_sLanguage; - ::com::sun::star::lang::Locale m_aLocale; + css::lang::Locale m_aLocale; bool m_bIsDefault; LanguageEntry( const OUString& _rLanguage, - const ::com::sun::star::lang::Locale& _rLocale, + const css::lang::Locale& _rLocale, bool _bIsDefault ) : m_sLanguage( _rLanguage ), m_aLocale( _rLocale ), m_bIsDefault( _bIsDefault ) {} }; -extern bool localesAreEqual( const ::com::sun::star::lang::Locale& rLocaleLeft, - const ::com::sun::star::lang::Locale& rLocaleRight ); +extern bool localesAreEqual( const css::lang::Locale& rLocaleLeft, + const css::lang::Locale& rLocaleRight ); class ManageLanguageDialog : public ModalDialog { @@ -96,7 +96,7 @@ public: virtual ~SetDefaultLanguageDialog(); virtual void dispose() SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > GetLocales() const; + css::uno::Sequence< css::lang::Locale > GetLocales() const; }; } // namespace basctl diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 3262d36301d0..507ed9c80e71 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -45,13 +45,13 @@ class PropBrw : public DockingWindow, public SfxListener, public SfxBroadcaster private: bool m_bInitialStateChange; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > + css::uno::Reference< css::frame::XFrame2 > m_xMeAsFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xBrowserController; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > + css::uno::Reference< css::awt::XWindow > m_xBrowserComponentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > m_xContextDocument; protected: @@ -59,18 +59,16 @@ protected: virtual void Resize() SAL_OVERRIDE; virtual bool Close() SAL_OVERRIDE; - typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> > InterfaceArray; + typedef std::vector< css::uno::Reference< css::uno::XInterface> > InterfaceArray; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > + static css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > CreateMultiSelectionSequence( const SdrMarkList& _rMarkList ); - void implSetNewObjectSequence( const ::com::sun::star::uno::Sequence - < ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& _rObjectSeq ); + void implSetNewObjectSequence( const css::uno::Sequence + < css::uno::Reference< css::uno::XInterface > >& _rObjectSeq ); - void implSetNewObject( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); + void implSetNewObject( const css::uno::Reference< css::beans::XPropertySet >& _rxObject); - static OUString GetHeadlineName( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject); + static OUString GetHeadlineName( const css::uno::Reference< css::beans::XPropertySet >& _rxObject); public: explicit PropBrw (DialogWindowLayout&); @@ -83,7 +81,7 @@ public: SdrView* GetCurView() const { return pView; } private: - void ImplUpdate( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxContextDocument, SdrView* pView ); + void ImplUpdate( const css::uno::Reference< css::frame::XModel >& _rxContextDocument, SdrView* pView ); void ImplDestroyController(); void ImplReCreateController(); }; diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx index 5479abf06cba..6b8dc9024674 100644 --- a/basctl/source/inc/scriptdocument.hxx +++ b/basctl/source/inc/scriptdocument.hxx @@ -95,7 +95,7 @@ namespace basctl @param _rxDocument the document. Must not be <NULL/>. */ - explicit ScriptDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument ); + explicit ScriptDocument( const css::uno::Reference< css::frame::XModel >& _rxDocument ); /// copy constructor ScriptDocument( const ScriptDocument& _rSource ); @@ -205,7 +205,7 @@ namespace basctl Must not be used when the instance operates on the application-wide Basic/Dialog libraries. */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > getDocument() const; /** returns the UNO component representing the document which the instance operates on @@ -213,14 +213,14 @@ namespace basctl May be used when the instance operates on the application-wide Basic/Dialog libraries, in this case it returns <NULL/>. */ - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > + css::uno::Reference< css::frame::XModel > getDocumentOrNull() const; /** returns the Basic or Dialog library container of the document If the document is not valid, <NULL/> is returned. */ - ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > + css::uno::Reference< css::script::XLibraryContainer > getLibraryContainer( LibraryContainerType _eType ) const; /** determines whether there exists a library of the given type, with the given name @@ -239,7 +239,7 @@ namespace basctl @throws NoSuchElementException if there is no script library with the given name */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > getLibrary( LibraryContainerType _eType, const OUString& _rLibName, bool _bLoadLibrary ) const; /** creates a script or dialog library in the document, or returns an existing one @@ -247,12 +247,12 @@ namespace basctl If <code>_rLibName</code> denotes an existing library which does not need to be created, then this library will automatically be loaded, and then returned. */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > getOrCreateLibrary( LibraryContainerType _eType, const OUString& _rLibName ) const; /** returns the names of the modules in a given script or dialog library of the document */ - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > getObjectNames( LibraryContainerType _eType, const OUString& _rLibName ) const; /** retrieves a name for a newly to be created module or dialog @@ -264,7 +264,7 @@ namespace basctl void loadLibraryIfExists( LibraryContainerType _eType, const OUString& _rLibrary ); /// retrieves the (combined) names of all script and dialog libraries - ::com::sun::star::uno::Sequence< OUString > + css::uno::Sequence< OUString > getLibraryNames() const; /** removes a given script module from the document @@ -366,7 +366,7 @@ namespace basctl bool getDialog( const OUString& _rLibName, const OUString& _rDialogName, - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >& _out_rDialogProvider + css::uno::Reference< css::io::XInputStreamProvider >& _out_rDialogProvider ) const; /** renames a dialog @@ -385,7 +385,7 @@ namespace basctl const OUString& _rLibName, const OUString& _rOldName, const OUString& _rNewName, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxExistingDialogModel + const css::uno::Reference< css::container::XNameContainer >& _rxExistingDialogModel ) const; /** create a dialog @@ -401,7 +401,7 @@ namespace basctl bool createDialog( const OUString& _rLibName, const OUString& _rDialogName, - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >& _out_rDialogProvider + css::uno::Reference< css::io::XInputStreamProvider >& _out_rDialogProvider ) const; /** inserts a given dialog into a given library @@ -420,7 +420,7 @@ namespace basctl bool insertDialog( const OUString& _rLibName, const OUString& _rDialogName, - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStreamProvider >& _rDialogProvider + const css::uno::Reference< css::io::XInputStreamProvider >& _rDialogProvider ) const; /** determines whether the document is read-only @@ -458,7 +458,7 @@ namespace basctl <code>isApplication</code> returns <FALSE/> */ bool saveDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator >& _rxStatusIndicator + const css::uno::Reference< css::task::XStatusIndicator >& _rxStatusIndicator ) const; /// returns the location of a library given by name |