diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-24 16:53:14 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-24 16:53:14 +0200 |
| commit | e655e92b3ffecba794041df652fe9eaaf3b66eee (patch) | |
| tree | 732595cf96431dce95e05a7cc56f2fc208be2a25 /framework/source | |
| parent | 91e635b2f8a56c6debc51eab00ded7ca91d4014b (diff) | |
| parent | 84d50758d4b9ebf25216259eb780757639f708ac (diff) | |
Merge commit 'ooo/OOO330_m12'
Conflicts:
desktop/source/app/app.cxx
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/services/backingwindow.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 60df7d5696..fa806f89d9 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -30,6 +30,7 @@ #include "precompiled_framework.hxx" #include "backingwindow.hxx" +#include "classes/resource.hrc" #include "framework.hrc" #include "classes/fwkresid.hxx" #include <services.h> @@ -385,8 +386,13 @@ void BackingWindow::prepareRecentFileMenu() aBuf.append( aMenuTitle ); mpRecentMenu->InsertItem( static_cast<USHORT>(i+1), aBuf.makeStringAndClear() ); } - maOpenButton.SetPopupMenu( mpRecentMenu ); } + else + { + String aNoDoc( FwkResId( STR_NODOCUMENT ) ); + mpRecentMenu->InsertItem( 0xffff, aNoDoc ); + } + maOpenButton.SetPopupMenu( mpRecentMenu ); } void BackingWindow::initBackground() |