summaryrefslogtreecommitdiff
path: root/svx/source/svdraw/ActionDescriptionProvider.cxx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
commit1fb042333fe6287756ff1fac11d18cd7c150730d (patch)
tree595de5d187177832ce656d7832af9dce9dce2d99 /svx/source/svdraw/ActionDescriptionProvider.cxx
parent5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
rebase to DEV300_m100
Diffstat (limited to 'svx/source/svdraw/ActionDescriptionProvider.cxx')
-rw-r--r--svx/source/svdraw/ActionDescriptionProvider.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index ffc753e61276..d6805fb24ee3 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -35,7 +35,7 @@
::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType
, const ::rtl::OUString& rObjectName )
{
- USHORT nResID=0;
+ sal_uInt16 nResID=0;
switch( eActionType )
{
case INSERT: