mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unwind RID_DATE_FUNCTION_DESCRIPTIONS local resource

Browse Source 
Change-Id: If769264721850397c3c243c976c64c49fddf64fb
This commit is contained in:
Caolán McNamara
2017-02-14 14:06:59 +00:00
parent a906102e4c
commit 56f6a86851
4 changed files with 158 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scaddins/source/datefunc/datefunc.cxx
View File

@@ -198,14 +198,11 @@ OUString ScaDateAddIn::GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex
{ {
OUString aRet; OUString aRet;
ScaResPublisher aResPubl( ScaResId( RID_DATE_FUNCTION_DESCRIPTIONS, GetResMgr() ) );
ScaResId aResId( nResId, GetResMgr() ); ScaResId aResId( nResId, GetResMgr() );
aResId.SetRT( RSC_RESOURCE ); aResId.SetRT( RSC_RESOURCE );
if( aResPubl.IsAvailableRes( aResId ) )
ScaFuncRes aSubRes( aResId, GetResMgr(), nStrIndex, aRet ); ScaFuncRes aSubRes( aResId, GetResMgr(), nStrIndex, aRet );
aResPubl.FreeResource();
return aRet; return aRet;
} }

4
scaddins/source/datefunc/datefunc.hrc
View File

@@ -22,9 +22,7 @@
#define DATE_RESOURCE_START 1000 #define DATE_RESOURCE_START 1000
#define RID_DATE_FUNCTION_DESCRIPTIONS DATE_RESOURCE_START #define DATE_FUNCDESC_START DATE_RESOURCE_START
#define DATE_FUNCDESC_START (RID_DATE_FUNCTION_DESCRIPTIONS+1)
#define DATE_FUNCDESC_DiffWeeks (DATE_FUNCDESC_START) #define DATE_FUNCDESC_DiffWeeks (DATE_FUNCDESC_START)
#define DATE_FUNCDESC_DiffMonths (DATE_FUNCDESC_START+1) #define DATE_FUNCDESC_DiffMonths (DATE_FUNCDESC_START+1)

9
scaddins/source/datefunc/datefunc.hxx
View File

@@ -43,15 +43,6 @@ public:
ScaResId(sal_uInt16 nResId, ResMgr& rResMgr); ScaResId(sal_uInt16 nResId, ResMgr& rResMgr);
}; };
class ScaResPublisher : public Resource
{
public:
explicit ScaResPublisher( const ScaResId& rResId ) : Resource( rResId ) {}
using Resource::IsAvailableRes;
using Resource::FreeResource;
};
class ScaFuncRes : public Resource class ScaFuncRes : public Resource
{ {
public: public:

3
scaddins/source/datefunc/datefunc.src
View File

@@ -19,8 +19,6 @@
#include "datefunc.hrc" #include "datefunc.hrc"
Resource RID_DATE_FUNCTION_DESCRIPTIONS
{
Resource DATE_FUNCDESC_DiffWeeks Resource DATE_FUNCDESC_DiffWeeks
{ {
String 1 // description DiffWeeks String 1 // description DiffWeeks
@@ -196,7 +194,6 @@ Resource RID_DATE_FUNCTION_DESCRIPTIONS
Text [ en-US ] = "Text to be encrypted or text already encrypted"; Text [ en-US ] = "Text to be encrypted or text already encrypted";
}; };
}; };
};
String DATE_FUNCNAME_DiffWeeks String DATE_FUNCNAME_DiffWeeks
{ {