[Libreoffice-commits] .: 2 commits - connectivity/source cui/source desktop/source framework/source sfx2/source svtools/source svx/source sw/source toolkit/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 3 09:34:53 PDT 2012
connectivity/source/drivers/flat/ETable.cxx | 5 ++---
cui/source/dialogs/SpellDialog.cxx | 6 +++---
cui/source/dialogs/about.cxx | 6 +++---
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 6 +++---
framework/source/services/backingwindow.cxx | 4 ++--
sfx2/source/appl/appserv.cxx | 6 +++---
svtools/source/contnr/templwin.cxx | 6 +++---
svx/source/core/extedit.cxx | 4 ++--
sw/source/ui/lingu/olmenu.cxx | 4 ++--
toolkit/source/awt/vclxwindows.cxx | 2 +-
10 files changed, 24 insertions(+), 25 deletions(-)
New commits:
commit 756352698de348226c685bad9ab80ea138e5da75
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 3 18:27:13 2012 +0200
More places that require a prefixed "system"
Change-Id: I49cf1f02faf70a5a92ab45e7678253ba4e5f68d0
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 834d31e..833d621 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2174,9 +2174,9 @@ IMPL_LINK( SpellDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )
return 1;
try
{
- uno::Reference< system::XSystemShellExecute > xSystemShellExecute(
- system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
- xSystemShellExecute->execute( sURL, rtl::OUString(), system::SystemShellExecuteFlags::URIS_ONLY );
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
+ xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch ( uno::Exception& )
{
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 9d5b4f1..e3a9111 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -133,9 +133,9 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
return 1;
try
{
- Reference< system::XSystemShellExecute > xSystemShellExecute(
- system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) );
- xSystemShellExecute->execute( sURL, rtl::OUString(), system::SystemShellExecuteFlags::URIS_ONLY );
+ Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) );
+ xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch (const Exception&)
{
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index e79d94d..88deb20 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1413,10 +1413,10 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink )
try
{
- uno::Reference< system::XSystemShellExecute > xSystemShellExecute(
- system::SystemShellExecute::create(m_context) );
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(m_context) );
//throws lang::IllegalArgumentException, system::SystemShellExecuteException
- xSystemShellExecute->execute( sURL, ::rtl::OUString(), system::SystemShellExecuteFlags::URIS_ONLY);
+ xSystemShellExecute->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY);
}
catch ( const uno::Exception& )
{
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 560330c..cc67aab 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -877,8 +877,8 @@ IMPL_LINK_NOARG(BackingWindow, ToolboxHdl)
sURL = value.get<rtl::OUString> ();
localizeWebserviceURI(sURL);
- Reference< system::XSystemShellExecute > xSystemShellExecute(
- system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
+ Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
//throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
xSystemShellExecute->execute( sURL, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY);
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c251d97..c99fe7a 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -426,9 +426,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
::rtl::OUString sURL("http://hub.libreoffice.org/file-a-bug/");
try
{
- uno::Reference< system::XSystemShellExecute > xSystemShellExecute(
- system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
- xSystemShellExecute->execute( sURL, ::rtl::OUString(), system::SystemShellExecuteFlags::URIS_ONLY );
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext()) );
+ xSystemShellExecute->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
catch ( uno::Exception& )
{
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 3f8df8a..9a77b77 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -1682,10 +1682,10 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl)
{
uno::Reference< uno::XComponentContext > xContext =
::comphelper::getProcessComponentContext();
- uno::Reference< system::XSystemShellExecute > xSystemShell(
- system::SystemShellExecute::create(xContext) );
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShell(
+ com::sun::star::system::SystemShellExecute::create(xContext) );
if ( xSystemShell.is() )
- xSystemShell->execute( sURL, ::rtl::OUString(), system::SystemShellExecuteFlags::URIS_ONLY );
+ xSystemShell->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
EndDialog( RET_CANCEL );
}
catch( const uno::Exception& e )
diff --git a/svx/source/core/extedit.cxx b/svx/source/core/extedit.cxx
index 52d6f57..b44b262 100644
--- a/svx/source/core/extedit.cxx
+++ b/svx/source/core/extedit.cxx
@@ -89,8 +89,8 @@ void ExternalToolEdit::threadWorker(void* pThreadData)
// getting changed
Application::PostUserEvent( LINK( NULL, ExternalToolEdit, StartListeningEvent ), pThreadData);
- uno::Reference< system::XSystemShellExecute > xSystemShellExecute(
- system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) );
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create(::comphelper::getProcessComponentContext() ) );
xSystemShellExecute->execute( pData->m_aFileName, rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx
index 4c5130a..956c87d 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/ui/lingu/olmenu.cxx
@@ -851,8 +851,8 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
{
try
{
- uno::Reference< system::XSystemShellExecute > xSystemShellExecute(
- system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
+ uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+ com::sun::star::system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) );
xSystemShellExecute->execute( sExplanationLink, rtl::OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 4ba4fc2..d5a313d 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2961,7 +2961,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve
::toolkit::FixedHyperlinkBase* pBase = (::toolkit::FixedHyperlinkBase*)GetWindow();
if ( pBase )
sURL = pBase->GetURL();
- Reference< system::XSystemShellExecute > xSystemShellExecute( system::SystemShellExecute::create(
+ Reference< ::com::sun::star::system::XSystemShellExecute > xSystemShellExecute( ::com::sun::star::system::SystemShellExecute::create(
::comphelper::getProcessComponentContext() ) );
if ( !sURL.isEmpty() )
{
commit a11940a871177bfce6fd5ac2e899a6659fb49fb3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Sep 3 18:26:03 2012 +0200
"using namespace ::com::sun::star" caused sdbcx::... ambiguity
Change-Id: I18573cb3c0b70996e3787028fff1a376bded02c4
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index c874ccf..337d0f0 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -50,7 +50,6 @@ using namespace connectivity::flat;
using namespace connectivity::file;
using namespace ::cppu;
using namespace utl;
-using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::beans;
@@ -422,8 +421,8 @@ void OFlatTable::construct()
aArg[0] <<= aAppLocale;
Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier(m_pConnection->getDriver()->getFactory()->createInstanceWithArguments(::rtl::OUString("com.sun.star.util.NumberFormatsSupplier"),aArg),UNO_QUERY);
- m_xNumberFormatter = Reference< util::XNumberFormatter >(
- util::NumberFormatter::create(
+ m_xNumberFormatter = Reference< ::com::sun::star::util::XNumberFormatter >(
+ ::com::sun::star::util::NumberFormatter::create(
comphelper::ComponentContext(m_pConnection->getDriver()->getFactory()).getUNOContext()),
UNO_QUERY_THROW);
m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
More information about the Libreoffice-commits
mailing list