diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-27 13:03:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-27 15:38:59 +0000 |
| commit | 60f11adb950e4f9645cc9ecb0f5af8235cc97366 (patch) | |
| tree | a4a758c31820e909d266f8b5cd49c651011acae9 /svx/source/accessibility/ShapeTypeHandler.cxx | |
| parent | e022c608fd927bfec20bdec5bee5b600668eeaac (diff) | |
Integrate branch of IAccessible2
Change-Id: I8327fb4ba2a86d4caa52b875221175b80464842a
Diffstat (limited to 'svx/source/accessibility/ShapeTypeHandler.cxx')
| -rw-r--r-- | svx/source/accessibility/ShapeTypeHandler.cxx | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 8eaee7fd7a20..f23b9abdbb62 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -25,8 +25,12 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> -#include "svx/svdstr.hrc" +#include <svx/unoshape.hxx> +#include <svx/svdoashp.hxx> +#include "svx/unoapi.hxx" + +#include "svx/svdstr.hrc" using namespace ::rtl; using namespace ::com::sun::star; @@ -292,6 +296,36 @@ OUString case DRAWING_RECTANGLE: nResourceId = STR_ObjNameSingulRECT; break; + case DRAWING_CUSTOM: + { + nResourceId = STR_ObjNameSingulCUSTOMSHAPE; + + SvxShape* pShape = SvxShape::getImplementation( rxShape ); + if (pShape) + { + SdrObject *pSdrObj = pShape->GetSdrObject(); + if (pSdrObj) + { + OUString aTmp(pSdrObj->TakeObjNameSingul()); + + if(pSdrObj->ISA(SdrObjCustomShape)) + { + SdrObjCustomShape* pCustomShape = (SdrObjCustomShape*)pSdrObj; + if(pCustomShape) + { + if (pCustomShape->IsTextPath()) + nResourceId = STR_ObjNameSingulFONTWORK; + else + { + nResourceId = -1; + sName = pCustomShape->GetCustomShapeName(); + } + } + } + } + } + break; + } case DRAWING_TEXT: nResourceId = STR_ObjNameSingulTEXT; break; |