diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-30 17:01:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-02 13:18:57 +0200 |
| commit | 34f7e618ddd3399d9e7f3998e25545256255d02d (patch) | |
| tree | fd946f8f2ab8386db89f531d49fae1718a21e943 /include | |
| parent | c881756fcfdc1fa63ff534bf4538d551b2139515 (diff) | |
untranslated strings are just strings
removes starmaths InsertCommand in favour of InsertCommandText
Change-Id: I5659adcaa28e5b5861d1a1cc5d2afa84009490f6
Reviewed-on: https://gerrit.libreoffice.org/37113
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/doctempl.hxx | 5 | ||||
| -rw-r--r-- | include/sfx2/templatelocnames.hrc | 11 | ||||
| -rw-r--r-- | include/svtools/svtools.hrc | 3 | ||||
| -rw-r--r-- | include/tools/resmgr.hxx | 1 |
4 files changed, 3 insertions, 17 deletions
diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx index 70b34362f64c..e77fd4c793f0 100644 --- a/include/sfx2/doctempl.hxx +++ b/include/sfx2/doctempl.hxx @@ -63,10 +63,7 @@ public: // Convert a resource string - a template name - to its localised pair // if it exists in templatelocnames.src - static OUString ConvertResourceString(int nSourceResIds, - int nDestResIds, - int nCount, - const OUString& rString); + static OUString ConvertResourceString(const OUString& rString); bool Copy(sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, diff --git a/include/sfx2/templatelocnames.hrc b/include/sfx2/templatelocnames.hrc index df1582fa1127..c4e005a12712 100644 --- a/include/sfx2/templatelocnames.hrc +++ b/include/sfx2/templatelocnames.hrc @@ -10,17 +10,6 @@ #define NUM_TEMPLATE_NAMES 10 #define TEMPL_LOC_OFFSET 2210 -#define STR_TEMPLATE_NAME1_DEF (TEMPL_LOC_OFFSET + 1) -#define STR_TEMPLATE_NAME2_DEF (TEMPL_LOC_OFFSET + 2) -#define STR_TEMPLATE_NAME3_DEF (TEMPL_LOC_OFFSET + 3) -#define STR_TEMPLATE_NAME4_DEF (TEMPL_LOC_OFFSET + 4) -#define STR_TEMPLATE_NAME5_DEF (TEMPL_LOC_OFFSET + 5) -#define STR_TEMPLATE_NAME6_DEF (TEMPL_LOC_OFFSET + 6) -#define STR_TEMPLATE_NAME7_DEF (TEMPL_LOC_OFFSET + 7) -#define STR_TEMPLATE_NAME8_DEF (TEMPL_LOC_OFFSET + 8) -#define STR_TEMPLATE_NAME9_DEF (TEMPL_LOC_OFFSET + 9) -#define STR_TEMPLATE_NAME10_DEF (TEMPL_LOC_OFFSET + 10) - #define STR_TEMPLATE_NAME1 (TEMPL_LOC_OFFSET + 51) #define STR_TEMPLATE_NAME2 (TEMPL_LOC_OFFSET + 52) #define STR_TEMPLATE_NAME3 (TEMPL_LOC_OFFSET + 53) diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index 7dc331fe91a8..2873c5f026ad 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -227,8 +227,7 @@ #define STR_FIELD_TELOTHER (STR_SVT_ADDRESSTEMPLATE_START+29) #define STR_FIELD_CALENDAR (STR_SVT_ADDRESSTEMPLATE_START+30) #define STR_FIELD_INVITE (STR_SVT_ADDRESSTEMPLATE_START+31) -#define STR_LOGICAL_FIELD_NAMES (STR_SVT_ADDRESSTEMPLATE_START+32) -#define STR_SVT_ADDRESSTEMPLATE_END (STR_LOGICAL_FIELD_NAMES) +#define STR_SVT_ADDRESSTEMPLATE_END (STR_FIELD_INVITE) #endif diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx index 6c52d2c7cfd1..68a6a66a911d 100644 --- a/include/tools/resmgr.hxx +++ b/include/tools/resmgr.hxx @@ -172,6 +172,7 @@ public: static void SetReadStringHook( ResHookProc pProc ); static ResHookProc GetReadStringHook(); + static OUString ExpandVariables(const OUString& rString); static void SetDefaultLocale( const LanguageTag& rLocale ); }; |