diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-28 14:18:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-29 06:45:22 +0000 |
| commit | 0c5f72b06f7d3b06e61cc5a0eabc8abc7bb72ef5 (patch) | |
| tree | 62259bba5006e3ea813d149cb6399be82f3d6636 /cui/source | |
| parent | 171990764eedee708ce458be2239466307b2dc6a (diff) | |
com::sun::star->css in cui
Change-Id: I70ee15db7c8de507fa21a9dfc705f518f223a70b
Reviewed-on: https://gerrit.libreoffice.org/17385
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui/source')
59 files changed, 427 insertions, 459 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 6ad019326631..2326ff40fd17 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -519,7 +519,7 @@ bool GetMenuItemData( return true; } } - catch ( ::com::sun::star::lang::IndexOutOfBoundsException& ) + catch ( css::lang::IndexOutOfBoundsException& ) { } @@ -572,7 +572,7 @@ bool GetToolbarItemData( return true; } } - catch ( ::com::sun::star::lang::IndexOutOfBoundsException& ) + catch ( css::lang::IndexOutOfBoundsException& ) { } @@ -809,7 +809,7 @@ SvxConfigDialog::SvxConfigDialog(vcl::Window * pParent, const SfxItemSet* pInSet } } -void SvxConfigDialog::SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame) +void SvxConfigDialog::SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame) { m_xFrame = xFrame; @@ -972,7 +972,7 @@ bool SaveInData::PersistChanges( } } } - catch ( com::sun::star::io::IOException& ) + catch ( css::io::IOException& ) { result = false; } @@ -1199,11 +1199,11 @@ bool MenuSaveInData::Apply() { OSL_TRACE("caught container::NoSuchElementException saving settings"); } - catch ( com::sun::star::io::IOException& ) + catch ( css::io::IOException& ) { OSL_TRACE("caught IOException saving settings"); } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_TRACE("caught some other exception saving settings"); } @@ -3532,10 +3532,9 @@ void ToolbarSaveInData::SetSystemStyle( // check reference before we call getRealInterface. The layout manager // can only provide references for elements that have been created // before. It's possible that the current element is not available. - uno::Reference< com::sun::star::awt::XWindow > xWindow; + uno::Reference< css::awt::XWindow > xWindow; if ( xUIElement.is() ) - xWindow = uno::Reference< com::sun::star::awt::XWindow >( - xUIElement->getRealInterface(), uno::UNO_QUERY ); + xWindow = uno::Reference< css::awt::XWindow >( xUIElement->getRealInterface(), uno::UNO_QUERY ); window = VCLUnoHelper::GetWindow( xWindow ); } @@ -4055,11 +4054,11 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar ) { OSL_TRACE("caught container::NoSuchElementException saving settings"); } - catch ( com::sun::star::io::IOException& ) + catch ( css::io::IOException& ) { OSL_TRACE("caught IOException saving settings"); } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_TRACE("caught some other exception saving settings"); } @@ -4091,15 +4090,15 @@ void ToolbarSaveInData::CreateToolbar( SvxConfigEntry* pToolbar ) { OSL_TRACE("caught ElementExistsException saving settings"); } - catch ( com::sun::star::lang::IllegalArgumentException& ) + catch ( css::lang::IllegalArgumentException& ) { OSL_TRACE("caught IOException saving settings"); } - catch ( com::sun::star::lang::IllegalAccessException& ) + catch ( css::lang::IllegalAccessException& ) { OSL_TRACE("caught IOException saving settings"); } - catch ( com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { OSL_TRACE("caught some other exception saving settings"); } @@ -4838,13 +4837,13 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, aDirectory += "soffice.cfg/import"; uno::Reference< lang::XSingleServiceFactory > xStorageFactory( - ::com::sun::star::embed::FileSystemStorageFactory::create( xComponentContext ) ); + css::embed::FileSystemStorageFactory::create( xComponentContext ) ); uno::Sequence< uno::Any > aArgs( 2 ); aArgs[ 0 ] <<= aDirectory; - aArgs[ 1 ] <<= com::sun::star::embed::ElementModes::READWRITE; + aArgs[ 1 ] <<= css::embed::ElementModes::READWRITE; - uno::Reference< com::sun::star::embed::XStorage > xStorage( + uno::Reference< css::embed::XStorage > xStorage( xStorageFactory->createInstanceWithArguments( aArgs ), uno::UNO_QUERY ); uno::Sequence< uno::Any > aProp( 2 ); @@ -4855,7 +4854,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( vcl::Window *pWindow, aProp[ 0 ] <<= aPropValue; aPropValue.Name = "OpenMode"; - aPropValue.Value <<= com::sun::star::embed::ElementModes::READWRITE; + aPropValue.Value <<= css::embed::ElementModes::READWRITE; aProp[ 1 ] <<= aPropValue; m_xImportedImageManager = css::ui::ImageManager::create( xComponentContext ); @@ -5115,7 +5114,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( aMediaProps[0].Name = "URL"; aMediaProps[0].Value <<= aURL; - com::sun::star::awt::Size aSize; + css::awt::Size aSize; bool bOK = false; try { @@ -5169,7 +5168,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem( bResult = true; break; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { break; } @@ -5293,7 +5292,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL ) aMediaProps[0].Name = "URL"; uno::Reference< graphic::XGraphic > xGraphic; - com::sun::star::awt::Size aSize; + css::awt::Size aSize; aMediaProps[0].Value <<= aURL; try { diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 33b5067c401f..7d0b3ade090d 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -70,7 +70,7 @@ using namespace ::com::sun::star::document; SfxStylesInfo_Impl::SfxStylesInfo_Impl() {} -void SfxStylesInfo_Impl::setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel) +void SfxStylesInfo_Impl::setModel(const css::uno::Reference< css::frame::XModel >& xModel) { m_xDoc = xModel; } diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 385df86d1bbb..e3b25e6dffbe 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -31,9 +31,9 @@ class SvxEventConfigPage : public _SvxMacroTabPage { VclPtr<ListBox> m_pSaveInListBox; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocumentEvents; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xDocumentModifiable; + css::uno::Reference< css::container::XNameReplace > m_xAppEvents; + css::uno::Reference< css::container::XNameReplace > m_xDocumentEvents; + css::uno::Reference< css::util::XModifiable > m_xDocumentModifiable; bool bAppConfig; @@ -50,7 +50,7 @@ public: virtual ~SvxEventConfigPage(); virtual void dispose() SAL_OVERRIDE; - void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ); + void LateInit( const css::uno::Reference< css::frame::XFrame >& _rxFrame ); protected: virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE; diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index 646f70ba2fb8..52af93d1f8b2 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -39,10 +39,10 @@ struct SpellErrorDescription OUString sDialogTitle; OUString sExplanation; OUString sExplanationURL; - ::com::sun::star::lang::Locale aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > xGrammarChecker; + css::lang::Locale aLocale; + css::uno::Reference< css::linguistic2::XProofreader > xGrammarChecker; OUString sServiceName; ///< service name of GrammarChecker/SpellChecker - ::com::sun::star::uno::Sequence< OUString > aSuggestions; + css::uno::Sequence< OUString > aSuggestions; OUString sRuleId; SpellErrorDescription() : @@ -50,9 +50,9 @@ struct SpellErrorDescription SpellErrorDescription( bool bGrammar, const OUString& rText, - const ::com::sun::star::lang::Locale& rLocale, - const ::com::sun::star::uno::Sequence< OUString >& rSuggestions, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XProofreader > rxGrammarChecker, + const css::lang::Locale& rLocale, + const css::uno::Sequence< OUString >& rSuggestions, + css::uno::Reference< css::linguistic2::XProofreader > rxGrammarChecker, const OUString& rServiceName, const OUString* pDialogTitle = 0, const OUString* pExplanation = 0, diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index ab539a6191aa..35203006c06f 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1550,7 +1550,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) } -bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xSpell ) +bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, css::uno::Reference<css::linguistic2::XSpellChecker1> xSpell ) { if (bIgnoreCurrentError) m_aIgnoreErrorsAt.insert( m_nErrorStart ); @@ -2034,9 +2034,9 @@ IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink ) return 1; try { - uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( - com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); - xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute( + css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) ); + xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); } catch ( uno::Exception& ) { diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 630dd30e9725..eeeadd13e7d9 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -134,9 +134,9 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton ) return 1; try { - Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( - com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) ); - xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY ); + Reference< css::system::XSystemShellExecute > xSystemShellExecute( + css::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) ); + xSystemShellExecute->execute( sURL, OUString(), css::system::SystemShellExecuteFlags::URIS_ONLY ); } catch (const Exception&) { diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 981ff315dcee..dedad530db94 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -38,11 +38,11 @@ #include <sal/macros.h> #include <boost/scoped_ptr.hpp> -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::i18n; +using namespace css::uno; +using namespace css::i18n; using namespace ::svxform; -using namespace ::com::sun::star::sdbc; -using namespace ::com::sun::star::util; +using namespace css::sdbc; +using namespace css::util; #define MAX_HISTORY_ENTRIES 50 @@ -692,7 +692,7 @@ IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnDelayedPaint, Timer *, void) EnableControlPaint(true); } -void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos) +void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPos) { FmFoundRecordInformation friInfo; friInfo.nContext = m_plbForm->GetSelectEntryPos(); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index def7872b7edf..1a588e246d0d 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -128,19 +128,19 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, try { - ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv; + css::uno::Reference< XCommandEnvironment > xEnv; Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext() ); Sequence< OUString > aProps( 2 ); aProps.getArray()[ 0 ] = "IsFolder"; aProps.getArray()[ 1 ] = "IsDocument"; - ::com::sun::star::uno::Reference< XResultSet > xResultSet( + css::uno::Reference< XResultSet > xResultSet( aCnt.createCursor( aProps, INCLUDE_FOLDERS_AND_DOCUMENTS ) ); if( xResultSet.is() ) { - ::com::sun::star::uno::Reference< XContentAccess > xContentAccess( xResultSet, UNO_QUERY_THROW ); - ::com::sun::star::uno::Reference< XRow > xRow( xResultSet, UNO_QUERY_THROW ); + css::uno::Reference< XContentAccess > xContentAccess( xResultSet, UNO_QUERY_THROW ); + css::uno::Reference< XRow > xRow( xResultSet, UNO_QUERY_THROW ); while( xResultSet->next() && schedule() ) { @@ -191,10 +191,10 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, catch (const ContentCreationException&) { } - catch (const ::com::sun::star::uno::RuntimeException&) + catch (const css::uno::RuntimeException&) { } - catch (const ::com::sun::star::uno::Exception&) + catch (const css::uno::Exception&) { } } @@ -1056,7 +1056,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) try { // setup folder picker - com::sun::star::uno::Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); + css::uno::Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); xFolderPicker = FolderPicker::create(xContext); OUString aDlgPathName( SvtPathOptions().GetGraphicPath() ); @@ -1064,7 +1064,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) aPreviewTimer.Stop(); - com::sun::star::uno::Reference< XAsynchronousExecutableDialog > xAsyncDlg( xFolderPicker, UNO_QUERY ); + css::uno::Reference< XAsynchronousExecutableDialog > xAsyncDlg( xFolderPicker, UNO_QUERY ); if ( xAsyncDlg.is() ) xAsyncDlg->startExecuteModal( xDialogListener.get() ); else @@ -1274,7 +1274,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl) -IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent*, pEvt ) +IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvt ) { DBG_ASSERT( xFolderPicker.is(), "TPGalleryThemeProperties::DialogClosedHdl(): no folder picker" ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 0d3c96deb694..c6ceba7bf335 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -49,10 +49,10 @@ namespace svx { using namespace ::com::sun::star; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::linguistic2; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::container; + using namespace css::uno; + using namespace css::linguistic2; + using namespace css::lang; + using namespace css::container; namespace @@ -633,7 +633,7 @@ namespace svx ModalDialog::dispose(); } - void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ) + void HangulHanjaConversionDialog::FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ) { m_pSuggestions->Clear(); const OUString* pSuggestions = _rSuggestions.getConstArray(); @@ -1493,7 +1493,7 @@ namespace svx 0, _rOrg.getLength(), ConversionDirection_FROM_LEFT, - ::com::sun::star::i18n::TextConversionOption::NONE ); + css::i18n::TextConversionOption::NONE ); bRet = _rEntries.getLength() > 0; } catch( const IllegalArgumentException& ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 1ae6e037fd47..332d45fc64af 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -311,7 +311,7 @@ void SvxHyperlinkNewDocTp::DoApply () // check if file exists, warn before we overwrite it { - com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler > xHandler; + css::uno::Reference < css::task::XInteractionHandler > xHandler; SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ, xHandler ); bool bOk = pIStm && ( pIStm->GetError() == 0); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 936c5f859d58..2ff9946506b5 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) { // Open Fileopen-Dialog ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0, + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0, GetParent() ); OUString aOldURL( GetCurrentURL() ); if( aOldURL.startsWithIgnoreAsciiCase( sFileScheme ) ) diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 6245fd8aec4c..de23e79c1021 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -472,7 +472,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink nEntries++; } } - catch(const com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { // insert Displayname into treelist without bitmaps pEntry = mpLbTree->InsertEntry ( aStrDisplayname, @@ -486,7 +486,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink if( xLTS.is() ) nEntries += FillTree( xLTS->getLinks(), pEntry ); } - catch(const com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { } } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index a68af459b3f7..8c267f035251 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -92,7 +92,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID, const OUString& rUIXMLDescription, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage) + const css::uno::Reference < css::embed::XStorage >& xStorage) : ModalDialog(pParent, rID, rUIXMLDescription) , m_xStorage( xStorage ) , aCnt( m_xStorage ) @@ -494,7 +494,7 @@ short SvInsertPlugInDialog::Execute() } SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( vcl::Window *pParent, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ) + const css::uno::Reference < css::embed::XStorage >& xStorage ) : InsertObjectDialog_Impl( pParent, "InsertFloatingFrameDialog", "cui/ui/insertfloatingframe.ui", xStorage ) { diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 4c1d5ab8db19..e41cbc22509a 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -124,7 +124,7 @@ SotClipboardFormatId SvPasteObjectDialog::GetFormat( const TransferableDataHelpe aEnd( ((DataFlavorExVector&)*pFormats).end() ); while( aIter != aEnd ) { - ::com::sun::star::datatransfer::DataFlavor aFlavor( *aIter ); + css::datatransfer::DataFlavor aFlavor( *aIter ); SotClipboardFormatId nFormat = (*aIter++).mnSotId; ::std::map< SotClipboardFormatId, OUString >::iterator itName = diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 8fbf409f99fa..8a4d6bb6de84 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -65,10 +65,10 @@ #include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::script; -using namespace ::com::sun::star::frame; -using namespace ::com::sun::star::document; +using namespace css::uno; +using namespace css::script; +using namespace css::frame; +using namespace css::document; void ShowErrorDialog( const Any& aException ) { @@ -302,7 +302,7 @@ SFTreeListBox::getLangNodeFromRootNode( Reference< browse::XBrowseNode >& rootNo return langNode; } -void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference< ::com::sun::star::script::browse::XBrowseNode >& node, +void SFTreeListBox:: RequestSubEntries( SvTreeListEntry* pRootEntry, Reference< css::script::browse::XBrowseNode >& node, Reference< XModel >& model ) { if (! node.is() ) @@ -737,22 +737,22 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton ) } catch ( reflection::InvocationTargetException& ite ) { - ::com::sun::star::uno::Any a = makeAny(ite); + css::uno::Any a = makeAny(ite); ShowErrorDialog(a); } catch ( provider::ScriptFrameworkErrorException& ite ) { - ::com::sun::star::uno::Any a = makeAny(ite); + css::uno::Any a = makeAny(ite); ShowErrorDialog(a); } catch ( RuntimeException& re ) { - ::com::sun::star::uno::Any a = makeAny(re); + css::uno::Any a = makeAny(re); ShowErrorDialog(a); } catch ( Exception& e ) { - ::com::sun::star::uno::Any a = makeAny(e); + css::uno::Any a = makeAny(e); ShowErrorDialog(a); } } @@ -1407,7 +1407,7 @@ OUString GetErrorMessage( const Exception& e ) return message; } -OUString GetErrorMessage( const com::sun::star::uno::Any& aException ) +OUString GetErrorMessage( const css::uno::Any& aException ) { if ( aException.getValueType() == cppu::UnoType<reflection::InvocationTargetException>::get()) @@ -1457,7 +1457,7 @@ OUString GetErrorMessage( const com::sun::star::uno::Any& aException ) } SvxScriptErrorDialog::SvxScriptErrorDialog( - vcl::Window* , ::com::sun::star::uno::Any aException ) + vcl::Window* , css::uno::Any aException ) : m_sMessage() { SolarMutexGuard aGuard; diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 79bdda9387bd..7af9b3467b93 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -56,7 +56,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !"); if (m_xColumns.is()) { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xCol; + css::uno::Reference< css::beans::XPropertySet > xCol; for (sal_Int32 i=0; i < m_pList->GetSelectEntryCount(); ++i) { m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectEntryPos(i))))) >>= xCol; @@ -79,7 +79,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk) } -void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols) +void FmShowColsDialog::SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols) { DBG_ASSERT(xCols.is(), "FmShowColsDialog::SetColumns : invalid columns !"); if (!xCols.is()) @@ -88,7 +88,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: m_pList->Clear(); - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xCurCol; + css::uno::Reference< css::beans::XPropertySet> xCurCol; OUString sCurName; for (sal_Int32 i=0; i<xCols->getCount(); ++i) { @@ -97,7 +97,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: bool bIsHidden = false; try { - ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); + css::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); bIsHidden = ::comphelper::getBOOL(aHidden); OUString sName; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 4825e95eb26d..efdc6f1104dc 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -312,7 +312,7 @@ editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversio void AbstractHangulHanjaConversionDialog_Impl::SetCurrentString( const OUString& _rNewString, - const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, + const css::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument ) { @@ -347,7 +347,7 @@ vcl::Window* AbstractHyphenWordDialog_Impl::GetWindow() return pDlg; } -Reference < com::sun::star::embed::XEmbeddedObject > AbstractInsertObjectDialog_Impl::GetObject() +Reference < css::embed::XEmbeddedObject > AbstractInsertObjectDialog_Impl::GetObject() { return pDlg->GetObject(); } @@ -357,7 +357,7 @@ bool AbstractInsertObjectDialog_Impl::IsCreateNew() return pDlg->IsCreateNew(); } -::Reference< ::com::sun::star::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( OUString* pGraphicMediaType ) +::Reference< css::io::XInputStream > AbstractInsertObjectDialog_Impl::GetIconIfIconified( OUString* pGraphicMediaType ) { return pDlg->GetIconIfIconified( pGraphicMediaType ); } @@ -379,7 +379,7 @@ SotClipboardFormatId AbstractPasteDialog_Impl::GetFormat( const TransferableData return pDlg->GetFormat( aHelper, pFormats, pDesc ); } -void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference< ::com::sun::star::container::XIndexContainer>& xCols) +void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference< css::container::XIndexContainer>& xCols) { pDlg->SetColumns(xCols); } @@ -577,8 +577,7 @@ long AbstractFmInputRecordNoDialog_Impl::GetValue() const return pDlg->GetValue(); } -::Reference< - ::com::sun::star::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary() +::Reference< css::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary() { return pDlg->GetNewDictionary(); } @@ -990,7 +989,7 @@ AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( vcl: AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( vcl::Window* pParent, const OUString &rWord, LanguageType nLang, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, + css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) { VclPtrInstance<SvxHyphenWordDialog> pDlg( rWord, nLang, pParent, xHyphen, pWrapper ); @@ -1026,7 +1025,7 @@ VclAbstractRefreshableDialog * AbstractDialogFactory_Impl::CreateActualizeProgre VclAbstractDialog* AbstractDialogFactory_Impl::CreateScriptErrorDialog( - vcl::Window* pParent, const ::com::sun::star::uno::Any& rException) + vcl::Window* pParent, const css::uno::Any& rException) { return new SvxScriptErrorDialog(pParent, rException); } @@ -1189,7 +1188,7 @@ AbstractFmInputRecordNoDialog * AbstractDialogFactory_Impl::CreateFmInputRecordN } AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog( vcl::Window* pParent, - ::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) + ::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) { VclPtrInstance<SvxNewDictionaryDialog> pDlg( pParent, xSpl ); return new AbstractSvxNewDictionaryDialog_Impl( pDlg ); @@ -1197,7 +1196,7 @@ AbstractSvxNewDictionaryDialog * AbstractDialogFactory_Impl::CreateSvxNewDiction VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, - ::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, + ::Reference< css::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId ) { Dialog* pDlg=NULL; @@ -1573,7 +1572,7 @@ GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nI } SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommand, - const Reference < com::sun::star::embed::XStorage >& xStor, + const Reference < css::embed::XStorage >& xStor, const SvObjectServerList* pList ) { InsertObjectDialog_Impl* pDlg=0; @@ -1593,7 +1592,7 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia } VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommand, - const Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) + const Reference < css::embed::XEmbeddedObject >& xObj ) { if ( rCommand == ".uno:InsertObjectFloatingFrame" ) { diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 90e412d199be..bff3db9066f4 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -152,7 +152,7 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const SAL_OVERRIDE; virtual void SetCurrentString( const OUString& _rNewString, - const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, + const css::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ) SAL_OVERRIDE; virtual OUString GetCurrentString( ) const SAL_OVERRIDE ; @@ -178,7 +178,7 @@ class FmShowColsDialog; class AbstractFmShowColsDialog_Impl : public AbstractFmShowColsDialog { DECL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl,FmShowColsDialog) - virtual void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols) SAL_OVERRIDE; + virtual void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols) SAL_OVERRIDE; }; class SvxZoomDialog; @@ -317,7 +317,7 @@ class SvxNewDictionaryDialog; class AbstractSvxNewDictionaryDialog_Impl :public AbstractSvxNewDictionaryDialog { DECL_ABSTDLG_BASE(AbstractSvxNewDictionaryDialog_Impl,SvxNewDictionaryDialog) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > GetNewDictionary() SAL_OVERRIDE; + virtual css::uno::Reference< css::linguistic2::XDictionary > GetNewDictionary() SAL_OVERRIDE; }; class SvxNameDialog; @@ -420,8 +420,8 @@ class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog { DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl) - virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; + virtual css::uno::Reference < css::embed::XEmbeddedObject > GetObject() SAL_OVERRIDE; + virtual css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; virtual bool IsCreateNew() SAL_OVERRIDE; }; @@ -501,7 +501,7 @@ 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 OUString *pUserButtonText=0 ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, @@ -518,21 +518,21 @@ public: SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone) SAL_OVERRIDE; virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( vcl::Window* pParent, const OUString& rCommmand, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, + const css::uno::Reference < css::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateEditObjectDialog( vcl::Window* pParent, const OUString& rCommmand, - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE; + const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ) SAL_OVERRIDE; virtual SfxAbstractPasteDialog* CreatePasteDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual SfxAbstractLinksDialog* CreateLinksDialog( vcl::Window* pParent, sfx2::LinkManager* pMgr, bool bHTML, sfx2::SvBaseLink* p=0 ) SAL_OVERRIDE; virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( vcl::Window* _pParent, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) SAL_OVERRIDE; - virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + virtual AbstractThesaurusDialog* CreateThesaurusDialog( vcl::Window*, css::uno::Reference< css::linguistic2::XThesaurus > xThesaurus, const OUString &rWord, sal_Int16 nLanguage ) SAL_OVERRIDE; virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( vcl::Window*, const OUString &rWord, LanguageType nLang, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, + css::uno::Reference< css::linguistic2::XHyphenator > &xHyphen, SvxSpellWrapper* pWrapper ) SAL_OVERRIDE; virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( vcl::Window* pParent ) SAL_OVERRIDE; @@ -586,10 +586,10 @@ public: sal_Int32 nInitialFlags) SAL_OVERRIDE; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( vcl::Window* pParent ) SAL_OVERRIDE; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( vcl::Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE; + css::uno::Reference< css::linguistic2::XSpellChecker1 > &xSpl ) SAL_OVERRIDE; virtual VclAbstractDialog * CreateSvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, + css::uno::Reference< css::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) SAL_OVERRIDE; virtual AbstractSvxNameDialog * CreateSvxNameDialog( vcl::Window* pParent, const OUString& rName, const OUString& rDesc ) SAL_OVERRIDE; @@ -644,7 +644,7 @@ public: 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 ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateScriptErrorDialog( @@ -652,9 +652,9 @@ public: virtual VclAbstractDialog* CreateSvxMacroAssignDlg( vcl::Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, + const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame, const bool _bUnoDialogMode, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& _rxEvents, + const css::uno::Reference< css::container::XNameReplace >& _rxEvents, const sal_uInt16 _nInitiallySelectedEvent ) SAL_OVERRIDE; diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 0d927e4457e9..c2f0d59e16b0 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -82,14 +82,14 @@ public: void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); void SetText( const OUString& rStr ) SAL_OVERRIDE; - bool MarkNextError( bool bIgnoreCurrentError, com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> ); + bool MarkNextError( bool bIgnoreCurrentError, css::uno::Reference<css::linguistic2::XSpellChecker1> ); void ChangeMarkedWord(const OUString& rNewWord, LanguageType eLanguage); void MoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16 nErrorEnd, bool bGrammar); OUString GetErrorText() const; void RestoreCurrentError(); void SetAlternatives( - com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellAlternatives> ); + css::uno::Reference<css::linguistic2::XSpellAlternatives> ); const SpellErrorDescription* GetAlternatives(); @@ -168,8 +168,8 @@ private: svx::SpellPortions m_aSavedSentence; SpellDialog_Impl* pImpl; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + css::uno::Reference< + css::linguistic2::XSpellChecker1 > xSpell; DECL_LINK(ChangeHdl, void *); DECL_LINK(ChangeAllHdl, void *); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 70584bae3f74..b2d92462df78 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -57,7 +57,7 @@ typedef std::vector< SvxConfigEntry* > SvxEntries; class SvxConfigDialog : public SfxTabDialog { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame; + css::uno::Reference< css::frame::XFrame > m_xFrame; sal_uInt16 m_nMenusPageId; sal_uInt16 m_nKeyboardPageId; sal_uInt16 m_nToolbarsPageId; @@ -67,7 +67,7 @@ public: SvxConfigDialog( vcl::Window*, const SfxItemSet* ); virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE; - void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); + void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame); }; class SaveInData @@ -79,36 +79,33 @@ private: bool bDocConfig; bool bReadOnly; - ::com::sun::star::uno::Reference - < com::sun::star::ui::XUIConfigurationManager > m_xCfgMgr; + css::uno::Reference + < css::ui::XUIConfigurationManager > m_xCfgMgr; - ::com::sun::star::uno::Reference - < com::sun::star::ui::XUIConfigurationManager > m_xParentCfgMgr; + css::uno::Reference + < css::ui::XUIConfigurationManager > m_xParentCfgMgr; - ::com::sun::star::uno::Reference - < com::sun::star::ui::XImageManager > m_xImgMgr; + css::uno::Reference + < css::ui::XImageManager > m_xImgMgr; - ::com::sun::star::uno::Reference - < com::sun::star::ui::XImageManager > m_xParentImgMgr; + css::uno::Reference + < css::ui::XImageManager > m_xParentImgMgr; - static ::com::sun::star::uno::Reference - < com::sun::star::ui::XImageManager >* xDefaultImgMgr; + static css::uno::Reference + < css::ui::XImageManager >* xDefaultImgMgr; public: SaveInData( - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >& xCfgMgr, - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >& xParentCfgMgr, + const css::uno::Reference < css::ui::XUIConfigurationManager >& xCfgMgr, + const css::uno::Reference < css::ui::XUIConfigurationManager >& xParentCfgMgr, const OUString& aModuleId, bool docConfig ); virtual ~SaveInData() {} bool PersistChanges( - const com::sun::star::uno::Reference - < com::sun::star::uno::XInterface >& xManager ); + const css::uno::Reference< css::uno::XInterface >& xManager ); void SetModified( bool bValue = true ) { bModified = bValue; } bool IsModified( ) { return bModified; } @@ -116,27 +113,27 @@ public: bool IsReadOnly( ) { return bReadOnly; } bool IsDocConfig( ) { return bDocConfig; } - ::com::sun::star::uno::Reference - < ::com::sun::star::ui::XUIConfigurationManager > + css::uno::Reference + < css::ui::XUIConfigurationManager > GetConfigManager() { return m_xCfgMgr; }; - ::com::sun::star::uno::Reference - < ::com::sun::star::ui::XUIConfigurationManager > + css::uno::Reference + < css::ui::XUIConfigurationManager > GetParentConfigManager() { return m_xParentCfgMgr; }; - ::com::sun::star::uno::Reference - < ::com::sun::star::ui::XImageManager > + css::uno::Reference + < css::ui::XImageManager > GetImageManager() { return m_xImgMgr; }; - ::com::sun::star::uno::Reference - < ::com::sun::star::ui::XImageManager > + css::uno::Reference + < css::ui::XImageManager > GetParentImageManager() { return m_xParentImgMgr; }; - ::com::sun::star::uno::Reference - < com::sun::star::container::XNameAccess > m_xCommandToLabelMap; + css::uno::Reference + < css::container::XNameAccess > m_xCommandToLabelMap; - com::sun::star::uno::Sequence - < com::sun::star::beans::PropertyValue > m_aSeparatorSeq; + css::uno::Sequence + < css::beans::PropertyValue > m_aSeparatorSeq; Image GetImage( const OUString& rCommandURL ); @@ -155,8 +152,8 @@ private: OUString m_aMenuResourceURL; OUString m_aDescriptorContainer; - ::com::sun::star::uno::Reference - < com::sun::star::container::XIndexAccess > m_xMenuSettings; + css::uno::Reference + < css::container::XIndexAccess > m_xMenuSettings; SvxConfigEntry* pRootEntry; @@ -168,31 +165,24 @@ private: void Apply( SvxConfigEntry* pRootEntry, - com::sun::star::uno::Reference< - com::sun::star::container::XIndexContainer >& rNewMenuBar, - com::sun::star::uno::Reference< - com::sun::star::lang::XSingleComponentFactory >& rFactory, + css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar, + css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory, SvTreeListEntry *pParent = NULL ); void ApplyMenu( - com::sun::star::uno::Reference< - com::sun::star::container::XIndexContainer >& rNewMenuBar, - com::sun::star::uno::Reference< - com::sun::star::lang::XSingleComponentFactory >& rFactory, + css::uno::Reference< css::container::XIndexContainer >& rNewMenuBar, + css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory, SvxConfigEntry *pMenuData = NULL ); bool LoadSubMenus( - const ::com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess >& xMenuBarSettings, + const css::uno::Reference< css::container::XIndexAccess >& xMenuBarSettings, const OUString& rBaseTitle, SvxConfigEntry* pParentData ); public: MenuSaveInData( - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, + const css::uno::Reference< css::ui::XUIConfigurationManager >&, + const css::uno::Reference< css::ui::XUIConfigurationManager >&, const OUString& aModuleId, bool docConfig ); @@ -227,8 +217,8 @@ private: bool bIsVisible; sal_Int32 nStyle; - ::com::sun::star::uno::Reference< - ::com::sun::star::graphic::XGraphic > xBackupGraphic; + css::uno::Reference< + css::graphic::XGraphic > xBackupGraphic; SvxEntries *mpEntries; @@ -286,14 +276,10 @@ public: void SetVisible( bool b ) { bIsVisible = b; } bool IsVisible() const { return bIsVisible; } - void SetBackupGraphic( - ::com::sun::star::uno::Reference< - ::com::sun::star::graphic::XGraphic > graphic ) + void SetBackupGraphic( css::uno::Reference< css::graphic::XGraphic > graphic ) { xBackupGraphic = graphic; } - ::com::sun::star::uno::Reference< - ::com::sun::star::graphic::XGraphic > - GetBackupGraphic() + css::uno::Reference< css::graphic::XGraphic > GetBackupGraphic() { return xBackupGraphic; } bool IsIconModified() { return xBackupGraphic.is(); } @@ -373,20 +359,17 @@ protected: VclPtr<SvxScriptSelectorDialog> m_pSelectorDlg; /// the ResourceURL to select when opening the dialog - OUString m_aURLToSelect; + OUString m_aURLToSelect; - ::com::sun::star::uno::Reference - < ::com::sun::star::frame::XFrame > m_xFrame; + css::uno::Reference< css::frame::XFrame > m_xFrame; SvxConfigPage( vcl::Window*, const SfxItemSet& ); DECL_LINK( MoveHdl, Button * ); virtual SaveInData* CreateSaveInData( - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, + const css::uno::Reference< css::ui::XUIConfigurationManager >&, + const css::uno::Reference< css::ui::XUIConfigurationManager >&, const OUString& aModuleId, bool docConfig ) = 0; @@ -450,7 +433,7 @@ public: the ModuleManager is asked for the module ID of the component in the frame. */ static OUString - GetFrameWithDefaultAndIdentify( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _inout_rxFrame ); + GetFrameWithDefaultAndIdentify( css::uno::Reference< css::frame::XFrame >& _inout_rxFrame ); }; class SvxMenuConfigPage : public SvxConfigPage @@ -477,10 +460,10 @@ public: virtual void dispose() SAL_OVERRIDE; SaveInData* CreateSaveInData( - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, + const css::uno::Reference < + css::ui::XUIConfigurationManager >&, + const css::uno::Reference < + css::ui::XUIConfigurationManager >&, const OUString& aModuleId, bool docConfig ) SAL_OVERRIDE; }; @@ -576,10 +559,10 @@ public: void MoveEntry( bool bMoveUp ) SAL_OVERRIDE; SaveInData* CreateSaveInData( - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, + const css::uno::Reference < + css::ui::XUIConfigurationManager >&, + const css::uno::Reference < + css::ui::XUIConfigurationManager >&, const OUString& aModuleId, bool docConfig ) SAL_OVERRIDE; }; @@ -591,28 +574,23 @@ private: SvxConfigEntry* pRootEntry; OUString m_aDescriptorContainer; - ::com::sun::star::uno::Reference - < com::sun::star::container::XNameAccess > m_xPersistentWindowState; + css::uno::Reference + < css::container::XNameAccess > m_xPersistentWindowState; bool LoadToolbar( - const ::com::sun::star::uno::Reference< - com::sun::star::container::XIndexAccess >& xToolBarSettings, + const css::uno::Reference< css::container::XIndexAccess >& xToolBarSettings, SvxConfigEntry* pParentData ); void ApplyToolbar( - com::sun::star::uno::Reference< - com::sun::star::container::XIndexContainer >& rNewToolbarBar, - com::sun::star::uno::Reference< - com::sun::star::lang::XSingleComponentFactory >& rFactory, + css::uno::Reference< css::container::XIndexContainer >& rNewToolbarBar, + css::uno::Reference< css::lang::XSingleComponentFactory >& rFactory, SvxConfigEntry *pToolbar = NULL ); public: ToolbarSaveInData( - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, - const ::com::sun::star::uno::Reference < - ::com::sun::star::ui::XUIConfigurationManager >&, + const css::uno::Reference< css::ui::XUIConfigurationManager >&, + const css::uno::Reference< css::ui::XUIConfigurationManager >&, const OUString& aModuleId, bool docConfig ); @@ -623,16 +601,14 @@ public: void RemoveToolbar( SvxConfigEntry* pToolbar ); void ApplyToolbar( SvxConfigEntry* pToolbar ); - OUString GetSystemUIName( const OUString& rResourceURL ); + OUString GetSystemUIName( const OUString& rResourceURL ); sal_Int32 GetSystemStyle( const OUString& rResourceURL ); - void SetSystemStyle( - const OUString& rResourceURL, sal_Int32 nStyle ); + void SetSystemStyle( const OUString& rResourceURL, sal_Int32 nStyle ); void SetSystemStyle( - ::com::sun::star::uno::Reference - < ::com::sun::star::frame::XFrame > xFrame, + css::uno::Reference< css::frame::XFrame > xFrame, const OUString& rResourceURL, sal_Int32 nStyle ); SvxEntries* GetEntries() SAL_OVERRIDE; @@ -683,39 +659,36 @@ private: sal_Int32 m_nExpectedSize; - ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager > m_xImageManager; + css::uno::Reference< + css::ui::XImageManager > m_xImageManager; - ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager > m_xParentImageManager; + css::uno::Reference< + css::ui::XImageManager > m_xParentImageManager; - ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager > m_xImportedImageManager; + css::uno::Reference< + css::ui::XImageManager > m_xImportedImageManager; - ::com::sun::star::uno::Reference< - ::com::sun::star::graphic::XGraphicProvider > m_xGraphProvider; + css::uno::Reference< + css::graphic::XGraphicProvider > m_xGraphProvider; bool ReplaceGraphicItem( const OUString& aURL ); bool ImportGraphic( const OUString& aURL ); - void ImportGraphics( - const com::sun::star::uno::Sequence< OUString >& aURLs ); + void ImportGraphics( const css::uno::Sequence< OUString >& aURLs ); public: SvxIconSelectorDialog( vcl::Window *pWindow, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager >& rXImageManager, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ui::XImageManager >& rXParentImageManager + const css::uno::Reference< css::ui::XImageManager >& rXImageManager, + const css::uno::Reference< css::ui::XImageManager >& rXParentImageManager ); virtual ~SvxIconSelectorDialog(); virtual void dispose() SAL_OVERRIDE; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > + css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); DECL_LINK_TYPED( SelectHdl, ToolBox *, void ); diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index a84277fec76b..d7118faaa7c6 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -56,14 +56,14 @@ struct SfxStyleInfo_Impl struct SfxStylesInfo_Impl { - private: +private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDoc; + css::uno::Reference< css::frame::XModel > m_xDoc; - public: +public: SfxStylesInfo_Impl(); - void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); + void setModel(const css::uno::Reference< css::frame::XModel >& xModel); static bool parseStyleCommand(SfxStyleInfo_Impl& aStyle); void getLabel4Style(SfxStyleInfo_Impl& aStyle); @@ -134,13 +134,13 @@ class SfxConfigGroupListBox : public SvTreeListBox css::uno::Reference< css::container::XNameAccess > m_xUICmdDescription; Image GetImage( - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, + css::uno::Reference< css::script::browse::XBrowseNode > node, + css::uno::Reference< css::uno::XComponentContext > xCtx, bool bIsRootNode ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, + static css::uno::Reference< css::uno::XInterface > getDocumentModel( + css::uno::Reference< css::uno::XComponentContext >& xCtx, OUString& docName ); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 8d32d5e8d9fd..e9840c6a664a 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -137,7 +137,7 @@ protected: void Init(const OUString& strVisibleFields, const OUString& strInitialText); // only to be used out of the constructors - void OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos); + void OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPos); /** When searching in an own thread I naturally want to disable the UI for starting the search and for setting search parameters. If bEnable == sal_False, for all affected controls painting is turned off and shortly after turned on again using m_aDelayedPaint. If there is a demand with bEnable == sal_True inbetween, the timer is stopped and @@ -175,7 +175,7 @@ private: DECL_LINK_TYPED( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI - void initCommon( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _rxCursor ); + void initCommon( const css::uno::Reference< css::sdbc::XResultSet >& _rxCursor ); }; inline void FmSearchDialog::SetActiveField(const OUString& strField) diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index ee9697d8e13c..f4078f484848 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -262,14 +262,14 @@ class TPGalleryThemeProperties : public SfxTabPage INetURLObject aURL; sal_uInt16 nCurFilterPos; sal_uInt16 nFirstExtFilterPos; - bool bEntriesFound; - bool bInputAllowed; - bool bTakeAll; - bool bSearchRecursive; + bool bEntriesFound; + bool bInputAllowed; + bool bTakeAll; + bool bSearchRecursive; - ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; - ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; + css::uno::Reference< ::svt::DialogClosedListener > xDialogListener; + css::uno::Reference< css::media::XPlayer > xMediaPlayer; + css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; virtual void Reset( const SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {} virtual bool FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; } @@ -290,7 +290,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK( DClickFoundHdl, void* ); DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void ); DECL_LINK(EndSearchProgressHdl, void *); - DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent* ); public: TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 692e889eda81..79ad87e677ed 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -154,7 +154,7 @@ namespace svx OUString GetCurrentString( ) const; void SetCurrentString( const OUString& _rNewString, - const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, + const css::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); @@ -188,11 +188,11 @@ namespace svx DECL_LINK( ClickByCharacterHdl, CheckBox* ); /// fill the suggestion list box with suggestions for the actual input - void FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions ); + void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ); }; - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > > HHDictList; + typedef ::std::vector< css::uno::Reference< css::linguistic2::XConversionDictionary > > HHDictList; class HangulHanjaOptionsDialog : public ModalDialog { @@ -209,7 +209,7 @@ namespace svx SvLBoxButtonData* m_pCheckButtonData; HHDictList m_aDictList; - ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; + css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; DECL_LINK( OkHdl, void* ); DECL_LINK( OnNew, void* ); @@ -312,7 +312,7 @@ namespace svx void SetEditText( Edit& _rEdit, sal_uInt16 _nEntryNum ); void EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ); - bool DeleteEntryFromDictionary( const OUString& rEntry, const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary >& xDict ); + bool DeleteEntryFromDictionary( const OUString& rEntry, const css::uno::Reference< css::linguistic2::XConversionDictionary >& xDict ); public: HangulHanjaEditDictDialog( vcl::Window* _pParent, HHDictList& _rDictList, sal_uInt32 _nSelDict ); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index ad1a3f704ee3..65b010cf66af 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -82,7 +82,7 @@ protected: SvTreeListEntry* FindEntry(const OUString& aStrName); void ClearTree(); - int FillTree( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL ); + int FillTree( css::uno::Reference< css::container::XNameAccess > xLinks, SvTreeListEntry* pParentEntry =NULL ); virtual void Move () SAL_OVERRIDE; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index fa5ddb9c6c78..9933d6c1c439 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -73,10 +73,10 @@ private: VclPtr<Edit> mpEdText; VclPtr<PushButton> mpBtScript; - bool mbIsCloseDisabled; + bool mbIsCloseDisabled; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > - mxDocumentFrame; + css::uno::Reference< css::frame::XFrame > + mxDocumentFrame; protected: VclPtr<vcl::Window> mpDialog; @@ -121,7 +121,7 @@ public: virtual void dispose() SAL_OVERRIDE; void SetDocumentFrame( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ) + const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame ) { mxDocumentFrame = rxDocumentFrame; } diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 9d08cc57bb75..aa42ba5594ec 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -40,17 +40,17 @@ class INetURLObject; class InsertObjectDialog_Impl : public ModalDialog { protected: - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > m_xObj; - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage > m_xStorage; + css::uno::Reference < css::embed::XEmbeddedObject > m_xObj; + const css::uno::Reference < css::embed::XStorage > m_xStorage; comphelper::EmbeddedObjectContainer aCnt; InsertObjectDialog_Impl(vcl::Window * pParent, const OUString& rID, const OUString& rUIXMLDescription, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); + const css::uno::Reference < css::embed::XStorage >& xStorage); public: - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject() + css::uno::Reference < css::embed::XEmbeddedObject > GetObject() { return m_xObj; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); + virtual css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); virtual bool IsCreateNew() const; }; @@ -66,7 +66,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl VclPtr<CheckBox> m_pCbFilelink; const SvObjectServerList* m_pServers; - ::com::sun::star::uno::Sequence< sal_Int8 > m_aIconMetaFile; + css::uno::Sequence< sal_Int8 > m_aIconMetaFile; OUString m_aIconMediaType; DECL_LINK(DoubleClickHdl, void*); @@ -84,14 +84,14 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl public: SvInsertOleDlg( vcl::Window* pParent, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage, + const css::uno::Reference < css::embed::XStorage >& xStorage, const SvObjectServerList* pServers = NULL ); virtual ~SvInsertOleDlg(); virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; /// get replacement for the iconified embedded object and the mediatype of the replacement - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; + css::uno::Reference< css::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ) SAL_OVERRIDE; }; class SvInsertPlugInDialog : public InsertObjectDialog_Impl @@ -109,7 +109,7 @@ private: public: SvInsertPlugInDialog(vcl::Window* pParent, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage); + const css::uno::Reference < css::embed::XStorage >& xStorage); virtual ~SvInsertPlugInDialog(); virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; @@ -143,9 +143,9 @@ private: public: SfxInsertFloatingFrameDialog(vcl::Window *pParent, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStorage ); + const css::uno::Reference < css::embed::XStorage >& xStorage ); SfxInsertFloatingFrameDialog( vcl::Window* pParent, - const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); + const css::uno::Reference < css::embed::XEmbeddedObject >& xObj ); virtual ~SfxInsertFloatingFrameDialog(); virtual void dispose() SAL_OVERRIDE; virtual short Execute() SAL_OVERRIDE; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index eb54a55335fc..38a8e6426d4c 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -79,7 +79,7 @@ class SfxMacroTabPage : public _SfxMacroTabPage public: SfxMacroTabPage( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, + const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); @@ -92,7 +92,7 @@ class SfxMacroAssignDlg : public SfxSingleTabDialog public: SfxMacroAssignDlg( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame, + const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame, const SfxItemSet& rSet ); }; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index b9bea10ccf31..ab7492f4d63b 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -65,9 +65,9 @@ class _SvxMacroTabPage : public SfxTabPage protected: _SvxMacroTabPage_Impl* mpImpl; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xAppEvents; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocEvents; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xModifiable; + css::uno::Reference< css::container::XNameReplace > m_xAppEvents; + css::uno::Reference< css::container::XNameReplace > m_xDocEvents; + css::uno::Reference< css::util::XModifiable > m_xModifiable; EventsHash m_appEventsHash; EventsHash m_docEventsHash; bool bReadOnly, bDocModified, bAppEvents, bInitialized; @@ -76,8 +76,8 @@ protected: _SvxMacroTabPage( vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet ); void EnableButtons(); - static ::com::sun::star::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); - static ::std::pair< OUString, OUString > GetPairFromAny( ::com::sun::star::uno::Any aAny ); + static css::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash ); + static ::std::pair< OUString, OUString > GetPairFromAny( css::uno::Any aAny ); public: @@ -85,7 +85,7 @@ public: virtual void dispose() SAL_OVERRIDE; void InitResources(); - void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable ); + void InitAndSetHandler( css::uno::Reference< css::container::XNameReplace > xAppEvents, css::uno::Reference< css::container::XNameReplace > xDocEvents, css::uno::Reference< css::util::XModifiable > xModifiable ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; @@ -100,9 +100,9 @@ class SvxMacroTabPage : public _SvxMacroTabPage public: SvxMacroTabPage( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, + const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xNameReplace, + css::uno::Reference< css::container::XNameReplace > xNameReplace, sal_uInt16 nSelectedIndex ); }; @@ -126,9 +126,9 @@ class SvxMacroAssignDlg : public SvxMacroAssignSingleTabDialog public: SvxMacroAssignDlg( vcl::Window* pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxDocumentFrame, + const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame, const SfxItemSet& rSet, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace >& xNameReplace, + const css::uno::Reference< css::container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex ); }; diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index ce0940f52645..7efb70d9e1e7 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -54,23 +54,23 @@ private: VclPtr<SvxLanguageBox> pLanguageLB; VclPtr<CheckBox> pExceptBtn; VclPtr<OKButton> pOKBtn; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > xNewDic; + css::uno::Reference< + css::linguistic2::XSpellChecker1 > xSpell; + css::uno::Reference< + css::linguistic2::XDictionary > xNewDic; DECL_LINK(OKHdl_Impl, void *); DECL_LINK(ModifyHdl_Impl, void *); public: SvxNewDictionaryDialog( vcl::Window* pParent, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl ); + css::uno::Reference< + css::linguistic2::XSpellChecker1 > &xSpl ); virtual ~SvxNewDictionaryDialog(); virtual void dispose() SAL_OVERRIDE; - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > + css::uno::Reference< + css::linguistic2::XDictionary > GetNewDictionary() { return xNewDic; } }; @@ -117,11 +117,11 @@ private: OUString sNew; DecorationView aDecoView; - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > > aDics; //! snapshot copy to work on - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; + css::uno::Sequence< + css::uno::Reference< + css::linguistic2::XDictionary > > aDics; //! snapshot copy to work on + css::uno::Reference< + css::linguistic2::XSpellChecker1 > xSpell; short nOld; long nWidth; @@ -137,10 +137,10 @@ private: void ShowWords_Impl( sal_uInt16 nId ); - void SetLanguage_Impl( ::com::sun::star::util::Language nLanguage ); + void SetLanguage_Impl( css::util::Language nLanguage ); bool IsDicReadonly_Impl() const { return bDicIsReadonly; } - void SetDicReadonly_Impl( ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XDictionary > &xDic ); + void SetDicReadonly_Impl( css::uno::Reference< + css::linguistic2::XDictionary > &xDic ); void RemoveDictEntry(SvTreeListEntry* pEntry); sal_uLong GetLBInsertPos(const OUString &rDicWord); @@ -148,8 +148,8 @@ private: public: SvxEditDictionaryDialog( vcl::Window* pParent, const OUString& rName, - ::com::sun::star::uno::Reference< - ::com::sun::star::linguistic2::XSpellChecker1> &xSpl ); + css::uno::Reference< + css::linguistic2::XSpellChecker1> &xSpl ); virtual ~SvxEditDictionaryDialog(); virtual void dispose() SAL_OVERRIDE; }; diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 96a02388f8f4..ac75f148dbbf 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -118,14 +118,14 @@ private: OUString sHyphAuto; OUString sHyphSpecial; - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XLinguProperties > xProp; + css::uno::Reference< + css::linguistic2::XLinguProperties > xProp; - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionaryList > xDicList; - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionary > > aDics; + css::uno::Reference< + css::linguistic2::XDictionaryList > xDicList; + css::uno::Sequence< + css::uno::Reference< + css::linguistic2::XDictionary > > aDics; SvLBoxButtonData* pCheckButtonData; @@ -134,8 +134,8 @@ private: SvxLinguTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - static sal_uLong GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); + void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); + static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); DECL_LINK( ClickHdl_Impl, PushButton * ); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 4158d02fc62a..128269341ab2 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -48,8 +48,8 @@ private: VclPtr<svx::OptHeaderTabListBox> pPathBox; OptPath_Impl* pImpl; - ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; + css::uno::Reference< ::svt::DialogClosedListener > xDialogListener; + css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; void ChangeCurrentEntry( const OUString& _rFolder ); @@ -60,7 +60,7 @@ private: DECL_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_LINK( HeaderEndDrag_Impl, HeaderBar * ); - DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent* ); void GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9a6354d3dec1..b7db84a86bb2 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -55,11 +55,11 @@ private: OUString m_sMyMacros; OUString m_sProdMacros; - static ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > - getLangNodeFromRootNode( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& root, OUString& language ); + static css::uno::Reference< css::script::browse::XBrowseNode > + getLangNodeFromRootNode( css::uno::Reference< css::script::browse::XBrowseNode >& root, OUString& language ); static void delUserData( SvTreeListEntry* pEntry ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, OUString& docName ); + static css::uno::Reference< css::uno::XInterface > getDocumentModel( css::uno::Reference< css::uno::XComponentContext >& xCtx, OUString& docName ); protected: virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; @@ -68,8 +68,8 @@ protected: public: void Init( const OUString& language ); void RequestSubEntries( SvTreeListEntry* pRootEntry, - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node, - ::com::sun::star::uno::Reference< com::sun::star::frame::XModel>& model ); + css::uno::Reference< css::script::browse::XBrowseNode >& node, + css::uno::Reference< css::frame::XModel>& model ); SFTreeListBox(vcl::Window* pParent); virtual ~SFTreeListBox(); virtual void dispose() SAL_OVERRIDE; @@ -115,18 +115,18 @@ class SFEntry private: sal_uInt8 nType; bool loaded; - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model; + css::uno::Reference< css::script::browse::XBrowseNode > nodes; + css::uno::Reference< css::frame::XModel > model; SFEntry(){} public: SFEntry( sal_uInt8 nT ) { nType = nT; loaded=false; } SFEntry( sal_uInt8 nT, - const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes , - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; } + const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes , + const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; } SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; } virtual ~SFEntry() {} - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;} - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;}; + css::uno::Reference< css::script::browse::XBrowseNode > GetNode() { return nodes ;} + css::uno::Reference< css::frame::XModel > GetModel() { return model ;}; bool isLoaded() const { return loaded; } void setLoaded() { loaded=true; } }; @@ -159,17 +159,17 @@ protected: DECL_LINK( MacroSelectHdl, SvTreeListBox * ); DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); DECL_LINK( ButtonHdl, Button * ); - static bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, OUString& propName ); - void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node ); + static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName ); + void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode >& node ); void createEntry( SvTreeListEntry* pEntry ); void renameEntry( SvTreeListEntry* pEntry ); void deleteEntry( SvTreeListEntry* pEntry ); - static ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > + static css::uno::Reference< css::script::browse::XBrowseNode > getBrowseNode( SvTreeListEntry* pEntry ); - static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getModel( SvTreeListEntry* pEntry ); - OUString getListOfChildren( ::com::sun::star::uno::Reference< com::sun::star::script::browse::XBrowseNode > node, int depth ); + static css::uno::Reference< css::frame::XModel > getModel( SvTreeListEntry* pEntry ); + OUString getListOfChildren( css::uno::Reference< css::script::browse::XBrowseNode > node, int depth ); void StoreCurrentSelection(); void RestorePreviousSelection(); @@ -194,8 +194,7 @@ private: public: - SvxScriptErrorDialog( - vcl::Window* parent, ::com::sun::star::uno::Any aException ); + SvxScriptErrorDialog( vcl::Window* parent, css::uno::Any aException ); virtual ~SvxScriptErrorDialog(); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index f8bd35ccf3e4..774851451ab0 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -43,11 +43,11 @@ struct SvxGroupInfo_Impl { sal_uInt16 nKind; sal_uInt16 nOrd; - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > - xBrowseNode; - OUString sURL; - OUString sHelpText; - bool bWasOpened; + css::uno::Reference< css::script::browse::XBrowseNode > + xBrowseNode; + OUString sURL; + OUString sHelpText; + bool bWasOpened; SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr ) :nKind( n ) @@ -59,7 +59,7 @@ struct SvxGroupInfo_Impl { } - SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxNode ) + SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const css::uno::Reference< css::script::browse::XBrowseNode >& _rxNode ) :nKind( n ) ,nOrd( nr ) ,xBrowseNode( _rxNode ) @@ -120,11 +120,11 @@ class SvxConfigGroupListBox : public SvTreeListBox VclPtr<SvxConfigFunctionListBox> pFunctionListBox; SaveInData* m_pImageProvider; - ::com::sun::star::uno::Reference - < ::com::sun::star::frame::XFrame > m_xFrame; + css::uno::Reference + < css::frame::XFrame > m_xFrame; - ::com::sun::star::uno::Reference - < ::com::sun::star::container::XNameAccess > m_xModuleCommands; + css::uno::Reference + < css::container::XNameAccess > m_xModuleCommands; Image m_hdImage; Image m_libImage; @@ -133,19 +133,19 @@ class SvxConfigGroupListBox : public SvTreeListBox OUString m_sMyMacros; OUString m_sProdMacros; Image GetImage( - ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > node, - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx, + css::uno::Reference< css::script::browse::XBrowseNode > node, + css::uno::Reference< css::uno::XComponentContext > xCtx, bool bIsRootNode ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getDocumentModel( - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xCtx, + static css::uno::Reference< css::uno::XInterface > getDocumentModel( + css::uno::Reference< css::uno::XComponentContext >& xCtx, OUString& docName ); private: void fillScriptList( - const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxRootNode, + const css::uno::Reference< css::script::browse::XBrowseNode >& _rxRootNode, SvTreeListEntry* _pParentEntry, bool _bCheapChildrenOnDemand ); @@ -159,8 +159,8 @@ public: virtual ~SvxConfigGroupListBox(); virtual void dispose() SAL_OVERRIDE; - void Init(bool bShowSlots, const ::com::sun::star::uno::Reference - < ::com::sun::star::frame::XFrame >& xFrame); + void Init(bool bShowSlots, const css::uno::Reference + < css::frame::XFrame >& xFrame); void ClearAll(); void GroupSelected(); @@ -195,8 +195,7 @@ public: SvxScriptSelectorDialog ( vcl::Window* pParent = NULL, bool bShowSlots = false, - const ::com::sun::star::uno::Reference - < ::com::sun::star::frame::XFrame >& xFrame = 0 + const css::uno::Reference< css::frame::XFrame >& xFrame = 0 ); virtual ~SvxScriptSelectorDialog(); virtual void dispose() SAL_OVERRIDE; diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index d7494d72896b..96c7022d774f 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -38,14 +38,14 @@ class FmShowColsDialog : public ModalDialog VclPtr<ListBox> m_pList; VclPtr<OKButton> m_pOK; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xColumns; + css::uno::Reference< css::container::XIndexAccess > m_xColumns; public: FmShowColsDialog(vcl::Window* pParent); virtual ~FmShowColsDialog(); virtual void dispose() SAL_OVERRIDE; - void SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols); + void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols); protected: DECL_LINK(OnClickedOk, void *); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 0ec5697e4b23..e88b3e21e0ec 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -151,20 +151,20 @@ private: VclPtr<SvTreeListBox> pTreeLB; VclPtr<VclBox> pTabBox; - OUString sTitle; - OUString sNotLoadedError; + OUString sTitle; + OUString sNotLoadedError; // for the ColorTabPage - SfxItemSet* pColorPageItemSet; + SfxItemSet* pColorPageItemSet; VclPtr<SvxColorTabPage> mpColorPage; - bool bForgetSelection; - bool bIsFromExtensionManager; + bool bForgetSelection; + bool bIsFromExtensionManager; // check "for the current document only" and set focus to "Western" languages box - bool bIsForSetDocumentLanguage; + bool bIsForSetDocumentLanguage; - com::sun::star::uno::Reference < com::sun::star::awt::XContainerWindowProvider > + css::uno::Reference < css::awt::XContainerWindowProvider > m_xContainerWinProvider; static LastPageSaver* pLastPageSaver; @@ -172,12 +172,12 @@ private: SfxItemSet* CreateItemSet( sal_uInt16 nId ); static void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ); void InitTreeAndHandler(); - void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame ); + void Initialize( const css::uno::Reference< css::frame::XFrame >& _xFrame ); void InitWidgets(); void LoadExtensionOptions( const OUString& rExtensionId ); - static OUString GetModuleIdentifier( const com::sun::star::uno::Reference< - com::sun::star::frame::XFrame >& xFrame ); + static OUString GetModuleIdentifier( const css::uno::Reference< + css::frame::XFrame >& xFrame ); static Module* LoadModule( const OUString& rModuleIdentifier ); static VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId ); void InsertNodes( const VectorOfNodes& rNodeList ); @@ -195,7 +195,7 @@ protected: public: OfaTreeOptionsDialog( vcl::Window* pParent, - const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame, + const css::uno::Reference< css::frame::XFrame >& _xFrame, bool bActivateLastSelection = true ); OfaTreeOptionsDialog( vcl::Window* pParent, const OUString& rExtensionId ); virtual ~OfaTreeOptionsDialog(); @@ -257,24 +257,24 @@ class ExtensionsTabPage : public TabPage { private: OUString m_sPageURL; - com::sun::star::uno::Reference< com::sun::star::awt::XWindow > + css::uno::Reference< css::awt::XWindow > m_xPage; OUString m_sEventHdl; - com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowEventHandler > + css::uno::Reference< css::awt::XContainerWindowEventHandler > m_xEventHdl; - com::sun::star::uno::Reference< com::sun::star::awt::XContainerWindowProvider > + css::uno::Reference< css::awt::XContainerWindowProvider > m_xWinProvider; bool m_bIsWindowHidden; void CreateDialogWithHandler(); - bool DispatchAction( const OUString& rAction ); + bool DispatchAction( const OUString& rAction ); public: ExtensionsTabPage( vcl::Window* pParent, WinBits nStyle, const OUString& rPageURL, const OUString& rEvtHdl, - const com::sun::star::uno::Reference< - com::sun::star::awt::XContainerWindowProvider >& rProvider ); + const css::uno::Reference< + css::awt::XContainerWindowProvider >& rProvider ); virtual ~ExtensionsTabPage(); virtual void dispose() SAL_OVERRIDE; diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx index 0e21077b6931..12e6b5dcffc6 100644 --- a/cui/source/options/cfgchart.cxx +++ b/cui/source/options/cfgchart.cxx @@ -267,7 +267,7 @@ void SvxChartOptions::ImplCommit() PutProperties( aNames, aValues ); } -void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< OUString >& ) +void SvxChartOptions::Notify( const css::uno::Sequence< OUString >& ) { } diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index f7e34fb8fde4..5f9a6c8b539a 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -63,12 +63,12 @@ class SvxChartOptions : public ::utl::ConfigItem { private: SvxChartColorTable maDefColors; - bool mbIsInitialized; + bool mbIsInitialized; - ::com::sun::star::uno::Sequence< OUString > - maPropertyNames; + css::uno::Sequence< OUString > + maPropertyNames; - inline ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const + inline css::uno::Sequence< OUString > GetPropertyNames() const { return maPropertyNames; } bool RetrieveOptions(); @@ -81,7 +81,7 @@ public: const SvxChartColorTable& GetDefaultColors(); void SetDefaultColors( const SvxChartColorTable& aCol ); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; + virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; }; diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 165e9e932fa6..37496e3d76e5 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -325,28 +325,28 @@ void CuiAboutConfigTabPage::FillItems(const Reference< XNameAccess >& xNameAcces { switch( aNode.getValueType().getTypeClass() ) { - case ::com::sun::star::uno::TypeClass_VOID: + case css::uno::TypeClass_VOID: break; - case ::com::sun::star::uno::TypeClass_BOOLEAN: + case css::uno::TypeClass_BOOLEAN: sValue = OUString::boolean( aNode.get<bool>() ); break; - case ::com::sun::star::uno::TypeClass_SHORT: - case ::com::sun::star::uno::TypeClass_LONG: - case ::com::sun::star::uno::TypeClass_HYPER: + case css::uno::TypeClass_SHORT: + case css::uno::TypeClass_LONG: + case css::uno::TypeClass_HYPER: sValue = OUString::number( aNode.get<sal_Int64>() ); break; - case ::com::sun::star::uno::TypeClass_DOUBLE: + case css::uno::TypeClass_DOUBLE: sValue = OUString::number( aNode.get<double>() ); break; - case ::com::sun::star::uno::TypeClass_STRING: + case css::uno::TypeClass_STRING: sValue = aNode.get<OUString>(); break; - case ::com::sun::star::uno::TypeClass_SEQUENCE: + case css::uno::TypeClass_SEQUENCE: if( sType == "[]boolean" ) { uno::Sequence<sal_Bool> seq = aNode.get< uno::Sequence<sal_Bool> >(); @@ -487,7 +487,7 @@ Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( const OUString& uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); uno::Reference< lang::XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( xContext ) ); + css::configuration::theDefaultProvider::get( xContext ) ); beans::NamedValue aProperty; aProperty.Name = "nodepath"; diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 8fbb3107b3f1..0938dc86d0ce 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -54,7 +54,7 @@ private: VclPtr< SvSimpleTable > m_pPrefBox; //for search - ::com::sun::star::util::SearchOptions m_options; + css::util::SearchOptions m_options; SvTreeListEntries m_prefBoxEntries; void AddToModifiedVector( const boost::shared_ptr< Prop_Impl >& rProp ); @@ -73,9 +73,9 @@ public: void InsertEntry(const OUString &rPropertyPath, const OUString& rProp, const OUString& rStatus, const OUString& rType, const OUString& rValue, SvTreeListEntry *pParentEntry = nullptr, bool bInsertToPrefBox = true); void Reset(); - void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess, + void FillItems(const css::uno::Reference<css::container::XNameAccess>& xNameAccess, SvTreeListEntry *pParentEntry = nullptr, int lineage = 0, bool bLoadAll = false); - static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, bool bUpdate ); + static css::uno::Reference< css::container::XNameAccess > getConfigAccess( const OUString& sNodePath, bool bUpdate ); bool FillItemSet(); }; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index c57641a51609..42bb2574e029 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -494,7 +494,7 @@ CanvasSettings::CanvasSettings() : try { Reference<XMultiServiceFactory> xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( + css::configuration::theDefaultProvider::get( comphelper::getProcessComponentContext())); Any propValue( @@ -1137,7 +1137,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& try { Reference< XMultiServiceFactory > theConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( + css::configuration::theDefaultProvider::get( comphelper::getProcessComponentContext())); Sequence< Any > theArgs(1); Reference< XNameAccess > theNameAccess; @@ -1188,11 +1188,11 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(vcl::Window* pParent, const SfxItemSet& } m_pWesternLanguageLB->SetLanguageList( SvxLanguageListFlags::WESTERN | SvxLanguageListFlags::ONLY_KNOWN, true, false, true ); - m_pWesternLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::LATIN ); + m_pWesternLanguageLB->InsertDefaultLanguage( css::i18n::ScriptType::LATIN ); m_pAsianLanguageLB->SetLanguageList( SvxLanguageListFlags::CJK | SvxLanguageListFlags::ONLY_KNOWN, true, false, true ); - m_pAsianLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::ASIAN ); + m_pAsianLanguageLB->InsertDefaultLanguage( css::i18n::ScriptType::ASIAN ); m_pComplexLanguageLB->SetLanguageList( SvxLanguageListFlags::CTL | SvxLanguageListFlags::ONLY_KNOWN, true, false, true ); - m_pComplexLanguageLB->InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX ); + m_pComplexLanguageLB->InsertDefaultLanguage( css::i18n::ScriptType::COMPLEX ); m_pLocaleSettingLB->SetLanguageList( SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, false, false, false); m_pLocaleSettingLB->InsertSystemLanguage( ); @@ -1340,7 +1340,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) aLangString = ConvertLanguageToIsoString(m_pUserInterfaceLB->GetSelectLanguage()); */ Reference< XMultiServiceFactory > theConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( + css::configuration::theDefaultProvider::get( comphelper::getProcessComponentContext())); Sequence< Any > theArgs(1); theArgs[0] = makeAny(NamedValue(OUString("nodepath"), makeAny(OUString(sUserLocalePath)))); @@ -1444,7 +1444,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) } if(pCurrentDocShell) { - rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN), + rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, css::i18n::ScriptType::LATIN), SID_ATTR_LANGUAGE)); } } @@ -1464,7 +1464,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) } if(pCurrentDocShell) { - rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN), + rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, css::i18n::ScriptType::ASIAN), SID_ATTR_CHAR_CJK_LANGUAGE)); } } @@ -1484,7 +1484,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) } if(pCurrentDocShell) { - rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX), + rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, css::i18n::ScriptType::COMPLEX), SID_ATTR_CHAR_CTL_LANGUAGE)); } } @@ -1633,21 +1633,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) if( SfxItemState::SET == rSet->GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = static_cast<const SvxLanguageItem*>(pLang)->GetValue(); - if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang) + if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, css::i18n::ScriptType::LATIN) != eTempCurLang) eCurLang = eTempCurLang; } if( SfxItemState::SET == rSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = static_cast<const SvxLanguageItem*>(pLang)->GetValue(); - if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang) + if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, css::i18n::ScriptType::ASIAN) != eTempCurLang) eCurLangCJK = eTempCurLang; } if( SfxItemState::SET == rSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = static_cast<const SvxLanguageItem*>(pLang)->GetValue(); - if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang) + if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, css::i18n::ScriptType::COMPLEX) != eTempCurLang) eCurLangCTL = eTempCurLang; } } diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 5e4836e907c1..61b1870227f8 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -190,7 +190,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pProxyModeLB->SetSelectHdl(LINK( this, SvxProxyTabPage, ProxyHdl_Impl )); - Reference< com::sun::star::lang::XMultiServiceFactory > + Reference< css::lang::XMultiServiceFactory > xConfigurationProvider( configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() ) ); @@ -293,7 +293,7 @@ void SvxProxyTabPage::ReadConfigData_Impl() OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: NoSuchElementException caught" ); } - catch (const com::sun::star::lang::WrappedTargetException &) { + catch (const css::lang::WrappedTargetException &) { OSL_TRACE( "SvxProxyTabPage::ReadConfigData_Impl: WrappedTargetException caught" ); } @@ -352,7 +352,7 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl() OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch (const com::sun::star::lang::WrappedTargetException &) { + catch (const css::lang::WrappedTargetException &) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } @@ -386,7 +386,7 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: UnknownPropertyException caught" ); } - catch (const com::sun::star::lang::WrappedTargetException &) { + catch (const css::lang::WrappedTargetException &) { OSL_TRACE( "SvxProxyTabPage::RestoreConfigDefaults_Impl: WrappedTargetException caught" ); } @@ -479,7 +479,7 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* ) xChangesBatch->commitChanges(); } - catch (const com::sun::star::lang::IllegalArgumentException &) { + catch (const css::lang::IllegalArgumentException &) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: IllegalArgumentException caught" ); } @@ -491,7 +491,7 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* ) OSL_TRACE( "SvxProxyTabPage::FillItemSet: PropertyVetoException caught" ); } - catch (const com::sun::star::lang::WrappedTargetException &) { + catch (const css::lang::WrappedTargetException &) { OSL_TRACE( "SvxProxyTabPage::FillItemSet: WrappedTargetException caught" ); } @@ -1082,7 +1082,7 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton ) if (m_pMailerURLPB == pButton && !pImpl->bROProgram) { FileDialogHelper aHelper( - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString sPath = m_pMailerURLED->GetText(); if ( sPath.isEmpty() ) diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 025118fe5ff4..178b0c079675 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -81,8 +81,8 @@ private: ::std::vector< JavaInfo* > m_aAddedInfos; - ::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener; - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker; + css::uno::Reference< ::svt::DialogClosedListener > xDialogListener; + css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker; DECL_LINK(EnableHdl_Impl, void *); DECL_LINK( CheckHdl_Impl, SvSimpleTable * ); @@ -93,7 +93,7 @@ private: DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void); DECL_LINK( StartFolderPickerHdl, void * ); - DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent* ); DECL_LINK(ExpertConfigHdl_Impl, void *); @@ -146,8 +146,8 @@ public: virtual short Execute() SAL_OVERRIDE; - ::com::sun::star::uno::Sequence< OUString > GetParameters() const; - void SetParameters( ::com::sun::star::uno::Sequence< OUString >& rParams ); + css::uno::Sequence< OUString > GetParameters() const; + void SetParameters( css::uno::Sequence< OUString >& rParams ); }; // class SvxJavaClassPathDlg --------------------------------------------- diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 1de1d71b2efc..d4d9f1bd3ef4 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -71,10 +71,10 @@ using namespace ::ucbhelper; using namespace ::com::sun::star; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::linguistic2; -using namespace ::com::sun::star::beans; +using namespace css::lang; +using namespace css::uno; +using namespace css::linguistic2; +using namespace css::beans; #define CBCOL_FIRST 0 #define CBCOL_SECOND 1 @@ -155,10 +155,10 @@ bool KillFile_Impl( const OUString& rURL ) bool bRet = true; try { - Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + Content aCnt( rURL, uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); aCnt.executeCommand( OUString("delete"), makeAny( true ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( css::ucb::CommandAbortedException& ) { SAL_WARN( "cui.options", "KillFile: CommandAbortedException" ); bRet = false; diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index f44456ce1c88..852c4c07a3a6 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -53,10 +53,10 @@ #include <boost/scoped_ptr.hpp> -using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::ui::dialogs; -using namespace ::com::sun::star::uno; +using namespace css::beans; +using namespace css::lang; +using namespace css::ui::dialogs; +using namespace css::uno; using namespace svx; // define ---------------------------------------------------------------- diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 5f66f5bbbd43..5dee38d29b04 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -321,7 +321,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl) try { uno::Reference< lang::XMultiServiceFactory > xConfigProvider( - com::sun::star::configuration::theDefaultProvider::get( xContext ) ); + css::configuration::theDefaultProvider::get( xContext ) ); beans::NamedValue aProperty; aProperty.Name = "nodepath"; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index ec749adc16c8..efafee9a6dc5 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -46,7 +46,7 @@ private: DECL_LINK(CheckNowHdl_Impl, void *) ; DECL_LINK( AutoCheckHdl_Impl, CheckBox* ) ; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xUpdateAccess; + css::uno::Reference< css::container::XNameReplace > m_xUpdateAccess; void UpdateLastCheckedText(); diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx index b32ccfca7767..ae2e1537e79e 100644 --- a/cui/source/options/sdbcdriverenum.cxx +++ b/cui/source/options/sdbcdriverenum.cxx @@ -29,10 +29,10 @@ namespace offapp { - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::container; - using namespace ::com::sun::star::sdbc; + using namespace css::uno; + using namespace css::lang; + using namespace css::container; + using namespace css::sdbc; class ODriverEnumerationImpl { diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 9df70c3e1568..303ecba50b49 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -260,7 +260,7 @@ public: MailMergeCfg_Impl(); virtual ~MailMergeCfg_Impl(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; + virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) SAL_OVERRIDE; bool IsEmailSupported() const {return bIsEmailSupported;} @@ -286,7 +286,7 @@ void MailMergeCfg_Impl::ImplCommit() { } -void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& ) +void MailMergeCfg_Impl::Notify( const css::uno::Sequence< OUString >& ) { } @@ -1497,7 +1497,7 @@ OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame ) { sIdentifier = xModuleManager->identify( xCurrentFrame ); } - catch ( ::com::sun::star::frame::UnknownModuleException& ) + catch ( css::frame::UnknownModuleException& ) { DBG_WARNING( "getActiveModule_Impl(): unknown module" ); } @@ -1542,7 +1542,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame ) if( ! xService.is() ) continue; } - catch ( ::com::sun::star::uno::DeploymentException& ) + catch ( css::uno::DeploymentException& ) { continue; } @@ -1851,7 +1851,7 @@ OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& r { sModule = xModuleManager->identify( xCurrentFrame ); } - catch ( ::com::sun::star::frame::UnknownModuleException& ) + catch ( css::frame::UnknownModuleException& ) { DBG_WARNING( "OfaTreeOptionsDialog::GetModuleIdentifier(): unknown module" ); } @@ -2149,7 +2149,7 @@ short OfaTreeOptionsDialog::Execute() if ( !bIsFromExtensionManager ) { // collect all DictionaryList Events while the dialog is executed - Reference<com::sun::star::linguistic2::XSearchableDictionaryList> xDictionaryList(SvxGetDictionaryList()); + Reference<css::linguistic2::XSearchableDictionaryList> xDictionaryList(SvxGetDictionaryList()); pClamp.reset( new SvxDicListChgClamp( xDictionaryList ) ); } short nRet = SfxModalDialog::Execute(); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 600f5a481758..3af51b13ae91 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1429,7 +1429,7 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage(vcl::Window* pParent, const SfxItem get(m_pDelDoublePB, "deldouble"); get(m_pAutoCapsCB, "autodouble"); - ::com::sun::star::lang::Locale aLcl( LanguageTag::convertToLocale(eLastDialogLanguage )); + css::lang::Locale aLcl( LanguageTag::convertToLocale(eLastDialogLanguage )); pCompareClass = new CollatorWrapper( comphelper::getProcessComponentContext() ); pCompareClass->loadDefaultCollator( aLcl, 0 ); @@ -2393,8 +2393,8 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const if (m_pAutoCompleteList && nSelCnt) { TransferDataContainer* pCntnr = new TransferDataContainer; - ::com::sun::star::uno::Reference< - ::com::sun::star::datatransfer::XTransferable > xRef( pCntnr ); + css::uno::Reference< + css::datatransfer::XTransferable > xRef( pCntnr ); OStringBuffer sData; const sal_Char aLineEnd[] = diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 3d56dbd72d72..0f6c8b566d7f 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -397,8 +397,8 @@ void _SfxMacroTabPage::InitAndSetHandler() void _SfxMacroTabPage::FillMacroList() { mpImpl->pGroupLB->Init( - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >(), + css::uno::Reference< + css::uno::XComponentContext >(), GetFrame(), OUString(), false); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 718b2f6d48d6..61efd7c754e0 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -370,8 +370,7 @@ void SvxNumberFormatTabPage::Init_Impl() // Don't list ambiguous locales where we won't be able to convert the // LanguageType back to an identical Language_Country name and therefore // couldn't load the i18n LocaleData. Show DebugMsg in non-PRODUCT version. - ::com::sun::star::uno::Sequence< sal_uInt16 > xLang = - LocaleDataWrapper::getInstalledLanguageTypes(); + css::uno::Sequence< sal_uInt16 > xLang = LocaleDataWrapper::getInstalledLanguageTypes(); sal_Int32 nCount = xLang.getLength(); for ( sal_Int32 i=0; i<nCount; i++ ) { diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 645b2472f8ac..362001bd62d5 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -696,7 +696,7 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight() const { const SvxWritingModeItem& rItem = static_cast<const SvxWritingModeItem&> ( rOutAttrs.Get (SDRATTR_TEXTDIRECTION)); - if (rItem.GetValue() == com::sun::star::text::WritingMode_TB_RL) + if (rItem.GetValue() == css::text::WritingMode_TB_RL) bLeftToRightDirection = false; } return bLeftToRightDirection; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 8c3427d8d335..21afbd10b46e 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -791,7 +791,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString aStrFilterType( "*.sob" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); OUString aPalettePath(SvtPathOptions().GetPalettePath()); @@ -879,7 +879,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.sob" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index d0c1241272ba..f8c60858d05f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -651,7 +651,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString aStrFilterType( "*.sog" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); OUString aPalettePath(SvtPathOptions().GetPalettePath()); @@ -743,7 +743,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl) IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl) { ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); + css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.sog" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 5b2871221f2a..cc1934a84bf5 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -688,7 +688,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString aStrFilterType( "*.soh" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); OUString aPalettePath(SvtPathOptions().GetPalettePath()); @@ -769,7 +769,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl) IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.soh" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 7849d1827d9c..8b992c6d2cdc 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -886,22 +886,22 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) { case 0: // Rounded, default { - pNew.reset(new XLineJointItem(com::sun::star::drawing::LineJoint_ROUND)); + pNew.reset(new XLineJointItem(css::drawing::LineJoint_ROUND)); break; } case 1: // - none - { - pNew.reset(new XLineJointItem(com::sun::star::drawing::LineJoint_NONE)); + pNew.reset(new XLineJointItem(css::drawing::LineJoint_NONE)); break; } case 2: // Miter { - pNew.reset(new XLineJointItem(com::sun::star::drawing::LineJoint_MITER)); + pNew.reset(new XLineJointItem(css::drawing::LineJoint_MITER)); break; } case 3: // Bevel { - pNew.reset(new XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL)); + pNew.reset(new XLineJointItem(css::drawing::LineJoint_BEVEL)); break; } } @@ -928,17 +928,17 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) { case 0: // Butt (=Flat), default { - pNew.reset(new XLineCapItem(com::sun::star::drawing::LineCap_BUTT)); + pNew.reset(new XLineCapItem(css::drawing::LineCap_BUTT)); break; } case 1: // Round { - pNew.reset(new XLineCapItem(com::sun::star::drawing::LineCap_ROUND)); + pNew.reset(new XLineCapItem(css::drawing::LineCap_ROUND)); break; } case 2: // Square { - pNew.reset(new XLineCapItem(com::sun::star::drawing::LineCap_SQUARE)); + pNew.reset(new XLineCapItem(css::drawing::LineCap_SQUARE)); break; } } @@ -1048,22 +1048,22 @@ bool SvxLineTabPage::FillXLSet_Impl() { case 0: // Rounded, default { - rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND)); + rXLSet.Put(XLineJointItem(css::drawing::LineJoint_ROUND)); break; } case 1: // - none - { - rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE)); + rXLSet.Put(XLineJointItem(css::drawing::LineJoint_NONE)); break; } case 2: // Miter { - rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER)); + rXLSet.Put(XLineJointItem(css::drawing::LineJoint_MITER)); break; } case 3: // Bevel { - rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL)); + rXLSet.Put(XLineJointItem(css::drawing::LineJoint_BEVEL)); break; } } @@ -1077,17 +1077,17 @@ bool SvxLineTabPage::FillXLSet_Impl() { case 0: // Butt (=Flat), default { - rXLSet.Put(XLineCapItem(com::sun::star::drawing::LineCap_BUTT)); + rXLSet.Put(XLineCapItem(css::drawing::LineCap_BUTT)); break; } case 1: // Round { - rXLSet.Put(XLineCapItem(com::sun::star::drawing::LineCap_ROUND)); + rXLSet.Put(XLineCapItem(css::drawing::LineCap_ROUND)); break; } case 2: // Square { - rXLSet.Put(XLineCapItem(com::sun::star::drawing::LineCap_SQUARE)); + rXLSet.Put(XLineCapItem(css::drawing::LineCap_SQUARE)); break; } } @@ -1462,16 +1462,16 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) } else if(SfxItemState::DONTCARE != rAttrs->GetItemState(XATTR_LINEJOINT)) { - const com::sun::star::drawing::LineJoint eLineJoint = static_cast<const XLineJointItem&>(rAttrs->Get(XATTR_LINEJOINT)).GetValue(); + const css::drawing::LineJoint eLineJoint = static_cast<const XLineJointItem&>(rAttrs->Get(XATTR_LINEJOINT)).GetValue(); switch(eLineJoint) { - case com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE: // fallback to round, unused value - case com::sun::star::drawing::LineJoint_MIDDLE : // fallback to round, unused value - case com::sun::star::drawing::LineJoint_ROUND : m_pLBEdgeStyle->SelectEntryPos(0); break; - case com::sun::star::drawing::LineJoint_NONE : m_pLBEdgeStyle->SelectEntryPos(1); break; - case com::sun::star::drawing::LineJoint_MITER : m_pLBEdgeStyle->SelectEntryPos(2); break; - case com::sun::star::drawing::LineJoint_BEVEL : m_pLBEdgeStyle->SelectEntryPos(3); break; + case css::drawing::LineJoint_MAKE_FIXED_SIZE: // fallback to round, unused value + case css::drawing::LineJoint_MIDDLE : // fallback to round, unused value + case css::drawing::LineJoint_ROUND : m_pLBEdgeStyle->SelectEntryPos(0); break; + case css::drawing::LineJoint_NONE : m_pLBEdgeStyle->SelectEntryPos(1); break; + case css::drawing::LineJoint_MITER : m_pLBEdgeStyle->SelectEntryPos(2); break; + case css::drawing::LineJoint_BEVEL : m_pLBEdgeStyle->SelectEntryPos(3); break; } } else @@ -1487,13 +1487,13 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) } else if(SfxItemState::DONTCARE != rAttrs->GetItemState(XATTR_LINECAP)) { - const com::sun::star::drawing::LineCap eLineCap(static_cast<const XLineCapItem&>(rAttrs->Get(XATTR_LINECAP)).GetValue()); + const css::drawing::LineCap eLineCap(static_cast<const XLineCapItem&>(rAttrs->Get(XATTR_LINECAP)).GetValue()); switch(eLineCap) { - case com::sun::star::drawing::LineCap_ROUND: m_pLBCapStyle->SelectEntryPos(1); break; - case com::sun::star::drawing::LineCap_SQUARE : m_pLBCapStyle->SelectEntryPos(2); break; - default /*com::sun::star::drawing::LineCap_BUTT*/: m_pLBCapStyle->SelectEntryPos(0); break; + case css::drawing::LineCap_ROUND: m_pLBCapStyle->SelectEntryPos(1); break; + case css::drawing::LineCap_SQUARE : m_pLBCapStyle->SelectEntryPos(2); break; + default /*css::drawing::LineCap_BUTT*/: m_pLBCapStyle->SelectEntryPos(0); break; } } else diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 07b904d9f34c..5e6c13124534 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -757,7 +757,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString aStrFilterType( "*.sod" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); OUString aPalettePath(SvtPathOptions().GetPalettePath()); @@ -825,7 +825,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.sod" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index dbd90637fe64..30eeeaeb148c 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -62,7 +62,7 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage pPolyObj ( NULL ), bObjSelected ( false ), - aXLStyle ( com::sun::star::drawing::LineStyle_SOLID ), + aXLStyle ( css::drawing::LineStyle_SOLID ), aXWidth ( XOUT_WIDTH ), aXColor ( OUString(), COL_BLACK ), aXLineAttr ( rInAttrs.GetPool() ), @@ -569,7 +569,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg(com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); OUString aStrFilterType( "*.soe" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); @@ -638,7 +638,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl) IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl) { - ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); OUString aStrFilterType( "*.soe" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); |