incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mba...@apache.org
Subject svn commit: r1172343 - in /incubator/ooo/trunk/main: cui/source/tabpages/autocdlg.src cui/source/tabpages/tpbitmap.cxx sfx2/source/dialog/dialog.hrc sfx2/source/dialog/newstyle.cxx sfx2/source/dialog/templdlg.hrc svx/source/dialog/ctredlin.src
Date Sun, 18 Sep 2011 20:51:30 GMT
Author: mbauer
Date: Sun Sep 18 20:51:29 2011
New Revision: 1172343

URL: http://svn.apache.org/viewvc?rev=1172343&view=rev
Log:
cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation

Modified:
    incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.src
    incubator/ooo/trunk/main/cui/source/tabpages/tpbitmap.cxx
    incubator/ooo/trunk/main/sfx2/source/dialog/dialog.hrc
    incubator/ooo/trunk/main/sfx2/source/dialog/newstyle.cxx
    incubator/ooo/trunk/main/sfx2/source/dialog/templdlg.hrc
    incubator/ooo/trunk/main/svx/source/dialog/ctredlin.src

Modified: incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.src?rev=1172343&r1=1172342&r2=1172343&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.src (original)
+++ incubator/ooo/trunk/main/cui/source/tabpages/autocdlg.src Sun Sep 18 20:51:29 2011
@@ -499,30 +499,6 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
     {
         Text [ en-US ] = "Delete words with two initial capitals" ;
 	};
-	String STR_PB_SGL_STD
-    {
-        Text [ en-US ] = "Single quotes default" ;
-	};
-	String STR_PB_DBL_STD
-    {
-        Text [ en-US ] = "Double quotes default" ;
-	};
-	String STR_PB_SGL_START
-    {
-        Text [ en-US ] = "Start quote of single quotes" ;
-	};
-	String STR_PB_DBL_START
-    {
-        Text [ en-US ] = "Start quote of double quotes" ;
-	};
-	String STR_PB_SGL_END
-    {
-        Text [ en-US ] = "End quote of single quotes" ;
-	};
-	String STR_PB_DBL_END
-    {
-        Text [ en-US ] = "End quote of double quotes" ;
-	};
 };
 /**************************************************************************/
 /*                                                                        */
@@ -691,6 +667,30 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
     {
         Text [ en-US ] = "Default" ;
 	};
+	String STR_PB_SGL_STD
+    {
+        Text [ en-US ] = "Single quotes default" ;
+	};
+	String STR_PB_DBL_STD
+    {
+        Text [ en-US ] = "Double quotes default" ;
+	};
+	String STR_PB_SGL_START
+    {
+        Text [ en-US ] = "Start quote of single quotes" ;
+	};
+	String STR_PB_DBL_START
+    {
+        Text [ en-US ] = "Start quote of double quotes" ;
+	};
+	String STR_PB_SGL_END
+    {
+        Text [ en-US ] = "End quote of single quotes" ;
+	};
+	String STR_PB_DBL_END
+    {
+        Text [ en-US ] = "End quote of double quotes" ;
+	};
 };
 
 /**************************************************************************/

Modified: incubator/ooo/trunk/main/cui/source/tabpages/tpbitmap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/cui/source/tabpages/tpbitmap.cxx?rev=1172343&r1=1172342&r2=1172343&view=diff
==============================================================================
--- incubator/ooo/trunk/main/cui/source/tabpages/tpbitmap.cxx (original)
+++ incubator/ooo/trunk/main/cui/source/tabpages/tpbitmap.cxx Sun Sep 18 20:51:29 2011
@@ -149,7 +149,7 @@ SvxBitmapTabPage::SvxBitmapTabPage
 	aLbBackgroundColor.SetSelectHdl(
 		LINK( this, SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl ) );
 
-	String accName = String(SVX_RES(STR_EXAMPLE)); 
+	String accName = String(CUI_RES(STR_EXAMPLE)); 
 	aCtlPreview.SetAccessibleName(accName); 
 	aCtlPixel.SetAccessibleRelationMemberOf( &aFlProp );
 	aCtlPixel.SetAccessibleRelationLabeledBy( &aFtPixelEdit );

Modified: incubator/ooo/trunk/main/sfx2/source/dialog/dialog.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/dialog/dialog.hrc?rev=1172343&r1=1172342&r2=1172343&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/dialog/dialog.hrc (original)
+++ incubator/ooo/trunk/main/sfx2/source/dialog/dialog.hrc Sun Sep 18 20:51:29 2011
@@ -78,6 +78,8 @@
 #define RID_EDIT_DURATIONS              ( RC_DIALOG_BEGIN + 123 )
 #define SFX_PB_EDIT                     ( RC_DIALOG_BEGIN + 124 )
 
+#define STR_STYLE_ELEMTLIST				( RC_DIALOG_BEGIN + 125 )
+
 #endif // #ifndef _SFX_DIALOG_HRC
 
 // eof ------------------------------------------------------------------------

Modified: incubator/ooo/trunk/main/sfx2/source/dialog/newstyle.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/dialog/newstyle.cxx?rev=1172343&r1=1172342&r2=1172343&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/dialog/newstyle.cxx (original)
+++ incubator/ooo/trunk/main/sfx2/source/dialog/newstyle.cxx Sun Sep 18 20:51:29 2011
@@ -91,7 +91,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* 
 	aOKBtn.SetClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
 	aColBox.SetModifyHdl(LINK(this, SfxNewStyleDlg, ModifyHdl));
 	aColBox.SetDoubleClickHdl(LINK(this, SfxNewStyleDlg, OKHdl));
-	aColBox.SetAccessibleName(SfxResId(FL_COL));
+	// aColBox.SetAccessibleName(SfxResId(FL_COL));
 
 	SfxStyleSheetBase *pStyle = rPool.First();
 	while ( pStyle )

Modified: incubator/ooo/trunk/main/sfx2/source/dialog/templdlg.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/dialog/templdlg.hrc?rev=1172343&r1=1172342&r2=1172343&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/source/dialog/templdlg.hrc (original)
+++ incubator/ooo/trunk/main/sfx2/source/dialog/templdlg.hrc Sun Sep 18 20:51:29 2011
@@ -48,8 +48,3 @@
 #define BT_FLIST 8
 #define BT_VLIST 9
 #define BT_TOOL 10
-
-//IAccessibility2 Implementation 2009-----
-#define STR_STYLE_ELEMTLIST	18
-//-----IAccessibility2 Implementation 2009
-

Modified: incubator/ooo/trunk/main/svx/source/dialog/ctredlin.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/dialog/ctredlin.src?rev=1172343&r1=1172342&r2=1172343&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/dialog/ctredlin.src (original)
+++ incubator/ooo/trunk/main/svx/source/dialog/ctredlin.src Sun Sep 18 20:51:29 2011
@@ -281,10 +281,6 @@ TabPage SID_REDLIN_FILTER_PAGE
 	{
 		Text [ en-US ] = "End Time" ;
 	};
-	String STR_TREE
-	{
-		Text [ en-US ] = "Changes" ;
-	};
 	/*-----IAccessibility2 Implementation 2009*/
 };
 TabPage SID_REDLIN_VIEW_PAGE
@@ -362,6 +358,10 @@ TabPage SID_REDLIN_VIEW_PAGE
 	{
 		Text [ en-US ] = "Comment" ;
 	};
+	String STR_TREE
+	{
+		Text [ en-US ] = "Changes" ;
+	};
 };
 
 



Mime
View raw message