diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
| commit | ca39c0ee5fb571693f96fe32f55b814d74e5b756 (patch) | |
| tree | 61059dca291da35c9eac7e275d0866598eeff2ee /sfx2/source | |
| parent | 9e1f58bf469984c19cd60031074eb60da56453a2 (diff) | |
| parent | d974d2ada8a61acf48fb0a9e3e4fa4744016dcda (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/dialog/passwd.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 24 |
3 files changed, 27 insertions, 9 deletions
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 09f9abfd1e01..282643a11502 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -188,6 +188,15 @@ void AppendConfigToken( String& rURL, sal_Bool bQuestionMark, const rtl::OUStrin rURL += DEFINE_CONST_UNICODE("&System="); rURL += SvtHelpOptions().GetSystem(); + static rtl::OUString aVersion; + if ( aVersion.isEmpty() ) + aVersion = utl::Bootstrap::getProductVersion(); + + if ( !aVersion.isEmpty() ) + { + rURL += DEFINE_CONST_UNICODE( "&Version=" ); + rURL += String( aVersion ); + } } sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index c5e41227896a..41a5de5650f1 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -165,6 +165,9 @@ SfxPasswordDialog::SfxPasswordDialog( Window* pParent, const String* pGroupText // add second confirm line xEdits->addRow( &maConfirm2FT, &maConfirm2ED, -2, aEditSize ); + // add password length warning line + xEdits->addWindow( &maMinLengthFT ); + // add a FixedLine FixedLine* pLine = new FixedLine( this, 0 ); pLine->Show(); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 7d825b6fa846..553cb872f82b 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -821,15 +821,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) && !( pPreviewItem && pPreviewItem->GetValue() ) && !( pHiddenItem && pHiddenItem->GetValue() ) ) { - INetURLObject aUrl( pMedium->GetOrigURL() ); - - if ( aUrl.GetProtocol() == INET_PROT_FILE ) - { - const SfxFilter* pOrgFilter = pMedium->GetOrigFilter(); - Application::AddToRecentDocumentList( - aUrl.GetURLNoPass( INetURLObject::NO_DECODE ), - (pOrgFilter) ? pOrgFilter->GetMimeType() : String() ); - } + AddToRecentlyUsedList(); } } @@ -2085,9 +2077,23 @@ sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) pMedium->ClearBackup_Impl(); pMedium->LockOrigFileOnDemand( sal_True, sal_False ); + AddToRecentlyUsedList(); + return bOk; } +void SfxObjectShell::AddToRecentlyUsedList() +{ + INetURLObject aUrl( pMedium->GetOrigURL() ); + + if ( aUrl.GetProtocol() == INET_PROT_FILE ) + { + const SfxFilter* pOrgFilter = pMedium->GetOrigFilter(); + Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::NO_DECODE ), + (pOrgFilter) ? pOrgFilter->GetMimeType() : String() ); + } +} + //------------------------------------------------------------------------- sal_Bool SfxObjectShell::ConvertFrom |