diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-17 16:09:38 +0100 |
| commit | 41bc9ff8d750b4af10d20a36539c57da14695dcf (patch) | |
| tree | dc2ee437c54daba12ac442fd0e10baf97eadf184 /reportdesign/inc/ModuleHelper.hxx | |
| parent | f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 (diff) | |
| parent | e35c56815d43a06c53488e3efa35f062a6a2d60c (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
dbaccess/source/core/misc/services.cxx
dbaccess/source/filter/migration/cfgimport.cxx
reportdesign/source/core/api/ReportDefinition.cxx
Diffstat (limited to 'reportdesign/inc/ModuleHelper.hxx')
| -rw-r--r-- | reportdesign/inc/ModuleHelper.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index cf3ccafded7d..b3ed01738b36 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -90,7 +90,7 @@ namespace rptui class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId { public: - inline ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { } + inline ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } }; //......................................................................... } // namespace rptui |