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/dialogs | |
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/dialogs')
-rw-r--r-- | cui/source/dialogs/SpellAttrib.hxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 8 | ||||
-rw-r--r-- | cui/source/dialogs/about.cxx | 6 | ||||
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 10 | ||||
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 18 | ||||
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 12 | ||||
-rw-r--r-- | cui/source/dialogs/hldocntp.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hldoctp.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/hlmarkwn.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/pastedlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/scriptdlg.cxx | 22 | ||||
-rw-r--r-- | cui/source/dialogs/showcols.cxx | 8 |
13 files changed, 55 insertions, 55 deletions
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; |