accfixes: global resources need id greater 256, moved global resources to access.hrc

12 files changed, 28 insertions, 38 deletions

diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 508b69509d08..d4b69ffe26d9 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -68,6 +68,8 @@
 #include <docary.hxx>
 #include <pagedesc.hxx>
 
+#include "access.hrc"
+
 #define FRAME_FORMAT_WIDTH 1000
 
 // sw/inc/fmtclds.hxx
@@ -931,19 +933,19 @@ void SwColumnPage::SetLabels( USHORT nVis )
     String tmp3(sLbl2);
     sLbl2.Insert(sLbl, sLbl2.Len() - 1);
     aLbl3.SetText(sLbl2);
-    String sColumnWidth = SW_RESSTR( STR_COLUMN_WIDTH ) ;
+    String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH ) ;
     sColumnWidth.SearchAndReplaceAscii("%1", tmp1);
     aEd1.SetAccessibleName(sColumnWidth);
 
-    sColumnWidth = SW_RESSTR( STR_COLUMN_WIDTH ) ;
+    sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH ) ;
     sColumnWidth.SearchAndReplaceAscii("%1", tmp2);
     aEd2.SetAccessibleName(sColumnWidth);
 
-    sColumnWidth = SW_RESSTR( STR_COLUMN_WIDTH ) ;
+    sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH ) ;
     sColumnWidth.SearchAndReplaceAscii("%1", tmp3);
     aEd3.SetAccessibleName(sColumnWidth);
 
-    String sDist = SW_RESSTR( STR_PAGESETUP_SPACING ) ;
+    String sDist = SW_RESSTR( STR_ACCESS_PAGESETUP_SPACING ) ;
     String sDist1 = sDist;
     sDist1.SearchAndReplaceAscii("%1", tmp1);
     sDist1.SearchAndReplaceAscii("%2", tmp2);
diff --git a/sw/source/ui/frmdlg/column.hrc b/sw/source/ui/frmdlg/column.hrc
index 86f23bed3029..e46697a8c618 100644
--- a/sw/source/ui/frmdlg/column.hrc
+++ b/sw/source/ui/frmdlg/column.hrc
@@ -79,15 +79,8 @@
 #define FT_TEXTDIRECTION        60
 #define LB_TEXTDIRECTION        61
 #define FL_VERT                 62
-//IAccessibility2 Impplementaton 2009-----
-#define STR_PAGESETUP_SPACING       32765
-//-----IAccessibility2 Impplementaton 2009
 #define LISTBOX_SELECTION       0
 #define LISTBOX_SECTION         1
 #define LISTBOX_SECTIONS        2
 #define LISTBOX_PAGE            3
 #define LISTBOX_FRAME           4
-
-//IAccessibility2 Impplementaton 2009-----
-#define STR_COLUMN_WIDTH    63
-//-----IAccessibility2 Impplementaton 2009
diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src
index 10b602f755d6..c5ba19c9a958 100644
--- a/sw/source/ui/frmdlg/column.src
+++ b/sw/source/ui/frmdlg/column.src
@@ -30,6 +30,8 @@
 #include "frmui.hrc"
 #include "cmdid.h"
 #include "helpid.h"
+#include "access.hrc"
+
  // #define TP_COLUMN 256
 TabPage TP_COLUMN
 {
@@ -417,12 +419,12 @@ ModalDialog DLG_COLUMN
 };
 
 //IAccessibility2 Impplementaton 2009-----
-String STR_PAGESETUP_SPACING
+String STR_ACCESS_PAGESETUP_SPACING
 {
     Text [ en-US ] = "Spacing between %1 and %2";
 };
 
-String STR_COLUMN_WIDTH
+String STR_ACCESS_COLUMN_WIDTH
 {
     Text [ en-US ] = "Column %1 Width";
 };
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 67b5f89d601d..4634ac4dc9b2 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -91,6 +91,8 @@
 #include <swmodule.hxx>
 #include <sfx2/filedlghelper.hxx>
 
+#include "access.hrc"
+
 #define LONG_LENGTH 60
 #define SHORT_LENGTH 30
 
@@ -298,7 +300,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame,
     aCategoryBox.GetModel()->SetSortMode(SortAscending);
     aCategoryBox.SetHighlightRange();   // ueber volle Breite selektieren
     aCategoryBox.SetNodeDefaultImages( );
-    aCategoryBox.SetAccessibleName(SW_RES(STR_SW_CATEGORY));
+    aCategoryBox.SetAccessibleName(SW_RES(STR_ACCESS_SW_CATEGORY));
     aCategoryBox.SetAccessibleRelationLabeledBy(&aInsertTipCB);
 
     Init();
diff --git a/sw/source/ui/misc/glossary.hrc b/sw/source/ui/misc/glossary.hrc
index 40c230a2e8c4..4ee5aaaa7ede 100644
--- a/sw/source/ui/misc/glossary.hrc
+++ b/sw/source/ui/misc/glossary.hrc
@@ -88,6 +88,4 @@
 #define   FL_NN              9
 #define   BT_CANCEL         10
 #define   BT_OKNEW          11
-//IAccessibility2 Implementation 2009-----
-#define STR_SW_CATEGORY 12
-//-----IAccessibility2 Implementation 2009
+
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index 745be55bad00..1302f02fbf9a 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -29,6 +29,8 @@
 #include "glossary.hrc"
 #include "cmdid.h"
 #include "helpid.h"
+#include "access.hrc"
+
  // #define DLG_GLOSSARY 256
 ModalDialog DLG_GLOSSARY
 {
@@ -289,7 +291,7 @@ String STR_GLOSSARY
     Text [ en-US ] = "AutoText :" ;
 };
 /*IAccessibility2 Implementation 2009-----*/
-String STR_SW_CATEGORY
+String STR_ACCESS_SW_CATEGORY
 {
     Text [ en-US ] = "Category" ;
 };
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index c6cd79b9f107..f4e5e8d2bb02 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -53,6 +53,8 @@
 #include <fmtrowsplt.hxx>
 #include <svx/htmlmode.hxx>
 
+#include "access.hrc"
+
 #ifndef _DOCSH_HXX
 #include <docsh.hxx>
 #endif
@@ -994,7 +996,7 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
         pTextArr[i]->SetText( sEntry );
 //IAccessibility2 Impplementaton 2009-----
         //added by menghu for SODC_5143,12/12/2006
-        String sColumnWidth = SW_RESSTR( STR_COLUMN_WIDTH );
+        String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH);
         sColumnWidth.SearchAndReplace( DEFINE_CONST_UNICODE("%1"), sIndex );
         pFieldArr[i]->SetAccessibleName( sColumnWidth );
         //end of SODC_5143
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
index 4c858f9fcb98..f03aed6afffc 100644
--- a/sw/source/ui/table/tabledlg.hrc
+++ b/sw/source/ui/table/tabledlg.hrc
@@ -106,8 +106,6 @@
 #define FL_VERT_ORIENT          140
 #define RB_FROM_LEFT        144
 
-//IAccessibility2 Impplementaton 2009-----
-#define STR_COLUMN_WIDTH    145
-//-----IAccessibility2 Impplementaton 2009
 #define FT_VERTORIENT       150
 #define LB_VERTORIENT       151
+
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index 4ac846597530..51248119c5f1 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -786,10 +786,3 @@ InfoBox MSG_WRONG_TABLENAME
 {
     Message [ en-US ] = "The name of the table must not contain spaces." ;
 };
-
-//IAccessibility2 Impplementaton 2009-----
-String STR_COLUMN_WIDTH
-{
-    Text [ en-US ] = "Column %1 Width" ;
-};
-//-----IAccessibility2 Impplementaton 2009
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 53b8b1aa2e54..49413fba6e97 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -80,6 +80,8 @@
 #include <utlui.hrc>
 #endif
 
+#include "access.hrc"
+
 #include <unomid.h>
 
 
@@ -934,8 +936,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     aPageChgTimer.SetTimeoutHdl(LINK(this, SwNavigationPI, ChangePageHdl));
     aPageChgTimer.SetTimeout(PAGE_CHANGE_TIMEOUT);
 
-    aContentTree.SetAccessibleName(SW_RESSTR(ST_TL_CONTENT));
-    aGlobalTree.SetAccessibleName(SW_RESSTR(ST_TL_GLOBAL));
+    aContentTree.SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_CONTENT));
+    aGlobalTree.SetAccessibleName(SW_RESSTR(STR_ACCESS_TL_GLOBAL));
     aDocListBox.SetAccessibleName(aStatusArr[3]);
 }
 
diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc
index 47dfe3ec4bab..70fd1dc6e14a 100644
--- a/sw/source/ui/utlui/navipi.hrc
+++ b/sw/source/ui/utlui/navipi.hrc
@@ -88,8 +88,3 @@
 #define ST_POSTIT_SHOW              (ST_GLOBAL_CONTEXT_FIRST +35)
 #define ST_POSTIT_HIDE              (ST_GLOBAL_CONTEXT_FIRST +36)
 #define ST_POSTIT_DELETE            (ST_GLOBAL_CONTEXT_FIRST +37)
-
-//IAccessibility2 Implementation 2009-----
-#define ST_TL_GLOBAL            ST_GLOBAL_CONTEXT_FIRST +38
-#define ST_TL_CONTENT           ST_GLOBAL_CONTEXT_FIRST +39
-//-----IAccessibility2 Implementation 2009
diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/ui/utlui/navipi.src
index e9d07896f321..fde6b82f139b 100644
--- a/sw/source/ui/utlui/navipi.src
+++ b/sw/source/ui/utlui/navipi.src
@@ -29,6 +29,7 @@
 #include "utlui.hrc"
 #include "navipi.hrc"
 #include "helpid.h"
+#include "access.hrc"
 
 Window DLG_NAVIGATION_PI
 {
@@ -536,11 +537,11 @@ ImageList IMG_NAVI_ENTRYBMPH
 };
 
 //IAccessibility2 Implementation 2009-----
-String ST_TL_GLOBAL
+String STR_ACCESS_TL_GLOBAL
 {
     Text [ en-US ] = "Global View";
 };
-String ST_TL_CONTENT
+String STR_ACCESS_TL_CONTENT
 {
     Text [ en-US ] = "Content View";
 };