diff options
author | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-01-21 12:23:11 +0100 |
---|---|---|
committer | Malte Timmermann [mt] <malte.timmermann@oracle.com> | 2011-01-21 12:23:11 +0100 |
commit | 72134106b433ecc665c726532a318ede38e6fb87 (patch) | |
tree | 0eb16cfddcbd0dca496d7f078842892863ceb410 | |
parent | 0c514ad4f653c63702b55a1e3c6f8e725a549079 (diff) |
accfixes: moved some shared strings to svx
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 10 | ||||
-rw-r--r-- | cui/source/dialogs/gallery.src | 17 | ||||
-rw-r--r-- | cui/source/inc/gallery.hrc | 8 |
3 files changed, 7 insertions, 28 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index fa95cfeaa1d1..c9dd8c10895e 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -54,6 +54,9 @@ #include <sfx2/sfxuno.hxx> #include "dialmgr.hxx" #include "gallery.hrc" +#include <svx/dialogs.hrc> +#include <svx/dialmgr.hxx> + // -------------- // - Namespaces - @@ -663,8 +666,9 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& { FreeResource(); - aEdtMSName.SetAccessibleName(GAL_RESID(RID_SVXSTR_GALLERY_THEMENAME)); - aFiMSImage.SetAccessibleName(GAL_RESID(RID_SVXSTR_GALLERY_THEMENAME)); + String aAccName(SVX_RES(RID_SVXSTR_GALLERY_THEMENAME)); + aEdtMSName.SetAccessibleName(aAccName); + aFiMSImage.SetAccessibleName(aAccName); aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage ); } @@ -770,7 +774,7 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxIt FreeResource(); xDialogListener->SetDialogClosedLink( LINK( this, TPGalleryThemeProperties, DialogClosedHdl ) ); - aLbxFound.SetAccessibleName(GAL_RESID(RID_SVXSTR_GALLERY_FILESFOUND)); + aLbxFound.SetAccessibleName(String(SVX_RES(RID_SVXSTR_GALLERY_FILESFOUND))); aWndPreview.SetAccessibleName(aCbxPreview.GetText()); aLbxFound.SetAccessibleRelationLabeledBy(&aLbxFound); } diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src index b40edf359d32..f8d035528c71 100644 --- a/cui/source/dialogs/gallery.src +++ b/cui/source/dialogs/gallery.src @@ -464,23 +464,6 @@ String RID_SVXSTR_GALLERY_ID_EXISTS { Text [ en-US ] = "This ID already exists..." ; }; -String RID_SVXSTR_GALLERY_THEMEITEMS -{ - Text [ en-US ] = "Theme Items"; -}; -String RID_SVXSTR_GALLERY_THEMENAME -{ - Text [ en-US ] = "Theme Name"; -}; -String RID_SVXSTR_GALLERY_FILESFOUND -{ - Text [ en-US ] = "Files Found"; -}; -String RID_SVXSTR_GALLERY_PREVIEW -{ - Text [ en-US ] = "Preview"; -}; - /******************************************************************************/ diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc index 985eda3bc257..c9d6729be447 100644 --- a/cui/source/inc/gallery.hrc +++ b/cui/source/inc/gallery.hrc @@ -49,14 +49,6 @@ #define RID_SVXSTR_GALLERY_ALLFILES (RID_CUI_GALLERY_START + 44) #define RID_SVXSTR_GALLERY_ID_EXISTS (RID_CUI_GALLERY_START + 81) -//IAccessibility2 Implementation 2009----- -#define RID_SVXSTR_GALLERY_THEMEITEMS (RID_CUI_GALLERY_START + 93) -#define RID_SVXSTR_GALLERY_THEMENAME (RID_CUI_GALLERY_START + 94) -#define RID_SVXSTR_GALLERY_FILESFOUND (RID_CUI_GALLERY_START + 95) -#define RID_SVXSTR_GALLERY_PREVIEW (RID_CUI_GALLERY_START + 96) -//-----IAccessibility2 Implementation 2009 - - // Images #define RID_SVXBMP_THEME_NORMAL_BIG (RID_CUI_GALLERY_START + 49) #define RID_SVXBMP_THEME_IMPORTED_BIG (RID_CUI_GALLERY_START + 51) |