diff options
Diffstat (limited to 'desktop/source')
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.src | 4 | ||||
-rw-r--r-- | desktop/source/deployment/gui/dp_gui_updatedialog.src | 2 | ||||
-rw-r--r-- | desktop/source/deployment/manager/dp_manager.cxx | 31 | ||||
-rw-r--r-- | desktop/source/deployment/unopkg/unopkg.src | 9 | ||||
-rw-r--r-- | desktop/source/migration/pages.cxx | 7 | ||||
-rw-r--r-- | desktop/source/migration/wizard.src | 2 | ||||
-rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_app.cxx | 23 | ||||
-rw-r--r-- | desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 11 | ||||
-rw-r--r-- | desktop/source/splash/makefile.mk | 1 |
9 files changed, 64 insertions, 26 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src index 0ca9f9e74362..7e4004bca1d4 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.src +++ b/desktop/source/deployment/gui/dp_gui_dialog2.src @@ -169,12 +169,12 @@ Image RID_IMG_WARNING_HC Image RID_IMG_LOCKED { - ImageBitmap = Bitmap { File = "lock_16.png"; }; + ImageBitmap = Bitmap { File = "shared_16.png"; }; }; Image RID_IMG_LOCKED_HC { - ImageBitmap = Bitmap { File = "lock_16_h.png"; }; + ImageBitmap = Bitmap { File = "shared_16_h.png"; }; }; Image RID_IMG_EXTENSION diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src index 319d953b1430..49d3c1c0cf8e 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.src +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src @@ -236,7 +236,7 @@ ModalDialog RID_DLG_UPDATE { Text[en-US] = "No descriptions available for this extension."; }; String RID_DLG_UPDATE_NOINSTALL { - Text[en-US] = "The extension cannot be installed because:"; + Text[en-US] = "The extension cannot be updated because:"; }; String RID_DLG_UPDATE_NODEPENDENCY { Text[en-US] = "Required OpenOffice.org version doesn't match:"; diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index afd44f83cff6..05e514305415 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -660,10 +660,15 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( { check(); if (m_readOnly) + { + OUString message; + if (m_context == OUSTR("shared")) + message = OUSTR("You need write permissions to install a shared extension!"); + else + message = OUSTR("You need write permissions to install this extension!"); throw deployment::DeploymentException( - OUSTR("operating on read-only context!"), - static_cast<OWeakObject *>(this), Any() ); - + message, static_cast<OWeakObject *>(this), Any() ); + } Reference<XCommandEnvironment> xCmdEnv; if (m_xLogFile.is()) xCmdEnv.set( new CmdEnvWrapperImpl( xCmdEnv_, m_xLogFile ) ); @@ -893,9 +898,15 @@ void PackageManagerImpl::removePackage( { check(); if (m_readOnly) + { + OUString message; + if (m_context == OUSTR("shared")) + message = OUSTR("You need write permissions in order to remove a shared extension!"); + else + message = OUSTR("You need write permissions in order to remove this extension!"); throw deployment::DeploymentException( - OUSTR("operating on read-only context!"), - static_cast<OWeakObject *>(this), Any() ); + message, static_cast<OWeakObject *>(this), Any() ); + } Reference<XCommandEnvironment> xCmdEnv; if (m_xLogFile.is()) @@ -1117,9 +1128,15 @@ void PackageManagerImpl::reinstallDeployedPackages( { check(); if (m_readOnly) + { + OUString message; + if (m_context == OUSTR("shared")) + message = OUSTR("You need write permissions in order to install shared extensions!"); + else + message = OUSTR("You need write permissions in order to install extensions!"); throw deployment::DeploymentException( - OUSTR("operating on read-only context!"), - static_cast<OWeakObject *>(this), Any() ); + message, static_cast<OWeakObject *>(this), Any() ); + } if (office_is_running()) throw RuntimeException( diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src index a3b2bac56cc5..bb5be7e8bbd6 100644 --- a/desktop/source/deployment/unopkg/unopkg.src +++ b/desktop/source/deployment/unopkg/unopkg.src @@ -81,5 +81,12 @@ String RID_STR_UNOPKG_ACCEPT_LIC_N String RID_STR_CONCURRENTINSTANCE { - Text [ en-US ] = "You need to close the already opened Extension Manager to continue."; + Text [ en-US ] = "unopkg cannot be started. The lock file indicates it as already running. " + "If this does not apply, delete the lock file at:"; }; + +String RID_STR_UNOPKG_ERROR +{ + Text [ en-US ] = "ERROR: "; +}; + diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx index 461ced320da4..0122caba945e 100644 --- a/desktop/source/migration/pages.cxx +++ b/desktop/source/migration/pages.cxx @@ -37,6 +37,7 @@ #include "migration.hxx" #include <vcl/msgbox.hxx> #include <vcl/mnemonic.hxx> +#include <vos/security.hxx> #include <app.hxx> #include <rtl/ustring.hxx> #include <osl/file.hxx> @@ -60,7 +61,6 @@ #include <unotools/bootstrap.hxx> #include <tools/config.hxx> - using namespace rtl; using namespace osl; using namespace utl; @@ -388,6 +388,10 @@ UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid) SvtUserOptions aUserOpt; m_edFirst.SetText(aUserOpt.GetFirstName()); m_edLast.SetText(aUserOpt.GetLastName()); + rtl::OUString aUserName; + vos::OSecurity().getUserName( aUserName ); + aUserOpt.SetID( aUserName ); + m_edInitials.SetText(aUserOpt.GetID()); if (m_lang == LANGUAGE_RUSSIAN) { @@ -403,6 +407,7 @@ sal_Bool UserPage::commitPage( CommitPageReason ) aUserOpt.SetFirstName(m_edFirst.GetText()); aUserOpt.SetLastName(m_edLast.GetText()); aUserOpt.SetID( m_edInitials.GetText()); + if (m_lang == LANGUAGE_RUSSIAN) aUserOpt.SetFathersName(m_edFather.GetText()); diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src index 05f637fe7027..3b49e070fa6d 100644 --- a/desktop/source/migration/wizard.src +++ b/desktop/source/migration/wizard.src @@ -305,7 +305,7 @@ TabPage TP_UPDATE_CHECK #define USERINDENT 40 #define EDHEIGHT 12 -#define INITIALSWIDTH 25 +#define INITIALSWIDTH 50 #define FTADD 2 TabPage TP_USER diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index a5d1fd2f746e..5fc4136a9501 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -470,14 +470,23 @@ extern "C" int unopkg_main() } catch (deployment::DeploymentException & exc) { + OUString cause; + if (option_verbose) + { + cause = ::comphelper::anyToString(exc.Cause); + } + else + { + css::uno::Exception e; + if (exc.Cause >>= e) + cause = e.Message; + } + dp_misc::writeConsoleError( - OUSTR("\nERROR: ") + - exc.Message + OUSTR("\n") + - OUSTR(" Cause: ") + - OUString(option_verbose ? ::comphelper::anyToString(exc.Cause): - reinterpret_cast< css::uno::Exception const *>( - exc.Cause.getValue())->Message) + - OUSTR("\n")); + OUSTR("\nERROR: ") + exc.Message + OUSTR("\n")); + if (cause.getLength()) + dp_misc::writeConsoleError( + OUSTR(" Cause: ") + cause + OUSTR("\n")); } catch (LockFileException & e) { diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index de8fedae2bdb..70b469fa58fa 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -471,10 +471,10 @@ Reference<XComponentContext> getUNO( { if (! s_lockfile.check( 0 )) { - //String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get())); - OUString sMsg(RTL_CONSTASCII_USTRINGPARAM( - "unopkg cannot be started. The lock file indicates it as already running. " - "If this does not apply, delete the lock file at:")); + String sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get())); + //Create this string before we call DeInitVCL, because this will kill + //the ResMgr + String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); sMsg = sMsg + OUSTR("\n") + getLockFilePath(); @@ -497,9 +497,8 @@ Reference<XComponentContext> getUNO( DeInitVCL(); } -// String sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); throw LockFileException( - OUSTR("\n") + OUSTR("ERROR: ") + sMsg + OUSTR("\n")); + OUSTR("\n") + sError + sMsg + OUSTR("\n")); } } diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk index 0447c0c2020e..3ca31875c937 100644 --- a/desktop/source/splash/makefile.mk +++ b/desktop/source/splash/makefile.mk @@ -72,6 +72,7 @@ SHL1STDLIBS= \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ + $(VOSLIB) \ $(SALLIB) \ $(SFXLIB) |