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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index fb14dce8a06d..472b3c251907 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1259,12 +1259,16 @@ OUString ResMgr::ReadStringWithoutHook() return aRet; } +OUString ResMgr::ExpandVariables(const OUString& rString) +{ + if (pImplResHookProc) + return pImplResHookProc(rString); + return rString; +} + OUString ResMgr::ReadString() { - OUString aRet = ReadStringWithoutHook(); - if ( pImplResHookProc ) - aRet = pImplResHookProc( aRet ); - return aRet; + return ExpandVariables(ReadStringWithoutHook()); } void ResMgr::SetReadStringHook( ResHookProc pProc ) |