Tag: cws_src680_oj14 User: oj Date: 2007-06-06 08:01:18+0000 Modified: dba/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx dba/dbaccess/source/ui/inc/ExtensionNotPresent.hxx
Log: linux compiler problem File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: ExtensionNotPresent.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +7 -8 ------------------- --- ExtensionNotPresent.cxx 2007-06-05 10:15:03+0000 1.1.2.1 +++ ExtensionNotPresent.cxx 2007-06-06 08:01:15+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: ExtensionNotPresent.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: lla $ $Date: 2007/06/05 10:15:03 $ + * last change: $Author: oj $ $Date: 2007/06/06 08:01:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,7 +48,6 @@ #include <svtools/syslocale.hxx> #include "UITools.hxx" -#include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> @@ -170,9 +169,9 @@ //------------------------------------------------------------------------------ -uno::Reference< system::XSystemShellExecute > OExtensionNotPresentDialog::getShellExecuter() const +uno::Reference< com::sun::star::system::XSystemShellExecute > OExtensionNotPresentDialog::getShellExecuter() const { - uno::Reference<system::XSystemShellExecute> xExecuter( m_xMultiServiceFactory->createInstance( UNISTRING( "com.sun.star.system.SystemShellExecute" )), uno::UNO_QUERY_THROW); + uno::Reference<com::sun::star::system::XSystemShellExecute> xExecuter( m_xMultiServiceFactory->createInstance( UNISTRING( "com.sun.star.system.SystemShellExecute" )), uno::UNO_QUERY_THROW); return xExecuter; } // ----------------------------------------------------------------------------- @@ -210,10 +209,9 @@ } // open such URL in a browser - uno::Reference< system::XSystemShellExecute > xShellExecute( getShellExecuter() ); - xShellExecute->execute( suDownloadURL, ::rtl::OUString(), system::SystemShellExecuteFlags::DEFAULTS ); + uno::Reference< com::sun::star::system::XSystemShellExecute > xShellExecute( getShellExecuter() ); + xShellExecute->execute( suDownloadURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS ); } - catch(uno::Exception) { OSL_ENSURE(0,"Exception caught!"); @@ -224,3 +222,4 @@ // ============================================================================= } // rptui // ============================================================================= + Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: ExtensionNotPresent.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/ExtensionNotPresent.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +4 -4 ------------------- --- ExtensionNotPresent.hxx 2007-06-05 10:17:02+0000 1.1.2.1 +++ ExtensionNotPresent.hxx 2007-06-06 08:01:15+0000 1.1.2.2 @@ -6,9 +6,9 @@ * * $RCSfile: ExtensionNotPresent.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: lla $ $Date: 2007/06/05 10:17:02 $ + * last change: $Author: oj $ $Date: 2007/06/06 08:01:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -34,7 +34,6 @@ * MA 02111-1307 USA * ************************************************************************/ - #ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> #endif @@ -93,7 +92,7 @@ rtl::OUString getFromConfigurationExtension(rtl::OUString const& _sPropertyName) const; rtl::OUString getFromConfigurationExtension(rtl::OString const& _sPropertyName) const; // syntactic sugar - com::sun::star::uno::Reference< com::sun::star::system::XSystemShellExecute > getShellExecuter() const; + ::com::sun::star::uno::Reference< ::com::sun::star::system::XSystemShellExecute > getShellExecuter() const; public: OExtensionNotPresentDialog( Window* pParent, com::sun::star::uno::Reference < com::sun::star::lang::XMultiServiceFactory > ); @@ -104,3 +103,4 @@ } // namespace rptui // ============================================================================= #endif // DBU_EXTENSIONNOTPRESENT_HXX + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
