Commits

Philipp Lohmann [pl]  committed b2ccf08

ooo33gsl11: #i115088# add a nodoc string, workaround botched define in classes/resource.hrc

  • Participants
  • Parent commits cdc7f7c

Comments (0)

Files changed (2)

File framework/inc/framework.hrc

 #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)
 #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
 #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

File framework/source/services/backingwindow.cxx

 #include "precompiled_framework.hxx"
 
 #include "backingwindow.hxx"
+#include "classes/resource.hrc"
 #include "framework.hrc"
 #include "classes/fwkresid.hxx"
 #include <services.h>
             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()