diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 21:09:27 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2014-08-15 23:30:23 +0200 |
| commit | a470c10d88b7824a9d3a986b302beef115fbc303 (patch) | |
| tree | 78174ffa5a9d8bf4855c1f5788e6e9538f7374c5 | |
| parent | c584f344b7f810c297da616befdc354b86fbf8b8 (diff) | |
ErrorBox RID_ERRBOX_MODULENOTINSTALLED to String
And move to sfx2 to stop this ResMgr mangling
Change-Id: I4633766fdcc53189cdb508f9eddaa6b2e8448858
| -rw-r--r-- | include/sfx2/sfx.hrc | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/appl/sfx.src | 5 | ||||
| -rw-r--r-- | svx/source/src/app.hrc | 4 | ||||
| -rw-r--r-- | svx/source/src/app.src | 6 |
5 files changed, 8 insertions, 22 deletions
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc index 5d8e11b9901a..e3307e3582ac 100644 --- a/include/sfx2/sfx.hrc +++ b/include/sfx2/sfx.hrc @@ -154,6 +154,7 @@ #define STR_NONCHECKEDOUT_DOCUMENT (RID_SFX_START+125) #define BT_CHECKOUT (RID_SFX_START+126) #define STR_PASSWD_MIN_LEN1 (RID_SFX_START+127) +#define STR_MODULENOTINSTALLED (RID_SFX_START+128) #define STR_ACCTITLE_PRODUCTIVITYTOOLS (RID_SFX_START+157) #define SFX_THUMBNAIL_TEXT (RID_SFX_START+158) diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 90ca40937452..9390ee9bcaf5 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -54,7 +54,7 @@ #include <unotools/configmgr.hxx> #include <tools/diagnose_ex.h> -#include <vcl/msgbox.hxx> +#include <vcl/layout.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> @@ -878,16 +878,6 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChoose #endif - -#define RID_ERRBOX_MODULENOTINSTALLED (RID_OFA_START + 72) - -ResMgr* SfxApplication::GetOffResManager_Impl() -{ - if ( !pAppData_Impl->pOfaResMgr ) - pAppData_Impl->pOfaResMgr = ResMgr::CreateResMgr( "ofa"); - return pAppData_Impl->pOfaResMgr; -} - namespace { #ifndef DISABLE_SCRIPTING @@ -1277,7 +1267,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) SvtModuleOptions aModuleOpt; if ( !aModuleOpt.IsImpress() ) { - ErrorBox( 0, ResId( RID_ERRBOX_MODULENOTINSTALLED, *GetOffResManager_Impl() )).Execute(); + MessageDialog( 0, SFX2_RESSTR( STR_MODULENOTINSTALLED )).Execute(); return; } diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src index 16f3044b699d..11467c866e70 100644 --- a/sfx2/source/appl/sfx.src +++ b/sfx2/source/appl/sfx.src @@ -44,6 +44,11 @@ String STR_PASSWD Text [ en-US ] = "Password" ; }; +String STR_MODULENOTINSTALLED +{ + Text [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed."; +}; + Bitmap ( SFX_THUMBNAIL_TEXT ) { File = "ott_96_8.png"; diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index d19db1c8443c..42190c2612bb 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -25,10 +25,6 @@ #include <svl/solar.hrc> #include <sfx2/sfxsids.hrc> -// Errors ---------------------------------------------------------------- - -#define RID_ERRBOX_MODULENOTINSTALLED (RID_OFA_START + 72) - // Dialoge --------------------------------------------------------------- #define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) diff --git a/svx/source/src/app.src b/svx/source/src/app.src index b2e90d23554d..0b52b097cfb5 100644 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -27,12 +27,6 @@ String RID_APPTITLE #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; -ErrorBox RID_ERRBOX_MODULENOTINSTALLED -{ - Buttons = WB_OK ; - Message [ en-US ] = "The action could not be executed. The %PRODUCTNAME program module needed for this action is currently not installed."; -}; - #define IMAGE_ID_LIST\ IdList = {\ SID_HLINKBAR_LINK; \ |