diff options
| author | Kurt Zenker <kz@openoffice.org> | 2010-10-20 16:59:30 +0200 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2010-10-20 16:59:30 +0200 |
| commit | 84d50758d4b9ebf25216259eb780757639f708ac (patch) | |
| tree | 930258b931e65c2f60f99346d523eef25025ba72 | |
| parent | f38a8cf165f8eaca6b7959a34b2465e3b82be498 (diff) | |
| parent | dc31e3b09838409c57f5ff9181cf4d6950575c81 (diff) | |
CWS-TOOLING: integrate CWS ooo33gsl11ooo/OOO330_m12
| -rw-r--r-- | framework/inc/framework.hrc | 8 | ||||
| -rw-r--r-- | framework/source/services/backingwindow.cxx | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index b1abc91cab..86ad3f7470 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -35,9 +35,9 @@ #define RID_GROUPS_OFFSET 32000 #define RID_GROUPS_END 32767 -#define RID_FWK_DIALOG_START (RID_FWK_START + 2048) +#define RID_FWK_DIALOG_START_CORRECT (RID_FWK_START + 2048) -#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START + 0) +#define DLG_FILTER_SELECT (RID_FWK_DIALOG_START_CORRECT + 0) #define STR_FILTER_DOWNLOAD (RID_FWK_START+0) #define STR_FILTER_CHOOSER (RID_FWK_START+1) @@ -45,7 +45,7 @@ #define STR_FILTER_ZIPPED (RID_FWK_START+3) // ResIds for BackingWindow -#define DLG_BACKING (RID_FWK_DIALOG_START+100) +#define DLG_BACKING (RID_FWK_DIALOG_START_CORRECT+100) #define STR_BACKING_WELCOME 1 #define STR_BACKING_WELCOMEPRODUCT 2 #define STR_BACKING_CREATE 3 @@ -78,7 +78,7 @@ #define BMP_BACKING_OPENTEMPLATE 17 // Ids of TabWindow -#define WIN_TABWINDOW (RID_FWK_DIALOG_START+101) +#define WIN_TABWINDOW (RID_FWK_DIALOG_START_CORRECT+101) #define TC_TABCONTROL 1 #endif diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 8817e60e92..b80c7f3b90 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -29,6 +29,7 @@ #include "precompiled_framework.hxx" #include "backingwindow.hxx" +#include "classes/resource.hrc" #include "framework.hrc" #include "classes/fwkresid.hxx" #include <services.h> @@ -388,8 +389,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() |